diff --git a/snapshotmfo.cls b/snapshotmfo.cls index 8cd3f56..7c11e7e 100644 --- a/snapshotmfo.cls +++ b/snapshotmfo.cls @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e} \listfiles -\ProvidesClass{snapshotmfo}[2023/05/19 Document class for "Snapshots of modern mathematics from Oberwolfach"] +\ProvidesClass{snapshotmfo}[2023/09/08 Document class for "Snapshots of modern mathematics from Oberwolfach"] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % snapshotmfo is based on the Koma-Script ‘article’ class \LoadClass[10pt,twoside]{scrartcl} @@ -94,8 +94,7 @@ \textsuperscript{\framebox{\raisebox{0pt}[1.05\height][0.025\height]{\thefootnotemark}}}% } \deffootnote[1.5em]{0em}{1.5em}{\rlap{\snapshot@footnotemark}\hspace{1.5em}} -\deffootnotemark{\hskip .1em\snapshot@footnotemark} -%\deffootnotemark{\snapshot@footnotemark} +\deffootnotemark{\snapshot@footnotemark} \@ifclasslater{scrartcl}{2010/06/17}{% \setfootnoterule[0.526pt]{\textwidth} }{% @@ -105,7 +104,7 @@ \kern 2.474pt } } -\newcommand\footnotewithoutspace[1]{\hskip -.1em\footnote{#1}} +\newcommand\footnotewithspace[1]{\kern .1em\footnote{#1}} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % fonts & symbols @@ -780,8 +779,7 @@ \snapshot@define@spaces% \newpage \global\@topnum\z@ -% \deffootnotemark{\hskip .1em\snapshot@footnotemark} - \let\thanks\footnote% + \let\thanks\footnotewithspace% \@maketitle \thispagestyle{\titlepagestyle} \endgroup @@ -824,7 +822,7 @@ }% \renewcommand*{\@maketitle}{% \clearpage - \let\footnote\thanks + \let\footnotewithspace\thanks \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative \noindent \parbox[t]{0.5\linewidth}{\sffamily\relscale{0.9}\snapshot@l@header}% diff --git a/template.pdf b/template.pdf index 929e251..f36f328 100644 Binary files a/template.pdf and b/template.pdf differ diff --git a/template.tex b/template.tex index c2db1d7..af9f237 100644 --- a/template.tex +++ b/template.tex @@ -200,7 +200,7 @@ \section{A heading} %%% If necessary, use the optional argument to supply an alternative text for the pdf bookmark, cf. the comment on \title above: %\section[Optional plain text substitute]{A heading containing math mode, for example} -This is the main text\footnote{This footnote follows a word.} of your snapshot.\footnotewithoutspace{This footnote follows a punctuation mark.} Here you develop the story of your snapshot. +This is the main text\footnotewithspace{This footnote follows a word.} of your snapshot.\footnote{This footnote follows a punctuation mark.} Here you develop the story of your snapshot. How do you come up with a good idea for a snapshot? Imagine your university organizes an ``open house'' and you want to give a talk to convince high school students to study with you. If you can touch on recent research in such a talk then it is also a great topic for a snapshot. Ideally, a snapshot has 5--8 pages, so you can necessarily explain only a small ``snapshot'' of your mathematical interests. diff --git a/testsuite/data/general/test-hyperref.tex b/testsuite/data/general/test-hyperref.tex index 0ba9071..db320e9 100644 --- a/testsuite/data/general/test-hyperref.tex +++ b/testsuite/data/general/test-hyperref.tex @@ -39,7 +39,7 @@ %%% Please insert your abstract here. \begin{abstract}[How to handle special content in special places?] -How to handle special content\footnote{as explained below} in special places\footnote{as explained below}? +How to handle special content\footnotewithspace{as explained below} in special places\footnotewithspace{as explained below}? \end{abstract} \noindent ``Special content'' means everything that raises a hyperref warning, e.\,g. @@ -96,7 +96,7 @@ \noindent Please activate the navigation pane (or side pane) of your pdf viewer, choose the bookmarks (or the table of contents) to be displayed and unfold the tree to compare its entries to the following headings: -\section[abbr. section heading]{a section heading\footnote{An ordinary footnote within a section heading.} +\section[abbr. section heading]{a section heading\footnotewithspace{An ordinary footnote within a section heading.} } The footnote has been removed from the pdf substitute of the section heading. diff --git a/testsuite/data/lang_USenglish/test-footnote.tex b/testsuite/data/lang_USenglish/test-footnote.tex index 0372337..123f29b 100644 --- a/testsuite/data/lang_USenglish/test-footnote.tex +++ b/testsuite/data/lang_USenglish/test-footnote.tex @@ -30,65 +30,71 @@ Does the spacing of the footnote marks in the title and in the text look good? \end{abstract} -\verb+\hskip .1em+ as set in snapshotmfo.cls is a good spacing for footnote marks, to be undone -using \verb+\footnotewithoutspace+ instead of \verb+\footnote+ after punctuation marks. +In the title, use\\ +\verb+\thanks+ after a word and\\ +\verb+\texorpdfstring{\kern -.1em}{}\thanks{\dots}+ after a punctuation mark. -In the title, the remedy is trickier:\\ -\verb+\texorpdfstring{\hskip -.1em}{}\thanks{\dots}+ +In a paragraph, use\\ +\verb+\footnote+ after a punctuation mark and\\ +\verb+\footnotewithspace+ after a word. \section{Case 1: after a word} -This\footnotewithoutspace{a} is narrow. +\noindent This\footnote{a} is narrow. -\noindent This\footnote{b} is natural. - -\noindent This\hskip .1em\footnote{c} is wide. +\noindent This\footnotewithspace{b} is natural. \section{Case 2: between word and punctuation} -\noindent This\footnotewithoutspace{d}. is narrow. - -\noindent This\footnote{e}. is natural. +\noindent This\footnote{d}. is narrow. -\noindent This\hskip .1em\footnote{f}. is wide. +\noindent This\footnotewithspace{e}. is natural. \subsection{with different punctuation marks} -\noindent This\footnote{g}, is natural. +\noindent This\footnote{g}, is narrow. -\noindent This\footnote{h}; is natural. +\noindent This\footnote{h}; is narrow. -\noindent This\footnote{i}: is natural. +\noindent This\footnote{i}: is narrow. -\noindent This\footnote{j}? is natural. +\noindent This\footnote{j}? is narrow. -\noindent This\footnote{k}! is natural. +\noindent This\footnote{k}! is narrow. \section{Case 3: after punctuation} -\noindent This.\footnotewithoutspace{l} is narrow. +\noindent This.\footnote{l} is natural. -\noindent This.\footnote{m} is natural. - -\noindent This.\hskip .1em\footnote{n} is wide. +\noindent This.\footnotewithspace{m} is wide. \subsection{with different punctuation marks} \noindent This,\footnote{o} is natural. +\noindent This,\footnotewithspace{o} is wide. + \noindent This;\footnote{p} is natural. +\noindent This;\footnotewithspace{p} is wide. + \noindent This:\footnote{q} is natural. +\noindent This:\footnotewithspace{q} is wide. + \noindent This?\footnote{r} is natural. +\noindent This?\footnotewithspace{r} is wide. + \noindent This!\footnote{s} is natural. +\noindent This!\footnotewithspace{s} is wide. + \section{punctuation by itself} diff --git a/testsuite/data/lang_USenglish/test-template.tex b/testsuite/data/lang_USenglish/test-template.tex index e92f301..709bf3f 100644 --- a/testsuite/data/lang_USenglish/test-template.tex +++ b/testsuite/data/lang_USenglish/test-template.tex @@ -245,7 +245,7 @@ \section{A heading} %%% If necessary, use the optional argument to supply an alternative text for the pdf bookmark, cf. the comment on \title above: %\section[Optional plain text substitute]{A heading containing math mode, for example} -This is the main text\footnote{This footnote follows a word.} of your snapshot.\footnotewithoutspace{This footnote follows a punctuation mark.} Here you develop the story of your snapshot. +This is the main text\footnotewithspace{This footnote follows a word.} of your snapshot.\footnote{This footnote follows a punctuation mark.} Here you develop the story of your snapshot. How do you come up with a good idea for a snapshot? Imagine your university organizes an ``open house'' and you want to give a talk to convince high school students to study with you. If you can touch on recent research in such a talk then it is also a great topic for a snapshot. Ideally, a snapshot has 5--8 pages, so you can necessarily explain only a small ``snapshot'' of your mathematical interests. diff --git a/testsuite/data/lang_french/test-footnote.tex b/testsuite/data/lang_french/test-footnote.tex index 2b17f4f..8828e08 100644 --- a/testsuite/data/lang_french/test-footnote.tex +++ b/testsuite/data/lang_french/test-footnote.tex @@ -16,7 +16,7 @@ \author{% natural\thanks{natural spacing} and -narrow,\texorpdfstring{\hskip -.1em}{}\thanks{narrow spacing} +narrow,\texorpdfstring{\kern -.1em}{}\thanks{narrow spacing} spacing of footnotemarks in the title \and Author Two} \title{french footnotes} @@ -30,65 +30,71 @@ Does the spacing of the footnote marks in the title and in the text look good? \end{abstract} -\verb+\hskip .1em+ as set in snapshotmfo.cls is a good spacing for footnote marks, to be undone -using \verb+\footnotewithoutspace+ instead of \verb+\footnote+ after punctuation marks. +In the title, use\\ +\verb+\thanks+ after a word and\\ +\verb+\texorpdfstring{\kern -.1em}{}\thanks{\dots}+ after a punctuation mark. -In the title, the remedy is trickier:\\ -\verb+\texorpdfstring{\hskip -.1em}{}\thanks{\dots}+ +In a paragraph, use\\ +\verb+\footnote+ after a punctuation mark and\\ +\verb+\footnotewithspace+ after a word. \section{Case 1: after a word} -This\footnotewithoutspace{a} is narrow. +\noindent This\footnote{a} is narrow. -\noindent This\footnote{b} is natural. - -\noindent This\hskip .1em\footnote{c} is wide. +\noindent This\footnotewithspace{b} is natural. \section{Case 2: between word and punctuation} -\noindent This\footnotewithoutspace{d}. is narrow. - -\noindent This\footnote{e}. is natural. +\noindent This\footnote{d}. is narrow. -\noindent This\hskip .1em\footnote{f}. is wide. +\noindent This\footnotewithspace{e}. is natural. \subsection{with different punctuation marks} -\noindent This\footnote{g}, is natural. +\noindent This\footnote{g}, is narrow. -\noindent This\footnote{h}; is natural. +\noindent This\footnote{h}; is narrow. -\noindent This\footnote{i}: is natural. +\noindent This\footnote{i}: is narrow. -\noindent This\footnote{j}? is natural. +\noindent This\footnote{j}? is narrow. -\noindent This\footnote{k}! is natural. +\noindent This\footnote{k}! is narrow. \section{Case 3: after punctuation} -\noindent This.\footnotewithoutspace{l} is narrow. +\noindent This.\footnote{l} is natural. -\noindent This.\footnote{m} is natural. - -\noindent This.\hskip .1em\footnote{n} is wide. +\noindent This.\footnotewithspace{m} is wide. \subsection{with different punctuation marks} \noindent This,\footnote{o} is natural. +\noindent This,\footnotewithspace{o} is wide. + \noindent This;\footnote{p} is natural. +\noindent This;\footnotewithspace{p} is wide. + \noindent This:\footnote{q} is natural. +\noindent This:\footnotewithspace{q} is wide. + \noindent This?\footnote{r} is natural. +\noindent This?\footnotewithspace{r} is wide. + \noindent This!\footnote{s} is natural. +\noindent This!\footnotewithspace{s} is wide. + \section{punctuation by itself} diff --git a/testsuite/data/lang_french/test-template.tex b/testsuite/data/lang_french/test-template.tex index 51b14a8..06c5c92 100644 --- a/testsuite/data/lang_french/test-template.tex +++ b/testsuite/data/lang_french/test-template.tex @@ -245,7 +245,7 @@ \section{A heading} %%% If necessary, use the optional argument to supply an alternative text for the pdf bookmark, cf. the comment on \title above: %\section[Optional plain text substitute]{A heading containing math mode, for example} -This is the main text\footnote{This footnote follows a word.} of your snapshot.\footnotewithoutspace{This footnote follows a punctuation mark.} Here you develop the story of your snapshot. +This is the main text\footnotewithspace{This footnote follows a word.} of your snapshot.\footnote{This footnote follows a punctuation mark.} Here you develop the story of your snapshot. How do you come up with a good idea for a snapshot? Imagine your university organizes an ``open house'' and you want to give a talk to convince high school students to study with you. If you can touch on recent research in such a talk then it is also a great topic for a snapshot. Ideally, a snapshot has 5--8 pages, so you can necessarily explain only a small ``snapshot'' of your mathematical interests. diff --git a/testsuite/data/lang_ngerman/test-footnote.tex b/testsuite/data/lang_ngerman/test-footnote.tex index b671b14..a598ece 100644 --- a/testsuite/data/lang_ngerman/test-footnote.tex +++ b/testsuite/data/lang_ngerman/test-footnote.tex @@ -30,65 +30,72 @@ Does the spacing of the footnote marks in the title and in the text look good? \end{abstract} -\verb+\hskip .1em+ as set in snapshotmfo.cls is a good spacing for footnote marks, to be undone -using \verb+\footnotewithoutspace+ instead of \verb+\footnote+ after punctuation marks. +In the title, use\\ +\verb+\thanks+ after a word and\\ +\verb+\texorpdfstring{\kern -.1em}{}\thanks{\dots}+ after a punctuation mark. -In the title, the remedy is trickier:\\ -\verb+\texorpdfstring{\hskip -.1em}{}\thanks{\dots}+ +In a paragraph, use\\ +\verb+\footnote+ after a punctuation mark and\\ +\verb+\footnotewithspace+ after a word. \section{Case 1: after a word} -This\footnotewithoutspace{a} is narrow. +\noindent This\footnote{a} is narrow. -\noindent This\footnote{b} is natural. - -\noindent This\hskip .1em\footnote{c} is wide. +\noindent This\footnotewithspace{b} is natural. \section{Case 2: between word and punctuation} -\noindent This\footnotewithoutspace{d}. is narrow. - -\noindent This\footnote{e}. is natural. +\noindent This\footnote{d}. is narrow. -\noindent This\hskip .1em\footnote{f}. is wide. +\noindent This\footnotewithspace{e}. is natural. \subsection{with different punctuation marks} -\noindent This\footnote{g}, is natural. +\noindent This\footnote{g}, is narrow. -\noindent This\footnote{h}; is natural. +\noindent This\footnote{h}; is narrow. -\noindent This\footnote{i}: is natural. +\noindent This\footnote{i}: is narrow. -\noindent This\footnote{j}? is natural. +\noindent This\footnote{j}? is narrow. -\noindent This\footnote{k}! is natural. +\noindent This\footnote{k}! is narrow. \section{Case 3: after punctuation} -\noindent This.\footnotewithoutspace{l} is narrow. - -\noindent This.\footnote{m} is natural. +\noindent This.\footnote{l} is natural. -\noindent This.\hskip .1em\footnote{n} is wide. +\noindent This.\footnotewithspace{m} is wide. \subsection{with different punctuation marks} \noindent This,\footnote{o} is natural. +\noindent This,\footnotewithspace{o} is wide. + \noindent This;\footnote{p} is natural. +\noindent This;\footnotewithspace{p} is wide. + \noindent This:\footnote{q} is natural. +\noindent This:\footnotewithspace{q} is wide. + \noindent This?\footnote{r} is natural. +\noindent This?\footnotewithspace{r} is wide. + \noindent This!\footnote{s} is natural. +\noindent This!\footnotewithspace{s} is wide. + + \section{punctuation by itself} diff --git a/testsuite/data/lang_ngerman/test-template.tex b/testsuite/data/lang_ngerman/test-template.tex index 7470737..62cf915 100644 --- a/testsuite/data/lang_ngerman/test-template.tex +++ b/testsuite/data/lang_ngerman/test-template.tex @@ -245,7 +245,7 @@ \section{A heading} %%% If necessary, use the optional argument to supply an alternative text for the pdf bookmark, cf. the comment on \title above: %\section[Optional plain text substitute]{A heading containing math mode, for example} -This is the main text\footnote{This footnote follows a word.} of your snapshot.\footnotewithoutspace{This footnote follows a punctuation mark.} Here you develop the story of your snapshot. +This is the main text\footnotewithspace{This footnote follows a word.} of your snapshot.\footnote{This footnote follows a punctuation mark.} Here you develop the story of your snapshot. How do you come up with a good idea for a snapshot? Imagine your university organizes an ``open house'' and you want to give a talk to convince high school students to study with you. If you can touch on recent research in such a talk then it is also a great topic for a snapshot. Ideally, a snapshot has 5--8 pages, so you can necessarily explain only a small ``snapshot'' of your mathematical interests. diff --git a/testsuite/data/lang_spanish/test-footnote.tex b/testsuite/data/lang_spanish/test-footnote.tex index bfd2885..a122690 100644 --- a/testsuite/data/lang_spanish/test-footnote.tex +++ b/testsuite/data/lang_spanish/test-footnote.tex @@ -30,65 +30,72 @@ Does the spacing of the footnote marks in the title and in the text look good? \end{abstract} -\verb+\hskip .1em+ as set in snapshotmfo.cls is a good spacing for footnote marks, to be undone -using \verb+\footnotewithoutspace+ instead of \verb+\footnote+ after punctuation marks. +In the title, use\\ +\verb+\thanks+ after a word and\\ +\verb+\texorpdfstring{\kern -.1em}{}\thanks{\dots}+ after a punctuation mark. -In the title, the remedy is trickier:\\ -\verb+\texorpdfstring{\hskip -.1em}{}\thanks{\dots}+ +In a paragraph, use\\ +\verb+\footnote+ after a punctuation mark and\\ +\verb+\footnotewithspace+ after a word. \section{Case 1: after a word} -This\footnotewithoutspace{a} is narrow. +\noindent This\footnote{a} is narrow. -\noindent This\footnote{b} is natural. - -\noindent This\hskip .1em\footnote{c} is wide. +\noindent This\footnotewithspace{b} is natural. \section{Case 2: between word and punctuation} -\noindent This\footnotewithoutspace{d}. is narrow. - -\noindent This\footnote{e}. is natural. +\noindent This\footnote{d}. is narrow. -\noindent This\hskip .1em\footnote{f}. is wide. +\noindent This\footnotewithspace{e}. is natural. \subsection{with different punctuation marks} -\noindent This\footnote{g}, is natural. +\noindent This\footnote{g}, is narrow. -\noindent This\footnote{h}; is natural. +\noindent This\footnote{h}; is narrow. -\noindent This\footnote{i}: is natural. +\noindent This\footnote{i}: is narrow. -\noindent This\footnote{j}? is natural. +\noindent This\footnote{j}? is narrow. -\noindent This\footnote{k}! is natural. +\noindent This\footnote{k}! is narrow. \section{Case 3: after punctuation} -\noindent This.\footnotewithoutspace{l} is narrow. - -\noindent This.\footnote{m} is natural. +\noindent This.\footnote{l} is natural. -\noindent This.\hskip .1em\footnote{n} is wide. +\noindent This.\footnotewithspace{m} is wide. \subsection{with different punctuation marks} \noindent This,\footnote{o} is natural. +\noindent This,\footnotewithspace{o} is wide. + \noindent This;\footnote{p} is natural. +\noindent This;\footnotewithspace{p} is wide. + \noindent This:\footnote{q} is natural. +\noindent This:\footnotewithspace{q} is wide. + \noindent This?\footnote{r} is natural. +\noindent This?\footnotewithspace{r} is wide. + \noindent This!\footnote{s} is natural. +\noindent This!\footnotewithspace{s} is wide. + + \section{punctuation by itself} diff --git a/testsuite/data/lang_spanish/test-template.tex b/testsuite/data/lang_spanish/test-template.tex index f302397..c6b078e 100644 --- a/testsuite/data/lang_spanish/test-template.tex +++ b/testsuite/data/lang_spanish/test-template.tex @@ -251,7 +251,7 @@ \section{A heading} %%% If necessary, use the optional argument to supply an alternative text for the pdf bookmark, cf. the comment on \title above: %\section[Optional plain text substitute]{A heading containing math mode, for example} -This is the main text\footnote{This footnote follows a word.} of your snapshot.\footnotewithoutspace{This footnote follows a punctuation mark.} Here you develop the story of your snapshot. +This is the main text\footnotewithspace{This footnote follows a word.} of your snapshot.\footnote{This footnote follows a punctuation mark.} Here you develop the story of your snapshot. How do you come up with a good idea for a snapshot? Imagine your university organizes an ``open house'' and you want to give a talk to convince high school students to study with you. If you can touch on recent research in such a talk then it is also a great topic for a snapshot. Ideally, a snapshot has 5--8 pages, so you can necessarily explain only a small ``snapshot'' of your mathematical interests.