Merge branch 'fix' into master

texjporg · Dec 1, 2016 · 3a07373 · 3a07373
2 parents a4cf1f2 + 94cee91
commit 3a07373
Show file tree

Hide file tree

Showing 5 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/11/19 okumura, texjporg]
+  [2016/11/29 okumura, texjporg]
 \def\jsc@clsname{jsarticle}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -1682,8 +1682,8 @@
 \def\f@@t{\bgroup\aftergroup\@foot\let\next}
 \def\f@t#1{#1\@foot}
 \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup
-  \ifhmode\null\fi
   \ifx\pltx@foot@penalty\@undefined\else
+    \ifhmode\null\fi
     \ifnum\pltx@foot@penalty=\z@\else
       \penalty\pltx@foot@penalty
       \pltx@foot@penalty\z@

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

diff --git a/jsclasses.dtx b/jsclasses.dtx
@@ -38,7 +38,7 @@
 %<*driver>
 \ProvidesFile{jsclasses.dtx}
 %</driver>
-  [2016/11/19 okumura, texjporg]
+  [2016/11/29 okumura, texjporg]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -5273,6 +5273,13 @@
 %
 % [2016-09-08] $B%3%_%e%K%F%#HG(B\pLaTeX $B$N%P%0=$@5$KDI?o$7$^$7$?!#(B
 %
+% [2016-11-29] $B8E$$(B\pLaTeX $B$G;HMQ$5$l$?>l9g$r9MN8$7$F%3!<%I$r2~NI!#(B
+% ^^A $B5SCmD>8e$K2~9T$r2DG=$K$9$k$?$a$K(B|\null|$B$rF~$l$k>l9g!$(B
+% ^^A $BF1;~$K%Z%J%k%F%#$b9MN8$7$J$1$l$P8m$C$?2~9T$,5/$-$k2DG=@-$,$"$k!#(B
+% ^^A $B$3$N$?$a!$(B|\ifhmode\null\fi|$B$O(B
+% ^^A   |\ifx\pltx@foot@penalty\@undefined\else ... \fi|
+% ^^A $B>r7o$NFbB&$KCV$$$F$*$/$N$,0BA4!#(B
+%
 %    \begin{macrocode}
 \long\def\@footnotetext{%
   \insert\footins\bgroup
@@ -5293,8 +5300,8 @@
 \def\f@@t{\bgroup\aftergroup\@foot\let\next}
 \def\f@t#1{#1\@foot}
 \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup
-  \ifhmode\null\fi
   \ifx\pltx@foot@penalty\@undefined\else
+    \ifhmode\null\fi
     \ifnum\pltx@foot@penalty=\z@\else
       \penalty\pltx@foot@penalty
       \pltx@foot@penalty\z@

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

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