texlive[43557] Master/texmf-dist: jlreq (20mar17)

commits+karl at tug.org commits+karl at tug.org
Mon Mar 20 23:57:49 CET 2017


Revision: 43557
          http://tug.org/svn/texlive?view=revision&revision=43557
Author:   karl
Date:     2017-03-20 23:57:49 +0100 (Mon, 20 Mar 2017)
Log Message:
-----------
jlreq (20mar17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.html
    trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
    trunk/Master/texmf-dist/doc/latex/jlreq/README.html
    trunk/Master/texmf-dist/doc/latex/jlreq/README.md
    trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls

Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.html	2017-03-20 22:56:55 UTC (rev 43556)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.html	2017-03-20 22:57:49 UTC (rev 43557)
@@ -254,6 +254,11 @@
 <li><code>\DeclareBlockHeading</code>にオプションをたくさん追加.</li>
 <li>quote環境などを調整するオプションを追加.</li>
 </ul></li>
+<li>2017-03-20
+<ul>
+<li>バグ修正.</li>
+<li><code>\footnote / \sidenote / \endnote</code>の周りに必要ならば空白を挿入するようにした.</li>
+</ul></li>
 </ul>
 </article>
 </body>

Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md	2017-03-20 22:56:55 UTC (rev 43556)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md	2017-03-20 22:57:49 UTC (rev 43557)
@@ -229,5 +229,7 @@
     - 和文ファミリを欧文ファミリに従属させるようにした.
     - `\DeclareBlockHeading`にオプションをたくさん追加.
     - quote環境などを調整するオプションを追加.
+* 2017-03-20
+    - バグ修正.
+    - `\footnote / \sidenote / \endnote`の周りに必要ならば空白を挿入するようにした.
 
-

Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README.html	2017-03-20 22:56:55 UTC (rev 43556)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README.html	2017-03-20 22:57:49 UTC (rev 43557)
@@ -80,6 +80,11 @@
 <li>Add many options to <code>\DeclareBlockHeading</code>.</li>
 <li>Some options related to <code>quote</code> environment etc.</li>
 </ul></li>
+<li>2017-03-20
+<ul>
+<li>Fux bugs.</li>
+<li>Insert some spaces around <code>\footnote / \sidenote / \endnote</code>.</li>
+</ul></li>
 </ul>
 </article>
 </body>

Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README.md	2017-03-20 22:56:55 UTC (rev 43556)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README.md	2017-03-20 22:57:49 UTC (rev 43557)
@@ -32,3 +32,6 @@
     - `\sffamily` etc. also change the Japanese font family.
     - Add many options to `\DeclareBlockHeading`.
     - Some options related to `quote` environment etc.
+* 2017-03-20
+    - Fux bugs.
+    - Insert some spaces around `\footnote / \sidenote / \endnote`.

Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls	2017-03-20 22:56:55 UTC (rev 43556)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls	2017-03-20 22:57:49 UTC (rev 43557)
@@ -5,10 +5,13 @@
 %%
 % (based on JLReq 20120403 https://www.w3.org/TR/2012/NOTE-jlreq-20120403/ja/)
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2017/03/14 jlreq]
+\ProvidesClass{jlreq}[2017/03/20 jlreq]
 \RequirePackage{xkeyval,everyhook,filehook,etoolbox,ifthen}
 
 %. helper1
+\newcount\jlreq at tempcnta
+\newcount\jlreq at tempcntb
+\newcount\jlreq at tempcntc
 \newdimen\jlreq at tempdima
 \newdimen\jlreq at tempdimb
 \newdimen\jlreq at tempdimc
@@ -23,6 +26,7 @@
 \newbox\jlreq at tempboxc
 % 計算結果を返すための変数
 \newdimen\jlreq at resultdimen
+\newskip\jlreq at resultskip
 \newbox\jlreq at resultbox
 \newif\ifjlreq at result
 
@@ -290,6 +294,29 @@
   \global\jlreq at currentpage=\zref at extractdefault{jlreq at rest@width.page.\the\jlreq at zref@reference at count}{jlreq at page}{\c at page}%
 }
 
+\def\jlreq at saveoriginalcs#1{
+  \@ifundefined{jlreq at original@#1}{}{%
+    \ClassError{jlreq}{Trying to save \expandafter\string\csname #1\endcsname\space twice, maybe a bug}{\@ehc}%
+  }%
+  \expandafter\expandafter\expandafter\let\expandafter\expandafter\csname jlreq at original@#1\endcsname\csname #1\endcsname
+}
+
+% #1の先頭が文字か
+\def\jlreq at isletter#1{%
+  \expandafter\expandafter\expandafter\jlreq at helper@isletter\jlreq at getfirsttoken#1\jlreq at uniqtoken{}\jlreq at endmark
+}
+\def\jlreq at helper@isletter#1{%
+  \ifnum
+    0\ifcat 阿\noexpand #11\fi
+    \ifcat あ\noexpand #11\fi
+    \ifcat (\noexpand #11\fi
+    \ifcat A\noexpand #11\fi
+    \ifcat 1\noexpand #11\fi
+  >0
+    \expandafter\@firstoftwo\else\expandafter\@secondoftwo
+  \fi
+}
+
 %. オプションの定義
 % オプション処理の際にしか使わない変数(後でそれを元に別の変数を調整する)
 % ものは\jlreq at option@<key>に格納する.
@@ -383,6 +410,8 @@
 \jlreq at addpapersize[c7]{}{114mm}{81mm}
 \jlreq at addpapersize[c8]{}{81mm}{57mm}
 
+\let\jlreq at addpapersize=\@undefined
+
 %.. フォントサイズ,行長,1ページあたりの行数で基本版面のサイズを決める(2.4.1.a)
 \newcommand*{\jlreq at option@fontsize}{}
 \DeclareOptionX{fontsize}{\renewcommand*{\jlreq at option@fontsize}{#1}}
@@ -496,6 +525,8 @@
 \newcommand*{\jlreq at warning}[1]{}
 \jlreq at DeclareOption{jlreq_warnings}{\renewcommand*{\jlreq at warning}[1]{\ClassWarningNoLine{jlreq}{(JLReq warning) ##1}}}
 
+\let\jlreq at DeclareOption=\@undefined
+
 \ExecuteOptionsX{article_type=article,paper=a4,fontsize=10pt,open_bracket_pos=zenkaku_tentsuki,reference_mark=inline,footnotetext_indent=one,endnote_position=headings,onecolumn,final}
 % \@removeelementを一旦置き換えてから\ProcessOptionsXを実行する
 \let\jlreq at original@@removeelement=\@removeelement
@@ -558,37 +589,26 @@
 \fi
 
 % \jlreq at gol(Gyo Okuri Length), \jlreq at mol (Moji Okuri Length)を定義
-\if at tate
-  \ifx l\jlreq at engine
-    \def\jlreq at gol{\zw}\def\jlreq at mol{\zh}
-  \else
-    \def\jlreq at gol{zw}\def\jlreq at mol{zh}  
-  \fi
+\ifx l\jlreq at engine
+  \def\jlreq at gol{\zh}\def\jlreq at mol{\zw}
 \else
-  \ifx l\jlreq at engine
-    \def\jlreq at gol{\zh}\def\jlreq at mol{\zw}
-  \else
-    \def\jlreq at gol{zh}\def\jlreq at mol{zw}
-  \fi
+  \def\jlreq at gol{zh}\def\jlreq at mol{zw}
 \fi
 
 %. helper2(エンジン依存系)
 % 組方向を判定
 % \jlreq at if(y|t)(dir|box)を定義する.
-\def\jlreq at do{%
-  \def\jlreq at ifydir{\ifydir\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-  \def\jlreq at iftdir{\iftdir\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-  \def\jlreq at ifybox##1{\ifybox##1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-  \def\jlreq at iftbox##1{\iftbox##1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-}
-\ifx l\jlreq at engine
+\ifx l\jlreq at engine\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{
   \def\jlreq at ifydir{\ifnum\ltjgetparameter{direction}=4\relax\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
   \def\jlreq at iftdir{\ifnum\numexpr\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8=3\relax\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
   \def\jlreq at ifybox#1{\ifnum\ltjgetparameter{boxdir}{#1}=4\relax\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
   \def\jlreq at iftbox#1{\ifnum\numexpr\ltjgetparameter{boxdir}{#1}-(\ltjgetparameter{boxdir}{#1}/8)*8=3\relax\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
-\else
-  \jlreq at do
-\fi
+}{
+  \def\jlreq at ifydir{\ifydir\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+  \def\jlreq at iftdir{\iftdir\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+  \def\jlreq at ifybox#1{\ifybox#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+  \def\jlreq at iftbox#1{\iftbox#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+}
 
 % 現在行の残りを得る.
 \ifx l\jlreq at engine
@@ -639,8 +659,42 @@
   \edef\jlreq at savepos@iflabelundefined{\noexpand\zref at ifrefundefined{jlreq at rest@width.pos.\the\jlreq at zref@reference at count}}%
 }
 
+\ifx\jlreq at engine l
+  \def\lastnodechar{\directlua{luatexja.pltx_composite_last_node_char()}}
+\fi
+
+% #1と#2の間に入るjmglueを\jlreq at resultskip((x)kanjiskipも)に入れる
+\newcommand*{\jlreq at calc@jfmglue}[2]{%
+  \begingroup
+    \setbox\jlreq at tempboxa=\hbox{\inhibitglue #1\inhibitglue\hbox{}\inhibitglue#2\inhibitglue}%
+    \setbox\jlreq at tempboxb=\hbox{\inhibitglue #1#2\inhibitglue}%
+    \edef\jlreq at do{\noexpand\jlreq at resultskip=\the\dimexpr\wd\jlreq at tempboxb - \wd\jlreq at tempboxa\relax\noexpand\relax}%
+  \expandafter\endgroup
+  \jlreq at do
+}
+\newcount\jlreq at lastnodechar
+% jlreq at lastnodecharに入っている値と次のトークン(\futureletで得る)の間に入るJFMグルー等を挿入する
+\def\jlreq at fixjfm{%
+  \ifnum\jlreq at lastnodechar>-1
+    \def\jlreq at do{%
+      \jlreq at isletter{\jlreq at nextchar}{%
+        \jlreq at calc@jfmglue{\char\jlreq at lastnodechar}{\jlreq at nextchar}%
+%        \message{fixjfm Insert: \the\jlreq at resultskip}%
+        \hskip\jlreq at resultskip
+        \inhibitglue
+      }{}%
+    }%
+    \def\@tempa{%
+      \futurelet\jlreq at nextchar\jlreq at do
+    }%
+  \else\def\@tempa{}\fi
+  \@tempa
+}
+
 %. 基本設定
 % 和文文字,欧文文字の設定(とりあえずLuaTeX-jaのデフォルトのまま)
+\def\jlreq at kanjiskip{0pt plus 0.25zw minus 0pt}
+\def\jlreq at xkanjiskip{0.25zw plus 0.25zw minus 0.125zw}
 \ifx l\jlreq at engine
   \ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}}
   % kanjiskip, xkanjiskipはjfmのものを使う
@@ -647,8 +701,8 @@
   \ltjsetparameter{kanjiskip=\maxdimen}
   \ltjsetparameter{xkanjiskip=\maxdimen}
 \else
-  \kanjiskip=0pt plus 0.25zw minus 0pt
-  \xkanjiskip=0.25zw plus 0.25zw minus 0.125zw
+  \kanjiskip=\jlreq at kanjiskip
+  \xkanjiskip=\jlreq at xkanjiskip
 \fi
 
 % 禁則処理,表1,2に従う
@@ -1117,8 +1171,27 @@
   \jlreq at warning{行間は二分以上全角以下が望ましい (2.4.2.d 注3)}
 }{}
 
-\emergencystretch 3\jlreq at mol
+\emergencystretch 3\jlreq at gol
 
+% 文字サイズを基準としているような寸法に対しては,
+% \@setfontsizeが実行されるたびに追随して値を変える
+% その処理は\jlreq at setfontsizehookに入れる
+\jlreq at saveoriginalcs{@setfontsize}
+\renewcommand*{\@setfontsize}[3]{%
+  \jlreq at original@@setfontsize{#1}{#2}{#3}%
+  \jlreq at setfontsizehook
+}
+\def\jlreq at setfontsizehook{}
+\appto\jlreq at setfontsizehook{\ifdim\parindent>0pt\setlength{\parindent}{1\jlreq at mol}\fi}
+\ifx\jlreq at engine l\else
+  \appto\jlreq at setfontsizehook{%
+    \kanjiskip=\jlreq at kanjiskip
+    \ifdim\xkanjiskip>0pt
+      \xkanjiskip=\jlreq at xkanjiskip
+    \fi
+  }
+\fi
+
 \renewcommand{\normalsize}{%
   \@setfontsize\normalsize{\jlreq at fontsize}{\jlreq at baselineskip}%
   \abovedisplayskip 1.1\jlreq at fontsize \@plus .3\jlreq at fontsize \@minus .4\jlreq at fontsize
@@ -1129,7 +1202,7 @@
 
 \if at tate\tate\fi % ここで発行しておく
 \mcfamily\selectfont\normalsize
-\setbox0\hbox{ } % 全角スペース
+\setbox0\hbox{阿}
 \setlength\Cht{\ht0}
 \setlength\Cdp{\dp0}
 \setlength\Cwd{\wd0}
@@ -1137,17 +1210,6 @@
 \setlength\Chs{\wd0}
 
 % 4.1.3.a
-% 文字サイズを基準としているような寸法に対しては,
-% \@setfontsizeが実行されるたびに追随して値を変える
-% その処理は\jlreq at setfontsizehookに入れる
-\let\jlreq at original@@setfontsize=\@setfontsize
-\renewcommand*{\@setfontsize}[3]{%
-  \jlreq at original@@setfontsize{#1}{#2}{#3}%
-  \jlreq at setfontsizehook
-}
-\def\jlreq at setfontsizehook{}
-\appto\jlreq at setfontsizehook{\ifdim\parindent>0pt\setlength{\parindent}{1\jlreq at mol}\fi}
-
 % 2.5.2 \baselineskipは一定の方がよい?
 \newcommand{\footnotesize}{%
   \@setfontsize\footnotesize{.8\jlreq at fontsize}{\dimexpr 115\jlreq at baselineskip/170\relax}% 脚注文字サイズの二分より少し小さい値を行間に: 4.2.5.e
@@ -1185,7 +1247,7 @@
     \RequirePackage{plext}
   \fi
   \renewcommand*{\@Kanji}[1]{\expandafter\kansuji\number #1\relax} % \relax追加
-  \rensujiskip=0\zh plus 0.25\zh minus 0\zh
+  \rensujiskip=0\jlreq at mol plus 0.25\jlreq at mol minus 0\jlreq at mol
 \fi
 
 % このあたりはtarticleと同じ
@@ -1254,8 +1316,9 @@
 \setlength{\columnsep}{\jlreq at speciallength{\jlreq at option@column at gap}}
 \setlength{\columnseprule}{0pt}
 
-% デフォルト値は縦横ともにが0.5倍.
-%.. \textwidth:縦書きは縦,横書きは横
+% \textwidthと\textheightのデフォルト値は縦横ともに0.75倍(調整が入る).
+%.. \textwidth:文字送り方向の行長
+% 二段の場合は最初の段の頭から次の段の後まで
 % 一度\textwidthに一行の長さの文字数を入れる(段組の場合でも)
 \@tempdima=1\jlreq at fontsize
 \ifx\jlreq at option@line at length\@empty
@@ -1286,7 +1349,11 @@
   \setlength{\textwidth}{\dimexpr2\textwidth + \columnsep\relax}
 \fi
 
-%.. \textheight:縦書きは横,横書きは縦
+\setlength{\topskip}{1\zw} % フォントサイズと一致させる
+
+%.. \textheight:行送り方向の長さ
+% 一番上(直後に\topskip由来が入る)から最終行のベースラインまでの長さ.
+% \topskipが十分ある時は先頭行のベースラインから最終行のベースライン+\topskip
 \ifx\jlreq at option@number at of@lines\@empty
   \if at tate
     \setlength{\textheight}{0.75\paperwidth}
@@ -1297,79 +1364,91 @@
   \divide\textheight\baselineskip \multiply\textheight\baselineskip
   \addtolength{\textheight}{\topskip}
 \else
-  \setlength{\textheight}{\dimexpr\jlreq at speciallength{\jlreq at option@number at of@lines\baselineskip} - \baselineskip + \topskip\relax}
+  \setlength{\textheight}{\dimexpr\jlreq at option@number at of@lines\baselineskip - \baselineskip + \topskip\relax}
 \fi
 
-\setlength{\topskip}{1\zw} % フォントサイズと一致させる
 \ifx\jlreq at option@headfoot at verticalpos\@empty
-  \if at tate\def\jlreq at option@headfoot at verticalpos{1zh}
+  \if at tate\def\jlreq at option@headfoot at verticalpos{1zw}
   \else\def\jlreq at option@headfoot at verticalpos{2zh}\fi
 \fi
 \setlength{\headsep}{\jlreq at speciallength{\jlreq at option@headfoot at verticalpos}}
 \ifdim\headsep<1\zw\jlreq at warning{基本版面との上下方向の最低の空き量を,基本版面の文字サイズの全角アキとする (26.1.a)}\fi
-\setlength{\headheight}{1\zh}
+\setlength{\headheight}{1\zw}
 %.. 横
 \ifx\jlreq at option@gutter\@empty
   % 中央配置
-  \setlength{\oddsidemargin}{\paperwidth}
   \if at tate
-    \addtolength{\oddsidemargin}{-\textheight}
+    \setlength{\oddsidemargin}{\dimexpr\paperwidth - \textheight + \topskip\relax}
   \else
-    \addtolength{\oddsidemargin}{-\textwidth}
+    \setlength{\oddsidemargin}{\dimexpr\paperwidth - \textwidth\relax}
   \fi
   \setlength{\oddsidemargin}{.5\oddsidemargin}
   \addtolength{\oddsidemargin}{-1in}
   \setlength{\evensidemargin}{\oddsidemargin}
 \else
-  \setlength{\oddsidemargin}{\jlreq at speciallength{\jlreq at option@gutter}}
-  \setlength{\evensidemargin}{\dimexpr\paperwidth - \textheight - \oddsidemargin\relax}
   \if at tate
-    \setlength{\jlreq at tempdima}{\oddsidemargin}
-    \setlength{\oddsidemargin}{\evensidemargin}
-    \setlength{\evensidemargin}{\jlreq at tempdima}
+    \setlength{\evensidemargin}{\jlreq at speciallength{\jlreq at option@gutter}}
+    \setlength{\oddsidemargin}{\dimexpr\paperwidth - \textheight - \evensidemargin + \topskip - \Cht\relax}
+    \addtolength{\evensidemargin}{\Cdp}
+  \else
+    \setlength{\oddsidemargin}{\jlreq at speciallength{\jlreq at option@gutter}}
+    \setlength{\evensidemargin}{\dimexpr\paperwidth - \textwidth - \oddsidemargin\relax}
   \fi
   \addtolength{\oddsidemargin}{-1in}
   \addtolength{\evensidemargin}{-1in}
 \fi
+
 %.. 縦
-\ifx\jlreq at option@head at space\@empty
-  \setlength{\topmargin}{\paperheight}
+% \topmarginに全体の頭からテキストの頭までの長さを入れる
+% 天の値からtopmarginを設定する
+\def\jlreq at settopmarginbyhead#1{
   \if at tate
-    \addtolength{\topmargin}{-\textwidth}
+    \setlength{\topmargin}{\dimexpr #1 - \headsep - \headheight - 1in\relax}
+    \jlreq at warning{縦組の場合は地の空き量を指定する (2.4.1.b)}
   \else
-    \addtolength{\topmargin}{-\textheight}
+    \setlength{\topmargin}{\dimexpr #1 - \headsep - \headheight - 1in - \topskip + \Cht\relax}
   \fi
+}
+% 地の値から
+\def\jlreq at settopmarginbyfoot#1{
+  \if at tate
+    \setlength{\topmargin}{\dimexpr\paperheight - \textwidth - \headsep - \headheight - 1in - #1\relax}
+  \else
+    \jlreq at warning{横組の場合は天の空き量を指定する (2.4.1.b)}
+    \setlength{\topmargin}{\dimexpr\paperheight - \textheight + \topskip - 1\zh - \headsep - \headheight - 1in - #1\relax}
+  \fi
+} 
+\ifx\jlreq at option@head at space\@empty
   \ifx\jlreq at option@foot at space\@empty
-    % 中央配置
-    \setlength{\topmargin}{0.5\topmargin}
+    \if at tate
+      \jlreq at settopmarginbyfoot{\dimexpr(\paperheight - \textwidth)/2\relax}
+    \else
+      \jlreq at settopmarginbyhead{\dimexpr(\paperheight - (\textheight - \topskip + 1\zh))/2\relax}
+    \fi
   \else
-    \addtolength{\topmargin}{-\jlreq at speciallength{\jlreq at option@foot at space}}
+    \jlreq at settopmarginbyfoot{\jlreq at speciallength{\jlreq at option@foot at space}}
   \fi
 \else
   \ifx\jlreq at option@foot at space\@empty
-    \setlength{\topmargin}{\jlreq at speciallength{\jlreq at option@head at space}}
+    \jlreq at settopmarginbyhead{\jlreq at speciallength{\jlreq at option@head at space}}
   \else
     % 両方指定されていたら,縦書きは地を,横書きは天を使う
     \if at tate
-      \setlength{\topmargin}{\paperheight}
-      \addtolength{\topmargin}{-\textwidth}
-      \addtolength{\topmargin}{-\jlreq at speciallength{\jlreq at option@foot at space}}
+      \jlreq at settopmarginbyfoot{\jlreq at speciallength{\jlreq at option@foot at space}}
+      \ClassWarningNoLine{jlreq}{head_space is ignored}
     \else
-      \setlength{\topmargin}{\jlreq at speciallength{\jlreq at option@head at space}}
+      \jlreq at settopmarginbyhead{\jlreq at speciallength{\jlreq at option@head at space}}
+      \ClassWarningNoLine{jlreq}{foot_space is ignored}
     \fi
   \fi
 \fi
+\let\jlreq at settopmarginbyhead=\@undefined
+\let\jlreq at settopmarginbyfoot=\@undefined
 
-
-\addtolength{\topmargin}{-\headsep}
-\addtolength{\topmargin}{-\headheight}
-\addtolength{\topmargin}{-1in}
 %.. 下
-% 本文から一文字分離すつもり
-\setlength{\footskip}{2\zh}
-% \maxdepth + \topskip = フォントサイズ×1.5
-\setlength{\maxdepth}{1.5\jlreq at fontsize}
-\addtolength{\maxdepth}{-\topskip}
+\setlength{\footskip}{\dimexpr\headsep + 1\zw\relax}
+% \maxdepth + \topskip = フォントサイズ×1.5(だってさ)
+\setlength{\maxdepth}{\dimexpr1.5\jlreq at fontsize - \topskip\relax}
 
 %. 見出し関係 (4.1)
 % 見出しの直前に実行される
@@ -1952,7 +2031,7 @@
       {after_space}{\def\jlreq at after@space{##1}}
     }{#3}%
     \ifthenelse{\lengthtest{\jlreq at after@space < 0.99\jlreq at mol} \OR \lengthtest{\jlreq at after@space > 2.01\jlreq at mol}}{%
-      \jlreq at warning{窓見出しと本文との空き量は,基本版面の文字サイズの全角以上,2倍未満とする(4.1.10.c)}%&
+      \jlreq at warning{窓見出しと本文との空き量は,基本版面の文字サイズの全角以上,2倍未満とする (4.1.10.c)}%&
     }{}%
     \edef\jlreq at do{%
       \noexpand\def\expandonce{\csname #1\endcsname}{%
@@ -2000,8 +2079,7 @@
 
 \newcommand*{\jlreq at keepbaselineskip}[1]{%
   \begingroup
-    \jlreq at tempdima=\baselineskip
-    \edef\jlreq at do{\unexpanded{#1}\noexpand\baselineskip=\the\jlreq at tempdima}%
+    \edef\jlreq at do{\unexpanded{#1}\noexpand\baselineskip=\the\baselineskip}%
   \expandafter\endgroup
   \jlreq at do
 }
@@ -2074,24 +2152,24 @@
     (\rensuji{\@arabic\c at subparagraph})}
 
   \ifthenelse{\equal{\jlreq at article@type}{article}}{
-    \NewBlockHeading{part}{0}{font={\jlreq at keepbaselineskip{\LARGE\headfont}},indent=4\zh,lines=4,after_label_space=1\zh,second_heading_text_indent={-1\zh,1\zh},subtitle_font={\jlreq at keepbaselineskip{\large}}}
+    \NewBlockHeading{part}{0}{font={\jlreq at keepbaselineskip{\LARGE\headfont}},indent=4\jlreq at mol,lines=4,after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},subtitle_font={\jlreq at keepbaselineskip{\large}}}
     \if at twoside\ModifyHeading{part}{allowbreak_if_evenpage=true}\fi
   }
   {% book, report
     \NewTobiraHeading{part}{-1}{label_format={第\thepart 部\hspace*{1\jlreq at mol}},format={\null\vfill {\Huge\headfont \hspace*{2\jlreq at mol}#1#2}\vspace*{2\jlreq at gol}}}
-    \NewBlockHeading{chapter}{0}{indent=2\zh,lines=6,label_format={第\thechapter 章},font={\huge\headfont},after_label_space=1\zh,second_heading_text_indent={-1\zh,1\zh},subtitle_font={\jlreq at keepbaselineskip{\Large}}}
+    \NewBlockHeading{chapter}{0}{indent=2\jlreq at mol,lines=6,label_format={第\thechapter 章},font={\huge\headfont},after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},subtitle_font={\jlreq at keepbaselineskip{\Large}}}
     \if at twoside\ModifyHeading{chapter}{allowbreak_if_evenpage=true}\fi
     \renewcommand{\thechapter}{\Kanji{chapter}}
   }
-  \NewBlockHeading{section}{1}{font={\jlreq at keepbaselineskip{\Large\headfont}},indent=6\zh,lines=3,after_label_space=1\zh,second_heading_text_indent={-1\zh,1\zh},subtitle_font={\jlreq at keepbaselineskip{\normalsize}}}
+  \NewBlockHeading{section}{1}{font={\jlreq at keepbaselineskip{\Large\headfont}},indent=6\jlreq at mol,lines=3,after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},subtitle_font={\jlreq at keepbaselineskip{\normalsize}}}
   \if at twoside\ModifyHeading{section}{allowbreak_if_evenpage=true}\fi
-  \NewBlockHeading{subsection}{2}{font={\jlreq at keepbaselineskip{\large\headfont}},indent=8\zh,lines=2,after_label_space=1\zh,second_heading_text_indent={-1\zh,1\zh},subtitle_font={\jlreq at keepbaselineskip{\small}}}
+  \NewBlockHeading{subsection}{2}{font={\jlreq at keepbaselineskip{\large\headfont}},indent=8\jlreq at mol,lines=2,after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},subtitle_font={\jlreq at keepbaselineskip{\small}}}
   \if at twoside\ModifyHeading{subsection}{allowbreak_if_evenpage=true}\fi
-  \NewBlockHeading{subsubsection}{3}{font={\jlreq at keepbaselineskip{\normalsize\headfont}},indent=10\zh,lines=1,before_lines=1,subtitle_break=false,after_label_space=1\zh,second_heading_text_indent={-1\zh,1\zh},,subtitle_font={\jlreq at keepbaselineskip{\scriptsize}}}
+  \NewBlockHeading{subsubsection}{3}{font={\jlreq at keepbaselineskip{\normalsize\headfont}},indent=10\jlreq at mol,lines=1,before_lines=1,subtitle_break=false,after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},,subtitle_font={\jlreq at keepbaselineskip{\scriptsize}}}
   \if at twoside\ModifyHeading{subsubsection}{allowbreak_if_evenpage=true}\fi
   \NewRuninHeading{paragraph}{4}{font={\jlreq at keepbaselineskip{\normalsize\headfont}}}
-  \NewRuninHeading{subparagraph}{5}{font={\jlreq at keepbaselineskip{\normalsize\headfont}},indent=1\zh}
-\else
+  \NewRuninHeading{subparagraph}{5}{font={\jlreq at keepbaselineskip{\normalsize\headfont}},indent=1\jlreq at mol}
+\else% yoko
   \renewcommand{\thepart}{\Roman{part}}
   \renewcommand{\thesubsection}{\thesection .\arabic{subsection}}
   \renewcommand{\thesubsubsection}{\thesubsection .\arabic{subsubsection}}
@@ -2098,15 +2176,15 @@
   \renewcommand{\theparagraph}{\thesubsubsection .\arabic{paragraph}}
   \renewcommand{\thesubparagraph}{\theparagraph .\arabic{subparagraph}}
   \ifthenelse{\equal{\jlreq at article@type}{article}}{
-    \NewBlockHeading{part}{0}{font={\jlreq at keepbaselineskip{\LARGE\headfont}},label_format={第\thepart 部},lines=4,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq at keepbaselineskip{\large}}}
+    \NewBlockHeading{part}{0}{font={\jlreq at keepbaselineskip{\LARGE\headfont}},label_format={第\thepart 部},lines=4,after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},subtitle_font={\jlreq at keepbaselineskip{\large}}}
     \renewcommand{\thesection}{\arabic{section}}
   }
   {% book, report
     \NewTobiraHeading{part}{-1}{label_format={第\thepart 部\hspace*{1\jlreq at gol}},format={\null\vfil {\Huge\headfont #1#2}\vfil}}
     \NewBlockHeading{chapter}{0}{%
-      format={{\jlreq at keepbaselineskip{\huge\headfont} #1#2}#3},
-      label_format={第\thechapter 章\quad},
-      lines=5,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},
+      font={\jlreq at keepbaselineskip{\huge\headfont}},
+      label_format={第\thechapter 章},
+      lines=5,after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},
       subtitle_font={\jlreq at keepbaselineskip{\Large}}}
     \renewcommand{\thechapter}{\arabic{chapter}}
     \renewcommand{\thesection}{\thechapter.\arabic{section}}
@@ -2116,11 +2194,11 @@
       \ModifyHeading{chapter}{pagebreak=clearpage}
     }
   }
-  \NewBlockHeading{section}{1}{font={\jlreq at keepbaselineskip{\Large\headfont}},lines=3,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq at keepbaselineskip{\normalsize}}}
-  \NewBlockHeading{subsection}{2}{font={\jlreq at keepbaselineskip{\large\headfont}},lines=2,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq at keepbaselineskip{\small}}}
-  \NewBlockHeading{subsubsection}{3}{font={\jlreq at keepbaselineskip{\normalsize\headfont}},lines=1,before_lines=1,subtitle_break=false,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq at keepbaselineskip{\scriptsize}}}
-  \NewRuninHeading{paragraph}{4}{font={\jlreq at keepbaselineskip{\normalsize\headfont}},indent=1\zw}
-  \NewRuninHeading{subparagraph}{5}{font={\jlreq at keepbaselineskip{\normalsize\headfont}},indent=2\zw}
+  \NewBlockHeading{section}{1}{font={\jlreq at keepbaselineskip{\Large\headfont}},lines=3,after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},subtitle_font={\jlreq at keepbaselineskip{\normalsize}}}
+  \NewBlockHeading{subsection}{2}{font={\jlreq at keepbaselineskip{\large\headfont}},lines=2,after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},subtitle_font={\jlreq at keepbaselineskip{\small}}}
+  \NewBlockHeading{subsubsection}{3}{font={\jlreq at keepbaselineskip{\normalsize\headfont}},lines=1,before_lines=1,subtitle_break=false,after_label_space=1\jlreq at mol,second_heading_text_indent={-1\jlreq at mol,1\jlreq at mol},subtitle_font={\jlreq at keepbaselineskip{\scriptsize}}}
+  \NewRuninHeading{paragraph}{4}{font={\jlreq at keepbaselineskip{\normalsize\headfont}},indent=1\jlreq at mol}
+  \NewRuninHeading{subparagraph}{5}{font={\jlreq at keepbaselineskip{\normalsize\headfont}},indent=2\jlreq at mol}
 \fi
 
 \ifthenelse{\equal{\jlreq at article@type}{article}}{}{% book, report
@@ -2163,6 +2241,39 @@
 %. 注
 % 合印:4.2.3
 % 文字サイズは6ポイントくらい(4.2.3.a)とりあえす\scriptsize
+
+% \footnoteとか\footnotemarkの前に#2後に#3を入れる
+\newcommand*{\jlreq at modify@noteandmark}[4]{%
+  \edef\@tempa{\expandafter\@gobble\string#1}%
+  \jlreq at saveoriginalcs{\@tempa}%
+  \edef#1{%
+    \unexpanded{#3}%
+    \noexpand\@ifnextchar[{\expandonce{\csname jlreq at fixjfm@\@tempa @\endcsname}}{\expandonce{\csname jlreq at fixjfm@\@tempa @@\endcsname}}%
+  }
+  \long\expandafter\edef\csname jlreq at fixjfm@\@tempa @\endcsname[##1]##2{%
+    \expandonce{\csname jlreq at original@\@tempa\endcsname}[##1]{##2}%
+    \unexpanded{#4}%
+  }
+  \long\expandafter\edef\csname jlreq at fixjfm@\@tempa @@\endcsname##1{%
+    \expandonce{\csname jlreq at original@\@tempa\endcsname}{##1}%
+    \unexpanded{#4}%
+  }
+  \edef\@tempa{\expandafter\@gobble\string#2}%
+  \jlreq at saveoriginalcs{\@tempa}%
+  \edef#2{%
+    \unexpanded{#3}%
+    \noexpand\@ifnextchar[{\expandonce{\csname jlreq at fixjfm@\@tempa @\endcsname}}{\expandonce{\csname jlreq at fixjfm@\@tempa @@\endcsname}}%
+  }
+  \expandafter\edef\csname jlreq at fixjfm@\@tempa @\endcsname[##1]{%
+    \expandonce{\csname jlreq at original@\@tempa\endcsname}[##1]%
+    \unexpanded{#4}%
+  }
+  \expandafter\edef\csname jlreq at fixjfm@\@tempa @@\endcsname{%
+    \expandonce{\csname jlreq at original@\@tempa\endcsname}%
+    \unexpanded{#4}%
+  }
+}
+
 \newcommand*\jlreq at referencemark@format[1]{#1}
 \ifthenelse{\equal{\jlreq at referencemark}{inline}}{
   \newcommand*{\jlreq at notemark}[1]{%
@@ -2173,6 +2284,9 @@
       \raise\dimexpr.5\jlreq at gol - (\ht\@tempboxa + \dp\@tempboxa)/2\relax\box\@tempboxa
     }%
   }
+  \newcommand*{\jlreq at modify@noteandmark at fixjfm}[2]{%
+    \jlreq at modify@noteandmark{#1}{#2}{\inhibitglue}{\inhibitglue}
+  }
 }{
   \newcommand*{\jlreq at notemark}[1]{{%
     \setbox\@tempboxa=\hbox{\scriptsize\jlreq at referencemark@format{#1}}%
@@ -2185,7 +2299,25 @@
     \fi
     \setbox\jlreq at tempboxa=\hbox to\z@{\hskip-\@tempdima\raise\dimexpr.5\zw + (\ht\@tempboxa + \dp\@tempboxa)/2\relax\box\@tempboxa\hss}%
     \dp\jlreq at tempboxa=0pt\ht\jlreq at tempboxa=0pt\box\jlreq at tempboxa}}%
+  \ifx\jlreq at engine l
+    % luatexの時は\inhibitglueすると\lastnodechar=-1になる
+    \newcommand*{\jlreq at modify@noteandmark at fixjfm}[2]{%
+      \jlreq at modify@noteandmark{#1}{#2}{%
+        \jlreq at lastnodechar=\lastnodechar
+        \ifnum\lastnodechar>-1\inhibitglue\fi
+      }{\jlreq at fixjfm}
+    }
+  \else
+    % (u)platexの時は代入すると\inhibitglueが効かなくなる
+    \newcommand*{\jlreq at modify@noteandmark at fixjfm}[2]{%
+      \jlreq at modify@noteandmark{#1}{#2}{%
+        \ifnum\lastnodechar>-1\inhibitglue\fi
+        \jlreq at lastnodechar=\lastnodechar
+      }{\jlreq at fixjfm}
+    }
+  \fi
 }
+\jlreq at modify@noteandmark at fixjfm{\footnote}{\footnotemark}
 % \@footnotemarkをシンプルなものにする
 \def\jlreq at setdefaultnotemark#1#2{%
   \def#1{%
@@ -2195,7 +2327,7 @@
     \ifhmode\spacefactor\@x at sf\fi
     \relax}
 }
-\let\jlreq at original@@footnotemark=\@footnotemark
+\def\@tempa{@footnotemark}
 \jlreq at setdefaultnotemark\@footnotemark\@makefnmark
 %.. 脚注  (縦書きの時は傍注,4.2.5)
 {%
@@ -2221,7 +2353,7 @@
   \footnotesize
   \jlreq at footnoteindent=1\jlreq at mol
   \@tempdima=\dimexpr\textwidth - \jlreq at footnoteindent\relax
-  \@tempdimb=1\zw
+  \@tempdimb=1\jlreq at mol
   \divide\@tempdima\@tempdimb \multiply\@tempdima\@tempdimb
   \global\jlreq at footnoteindent=\dimexpr\textwidth - \@tempdima\relax
 }
@@ -2258,7 +2390,7 @@
 \def\jlreq at endnote@texts{}
 \long\def\jlreq at endnote@addtext#1#2{%
   \expandafter\gdef\expandafter\jlreq at endnote@texts\expandafter{\jlreq at endnote@texts{{#1}{#2}}}}
-\def\endnote{\@ifnextchar[{\jlreq at endnote}{\jlreq at endnote[]}}
+\def\endnote{\@ifnextchar[{\jlreq at endnote}{\jlreq at endnote[]}}  
 \def\endnotemark{\@ifnextchar[{\jlreq at endnotemark}{\jlreq at endnotemark[]}}
 \def\endnotetext{\@ifnextchar[{\jlreq at endnotetext}{\jlreq at endnotetext[]}}
 \long\def\jlreq at endnote[#1]#2{\jlreq at endnotemark[#1]\@endnotetext{#2}}
@@ -2328,7 +2460,7 @@
     \par
   \fi
 }
-
+\jlreq at modify@noteandmark at fixjfm{\endnote}{\endnotemark}
 \jlreq at endnote@indent=2\jlreq at mol
 % 二行目以降を全角分下げる
 \newcommand{\@makeendtext}[1]{\parindent 1\jlreq at mol
@@ -2402,8 +2534,10 @@
     \fi
   \else
     \setlength{\jlreq at tempdima}{\dimexpr \paperwidth - \textwidth - 1in - \oddsidemargin - \marginparsep\relax}
-    \ifdim\jlreq at tempdima>\dimexpr\oddsidemargin + 1in\relax
-      \setlength{\jlreq at tempdima}{\dimexpr\oddsidemargin + 1in\relax}
+    \if at twocolumn
+      \ifdim\jlreq at tempdima>\dimexpr\oddsidemargin + 1in - \marginparsep\relax
+        \setlength{\jlreq at tempdima}{\dimexpr\oddsidemargin + 1in - \marginparsep\relax}
+      \fi
     \fi
   \fi
   \ifx\jlreq at option@sidenote at width\@empty
@@ -2418,7 +2552,7 @@
       \ClassWarningNoLine{jlreq}{sidenote_width is greater than the width of the margin}
     \fi
   \fi
-  \@tempdima=1\zw% 1\jlreq at mol
+  \@tempdima=1\jlreq at mol
   \global\divide\marginparwidth\@tempdima
   \global\multiply\marginparwidth\@tempdima
   \global\setlength{\marginparpush}{.5\@tempdima} % 同上:g
@@ -2455,7 +2589,7 @@
       \begingroup
         \csname c@\jlreq at sidenotecounter\endcsname #1\relax
         \expandafter\unrestored at protected@xdef\csname\jlreq at sidenotemarkname\endcsname{\csname the\jlreq at sidenotecounter\endcsname}%
-     \endgroup
+      \endgroup
     }%
     \@sidenotemark
   }
@@ -2475,9 +2609,10 @@
     \long\def\@makesidetext#1{\csname\jlreq at sidenotemarkname\endcsname\hspace{0.5\jlreq at mol}#1}
   \else
     % thefootnote = \inhibitglue (...だと\inhibitglueが効かない
-    \long\def\@makesidetext#1{ \kern-1\zw\csname\jlreq at sidenotemarkname\endcsname\hspace{0.5\jlreq at mol}#1}
+    \long\def\@makesidetext#1{ \kern-1\jlreq at mol\csname\jlreq at sidenotemarkname\endcsname\hspace{0.5\jlreq at mol}#1}
   \fi
   \def\@makesidemark{\@makefnmark}
+  \jlreq at modify@noteandmark at fixjfm{\sidenote}{\sidenotemark}
 }{% sidenote_type = symbol
   \jlreq at jlreqsetup@add{sidenote_symbol}{\def\jlreq at sidenote@defaultmark{#1}}
   \jlreq at jlreqsetup@add{sidenote_keyword_font}{\def\jlreq at sidenote@keywordfont{#1}}
@@ -2488,13 +2623,31 @@
   \def\sidenotemark{\jlreq at sidenotemark}
   \def\sidenotetext{\jlreq at sidenotetext}
   \long\def\jlreq at sidenote#1#2{\jlreq at sidenotemark{#1}\jlreq at sidenotetext{#1}{#2}}
-  \def\jlreq at sidenotemark#1{%
-    {\reset at font\jlreq at sidenote@keywordfont #1}%
-    \ifx\jlreq at sidenote@defaultmark\@empty\else
-      \expandafter\edef\csname\jlreq at sidenotemarkname\endcsname{\jlreq at sidenote@defaultmark}%
-      \@sidenotemark
+  \ifthenelse{\equal{\jlreq at referencemark}{inline}}{%
+    \def\@tempa{\inhibitglue}
+  }{
+    \ifx\jlreq at engine l
+      \def\@tempa{%
+        \jlreq at lastnodechar=\lastnodechar
+        \ifnum\lastnodechar>-1\inhibitglue\fi
+      }
+    \else
+      \def\@tempa{%
+        \ifnum\lastnodechar>-1\inhibitglue\fi
+        \jlreq at lastnodechar=\lastnodechar
+      }
     \fi
   }
+  \edef\jlreq at sidenotemark#1{%
+    {\noexpand\reset at font\jlreq at sidenote@keywordfont #1}%
+    \expandonce{\@tempa}%
+    \unexpanded{%
+      \ifx\jlreq at sidenote@defaultmark\@empty\else
+        \expandafter\edef\csname\jlreq at sidenotemarkname\endcsname{\jlreq at sidenote@defaultmark}%
+        \@sidenotemark
+      \fi
+    }%
+  }
   \def\@sidenotemark{\@makesidemark}
   % カスタマイズできるべき?
   \long\def\jlreq at sidenotetext#1#2{%
@@ -2503,6 +2656,19 @@
   }
   \long\def\@makesidetext#1{{\headfont\csname\jlreq at sidenotemarkname\endcsname}\hspace*{1\jlreq at mol}#1}
   \def\@makesidemark{\@makefnmark}
+  \ifthenelse{\equal{\jlreq at referencemark}{interlinear}}{\def\@tempa{\jlreq at fixjfm}}{\def\@tempa{\inhibitglue}}
+  \edef\jlreq at do{
+    % \jlreq at lastnodecharの仕込みはすんでいる
+    \unexpanded{\long\def\sidenote#1#2}{%
+      \expandonce{\sidenote{#1}{#2}}%
+      \expandonce{\@tempa}%
+    }
+    \unexpanded{\long\def\sidenotemark#1}{%
+      \expandonce{\sidenotemark{#1}}%
+      \expandonce{\@tempa}%
+    }
+  }
+  \jlreq at do
 }
 
 %.. 割注(3.4)
@@ -2832,10 +2998,10 @@
       \)
     \)}{%
       \if at twoside
-        \jlreq at warning{柱やノンブルは,左ページでは,基本版面の左端の延長線にノンブル又は柱の先頭をそろえて配置するか,基本版面の左端の延長線から基本版面の文字サイズの全角アキだけ右に寄せた位置に配置する(ページスタイル #1 内,2.6.1.b)}%
+        \jlreq at warning{柱やノンブルは,左ページでは,基本版面の左端の延長線にノンブル又は柱の先頭をそろえて配置するか,基本版面の左端の延長線から基本版面の文字サイズの全角アキだけ右に寄せた位置に配置する (ページスタイル #1 内,2.6.1.b)}%
       \fi
     }{}%
-    \ifthenelse{\lengthtest{\jlreq at gap < 1.49\zw} \OR \( \lengthtest{\jlreq at gap > 1.51\zw} \AND \lengthtest{\jlreq at gap < 1.99\zw} \) \OR \lengthtest{\jlreq at gap > 2.01\zw}}{\jlreq at warning{ノンブルと柱との空き量は文字サイズの2倍又は1.5倍とする(ページスタイル #1 内,2.6.1.c)}}{}%
+    \ifthenelse{\lengthtest{\jlreq at gap < 1.49\zw} \OR \( \lengthtest{\jlreq at gap > 1.51\zw} \AND \lengthtest{\jlreq at gap < 1.99\zw} \) \OR \lengthtest{\jlreq at gap > 2.01\zw}}{\jlreq at warning{ノンブルと柱との空き量は文字サイズの2倍又は1.5倍とする (ページスタイル #1 内,2.6.1.c)}}{}%
     % 見出しを出す場合:evenに章などの高いレベルの見出しを出す(2.6.3.a)
     \def\jlreq at markdefinition{}%
     \def\jlreq at even@running at head@level{}%
@@ -2886,7 +3052,7 @@
     \expandafter\@tempb\jlreq at odd@running at head\jlreq at endmark\jlreq at endmark
     \ifx\jlreq at odd@running at head@level\@empty\else\ifx\jlreq at even@running at head@level\@empty\else
       \ifnum\jlreq at odd@running at head@level<\jlreq at even@running at head@level
-        \jlreq at warning{偶数ページには奇数ページよりアウトラインレベルの高い見出しを入れる(ページスタイル #1内,2.6.3.a)}%
+        \jlreq at warning{偶数ページには奇数ページよりアウトラインレベルの高い見出しを入れる (ページスタイル #1内,2.6.3.a)}%
       \fi
     \fi\fi
     % ##1 ##2 ##3と並んだヘッダを作る,戻り値は\jlreq at result
@@ -3068,9 +3234,6 @@
 % \begin{figure}***\caption{???}\end{figure}を
 % \begin{figure}\layoutfloat{***}\pcaption{???}\end{figure}にする.
 % 
-%\def\jlreq at saveoriginalcs#1{
-%  \expandafter\expandafter\expandafter\let\expandafter\expandafter\csname jlreq at original@#1\endcsname\csname #1\endcsname
-%}
 %\long\def\jlreq at replace@layoutfloat#1\caption{\layoutfloat{#1}\jlreq at caption}
 %\long\def\jlreq at caption#1{\ifx#1\jlreq at endmark\else\pcaption{#1}\expandafter\jlreq at replace@layoutfloat\fi}
 %\def\jlreq at modify@float#1{%
@@ -3352,7 +3515,7 @@
   \setlength{\parsep}{0pt}%
   \setlength{\listparindent}{\parindent}%
 % itemizeは直後ベタ,enumerateは直後全角空き.
-  \ifthenelse{\equal{\@currenvir}{itemize}}{
+  \ifthenelse{\equal{\@currenvir}{itemize}}{%
     \setlength{\labelsep}{0\jlreq at mol}%
   }{%
     \setlength{\labelsep}{1\jlreq at mol}%
@@ -3408,7 +3571,7 @@
 \fi
 \newcommand{\labelitemiv}{\hbox to 1\jlreq at mol{\hss ・\hss}}
 
-% 引用系.1.5em→1\zh,字下げを二文字にした.3.5.2の例.
+% 引用系.3.5.2の例.
 \newenvironment{verse}
   {\let\\\@centercr
   \list{}{\itemsep\z@ \itemindent -2\jlreq at mol%
@@ -3461,8 +3624,8 @@
 
 %. 表関係 4.4
 % 表内の行間を0にする(4.4.3.f)
-\let\jlreq at original@tabular=\tabular
-\let\jlreq at original@endtabular=\endtabular
+\jlreq at saveoriginalcs{tabular}
+\jlreq at saveoriginalcs{endtabular}
 \preto\tabular{\begingroup\appto\@arrayparboxrestore{\baselineskip=0pt\lineskip=0pt}}
 \appto\endtabular{\endgroup}
 % 4.4.3.e
@@ -3545,7 +3708,7 @@
 % 第三引数は,上からの幅に加え更にトップの見出しからの差による補正(プラス)が入る.
 % 補正には\jlreq at top@contentsを使う.
 % 「トップ」というか,一番最初に現れた見出しを入れる.
-% リーダーは.から・に変更しました.更に直後から出るように.
+% リーダーは.から・に変更しました.
 \def\@dottedtocline#1#2#3#4#5{%
   \jlreq at set@top at contents{#1}%
   \ifnum #1>\c at tocdepth \else
@@ -3562,7 +3725,7 @@
     \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
       \advance\leftskip\@tempdima
     {#4}\nobreak
-    \leaders\hbox{$\hbox{・}\mkern \@dotsep mu \m at th \mkern \@dotsep mu$}%
+    \leaders\hbox{$\m at th\mkern \@dotsep mu$\null\inhibitglue ・\inhibitglue\null$\m at th\mkern \@dotsep mu$}%
     \hfill\nobreak
     \hb at xt@\@pnumwidth{\hss\normalfont\normalcolor #5}%
     \par}%
@@ -3740,11 +3903,11 @@
 
 %. 定理環境
 \def\jlreq at theorem@abovebelowspace{1\baselineskip}%とりあえず前後に一行分のアキ
-\let\jlreq at original@@begintheorem=\@begintheorem
+\jlreq at saveoriginalcs{@begintheorem}
 \def\@begintheorem#1#2{\topsep=\jlreq at theorem@abovebelowspace
   \trivlist\labelsep=1\jlreq at mol
    \item[\hskip \labelsep{\headfont #1\ #2}]}
-\let\jlreq at original@@opargbegintheorem=\@opargbegintheorem
+\jlreq at saveoriginalcs{@opargbegintheorem}
 \def\@opargbegintheorem#1#2#3{\topsep=\jlreq at theorem@abovebelowspace
   \trivlist\labelsep=1\jlreq at mol
   \item[\hskip \labelsep{\headfont #1\ #2(#3)}]}
@@ -3752,8 +3915,8 @@
 \AtEndOfPackageFile*{amsthm}{
   \newtheoremstyle{jlreq}{\jlreq at theorem@abovebelowspace}{\jlreq at theorem@abovebelowspace}{\normalfont}{}{\headfont}{}{1\jlreq at mol}{\thmname{#1}\thmnumber{\ #2}\thmnote{ (#3)}}
   \theoremstyle{jlreq}
-  \let\jlreq at original@proof=\proof
-  \let\jlreq at original@endproof=\endproof
+  \jlreq at saveoriginalcs{proof}
+  \jlreq at saveoriginalcs{endproof}
   \def\proof{\@ifnextchar[{\jlreq at proof}{\jlreq at proof[\proofname]}}
   \def\jlreq at proof[#1]{\labelsep=1\jlreq at mol\jlreq at original@proof[{\normalfont\headfont #1\inhibitglue}\nopunct]}
   \renewcommand{\proofname}{証明}



More information about the tex-live-commits mailing list