ltjsclasses: sync with jsclasses (\topskip=1.38\zh)

diff --git a/doc/ltjsclasses.pdf b/doc/ltjsclasses.pdf
index a1c2dd6..5d2b9dd 100644 (file)
Binary files a/doc/ltjsclasses.pdf and b/doc/ltjsclasses.pdf differ

diff --git a/src/ltjsarticle.cls b/src/ltjsarticle.cls
index e6ef345..ce0f975 100644 (file)
--- a/src/ltjsarticle.cls
+++ b/src/ltjsarticle.cls
@@ -461,11 +461,11 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \@lowpenalty   51
 \@medpenalty  151
 \@highpenalty 301
-\setlength\topskip{10\jsc@mpt}
+\setlength\topskip{1.38\zh}%% 2016-08-17
 \if@slide
   \setlength\headheight{0\jsc@mpt}
 \else
-  \setlength\headheight{2\topskip}
+  \setlength\headheight{20\jsc@mpt}%% 2016-08-17
 \fi
 \if@slide
   \setlength\footskip{\z@}
@@ -532,7 +532,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \if@slide
   \addtolength\topmargin{-\headheight}
 \else
-  \addtolength\topmargin{-\topskip}
+  \addtolength\topmargin{-0.5\headheight}%% 2016-08-17
 \fi
 \addtolength\topmargin{-\headsep}
 \addtolength\topmargin{-\footskip}

diff --git a/src/ltjsbook.cls b/src/ltjsbook.cls
index cfedbfc..e144c06 100644 (file)
--- a/src/ltjsbook.cls
+++ b/src/ltjsbook.cls
@@ -468,11 +468,11 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \@lowpenalty   51
 \@medpenalty  151
 \@highpenalty 301
-\setlength\topskip{10\jsc@mpt}
+\setlength\topskip{1.38\zh}%% 2016-08-17
 \if@slide
   \setlength\headheight{0\jsc@mpt}
 \else
-  \setlength\headheight{2\topskip}
+  \setlength\headheight{20\jsc@mpt}%% 2016-08-17
 \fi
 \if@report
   \setlength\footskip{0.03367\paperheight}
@@ -547,7 +547,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \if@slide
   \addtolength\topmargin{-\headheight}
 \else
-  \addtolength\topmargin{-\topskip}
+  \addtolength\topmargin{-0.5\headheight}%% 2016-08-17
 \fi
 \addtolength\topmargin{-\headsep}
 \addtolength\topmargin{-\footskip}

diff --git a/src/ltjsclasses.dtx b/src/ltjsclasses.dtx
index ee896d5..ddf5b74 100644 (file)
--- a/src/ltjsclasses.dtx
+++ b/src/ltjsclasses.dtx
@@ -1509,12 +1509,19 @@
 % 計算では |\headheight| ではなく |\topskip| を使う
 % ことにしました。
 %
+%
+% [2016-08-17] 圏点やルビが一行目に来た場合に下がるのを防ぐた
+% め，|\topskip| を10ptから1.38zwに増やしました。
+% |\headheight| は従来と同じ20ptのままとします。
+%
+% [2016-08-17 LTJ] 1.38zwの代わりに1.38|\zh|にしています。
+%
 %    \begin{macrocode}
-\setlength\topskip{10\jsc@mpt}
+\setlength\topskip{1.38\zh}%% 2016-08-17
 \if@slide
   \setlength\headheight{0\jsc@mpt}
 \else
-  \setlength\headheight{2\topskip}
+  \setlength\headheight{20\jsc@mpt}%% 2016-08-17
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -1809,7 +1816,7 @@
 \if@slide
   \addtolength\topmargin{-\headheight}
 \else
-  \addtolength\topmargin{-\topskip}
+  \addtolength\topmargin{-0.5\headheight}%% 2016-08-17
 \fi
 \addtolength\topmargin{-\headsep}
 \addtolength\topmargin{-\footskip}

diff --git a/src/ltjskiyou.cls b/src/ltjskiyou.cls
index ae90ab1..0edf707 100644 (file)
--- a/src/ltjskiyou.cls
+++ b/src/ltjskiyou.cls
@@ -462,11 +462,11 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \@lowpenalty   51
 \@medpenalty  151
 \@highpenalty 301
-\setlength\topskip{10\jsc@mpt}
+\setlength\topskip{1.38\zh}%% 2016-08-17
 \if@slide
   \setlength\headheight{0\jsc@mpt}
 \else
-  \setlength\headheight{2\topskip}
+  \setlength\headheight{20\jsc@mpt}%% 2016-08-17
 \fi
 \if@slide
   \setlength\footskip{\z@}
@@ -514,7 +514,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \if@slide
   \addtolength\topmargin{-\headheight}
 \else
-  \addtolength\topmargin{-\topskip}
+  \addtolength\topmargin{-0.5\headheight}%% 2016-08-17
 \fi
 \addtolength\topmargin{-\headsep}
 \addtolength\topmargin{-\footskip}

diff --git a/src/ltjspf.cls b/src/ltjspf.cls
index 319fbad..5c24ca2 100644 (file)
--- a/src/ltjspf.cls
+++ b/src/ltjspf.cls
@@ -461,11 +461,11 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \@lowpenalty   51
 \@medpenalty  151
 \@highpenalty 301
-\setlength\topskip{10\jsc@mpt}
+\setlength\topskip{1.38\zh}%% 2016-08-17
 \if@slide
   \setlength\headheight{0\jsc@mpt}
 \else
-  \setlength\headheight{2\topskip}
+  \setlength\headheight{20\jsc@mpt}%% 2016-08-17
 \fi
 \setlength\footskip{9\jsc@mmm}
 \setlength\headsep{9\jsc@mmm}
@@ -507,7 +507,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
 \if@slide
   \addtolength\topmargin{-\headheight}
 \else
-  \addtolength\topmargin{-\topskip}
+  \addtolength\topmargin{-0.5\headheight}%% 2016-08-17
 \fi
 \addtolength\topmargin{-\headsep}
 \addtolength\topmargin{-\footskip}