texlive[51036] Master/texmf-dist: jlreq (7may19)
commits+karl at tug.org
commits+karl at tug.org
Tue May 7 21:53:52 CEST 2019
Revision: 51036
http://tug.org/svn/texlive?view=revision&revision=51036
Author: karl
Date: 2019-05-07 21:53:52 +0200 (Tue, 07 May 2019)
Log Message:
-----------
jlreq (7may19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
trunk/Master/texmf-dist/doc/latex/jlreq/README.md
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html
trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty
trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2019-05-07 19:53:19 UTC (rev 51035)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2019-05-07 19:53:52 UTC (rev 51036)
@@ -439,6 +439,10 @@
- `zref`パッケージの利用をやめた．
- 新元号を追加．
- バグ修正．
+* 2019-05-07
+ - わずかな誤差で行数が減ってしまうのを防ぐために，`\textwidth`と`\textheight`を少しだけ増やした．
+ - `\DeclarePageStyle`内の`running_head_ii`などの実装を変更．
+ - バグ修正
--------------
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2019-05-07 19:53:19 UTC (rev 51035)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2019-05-07 19:53:52 UTC (rev 51036)
@@ -111,6 +111,10 @@
- Stopped to use `zref` package.
- New regnal year.
- Fixed bugs.
+* 2019-05-07
+ - Added a small length to `\textwidth` and `\textheight'.
+ - Changed the implementation of `running_head_ii` etc. in `\DeclarePageStyle`.
+ - Fixed bugs.
--------------
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2019-05-07 19:53:19 UTC (rev 51035)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2019-05-07 19:53:52 UTC (rev 51036)
@@ -536,6 +536,12 @@
<li>新元号を追加．</li>
<li>バグ修正．</li>
</ul></li>
+<li>2019-05-07
+<ul>
+<li>わずかな誤差で行数が減ってしまうのを防ぐために，<code>\textwidth</code>と<code>\textheight</code>を少しだけ増やした．</li>
+<li><code>\DeclarePageStyle</code>内の<code>running_head_ii</code>などの実装を変更．</li>
+<li>バグ修正</li>
+</ul></li>
</ul>
<hr />
<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq" class="uri">https://github.com/abenori/jlreq</a></p>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html 2019-05-07 19:53:19 UTC (rev 51035)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html 2019-05-07 19:53:52 UTC (rev 51036)
@@ -136,12 +136,12 @@
</ul>
<h3 id="bleed_margin"><code>bleed_margin</code></h3>
<p>仕上がりと裁ち落としの間（ドブ）の長さを指定します．次のようにすると，上下左右を独立に変更できます．</p>
-<pre class="sourceCode latex" id="cb2"><code class="sourceCode latex"><a class="sourceLine" id="cb2-1" data-line-number="1"><span class="bu">\usepackage</span>[bleed_margin={top=3mm,bottom=5mm,gutter=0mm,fore-edge=2mm}]{<span class="ex">jlreq-trimmarks</span>}</a></code></pre>
+<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><a class="sourceLine" id="cb2-1" data-line-number="1"><span class="bu">\usepackage</span>[bleed_margin={top=3mm,bottom=5mm,gutter=0mm,fore-edge=2mm}]{<span class="ex">jlreq-trimmarks</span>}</a></code></pre></div>
<h2 id="jlreqtrimmarkssetup"><code>\jlreqtrimmarkssetup</code></h2>
<p>パッケージオプションで指定できない設定を行えます．keyval形式です．</p>
<h3 id="banner"><code>banner</code></h3>
<p><code>show=banner</code>時に出力される文字列．通常は左上に出力されますが，四つ角および上下左右の中心に出力することもできます．指定は</p>
-<pre class="sourceCode latex" id="cb3"><code class="sourceCode latex"><a class="sourceLine" id="cb3-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
+<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><a class="sourceLine" id="cb3-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
<a class="sourceLine" id="cb3-2" data-line-number="2"> banner={</a>
<a class="sourceLine" id="cb3-3" data-line-number="3"> <場所（上下，左右中央）>={</a>
<a class="sourceLine" id="cb3-4" data-line-number="4"> <細かな位置>={</a>
@@ -151,9 +151,9 @@
<a class="sourceLine" id="cb3-8" data-line-number="8"> }</a>
<a class="sourceLine" id="cb3-9" data-line-number="9"> }</a>
<a class="sourceLine" id="cb3-10" data-line-number="10"> }</a>
-<a class="sourceLine" id="cb3-11" data-line-number="11">}</a></code></pre>
+<a class="sourceLine" id="cb3-11" data-line-number="11">}</a></code></pre></div>
<p>のようになります．キー名は省略することもできます．例えば次のように指定します．</p>
-<pre class="sourceCode latex" id="cb4"><code class="sourceCode latex"><a class="sourceLine" id="cb4-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
+<div class="sourceCode" id="cb4"><pre class="sourceCode latex"><code class="sourceCode latex"><a class="sourceLine" id="cb4-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
<a class="sourceLine" id="cb4-2" data-line-number="2"> banner={</a>
<a class="sourceLine" id="cb4-3" data-line-number="3"> top-right={</a>
<a class="sourceLine" id="cb4-4" data-line-number="4"> tate={</a>
@@ -175,10 +175,10 @@
<a class="sourceLine" id="cb4-20" data-line-number="20"> below={ノド側中央の下側に表示},</a>
<a class="sourceLine" id="cb4-21" data-line-number="21"> },</a>
<a class="sourceLine" id="cb4-22" data-line-number="22"> }</a>
-<a class="sourceLine" id="cb4-23" data-line-number="23">}</a></code></pre>
+<a class="sourceLine" id="cb4-23" data-line-number="23">}</a></code></pre></div>
<p>場所は<code>top/bottom/center</code>と<code>left/right/center/gutter/fore-edge</code>の可能な組み合わせが指定可能です．各項目に<code>\thepage</code>を指定するとページ数を出力できます．</p>
<p>次のような指定も可能です．</p>
-<pre class="sourceCode latex" id="cb5"><code class="sourceCode latex"><a class="sourceLine" id="cb5-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
+<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><a class="sourceLine" id="cb5-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
<a class="sourceLine" id="cb5-2" data-line-number="2"> banner={</a>
<a class="sourceLine" id="cb5-3" data-line-number="3"> tate={左上に縦書き}, <span class="co">% 場所が省略されるとtop-leftと見なされる．</span></a>
<a class="sourceLine" id="cb5-4" data-line-number="4"> odd={左上奇数ページ}, <span class="co">% 省略されたのでyokoと見なされる．</span></a>
@@ -186,7 +186,7 @@
<a class="sourceLine" id="cb5-6" data-line-number="6"> odd={右上奇数ページ} <span class="co">% ここもyokoが省略されている．</span></a>
<a class="sourceLine" id="cb5-7" data-line-number="7"> }</a>
<a class="sourceLine" id="cb5-8" data-line-number="8"> }</a>
-<a class="sourceLine" id="cb5-9" data-line-number="9">}</a></code></pre>
+<a class="sourceLine" id="cb5-9" data-line-number="9">}</a></code></pre></div>
<h3 id="trimmarks_width"><code>trimmarks_width</code></h3>
<p>トンボ自身の太さを指定します．</p>
<h3 id="color"><code>color</code></h3>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html 2019-05-07 19:53:19 UTC (rev 51035)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html 2019-05-07 19:53:52 UTC (rev 51036)
@@ -135,12 +135,12 @@
</ul>
<h3 id="bleed_margin"><code>bleed_margin</code></h3>
<p>Set the bleed margin. You can also specify as follows.</p>
-<pre class="sourceCode latex" id="cb2"><code class="sourceCode latex"><a class="sourceLine" id="cb2-1" data-line-number="1"><span class="bu">\usepackage</span>[bleed_margin={top=3mm,bottom=5mm,gutter=0mm,fore-edge=2mm}]{<span class="ex">jlreq-trimmarks</span>}</a></code></pre>
+<div class="sourceCode" id="cb2"><pre class="sourceCode latex"><code class="sourceCode latex"><a class="sourceLine" id="cb2-1" data-line-number="1"><span class="bu">\usepackage</span>[bleed_margin={top=3mm,bottom=5mm,gutter=0mm,fore-edge=2mm}]{<span class="ex">jlreq-trimmarks</span>}</a></code></pre></div>
<h2 id="jlreqtrimmarkssetup"><code>\jlreqtrimmarkssetup</code></h2>
<p>Set the additional settings with the keyval style.</p>
<h3 id="banner"><code>banner</code></h3>
<p>The things which the package outputs when <code>show=banner</code> is specified in the package option. Normally it is showed in the left of the top. You can also put them in many places with</p>
-<pre class="sourceCode latex" id="cb3"><code class="sourceCode latex"><a class="sourceLine" id="cb3-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
+<div class="sourceCode" id="cb3"><pre class="sourceCode latex"><code class="sourceCode latex"><a class="sourceLine" id="cb3-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
<a class="sourceLine" id="cb3-2" data-line-number="2"> banner={</a>
<a class="sourceLine" id="cb3-3" data-line-number="3"> <Position (top/bottom, left/right, center)>={</a>
<a class="sourceLine" id="cb3-4" data-line-number="4"> <more precise position>={</a>
@@ -150,9 +150,9 @@
<a class="sourceLine" id="cb3-8" data-line-number="8"> }</a>
<a class="sourceLine" id="cb3-9" data-line-number="9"> }</a>
<a class="sourceLine" id="cb3-10" data-line-number="10"> }</a>
-<a class="sourceLine" id="cb3-11" data-line-number="11">}</a></code></pre>
+<a class="sourceLine" id="cb3-11" data-line-number="11">}</a></code></pre></div>
<p>Here is an example.</p>
-<pre class="sourceCode latex" id="cb4"><code class="sourceCode latex"><a class="sourceLine" id="cb4-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
+<div class="sourceCode" id="cb4"><pre class="sourceCode latex"><code class="sourceCode latex"><a class="sourceLine" id="cb4-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
<a class="sourceLine" id="cb4-2" data-line-number="2"> banner={</a>
<a class="sourceLine" id="cb4-3" data-line-number="3"> top-right={</a>
<a class="sourceLine" id="cb4-4" data-line-number="4"> vertical={</a>
@@ -170,10 +170,10 @@
<a class="sourceLine" id="cb4-16" data-line-number="16"> in={In the trim area in the center of the bottom.},</a>
<a class="sourceLine" id="cb4-17" data-line-number="17"> }</a>
<a class="sourceLine" id="cb4-18" data-line-number="18"> }</a>
-<a class="sourceLine" id="cb4-19" data-line-number="19">}</a></code></pre>
+<a class="sourceLine" id="cb4-19" data-line-number="19">}</a></code></pre></div>
<p>A possible combination of <code>top/bottom/center</code> and <code>left/right/center/gutter/fore-edge</code> can be used for the position. You can use <code>\thepage</code> to output the number of the page.</p>
<p>The keys can be ommited. For example:</p>
-<pre class="sourceCode latex" id="cb5"><code class="sourceCode latex"><a class="sourceLine" id="cb5-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
+<div class="sourceCode" id="cb5"><pre class="sourceCode latex"><code class="sourceCode latex"><a class="sourceLine" id="cb5-1" data-line-number="1"><span class="fu">\jlreqtrimmarkssetup</span>{</a>
<a class="sourceLine" id="cb5-2" data-line-number="2"> banner={</a>
<a class="sourceLine" id="cb5-3" data-line-number="3"> vertical={Vertical mode, in the top of the left},</a>
<a class="sourceLine" id="cb5-4" data-line-number="4"> odd={In the top of the left, only in odd pages.}, <span class="co">% regarded as `horizontal`</span></a>
@@ -181,7 +181,7 @@
<a class="sourceLine" id="cb5-6" data-line-number="6"> odd={In the top of the right, only in odd pages, horizontal mode.}</a>
<a class="sourceLine" id="cb5-7" data-line-number="7"> }</a>
<a class="sourceLine" id="cb5-8" data-line-number="8"> }</a>
-<a class="sourceLine" id="cb5-9" data-line-number="9">}</a></code></pre>
+<a class="sourceLine" id="cb5-9" data-line-number="9">}</a></code></pre></div>
<h3 id="trimmarks_width"><code>trimmarks_width</code></h3>
<p>Set the width of trim marks.</p>
<h3 id="color"><code>color</code></h3>
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2019-05-07 19:53:19 UTC (rev 51035)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2019-05-07 19:53:52 UTC (rev 51036)
@@ -209,6 +209,12 @@
<li>New regnal year.</li>
<li>Fixed bugs.</li>
</ul></li>
+<li>2019-05-07
+<ul>
+<li>Added a small length to <code>\textwidth</code> and `\textheight'.</li>
+<li>Changed the implementation of <code>running_head_ii</code> etc. in <code>\DeclarePageStyle</code>.</li>
+<li>Fixed bugs.</li>
+</ul></li>
</ul>
<hr />
<p>Noriyuki Abe <a href="https://github.com/abenori/jlreq" class="uri">https://github.com/abenori/jlreq</a></p>
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty 2019-05-07 19:53:19 UTC (rev 51035)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty 2019-05-07 19:53:52 UTC (rev 51036)
@@ -60,6 +60,12 @@
% #1が\jlreq at endmarkか
\long\def\jlreq at ifendmark#1{\jlreq at iffirsttoken{#1}{\jlreq at endmark}}
+% 条件．\jlreq at if{ifnum\@count=1 \fi}{<TRUE>}{<FALSE>}みたいに使う
+\def\jlreq at if@endmark{\jlreq at if@endmark}
+\def\jlreq at if#1{\jlreq at if@#1\jlreq at if@endmark}
+\@gobbletwo\if\if
+\def\jlreq at if@#1\fi\jlreq at if@endmark{#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+
% #1の先頭が引数なしのマクロか
\long\def\jlreq at ifmacro@noargument#1{%
\jlreq at ifempty{#1}{\@secondoftwo}{%
@@ -164,7 +170,7 @@
\def\jlreq at helper@dividebycomma@#1,#2\jlreq at endmark{%
\jlreq at helper@trim{#1}{\jlreq at resulta}%
\jlreq at helper@trim{#2}{\jlreq at resultb}%
- \ifx\jlreq at resultb\@empty\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{%
+ \jlreq at if{\ifx\jlreq at resultb\@empty\fi}{%
\jlreq at resultfalse
}{%
\jlreq at resulttrue
@@ -366,7 +372,7 @@
\edef\jlreq at do{\unexpanded{#2}}%
}{%
\edef\jlreq at tempb{\jlreq at ifempty{#1}{#2}{\unexpanded{#2}}}%
- \ifx\jlreq at tempa\jlreq at tempb\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{%
+ \jlreq at if{\ifx\jlreq at tempa\jlreq at tempb\fi}{%
\edef\jlreq at do{\unexpanded{#3}}%
\jlreq at deleteuntileendmark
}{%
@@ -377,11 +383,11 @@
% オレオレラベル……
% \jlreq at reference@ref{ラベル名}{デフォルト値}
-\def\jlreq at reference@ref#1{\expandafter\ifx\csname jlreq at reference@#1\endcsname\relax\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi{\csname jlreq at reference@#1\endcsname}}
+\def\jlreq at reference@ref#1{\jlreq at if{\expandafter\ifx\csname jlreq at reference@#1\endcsname\fi}{\csname jlreq at reference@#1\endcsname}}
% \jlreq at reference@label{ラベル名}{値}
\def\jlreq at reference@label#1#2{\protected at write\@auxout{}{\string\@newl at bel{jlreq at reference}{#1}{#2}}}%
\def\jlreq at reference@immediate at write#1#2{\immediate\write\@auxout{\string\@newl at bel{jlreq at reference}{#1}{#2}}}%
-\def\jlreq at reference@ifexist#1{\expandafter\ifx\csname jlreq at reference@#1\endcsname\relax\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi}
+\def\jlreq at reference@ifexist#1{\jlreq at if{\expandafter\ifx\csname jlreq at reference@#1\endcsname\fi}}
% 自動生成されるラベル用の番号
\newcount\jlreq at reference@count
@@ -412,7 +418,7 @@
\def\jlreq at helper@checktokenlist#1#2{%
\jlreq at ifendmark{#2}{\@firstoftwo}%
{%
- \ifnum0#1{#2}>0 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
+ \jlreq at if{\ifnum0#1{#2}>0 \fi}%
{\jlreq at helper@checktokenlist{#1}}%
{\expandafter\@secondoftwo\jlreq at deleteuntileendmark}%
}%
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2019-05-07 19:53:19 UTC (rev 51035)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2019-05-07 19:53:52 UTC (rev 51036)
@@ -5,7 +5,7 @@
%%
% (based on JLReq 20120403 https://www.w3.org/TR/2012/NOTE-jlreq-20120403/ja/)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2019/04/01 jlreq]
+\ProvidesClass{jlreq}[2019/05/07 jlreq]
\RequirePackage{xkeyval,everyhook,filehook,etoolbox,ifthen}
\RequirePackage{jlreq-helpers}
@@ -40,7 +40,7 @@
\expandafter\let\csname jlreq at original@\expandafter\@gobble\string#1\endcsname=#1
}
\def\jlreq at useoriginalcs#1{%
- \ifcsname jlreq at original@\expandafter\@gobble\string#1\endcsname\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
+ \jlreq at if{\ifcsname jlreq at original@\expandafter\@gobble\string#1\endcsname\fi}%
{\csname jlreq at original@\expandafter\@gobble\string#1\endcsname}%
{#1}%
}
@@ -376,31 +376,31 @@
}
\long\def\jlreq at helper@ifletter#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 if{%
+ \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
+ \fi}%
}
% 組方向を判定
% \jlreq at if(y|t)(dir|box)を定義する．
-\ifx l\jlreq at engine\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{
- \def\jlreq at ifydir{\ifnum\ltjgetparameter{direction}=4 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
- \def\jlreq at iftdir{\ifnum\numexpr\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8\relax=3 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
- \def\jlreq at ifybox#1{\ifnum\ltjgetparameter{boxdir}{#1}=4 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
- \def\jlreq at iftbox#1{\ifnum\numexpr\ltjgetparameter{boxdir}{#1}-(\ltjgetparameter{boxdir}{#1}/8)*8\relax=3 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+\jlreq at if{\ifx l\jlreq at engine\fi}{
+ \def\jlreq at ifydir{\jlreq at if{\ifnum\ltjgetparameter{direction}=4 \fi}}
+ \def\jlreq at iftdir{\jlreq at if{\ifnum\numexpr\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8\relax=3 \fi}}
+ \def\jlreq at ifybox#1{\jlreq at if{\ifnum\ltjgetparameter{boxdir}{#1}=4 \fi}}
+ \def\jlreq at iftbox#1{\jlreq at if{\ifnum\numexpr\ltjgetparameter{boxdir}{#1}-(\ltjgetparameter{boxdir}{#1}/8)*8\relax=3 \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}
+ \def\jlreq at ifydir{\jlreq at if{\ifydir\fi}}
+ \def\jlreq at iftdir{\jlreq at if{\iftdir\fi}}
+ \def\jlreq at ifybox#1{\jlreq at if{\ifybox#1\fi}}
+ \def\jlreq at iftbox#1{\jlreq at if{\iftbox#1\fi}}
}
% 左ページであるか
@@ -1332,6 +1332,7 @@
\if at twocolumn
\setlength{\textwidth}{\dimexpr2\textwidth + \columnsep\relax}
\fi
+\addtolength{\textwidth}{0.0001pt}
%.. \textheight：行送り方向の長さ
@@ -1364,6 +1365,7 @@
\else
\setlength{\textheight}{\dimexpr\numexpr\jlreq at option@number at of@lines\relax\baselineskip - \baselineskip + \topskip\relax}
\fi
+\addtolength{\textheight}{0.0001pt}
%.. 横
\def\jlreq at setsidemargin@by at gutter#1{
@@ -1635,7 +1637,7 @@
{\long\gdef\jlreqHeadingText####1{####1}}%
}%
\ifjlreq at number
- \unexpanded{\ifnum#2>\c at secnumdepth\relax\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}{%
+ \unexpanded{\jlreq at if{\ifnum#2>\c at secnumdepth\relax\fi}}{%
\unexpanded{\long\gdef\jlreqHeadingLabel####1{}}%
\expandonce{\jlreq at format{}{##1}}%
}{%
@@ -1724,11 +1726,18 @@
\long\def\jlreq at BlockHeading@start@@@@#1#2#3#4#5#6#7#8{%
\edef\jlreq at tempa##1##2##3##4##5##6##7{%
\unexpanded{\jlreq at BlockHeading@start at makeoutput{#1}{#2}}{{##1}{##2}{##3}}{\expandonce{\jlreq at BlockHeading@start at eachformat}}{\expandonce{\jlreq at BlockHeading@start at format}}\unexpanded{{#5}{#6}{#7}{#8}}%
- \unexpanded{\def\jlreq at tempb}{{##4}{##5}{##6}{##7}}% 縦方向空き
+ \unexpanded{\def\jlreq at tempb}{{##4}{##5}{##6}}% 縦方向空き
+ \noexpand\jlreq at ifempty{##7}{\noexpand\jlreq at tempatrue}{\noexpand\jlreq at tempafalse}% 偶数ページのみで改ページするならば\jlreq at tempatrue
}%
\jlreq at tempa#3%
\global\advance\jlreq at BlockHeading@spaces at current@count by 1
\gappto\jlreq at BlockHeading@spaces at current@sequence{_#1}%
+ % 連続する見出しの間の処理をするために，即時では出力せず，いったんマクロに格納する．
+ % \jlreq at BlockHeading@spaces at current@before@<n>
+ % \jlreq at BlockHeading@start at gyodori\jlreq at BlockHeading@spaces at current@space@<n>{jlreq at BlockHeading@spaces at current@output@<n>}
+ % ↑\jlreq at BlockHeading@spaces at current@format@<n>で整形される．
+ % \jlreq at BlockHeading@spaces at current@after@<n>
+ % として後に呼び出される．（spaceは書き換えられる可能性がある．）
\expandafter\xdef\csname jlreq at BlockHeading@spaces at current@output@\the\jlreq at BlockHeading@spaces at current@count\endcsname{%
\expandonce{\jlreq at resultb}%
}%
@@ -1739,6 +1748,10 @@
\expandafter\xdef\csname jlreq at BlockHeading@spaces at current@before@\the\jlreq at BlockHeading@spaces at current@count\endcsname{%
\expandonce{\@tempa#4}%
\expandonce{\jlreq at resulta}%
+ \ifjlreq at tempa\unexpanded{%
+ \jlreq at setcurrentpage
+ \edef\jlreq at BlockHeading@currentpage{\the\jlreq at currentpage}%
+ }\fi
}%
\def\@tempa##1##2##3{##2}%
\expandafter\xdef\csname jlreq at BlockHeading@spaces at current@format@\the\jlreq at BlockHeading@spaces at current@count\endcsname{%
@@ -1747,6 +1760,12 @@
\def\@tempa##1##2##3{##3}%
\expandafter\xdef\csname jlreq at BlockHeading@spaces at current@after@\the\jlreq at BlockHeading@spaces at current@count\endcsname{%
\expandonce{\jlreq at resultc}%
+ \ifjlreq at tempa\unexpanded{%
+ \ifx\jlreq at BlockHeading@currentpage\@empty\nobreak\else
+ \ifodd\jlreq at BlockHeading@currentpage\nobreak\else\allowbreak\fi
+ \fi
+ }\else\noexpand\nobreak\fi
+ % 現状ここ↓は常に空
\expandonce{\@tempa#4}%
}%
\ifx\jlreq at BlockHeading@spaces at headingslist\@empty
@@ -1922,10 +1941,10 @@
}
% 行取り処理．#3が空の時は行取りの処理はしない．（空白挿入は行う．）
-% {1 = 前空き}{2 = 後ろ空き}{3 = トータル行数}{4 = 偶数ページ改ページするなら空}{5 = 出力}
-\long\def\jlreq at BlockHeading@start at gyodori#1#2#3#4#5{\par{%
- \jlreq at ifempty{#4}{\jlreq at setcurrentpage}{}%
- \setbox\jlreq at tempboxa=\vbox{#5}%
+% {1 = 前空き}{2 = 後ろ空き}{3 = トータル行数}{4 = 出力}
+% 最後には\nobreak（と\vskip）が入っている
+\long\def\jlreq at BlockHeading@start at gyodori#1#2#3#4{\par{%
+ \setbox\jlreq at tempboxa=\vbox{#4}%
% \jlreq at tempskip(a/b)に前/後ろに入れるべき値を入れる
% #1がa:ならばその値は\jlreq at tempskipaには足さず\jlreq at tempskipcに入れておく
\jlreq at tempskipa=0pt
@@ -2005,7 +2024,7 @@
\box\jlreq at tempboxa
\ifx r\jlreq at ushiroakitype\prevdepth=-1000pt \else\prevdepth=0pt \fi
\fi
- \jlreq at ifempty{#4}{\ifodd\jlreq at currentpage\nobreak\fi}{\nobreak}%
+ \nobreak
\jlreq at ifgluezero\jlreq at tempskipb{}{\vskip\jlreq at tempskipb}%
\edef\jlreq at do{%
\ifdim\parskip=0pt \else
@@ -2107,7 +2126,7 @@
% a,bみたいなのをaとbにわける．カンマがなければbは空．引数を{a}{b}として##2を呼び出す．
\def\jlreq at parsecomma##1##2{%
\jlreq at helper@dividebycomma{##1}%
- \ifjlreq at result\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{%
+ \jlreq at if{\ifjlreq at result\fi}{%
\edef\jlreq at do{\noexpand\jlreq at tempa{\expandonce{\jlreq at resulta}}{\expandonce{\jlreq at resultb}}}%
}{%
\edef\jlreq at do{\noexpand\jlreq at tempa{##1}{}}%
@@ -2291,7 +2310,7 @@
% 前開きが常に入ってしまうので，a:の時は除去する
\jlreq at iffirsttoken{##1}{a}{\def\jlreq at spaceset{{}{##2}{##3}}}{}%
\edef\jlreq at totalformat{%
- \unexpanded{\if at twocolumn\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}{%
+ \unexpanded{\jlreq at if{\if at twocolumn\fi}}{%
\noexpand\twocolumn[{%
% 普段自動で入る\topskipと\baselineskipを手動で入れる
\jlreq at iffirsttoken{##1}{r}{}{\unexpanded{\vskip\topskip\relax}}%
@@ -2531,7 +2550,7 @@
\ifthenelse{\equal{#1}{{}{}{}}}{\jlreq at tempafalse}{}%
\edef\jlreq at do{%
\ifjlreq at tempa
- \unexpanded{\jlreq at BlockHeading@start at gyodori#1}{*}{%
+ \unexpanded{\jlreq at BlockHeading@start at gyodori#1}{%
\expandonce{\jlreq at result}%
}%
\else
@@ -2563,7 +2582,7 @@
\jlreq at do
}
% #1: デフォルト値を使うならば*，#2#3#4が設定された値，#5#6#7がデフォルト値，#8は偶数ページの，#9が出力
-\def\jlreq at BlockHeading@spaces at output@@@@#1#2#3#4#5#6#7#8#9{%
+\def\jlreq at BlockHeading@spaces at output@@@@#1#2#3#4#5#6#7#8{%
\edef\jlreq at tempa{%
\unexpanded{\long\def\jlreq at tempa##1}{\csexpandonce{jlreq at BlockHeading@spaces at current@format@\the\jlreq at tempcnta}}%
}%
@@ -2575,7 +2594,7 @@
{\jlreq at ifempty{#2}{\unexpanded{#5}}{\unexpanded{#2}}}%
{\jlreq at ifempty{#3}{\unexpanded{#6}}{\unexpanded{#3}}}%
{\jlreq at ifempty{#4}{\unexpanded{#7}}{\unexpanded{#4}}}%
- }\unexpanded{{#8}{#9}}%
+ }\unexpanded{{#8}}%
}}%
}%
\eappto\jlreq at result{%
@@ -2728,7 +2747,7 @@
\def\jlreq at CutinHeading@start#1#2#3#4#5#6#7{%
\if at noskipsec\leavevmode\fi
\par
- \ifnum\hangafter=1 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{%
+ \jlreq at if{\ifnum\hangafter=1 \fi}{%
\jlreq at CutinHeading@start@{#2}{#3}{#4}{#5}{#6}{#7}%
}{%
\ClassError{jlreq}{Can not use \expandafter\string\csname#1\endcsname\space here}{\@ehc}%
@@ -2864,7 +2883,7 @@
\fi
}
\newcommand*{\jlreq at HeadingType@}[2]{%
- \expandafter\expandafter\expandafter\ifx\csname jlreq at heading@type@#1\endcsname#2\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
+ \jlreq at if{\expandafter\expandafter\expandafter\ifx\csname jlreq at heading@type@#1\endcsname#2\fi}%
}
% 全ての見出しにマクロ#1を適用する．
@@ -3726,168 +3745,40 @@
}
%.. マークの拡張
-% 三つ以上のマークを保持するために，markを次のようにする
-% <マーク1>\jlreq at extramark{{<マーク2>}{<マーク3>}...}
-\def\jlreq at extramark#1{}
-
-% #1番目の\leftmarkや\rightmarkを取得する．\leftmark/\rightmarkの実装に強く依存している．
-\def\jlreq at extraleftmark#1{\jlreq at getextramark{#1}{\leftmark}}%
-\def\jlreq at extrarightmark#1{\jlreq at getextramark{#1}{\rightmark}}%
-\def\jlreq at getextramark#1#2{\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\jlreq at getextramark@#2\jlreq at extramark\jlreq at endmark{#1}}
-\def\jlreq at getextramark@#1\jlreq at extramark#2\jlreq at endmark#3{%
- \jlreq at ifempty{#2}{}{\jlreq at getextramark@@{#3}#2}%
+\def\jlreq at markregistername#1{jlreq at extramark@register@#1}
+\def\jlreq at extraleftmark#1{\jlreq at extramark@{#1}{\expandafter\@firstoftwo\botmarks}}
+\def\jlreq at extrarightmark#1{\jlreq at extramark@{#1}{\expandafter\@secondoftwo\firstmarks}}
+\def\jlreq at extramark@#1#2{\jlreq at if{\ifcsname\jlreq at markregistername{#1}\endcsname\fi}%
+ {\expandafter\jlreq at extramark@@\expandafter{\csname \jlreq at markregistername{#1}\endcsname}{#2}}%
+ {}%
}
-\def\jlreq at getextramark@@#1#2#3\jlreq at extramark{\jlreq at getextramark@@@{#1}#2\jlreq at endmark}
-\def\jlreq at getextramark@@@#1#2{%
- \jlreq at ifendmark{#2}{}{%
- \ifnum#1=1 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
- {\jlreq at getextramark@@@@{#2}}{\expandafter\jlreq at getextramark@@@\expandafter{\the\numexpr #1-1\relax}}%
- }%
-}
-\def\jlreq at getextramark@@@@#1#2\jlreq at endmark{#1}
+\def\jlreq at extramark@@#1#2{#2#1\@empty\@empty}
-% トークン列#1に必要ならば\jlre at extramarkを加え，#2に代入
-\def\jlreq at addextramarkcommand#1#2{%
- \jlreq at ifcontains{#1}{\jlreq at extramark}{\edef#2{\unexpanded{#1}}}{\edef#2{\unexpanded{#1\jlreq at extramark{}}}}%
-}
-\def\jlreq at addextramarkcommand@tothemark{%
- \begingroup
- \expandafter\expandafter\expandafter\jlreq at addextramarkcommand\expandafter\expandafter\expandafter{\expandafter\@firstoftwo\@themark}{\jlreq at tempa}%
- \expandafter\expandafter\expandafter\jlreq at addextramarkcommand\expandafter\expandafter\expandafter{\expandafter\@secondoftwo\@themark}{\jlreq at tempb}%
- \edef\jlreq at do{\unexpanded{\def\@themark}{{\expandonce{\jlreq at tempa}}{\expandonce{\jlreq at tempb}}}}%
- \expandafter\endgroup
- \jlreq at do
-}
-
-% #1番目を#2に置き換える
-\def\jlreq at setextraleftmark#1#2{%
- \let\jlreq at extramark@=\jlreq at extramark
- \begingroup
- \jlreq at addextramarkcommand@tothemark
- \def\jlreq at extramark##1{\noexpand\jlreq at extramark{\jlreq at changeargument{##1}{#1}{#2}}}%
- \protected at edef\jlreq at tempa{\expandafter\@firstoftwo\@themark}%
- \def\jlreq at extramark{\noexpand\jlreq at extramark}%
- \protected at edef\jlreq at tempb{\expandafter\@secondoftwo\@themark}%
- \edef\@themark{{\expandonce{\jlreq at tempa}}{\expandonce{\jlreq at tempb}}}%
- \edef\jlreq at do{%
- \unexpanded{\def\jlreq at extramark{\noexpand\jlreq at extramark}}%
- \noexpand\markboth\expandonce{\@themark}%
- }%
- \expandafter\endgroup
- \jlreq at do
- \let\jlreq at extramark=\jlreq at extramark@
-}
-\def\jlreq at setextrarightmark#1#2{%
- \let\jlreq at extramark@=\jlreq at extramark
- \begingroup
- \jlreq at addextramarkcommand@tothemark
- \def\jlreq at extramark{\noexpand\jlreq at extramark}%
- \protected at edef\jlreq at tempa{\expandafter\@firstoftwo\@themark}%
- \def\jlreq at extramark##1{\noexpand\jlreq at extramark{\jlreq at changeargument{##1}{#1}{#2}}}%
- \protected at edef\jlreq at tempb{\expandafter\@secondoftwo\@themark}%
- \edef\@themark{{\expandonce{\jlreq at tempa}}{\expandonce{\jlreq at tempb}}}%
- \edef\jlreq at do{%
- \unexpanded{\def\jlreq at extramark{\noexpand\jlreq at extramark}}%
- \noexpand\markright{\expandonce{\jlreq at tempb}}%
- }%
- \expandafter\endgroup
- \jlreq at do
- \let\jlreq at extramark=\jlreq at extramark@
-}
-
-% #1内の#2番目を#3に取り替える．\jlreq at changeargument{{arg1}{arg2}...{argk}}{n}{arg}
-% k < nならば{}を加えた後{arg}を最後につける
-\def\jlreq at changeargument#1#2#3{%
- \jlreq at changeargument@{#2}{#3}#1\jlreq at endmark
-}
-\def\jlreq at changeargument@#1#2#3{%
- \jlreq at ifendmark{#3}{%
- \ifnum#1>0 \expandafter\@firstofone\else\expandafter\@gobble\fi
- {\jlreq at changeargument@@{#1}{#2}}%
- }{%
- \ifnum#1=1 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
- {{#2}}{{#3}}%
- \expandafter\jlreq at changeargument@\expandafter{\the\numexpr #1 - 1\relax}{#2}%
+\def\jlreq at setextraleftmark@#1#2{{#2}{\expandafter\@secondoftwo#1}}
+\def\jlreq at setextrarightmark@#1#2{{\expandafter\@firstoftwo#1}{#2}}
+\def\jlreq at setextraleftmark#1#2{\jlreq at setextramark{#1}{#2}{\jlreq at setextraleftmark@}}
+\def\jlreq at setextrarightmark#1#2{\jlreq at setextramark{#1}{#2}{\jlreq at setextrarightmark@}}
+\def\jlreq at setextramark#1#2#3{%
+ \jlreq at if{\ifcsname\jlreq at markregistername{#1}\endcsname\fi}{}{%
+ \expandafter\newmarks\csname\jlreq at markregistername{#1}\endcsname
+ \expandafter\def\csname\jlreq at markregistername{#1}@themark\endcsname{{}{}}%
}%
-}
-\def\jlreq at changeargument@@#1#2{%
- \ifnum#1<2 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{{#2}}{%
- {}\expandafter\jlreq at changeargument@@\expandafter{\the\numexpr #1 -1 \relax}{#2}%
- }%
-}
-
-% \jlreq at cleararguments{k}{{arg1}...{argn}}を{arg1}...{argk}{}...{}にする
-\def\jlreq at cleararguments#1#2{\jlreq at cleararguments@{#1}#2\jlreq at endmark}
-\def\jlreq at cleararguments@#1#2{\jlreq at ifendmark{#2}{}{%
- \ifnum#1<1 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
- {{}}{{#2}}%
- \expandafter\jlreq at cleararguments@\expandafter{\the\numexpr #1 - 1\relax}%
- }%
-}
-% ...\jlreq at extramark{...}を\jlreq at extramark{...}のみにする．
-\def\jlreq at getextramarkpart#1{\jlreq at getextramarkpart@#1\jlreq at extramark\jlreq at endmark}
-\def\jlreq at getextramarkpart@#1\jlreq at extramark#2\jlreq at endmark{\jlreq at ifempty{#2}{}{\jlreq at getextramarkpart@@#2}}
-\def\jlreq at getextramarkpart@@#1\jlreq at extramark{\jlreq at extramark{#1}}
-
-% #1番目以降を空にする
-\def\jlreq at clearleftextramarks#1{%
- \let\jlreq at extramark@=\jlreq at extramark
\begingroup
- \def\jlreq at extramark##1{\noexpand\jlreq at extramark{\jlreq at cleararguments{#1}{##1}}}%
- \protected at edef\jlreq at tempa{\expandafter\@firstoftwo\@themark}%
- \edef\jlreq at tempb{\expandafter\expandafter\expandafter\expandonce\expandafter\expandafter\expandafter{\expandafter\@secondoftwo\@themark}}%
- \edef\jlreq at do{%
- \unexpanded{\def\jlreq at extramark{\noexpand\jlreq at extramark}}%
- \noexpand\markboth{\expandonce{\jlreq at tempa}}{\expandonce{\jlreq at tempb}}%
+ \let\label\relax
+ \let\index\relax
+ \let\glossary\relax
+ \def\jlreq@@themark at csname{\jlreq at markregistername{#1}@themark}%
+ \expandafter\unrestored at protected@xdef\csname\jlreq@@themark at csname\endcsname{%
+ \expandafter#3\expandafter{\csname\jlreq@@themark at csname\endcsname}{#2}%
}%
- \expandafter\endgroup
- \jlreq at do
- \let\jlreq at extramark=\jlreq at extramark@
+ \expandafter\expandafter\expandafter\@temptokena\expandafter\expandafter\expandafter{\csname\jlreq@@themark at csname\endcsname}%
+ \expandafter\marks\csname\jlreq at markregistername{#1}\endcsname{\the\@temptokena}%
+ \endgroup
+ \if at nobreak\ifvmode\nobreak\fi\fi
}
-\def\jlreq at clearrightextramarks#1{%
- \let\jlreq at extramark@=\jlreq at extramark
- \begingroup
- \edef\jlreq at tempa{\expandafter\expandafter\expandafter\expandonce\expandafter\expandafter\expandafter{\expandafter\@firstoftwo\@themark}}%
- \def\jlreq at extramark##1{\noexpand\jlreq at extramark{\jlreq at cleararguments{#1}{##1}}}%
- \protected at edef\jlreq at tempb{\expandafter\@secondoftwo\@themark}%
- \edef\jlreq at do{%
- \unexpanded{\def\jlreq at extramark{\noexpand\jlreq at extramark}}%
- \noexpand\markboth{\expandonce{\jlreq at tempa}}{\expandonce{\jlreq at tempb}}%
- }%
- \expandafter\endgroup
- \jlreq at do
- \let\jlreq at extramark=\jlreq at extramark@
-}
+\let\jlreq at markboth=\markboth
+\let\jlreq at markright=\markright
-\def\jlreq at markboth#1#2{%
- \let\jlreq at extramark@=\jlreq at extramark
- \def\jlreq at extramark{\noexpand\jlreq at extramark}%
- \begingroup
- \protected at edef\jlreq at tempa{\expandafter\@firstoftwo\@themark}%
- \protected at edef\jlreq at tempa{\unexpanded{#1}\expandafter\jlreq at getextramarkpart\expandafter{\jlreq at tempa}}%
- \protected at edef\jlreq at tempb{\expandafter\@secondoftwo\@themark}%
- \protected at edef\jlreq at tempb{\unexpanded{#2}\expandafter\jlreq at getextramarkpart\expandafter{\jlreq at tempb}}%
- \edef\jlreq at do{%
- \noexpand\markboth{\expandonce{\jlreq at tempa}}{\expandonce{\jlreq at tempb}}%
- }%
- \expandafter\endgroup
- \jlreq at do
- \let\jlreq at extramark=\jlreq at extramark@
-}
-\def\jlreq at markright#1{%
- \let\jlreq at extramark@=\jlreq at extramark
- \def\jlreq at extramark{\noexpand\jlreq at extramark}%
- \begingroup
- \protected at edef\jlreq at tempb{\expandafter\@secondoftwo\@themark}%
- \protected at edef\jlreq at tempb{\unexpanded{#1}\expandafter\jlreq at getextramarkpart\expandafter{\jlreq at tempb}}%
- \edef\jlreq at do{%
- \noexpand\markright{\expandonce{\jlreq at tempb}}%
- }%
- \expandafter\endgroup
- \jlreq at do
- \let\jlreq at extramark=\jlreq at extramark@
-}
-
%.. \DeclarePageStyle内で使うもの
% mark情報の取得を行う．
% #1の中身をみて，#2 = 何段目見出しか，#3 = odd/even，\csname #4@<見出し命令名>\endcsnameに必要情報を追加し，#5の見出し命令名リストに追加
@@ -3971,7 +3862,7 @@
% \jlreq at tempbに\***markの定義を入れる
\edef\jlreq at tempb{%
\expandonce{\csname the#1\endcsname}%
- \noexpand\ifx\expandonce{\csname the#1\endcsname}\unexpanded{\@empty\else\quad\fi}%
+ \noexpand\ifx\expandonce{\csname the#1\endcsname}\unexpanded{\@empty\else\protect\quad\fi}%
\unexpanded{##1}%
}%
\jlreq at parsekeyval@nokey{%
@@ -4050,7 +3941,7 @@
% 間に空白を入れる．
% #1: ターゲットなコントロールシークエンスの名前，#2：*ならばreverseする，#3：空き
\def\jlreq at pagestyle@make at runninghead#1#2#3{%
- \expandafter\ifx\csname #1\endcsname\@empty\expandafter\@gobble\else\expandafter\@firstofone\fi{%
+ \jlreq at if{\expandafter\ifx\csname #1\endcsname\@empty\fi}{}{%
\edef\jlreq at do{%
\noexpand\jlreq at tempatrue % 最初の処理かフラグ
\unexpanded{\jlreq at pagestyle@make at runninghead@{#1}{#2}{#3}}\csexpandonce{#1}\noexpand\jlreq at endmark
@@ -4062,7 +3953,7 @@
}%
}
\def\jlreq at pagestyle@make at runninghead@#1#2#3#4#5{%
- \ifnum\numexpr\jlreq at ifendmark{#5}{1}{0}*\ifjlreq at tempa 1\else 0\fi\relax=1 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{%
+ \jlreq at if{\ifnum\numexpr\jlreq at ifendmark{#5\fi}{1}{0}*\ifjlreq at tempa 1\else 0\fi\relax=1 \fi}{%
% 項目が一つしか無い
\jlreq at ifempty{#2}{\csappto}{\cspreto}{#1}{#4}%
}{%
@@ -4256,7 +4147,7 @@
\jlreq at pagestyle@addfont at tocs{jlreq at nombre@\jlreq at i}{jlreq at nombre@\jlreq at i @font}%
}%
% \jlreq at oddhead,\jlreq at oddfoot,\jlreq at evenhead,\jlreq at evenfootに必要なものを入れる．
- \ifjlreq at pstate\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{% tate
+ \jlreq at if{\ifjlreq at pstate\fi}{% tate
% headの方に処理を入れる．footは空．
\def\jlreq at oddfoot{}\def\jlreq at evenfoot{}%
\jlreq at for@noexpand\jlreq at position:=\jlreq at nombre@i at position,\jlreq at running@head at i@position\do{%
@@ -4435,11 +4326,11 @@
\expandafter\edef\csname\jlreq at nombrecsname\endcsname{{\expandonce{\jlreq at nombre@font}\csexpandonce{\jlreq at nombrecsname}}}%
\fi
\fi
- \expandafter\ifx\csname\jlreq at runheadcsname\endcsname\@empty\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{%
+ \jlreq at if{\expandafter\ifx\csname\jlreq at runheadcsname\endcsname\@empty\fi}{%
% 柱が空：ノンブルのみでよい
\expandafter\let\csname\jlreq at csname\expandafter\endcsname\csname\jlreq at nombrecsname\endcsname
}{%
- \expandafter\ifx\csname\jlreq at nombrecsname\endcsname\@empty\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{%
+ \jlreq at if{\expandafter\ifx\csname\jlreq at nombrecsname\endcsname\@empty\fi}{%
% % ノンブルが空．柱のみでよい．
\jlreq at pagestyle@addfont at tocs{\jlreq at runheadcsname}{jlreq at running@head at font}%
\expandafter\let\csname\jlreq at csname\expandafter\endcsname\csname\jlreq at runheadcsname\endcsname
@@ -4609,7 +4500,7 @@
% #1@#2が定義されていれば\#1@#2の中身に，そうでなければ\#1の中身に展開される．
% 展開は\unexpandedで抑制される．
\def\jlreq at jlreqsetup@withenv at nameuse#1#2{%
- \expandafter\ifx\csname #1@#2\endcsname\relax\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{\csexpandonce{#1}}{\csexpandonce{#1@#2}}%
+ \jlreq at if{\expandafter\ifx\csname #1@#2\endcsname\relax\fi}{\csexpandonce{#1}}{\csexpandonce{#1@#2}}%
}
% 4.3.1 注4
\newlength\abovecaptionskip
Modified: trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua 2019-05-07 19:53:19 UTC (rev 51035)
+++ trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua 2019-05-07 19:53:52 UTC (rev 51036)
@@ -1,4 +1,4 @@
---[[
+--[[
3.1.3
3.1.6.a
]]
Modified: trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua 2019-05-07 19:53:19 UTC (rev 51035)
+++ trunk/Master/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua 2019-05-07 19:53:52 UTC (rev 51036)
@@ -1376,8 +1376,8 @@
["kanjiskip"]={ 0, 0.25, 0 },
["version"]=3,
["xkanjiskip"]={ 0.25, 0.25, 0.125 },
- ["zh"]=1,
- ["zw"]=1,
+ ["zh"]=1.0,
+ ["zw"]=1.0,
}
local function add_space(before,after,glueorkern,space,ratio)
if jfm[before][glueorkern] == nil then jfm[before][glueorkern] = {} end
More information about the tex-live-commits
mailing list