jsclasses.dtx: Fix for \@footnotetext (texjporg/platex#23)

texjporg · Sep 8, 2016 · bb632fb · bb632fb
1 parent e136519
commit bb632fb
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/jsarticle.cls b/jsarticle.cls
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jsarticle}
-  [2016/08/26 okumura, texjporg]
+  [2016/09/08 okumura, texjporg]
 \def\jsc@clsname{jsarticle}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -1663,7 +1663,8 @@
                                 \else \let\next\f@t\fi \next}
 \def\f@@t{\bgroup\aftergroup\@foot\let\next}
 \def\f@t#1{#1\@foot}
-\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup\null
+\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup
+  \ifhmode\null\fi
   \ifx\pltx@foot@penalty\@undefined\else
     \ifnum\pltx@foot@penalty=\z@\else
       \penalty\pltx@foot@penalty

diff --git a/jsbook.cls b/jsbook.cls
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jsbook}
-  [2016/08/26 okumura, texjporg]
+  [2016/09/08 okumura, texjporg]
 \def\jsc@clsname{jsbook}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -1747,7 +1747,8 @@
                                 \else \let\next\f@t\fi \next}
 \def\f@@t{\bgroup\aftergroup\@foot\let\next}
 \def\f@t#1{#1\@foot}
-\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup\null
+\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup
+  \ifhmode\null\fi
   \ifx\pltx@foot@penalty\@undefined\else
     \ifnum\pltx@foot@penalty=\z@\else
       \penalty\pltx@foot@penalty

diff --git a/jsclasses.dtx b/jsclasses.dtx
@@ -38,7 +38,7 @@
 %<*driver>
 \ProvidesFile{jsclasses.dtx}
 %</driver>
-  [2016/08/26 okumura, texjporg]
+  [2016/09/08 okumura, texjporg]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -5178,6 +5178,8 @@
 % |\footnotetext| $B$,B3$/>l9g$K2~9T$,5/$-$k$3$H$,$"$kLdBj$KBP=h!W(B
 % $B$HF1Ey$N%3!<%I$rDI2C$7$^$7$?!#(B
 %
+% [2016-09-08] $B%3%_%e%K%F%#HG(B\pLaTeX $B$N%P%0=$@5$KDI?o$7$^$7$?!#(B
+%
 %    \begin{macrocode}
 \long\def\@footnotetext{%
   \insert\footins\bgroup
@@ -5197,7 +5199,8 @@
                                 \else \let\next\f@t\fi \next}
 \def\f@@t{\bgroup\aftergroup\@foot\let\next}
 \def\f@t#1{#1\@foot}
-\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup\null
+\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup
+  \ifhmode\null\fi
   \ifx\pltx@foot@penalty\@undefined\else
     \ifnum\pltx@foot@penalty=\z@\else
       \penalty\pltx@foot@penalty

diff --git a/jsclasses.pdf b/jsclasses.pdf
diff --git a/jspf.cls b/jspf.cls
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jspf}
-  [2016/08/26 okumura, texjporg]
+  [2016/09/08 okumura, texjporg]
 \def\jsc@clsname{jspf}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -1546,7 +1546,8 @@
                                 \else \let\next\f@t\fi \next}
 \def\f@@t{\bgroup\aftergroup\@foot\let\next}
 \def\f@t#1{#1\@foot}
-\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup\null
+\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup
+  \ifhmode\null\fi
   \ifx\pltx@foot@penalty\@undefined\else
     \ifnum\pltx@foot@penalty=\z@\else
       \penalty\pltx@foot@penalty

diff --git a/kiyou.cls b/kiyou.cls
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{kiyou}
-  [2016/08/26 okumura, texjporg]
+  [2016/09/08 okumura, texjporg]
 \def\jsc@clsname{kiyou}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -1659,7 +1659,8 @@
                                 \else \let\next\f@t\fi \next}
 \def\f@@t{\bgroup\aftergroup\@foot\let\next}
 \def\f@t#1{#1\@foot}
-\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup\null
+\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup
+  \ifhmode\null\fi
   \ifx\pltx@foot@penalty\@undefined\else
     \ifnum\pltx@foot@penalty=\z@\else
       \penalty\pltx@foot@penalty