Fix \footnote call (#155)

gi-ev · Jan 8, 2024 · c180778 · c180778
1 parent ebe6dca
commit c180778
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ## [Unreleased]
 
+## [1.8.1] - 2024-01-08
+
+### Changed
+- Option `defaultsups` now active for package `newtxtext`
+
 ### Fixed
 - Fixed `There's no line here to end.` error for more than two `\affil` calls
-
+- Fixed `\footnote`
 
 ## [1.8] - 2023-11-26
 
@@ -162,7 +167,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 First release of the revised files
 
-[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.8...HEAD
+[Unreleased]: https://github.com/gi-ev/LNI/compare/v1.8.1...HEAD
+[1.8]: https://github.com/gi-ev/LNI/compare/v1.8...v1.8.1
 [1.8]: https://github.com/gi-ev/LNI/compare/v1.7...v1.8
 [1.7]: https://github.com/gi-ev/LNI/compare/v1.6...v1.7
 [1.6]: https://github.com/gi-ev/LNI/compare/v1.5...v1.6

diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@
 ```yaml
 ----------------------------------------------------------------------------
 lni -- A class for submissions to the ``Lecture Notes in Informatics''
-(c) 2016-2023 Gesellschaft für Informatik (GI)
-Version:    1.8
+(c) 2016-2024 Gesellschaft für Informatik (GI)
+Version:    1.8.1
 Maintainer: Martin Sievers
 Email:      [email protected]
 License:    Released under the LaTeX Project Public License v1.3c or later

diff --git a/lni.bst b/lni.bst
@@ -1285,7 +1285,7 @@ FUNCTION {end.bib}
 
 EXECUTE {end.bib}
 %% 
-%% Copyright (C) 2016-2023 by Gesellschaft für Informatik e.V. (GI)
+%% Copyright (C) 2016-2024 by Gesellschaft für Informatik e.V. (GI)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either

diff --git a/lni.cls b/lni.cls
@@ -14,7 +14,7 @@
 %% --------| -----------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{lni}
-    [2023/11/26 v1.8 Official class for submissions to the ``Lecture Notes
+    [2024/01/08 v1.8.1 Official class for submissions to the ``Lecture Notes
     in Informatics'']
 \RequirePackage{iftex}\ifluatex\else\pdfoutput=1\fi%
 \def\@clearglobaloption#1{%
@@ -110,7 +110,7 @@
    \ifPDFTeX
       \IfFileExists{newtxtext.sty}
          {%
-            \RequirePackage{newtxtext}
+            \RequirePackage[defaultsups]{newtxtext}
             \RequirePackage{newtxmath}
             \RequirePackage[zerostyle=b,scaled=.9]{newtxtt}
             \@ifpackagelater{newtxtt}{2014/11/18}%
@@ -125,7 +125,7 @@
          }%
    \else%
       \IfFileExists{newtxmath.sty}
-         {\RequirePackage{newtxmath}}%
+         {\RequirePackage[defaultsups]{newtxmath}}%
          {}%
       \RequirePackage[no-math]{fontspec}
       \IfFontExistsTF{texgyretermes-regular.otf}
@@ -290,8 +290,47 @@
 \RequirePackage{enumitem}
 \RequirePackage[hang]{footmisc}
 \setlength{\footnotemargin}{1em}
-\def\@makefnmark{\rlap{\normalfont\@thefnmark}}%
-
+\long\def\@makefntext#1{%
+   \def\@makefnmark{\rlap{\normalfont\@thefnmark}}%
+   \ifFN@hangfoot
+      \bgroup
+      \setbox\@tempboxa\hbox{%
+         \ifdim\footnotemargin>0pt
+            \hb@xt@\footnotemargin{\@makefnmark\hss}%
+         \else
+            \@makefnmark
+         \fi
+      }%
+      \leftmargin\wd\@tempboxa
+      \rightmargin\z@
+      \linewidth \columnwidth
+      \advance \linewidth -\leftmargin
+      \parshape \@ne \leftmargin \linewidth
+      \@totalleftmargin \leftmargin
+      \footnotesize
+      \@setpar{{\@@par}}%
+      \leavevmode
+      \llap{\box\@tempboxa}%
+      \parskip\hangfootparskip\relax
+      \parindent\hangfootparindent\relax
+   \else
+      \parindent1em
+      \noindent
+      \ifdim\footnotemargin>\z@
+         \hb@xt@ \footnotemargin{\hss\@makefnmark}%
+      \else
+         \ifdim\footnotemargin=\z@
+            \llap{\@makefnmark}%
+         \else
+            \llap{\hb@xt@ -\footnotemargin{\@makefnmark\hss}}%
+         \fi
+      \fi
+   \fi
+   \footnotelayout#1%
+   \ifFN@hangfoot
+      \par\egroup
+   \fi
+}
 \lstset{%
    basicstyle=\ttfamily,%
    columns=fixed,%
@@ -332,7 +371,7 @@
 \renewcommand\Authsep{, }
 \renewcommand\Authands{\iflanguage{ngerman}{ und }{, and }}
 \renewcommand\Authand{\iflanguage{ngerman}{ und }{ and }}
-\renewcommand{\AB@authnote}[1]{$^{\mbox{\footnotesize #1}}$}
+\renewcommand{\AB@authnote}[1]{$^{\text{\mbox{\normalfont\footnotesize #1}}}$}
 \renewcommand\author[4][]{%
    \ifnewaffil\addtocounter{affil}{1}%
       \edef\AB@thenote{\arabic{affil}}%
@@ -554,13 +593,6 @@
   \vfill\kern-3\p@
   \hrule\@width 5cm
   \kern2.6\p@}
-   %\newdimen\fnindent
-   %\fnindent0.18cm
-   %\long\def\@makefntext#1{%
-    %\parindent \fnindent%
-    %\leftskip \fnindent% Einrückung vor der footnotemark
-    %\noindent
-    %\llap{\hb@[email protected]{\hss\@makefnmark\ }}\ignorespaces#1}
 \setlength{\parindent}{0pt}
 \setlength{\parskip}{8pt}
 \setlist{topsep=0pt,itemsep=7pt,parsep=-2pt}
@@ -717,7 +749,7 @@
 \vfuzz \hfuzz
 \raggedbottom
 %% 
-%% Copyright (C) 2016-2023 by Gesellschaft für Informatik e.V. (GI)
+%% Copyright (C) 2016-2024 by Gesellschaft für Informatik e.V. (GI)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either

diff --git a/lni.dtx b/lni.dtx
@@ -60,7 +60,7 @@ License:| Released under the LaTeX Project Public License v1.3c or later
 
 \postamble
 
-Copyright (C) 2016-2023 by Gesellschaft für Informatik e.V. (GI)
+Copyright (C) 2016-2024 by Gesellschaft für Informatik e.V. (GI)
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License (LPPL), either
@@ -134,7 +134,7 @@ This work consists of the file  lni.dtx
 %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<class>\ProvidesClass{lni}
 %<*class>
-    [2023/11/26 v1.8 Official class for submissions to the ``Lecture Notes
+    [2024/01/08 v1.8.1 Official class for submissions to the ``Lecture Notes
     in Informatics'']
 %</class>
 %<*driver>
@@ -826,7 +826,7 @@ This work consists of the file  lni.dtx
    \ifPDFTeX
       \IfFileExists{newtxtext.sty}
          {%
-            \RequirePackage{newtxtext}
+            \RequirePackage[defaultsups]{newtxtext}
             \RequirePackage{newtxmath}
             \RequirePackage[zerostyle=b,scaled=.9]{newtxtt}
 %    \end{macrocode}
@@ -850,7 +850,7 @@ This work consists of the file  lni.dtx
 %    \begin{macrocode}
    \else%
       \IfFileExists{newtxmath.sty}
-         {\RequirePackage{newtxmath}}%
+         {\RequirePackage[defaultsups]{newtxmath}}%
          {}%
       \RequirePackage[no-math]{fontspec}
       \IfFontExistsTF{texgyretermes-regular.otf}
@@ -1043,11 +1043,47 @@ This work consists of the file  lni.dtx
 \RequirePackage{enumitem}
 \RequirePackage[hang]{footmisc}
 \setlength{\footnotemargin}{1em}
-\def\@makefnmark{\rlap{\normalfont\@thefnmark}}%
-
-%    \end{macrocode}
-%    \begin{macrocode}
-%\def\@makefnmark{\rlap{\normalfont\@thefnmark}}%
+\long\def\@makefntext#1{%
+   \def\@makefnmark{\rlap{\normalfont\@thefnmark}}%
+   \ifFN@hangfoot
+      \bgroup
+      \setbox\@tempboxa\hbox{%
+         \ifdim\footnotemargin>0pt
+            \hb@xt@\footnotemargin{\@makefnmark\hss}%
+         \else
+            \@makefnmark
+         \fi
+      }%
+      \leftmargin\wd\@tempboxa
+      \rightmargin\z@
+      \linewidth \columnwidth
+      \advance \linewidth -\leftmargin
+      \parshape \@ne \leftmargin \linewidth
+      \@totalleftmargin \leftmargin
+      \footnotesize
+      \@setpar{{\@@par}}%
+      \leavevmode
+      \llap{\box\@tempboxa}%
+      \parskip\hangfootparskip\relax
+      \parindent\hangfootparindent\relax
+   \else
+      \parindent1em
+      \noindent
+      \ifdim\footnotemargin>\z@
+         \hb@xt@ \footnotemargin{\hss\@makefnmark}%
+      \else
+         \ifdim\footnotemargin=\z@
+            \llap{\@makefnmark}%
+         \else
+            \llap{\hb@xt@ -\footnotemargin{\@makefnmark\hss}}%
+         \fi
+      \fi
+   \fi
+   \footnotelayout#1%
+   \ifFN@hangfoot
+      \par\egroup
+   \fi
+}
 %    \end{macrocode}
 % We fix the basewidth for lstlistings:
 % The default setting of listings with ``fixed columns'' has a space 0.6em
@@ -1113,7 +1149,7 @@ This work consists of the file  lni.dtx
 \renewcommand\Authsep{, }
 \renewcommand\Authands{\iflanguage{ngerman}{ und }{, and }}
 \renewcommand\Authand{\iflanguage{ngerman}{ und }{ and }}
-\renewcommand{\AB@authnote}[1]{$^{\mbox{\footnotesize #1}}$}
+\renewcommand{\AB@authnote}[1]{$^{\text{\mbox{\normalfont\footnotesize #1}}}$}
 \renewcommand\author[4][]{%
    \ifnewaffil\addtocounter{affil}{1}%
       \edef\AB@thenote{\arabic{affil}}%
@@ -1389,13 +1425,6 @@ This work consists of the file  lni.dtx
   \vfill\kern-3\p@
   \hrule\@width 5cm
   \kern2.6\p@}
-   %\newdimen\fnindent
-   %\fnindent0.18cm
-   %\long\def\@makefntext#1{%
-    %\parindent \fnindent%
-    %\leftskip \fnindent% Einrückung vor der footnotemark
-    %\noindent
-    %\llap{\hb@[email protected]{\hss\@makefnmark\ }}\ignorespaces#1}
 %    \end{macrocode}
 %    \begin{macrocode}
 \setlength{\parindent}{0pt}

diff --git a/lnig.bst b/lnig.bst
@@ -1285,7 +1285,7 @@ FUNCTION {end.bib}
 
 EXECUTE {end.bib}
 %% 
-%% Copyright (C) 2016-2023 by Gesellschaft für Informatik e.V. (GI)
+%% Copyright (C) 2016-2024 by Gesellschaft für Informatik e.V. (GI)
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License (LPPL), either