sync with jsclasses/2016-12-01

diff --git a/src/ltjsarticle.cls b/src/ltjsarticle.cls
index 45e5899..d5755cf 100644 (file)
--- a/src/ltjsarticle.cls
+++ b/src/ltjsarticle.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsarticle}
-  [2016/10/13 ltjsclasses ]
+  [2016/12/05 ltjsclasses ]
 \def\jsc@clsname{ltjsarticle}
 \RequirePackage{luatexja}
 \newif\if@restonecol
@@ -1440,7 +1440,7 @@ class has defined the old font commands like\MessageBreak
   \ifvmode
     \@nolnerr
   \else
-    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
+    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip\z@
     \inhibitglue \ignorespaces
   \fi}
 \IfFileExists{jslogo.sty}{}{\@jslogofalse}%

diff --git a/src/ltjsbook.cls b/src/ltjsbook.cls
index ccbb90b..52ccab7 100644 (file)
--- a/src/ltjsbook.cls
+++ b/src/ltjsbook.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsbook}
-  [2016/10/13 ltjsclasses ]
+  [2016/12/05 ltjsclasses ]
 \def\jsc@clsname{ltjsbook}
 \RequirePackage{luatexja}
 \newif\if@restonecol
@@ -1523,7 +1523,7 @@ class has defined the old font commands like\MessageBreak
   \ifvmode
     \@nolnerr
   \else
-    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
+    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip\z@
     \inhibitglue \ignorespaces
   \fi}
 \IfFileExists{jslogo.sty}{}{\@jslogofalse}%

diff --git a/src/ltjsclasses.dtx b/src/ltjsclasses.dtx
index 33523e3..98fe737 100644 (file)
--- a/src/ltjsclasses.dtx
+++ b/src/ltjsclasses.dtx
@@ -56,7 +56,7 @@
 %<*driver>
 \ProvidesFile{ltjsclasses.dtx}
 %</driver>
-  [2016/11/24 ltjsclasses ]
+  [2016/12/05 ltjsclasses ]
 %<*driver>
 \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{}
 \documentclass{ltjsarticle}
@@ -4750,17 +4750,17 @@
 % で囲んでください。
 %
 %    \begin{macrocode}
-% \def\@citex[#1]#2{%
+% \def\@citex[#1]#2{\leavevmode
 %   \let\@citea\@empty
 %   \@cite{\@for\@citeb:=#2\do
 %     {\@citea\def\@citea{，\inhibitglue\penalty\@m\ }%
-%      \edef\@citeb{\expandafter\@firstofone\@citeb}%
+%      \edef\@citeb{\expandafter\@firstofone\@citeb\@empty}%
 %      \if@filesw\immediate\write\@auxout{\string\citation{\@citeb}}\fi
 %      \@ifundefined{b@\@citeb}{\mbox{\normalfont\bfseries ?}%
 %        \G@refundefinedtrue
 %        \@latex@warning
 %          {Citation `\@citeb' on page \thepage \space undefined}}%
-%        {\hbox{\csname b@\@citeb\endcsname}}}}{#1}}
+%        {\@cite@ofmt{\csname b@\@citeb\endcsname}}}}{#1}}
 % \def\@cite#1#2{\inhibitglue［{#1\if@tempswa ，#2\fi}］\inhibitglue}
 %    \end{macrocode}
 %
@@ -5115,12 +5115,15 @@
 %
 % しかし単に戻すだけでも駄目みたいなので，ここでも最後にグルーを消しておきます。
 %
+% [2016-12-05 LTJ] 本家[2016-11-29]，lltjcore.styでの変更に追従させます．
+%
 %    \begin{macrocode}
 \def\@gnewline #1{%
   \ifvmode
     \@nolnerr
   \else
-    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
+%<article|book>    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip\z@
+%<jspf|kiyou>    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
     \inhibitglue \ignorespaces
   \fi}
 %    \end{macrocode}

diff --git a/src/ltjskiyou.cls b/src/ltjskiyou.cls
index 99d652a..f2d451d 100644 (file)
--- a/src/ltjskiyou.cls
+++ b/src/ltjskiyou.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjskiyou}
-  [2016/10/13 ltjsclasses ]
+  [2016/12/05 ltjsclasses ]
 \def\jsc@clsname{ltjskiyou}
 \RequirePackage{luatexja}
 \newif\if@restonecol

diff --git a/src/ltjspf.cls b/src/ltjspf.cls
index 38380a0..47f4cfa 100644 (file)
--- a/src/ltjspf.cls
+++ b/src/ltjspf.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjspf}
-  [2016/10/13 ltjsclasses ]
+  [2016/12/05 ltjsclasses ]
 \def\jsc@clsname{ltjspf}
 \RequirePackage{luatexja}
 \newif\if@restonecol

diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty
index 4c30451..b0048e3 100644 (file)
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -235,7 +235,7 @@
   \ifvmode
     \@nolnerr
   \else
-    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
+    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip\z@
     \ignorespaces
   \fi}