texlive[48039] Master/texmf-dist: jlreq (17jun18)
commits+karl at tug.org
commits+karl at tug.org
Sun Jun 17 23:04:12 CEST 2018
Revision: 48039
http://tug.org/svn/texlive?view=revision&revision=48039
Author: karl
Date: 2018-06-17 23:04:11 +0200 (Sun, 17 Jun 2018)
Log Message:
-----------
jlreq (17jun18)
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-ja.md
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html
trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md
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-trimmarks.sty
trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2018-06-17 21:03:51 UTC (rev 48038)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md 2018-06-17 21:04:11 UTC (rev 48039)
@@ -369,7 +369,7 @@
- `\theequation`，`\thefigure`，`\thetable`に章番号を追加．
* 2018-02-01
- 縦書きの傍注は奇数ページにのみ出るようにした（改善の余地ありかも）．
- - LuaTeX時に`\fnixbottomtrue`を追加．
+ - LuaTeX時に`\fnfixbottomtrue`を追加．
- キャプション関係のオプションを`\jlreqsetup`に追加．
- `itemization_beforeafter_space`を拡張．
- バグ修正．
@@ -383,8 +383,10 @@
- 目次内のラベルの長さを今までよりも長くした．
- 一部のマクロをjlreq-helpers.styに分離した．
- バグ修正．
+* 2018-06-17
+ - シリーズbもゴシックにするようにした．
+ - バグ修正．
-
--------------
Noriyuki Abe
https://github.com/abenori/jlreq
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2018-06-17 21:03:51 UTC (rev 48038)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README.md 2018-06-17 21:04:11 UTC (rev 48039)
@@ -70,7 +70,7 @@
- Added chapter number to `\theequation`，`\thefigure`，`\thetable`.
* 2018-02-01
- Sidenotes appears only odd pages in `tate` mode.
- - Added `\fnixbottomtrue` for LuaLaTeX.
+ - Added `\fnfixbottomtrue` for LuaLaTeX.
- Added some options related to captions.
- Extended `itemization_beforeafter_space`.
- Fixed bugs.
@@ -84,7 +84,11 @@
- Made the width of the label in the table of contents longer.
- Moved some macros to jlreq-helpers.sty
- Fixed bugs.
+* 2018-06-17
+ - Gothic font is attached to font shape 'b'.
+ - Fixed bugs.
+
--------------
Noriyuki Abe
https://github.com/abenori/jlreq
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2018-06-17 21:03:51 UTC (rev 48038)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2018-06-17 21:04:11 UTC (rev 48039)
@@ -102,9 +102,9 @@
<p>と配置します．<code>make install</code>とすると，$TEXMF=$TEXMFHOMEとしてこのコピーを行います．</p>
<h2 id="使い方">使い方</h2>
<p>通常通り</p>
-<div class="sourceCode" id="cb1"><pre class="sourceCode latex"><code class="sourceCode latex"><a class="sourceLine" id="cb1-1" data-line-number="1"><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</a></code></pre></div>
+<pre class="sourceCode latex" id="cb1"><code class="sourceCode latex"><a class="sourceLine" id="cb1-1" data-line-number="1"><span class="bu">\documentclass</span>{<span class="ex">jlreq</span>}</a></code></pre>
<p>とします．これで横書きのarticle相当の文書クラスとなります．エンジンは自動判定されますが，指定する場合はクラスオプションに<code>platex/uplatex/lualatex</code>のいずれかを渡してください．縦書きにするには<code>tate</code>オプションを渡します．また，reportやbook相当の文書クラスとするには，それぞれ<code>report</code>や<code>book</code>オプションを渡します．たとえば，縦書きの本を作成するには</p>
-<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">\documentclass</span>[tate,book]{<span class="ex">jlreq</span>}</a></code></pre></div>
+<pre class="sourceCode latex" id="cb2"><code class="sourceCode latex"><a class="sourceLine" id="cb2-1" data-line-number="1"><span class="bu">\documentclass</span>[tate,book]{<span class="ex">jlreq</span>}</a></code></pre>
<p>とします．</p>
<p>その他，<code>oneside / twoside / onecolumn / twocolumn / titlepage / notitlepage / draft / final / openright / openany / leqno / fleqn</code>というよくあるオプションを受け付けます．</p>
<p>標準的な文書クラスと同じように中身を書くことができますが，次のような命令が追加 / 拡張されています．</p>
@@ -117,7 +117,7 @@
<h3 id="sidenote"><code>\sidenote</code></h3>
<p>この命令は傍注の幅が正の時にのみ定義されます．デフォルトの基本版面ではこの幅は0に設定されています．従って<code>\sidenote</code>は定義されません．後の基本版面の設定を参考にしてください．</p>
<p><code>\sidenote</code>は傍注（縦組みの場合は脚注）を出力します．内部では<code>\marginpar</code>を使っています．デフォルトでは<code>\footnote</code>と同様の書式となりますが，<code>\jlreqsetup</code>で<code>sidenote_type=symbol</code>が指定されている場合，その書式は<code>\sidenote{該当項目}{注}</code>となります．たとえば</p>
-<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">\sidenote</span>{原稿}{印刷などの方法により……}を入手する仕事である．</a></code></pre></div>
+<pre class="sourceCode latex" id="cb3"><code class="sourceCode latex"><a class="sourceLine" id="cb3-1" data-line-number="1">刊行できる<span class="fu">\sidenote</span>{原稿}{印刷などの方法により……}を入手する仕事である．</a></code></pre>
<p>とします．後の説明も参照してください．</p>
<h3 id="endnote"><code>\endnote</code></h3>
<p>後注を指定します．<code>\footnote</code>と同様の書式です．デフォルトでは，注自身の出力は見出し直前に行われます．この動作は<code>\jlreqsetup</code>に<code>endnote_position</code>を渡すことで制御できます．詳しくは後の注関係の説明をご覧ください．また<code>\theendnotes</code>を実行するとその場に出力をします．</p>
@@ -136,7 +136,7 @@
<ul>
<li><p>ルビや圏点は提供されません．<a href="https://github.com/zr-tex8r/PXrubrica">PXrubrica</a>または<code>luatexja-ruby</code>（LuaLaTeX，LuaTeX-jaパッケージに付属）を使うと良いかと思います．</p></li>
<li><p>日本語組版処理の要件2.3.2.dによれば，横組みにおける二段組の最後のページの各段の行数は揃えることが望ましいとされていますが，この処理は行われません．<code>nidanfloat</code>パッケージを使い，</p>
-<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="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</a></code></pre></div>
+<pre class="sourceCode latex" id="cb5"><code class="sourceCode latex"><a class="sourceLine" id="cb5-1" data-line-number="1"><span class="bu">\usepackage</span>[balance]{<span class="ex">nidanfloat</span>}</a></code></pre>
<p>とするとこの処理が行われます．ただし，最終ページでの<code>\newpage</code>や<code>\clearpage</code>が正しく動作しません．詳しくは<code>nidanfloat</code>パッケージのマニュアルをご覧ください．</p></li>
<li><p>フォントを設定する機能は有していません．和文フォントは，LuaLaTeX利用時は<code>luatexja-fontspec</code>や<code>luatexja-preset</code>（いずれもLuaTeX-jaパッケージに付属）により設定することができます．dvipdfmxを使う場合は，<a href="https://github.com/zr-tex8r/PXchfon">PXchfon</a>での設定が可能です．</p></li>
</ul>
@@ -270,10 +270,10 @@
</ul>
<h4 id="連続して掲げる見出しの行取り">連続して掲げる見出しの行取り</h4>
<p><code>\SetBlockHeadingSpaces</code>により，見出しが連続して掲げられたときの行取りを設定することができます．<code>\SetBlockHeadingSpaces</code>は</p>
-<div class="sourceCode" id="cb7"><pre class="sourceCode latex"><code class="sourceCode latex"><a class="sourceLine" id="cb7-1" data-line-number="1"><span class="fu">\SetBlockHeadingSpaces</span>{</a>
+<pre class="sourceCode latex" id="cb7"><code class="sourceCode latex"><a class="sourceLine" id="cb7-1" data-line-number="1"><span class="fu">\SetBlockHeadingSpaces</span>{</a>
<a class="sourceLine" id="cb7-2" data-line-number="2"> {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}}</a>
<a class="sourceLine" id="cb7-3" data-line-number="3"> [lines=5]{_section,23pt,_subsection,16pt}</a>
-<a class="sourceLine" id="cb7-4" data-line-number="4">}</a></code></pre></div>
+<a class="sourceLine" id="cb7-4" data-line-number="4">}</a></code></pre>
<p>のように使います．この意味は次の通りです．</p>
<ul>
<li><code>\part</code>，<code>\section</code>，<code>\subsection</code>という順番で見出しが掲げられていて，その前後が見出しでない場合は，<code>\part</code>は三行取り＋前に一行空き，<code>\section</code>と<code>\subsection</code>は二行取りとなります．</li>
@@ -307,14 +307,14 @@
</ul>
<h3 id="modifyheading"><code>\ModifyHeading</code></h3>
<p>既に（上のどれかを使い）定義された見出し命令の設定を変更します．たとえば</p>
-<div class="sourceCode" id="cb8"><pre class="sourceCode latex"><code class="sourceCode latex"><a class="sourceLine" id="cb8-1" data-line-number="1"><span class="fu">\ModifyHeading</span>{section}{lines=10}</a></code></pre></div>
+<pre class="sourceCode latex" id="cb8"><code class="sourceCode latex"><a class="sourceLine" id="cb8-1" data-line-number="1"><span class="fu">\ModifyHeading</span>{section}{lines=10}</a></code></pre>
<p>とすると，<code>\section</code>のフォントなどの設定はそのままに，行取りのみが10行に変更されます．見出しの種類を変更することはできません．</p>
<h3 id="saveheading"><code>\SaveHeading</code></h3>
<p>見出し命令の定義を待避します．</p>
-<div class="sourceCode" id="cb9"><pre class="sourceCode latex"><code class="sourceCode latex"><a class="sourceLine" id="cb9-1" data-line-number="1"><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% \sectionの中身を\restoresectionに待避．</span></a>
+<pre class="sourceCode latex" id="cb9"><code class="sourceCode latex"><a class="sourceLine" id="cb9-1" data-line-number="1"><span class="fu">\SaveHeading</span>{section}{<span class="fu">\restoresection</span>} <span class="co">% \sectionの中身を\restoresectionに待避．</span></a>
<a class="sourceLine" id="cb9-2" data-line-number="2"><span class="fu">\RenewBlockHeading</span>{section}{1}{font=……} <span class="co">% \sectionを新しく定義する．</span></a>
<a class="sourceLine" id="cb9-3" data-line-number="3">……</a>
-<a class="sourceLine" id="cb9-4" data-line-number="4"><span class="fu">\restoresection</span> <span class="co">% \sectionの中身を元に戻す．</span></a></code></pre></div>
+<a class="sourceLine" id="cb9-4" data-line-number="4"><span class="fu">\restoresection</span> <span class="co">% \sectionの中身を元に戻す．</span></a></code></pre>
<p>のように使います．</p>
<h2 id="ページスタイル">ページスタイル</h2>
<pre><code>\DeclarePageStyle{<ページスタイル名>}{<設定>}
@@ -336,7 +336,7 @@
<p><code>\NewPageStyle</code>，<code>\RenewPageStyle</code>，<code>\ProvidePageStyle</code>もあります．<code>\ModifyPageStyle</code>により既存のページスタイルを改変することが可能です．</p>
<h2 id="jfm">JFM</h2>
<p>以下のような独自のJFMを使います．パッケージによっては，パッケージ独自のJFMや，また標準のJFMを使うように設定がし直される場合があります．例えばLuaTeX-jaに付属するluatexja-presetパッケージは通常LuaTeX-ja標準のJFMを使います．本クラスファイルで使っているJFMを使う場合は，</p>
-<div class="sourceCode" id="cb11"><pre class="sourceCode LaTeX"><code class="sourceCode latex"><a class="sourceLine" id="cb11-1" data-line-number="1"><span class="bu">\usepackage</span>[jfm_yoko=jlreq,jfm_tate=jlreqv,hiragino-pron]{<span class="ex">luatexja-preset</span>}</a></code></pre></div>
+<pre class="sourceCode LaTeX" id="cb11"><code class="sourceCode latex"><a class="sourceLine" id="cb11-1" data-line-number="1"><span class="bu">\usepackage</span>[jfm_yoko=jlreq,jfm_tate=jlreqv,hiragino-pron]{<span class="ex">luatexja-preset</span>}</a></code></pre>
<p>のようにオプションで指定する必要があります．</p>
<h3 id="platexuplatexの場合">pLaTeX/upLaTeXの場合</h3>
<p>JFMの名前は次の通りです．<code>[]</code>で囲まれている文字は設定により入ったり入らなかったりします．</p>
@@ -440,7 +440,7 @@
<li>2018-02-01
<ul>
<li>縦書きの傍注は奇数ページにのみ出るようにした（改善の余地ありかも）．</li>
-<li>LuaTeX時に<code>\fnixbottomtrue</code>を追加．</li>
+<li>LuaTeX時に<code>\fnfixbottomtrue</code>を追加．</li>
<li>キャプション関係のオプションを<code>\jlreqsetup</code>に追加．</li>
<li><code>itemization_beforeafter_space</code>を拡張．</li>
<li>バグ修正．</li>
@@ -459,6 +459,11 @@
<li>一部のマクロをjlreq-helpers.styに分離した．</li>
<li>バグ修正．</li>
</ul></li>
+<li>2018-06-17
+<ul>
+<li>シリーズbもゴシックにするようにした．</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 2018-06-17 21:03:51 UTC (rev 48038)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html 2018-06-17 21:04:11 UTC (rev 48039)
@@ -121,6 +121,10 @@
<ul>
<li>最初のバージョン</li>
</ul></li>
+<li>2018-06-17
+<ul>
+<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.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md 2018-06-17 21:03:51 UTC (rev 48038)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md 2018-06-17 21:04:11 UTC (rev 48039)
@@ -73,9 +73,10 @@
## 履歴
* 2018-05-19
- 最初のバージョン
+* 2018-06-17
+ - バグ修正．
-
--------------
Noriyuki Abe
https://github.com/abenori/jlreq
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html 2018-06-17 21:03:51 UTC (rev 48038)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html 2018-06-17 21:04:11 UTC (rev 48039)
@@ -122,6 +122,10 @@
<ul>
<li>First release.</li>
</ul></li>
+<li>2018-06-17
+<ul>
+<li>Fixed a bug.</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.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md 2018-06-17 21:03:51 UTC (rev 48038)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md 2018-06-17 21:04:11 UTC (rev 48039)
@@ -72,6 +72,8 @@
## CHANGELOG
* 2018-05-19
- First release.
+* 2018-06-17
+ - Fixed a bug.
--------------
Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2018-06-17 21:03:51 UTC (rev 48038)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html 2018-06-17 21:04:11 UTC (rev 48039)
@@ -149,7 +149,7 @@
<li>2018-02-01
<ul>
<li>Sidenotes appears only odd pages in <code>tate</code> mode.</li>
-<li>Added <code>\fnixbottomtrue</code> for LuaLaTeX.</li>
+<li>Added <code>\fnfixbottomtrue</code> for LuaLaTeX.</li>
<li>Added some options related to captions.</li>
<li>Extended <code>itemization_beforeafter_space</code>.</li>
<li>Fixed bugs.</li>
@@ -168,6 +168,11 @@
<li>Moved some macros to jlreq-helpers.sty</li>
<li>Fixed bugs.</li>
</ul></li>
+<li>2018-06-17
+<ul>
+<li>Gothic font is attached to font shape 'b'.</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 2018-06-17 21:03:51 UTC (rev 48038)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty 2018-06-17 21:04:11 UTC (rev 48039)
@@ -184,6 +184,7 @@
% 簡易なkeyvalのパース．
% \jlreq at parsekeyval*[family=jlreq at key]{ % *ありは\setkeys*を使う
% {key}{\def\val{#1}}
+% {key1,key2}{\def\val{#1}} % key1=valとkey2=valを受け付けるようになる
% *{key}{\def\val{#1}} % デフォルト値を空文字列にする
% {key}[choice1,choice2]{\def\valchoice{#1}}
%}{parse対象}
@@ -195,7 +196,7 @@
}
\long\def\jlreq at helper@parsekeyval@@#1[#2]#3#4{%
\begingroup
- \def\jlreq at do{}%
+ \def\jlreq at do{}% \setkeysの結果処理がここに入れられる（よってループ内で利用不可）
\jlreq at helper@parsekeyval@@@{#2}#3{\jlreq at endmark}%
\setkeys#1{#2}{#4}%
\expandafter\endgroup
@@ -214,15 +215,24 @@
}%
}
\long\def\jlreq at helper@parsekeyval@@@choicekey#1#2[#3]#4{%
- \define at choicekey{#1}{#2}{#3}{\eappto\jlreq at do{\unexpanded{#4}}}%
+ \@for\@tempa:=#2\do{%
+ \edef\jlreq at next{\unexpanded{\define at choicekey{#1}}{\expandonce{\@tempa}}}%
+ \jlreq at next{#3}{\eappto\jlreq at do{\unexpanded{#4}}}%
+ }%
\jlreq at helper@parsekeyval@@@{#1}%
}
\long\def\jlreq at helper@parsekeyval@@@definekeywithdefault#1#2#3{%
- \define at key{#1}{#2}[]{\eappto\jlreq at do{\unexpanded{#3}}}%
+ \@for\@tempa:=#2\do{%
+ \edef\jlreq at next{\unexpanded{\define at key{#1}}{\expandonce{\@tempa}}}%
+ \jlreq at next[]{\eappto\jlreq at do{\unexpanded{#3}}}%
+ }%
\jlreq at helper@parsekeyval@@@{#1}%
}
\long\def\jlreq at helper@parsekeyval@@@definekey#1#2#3{%
- \define at key{#1}{#2}{\eappto\jlreq at do{\unexpanded{#3}}}%
+ \@for\@tempa:=#2\do{%
+ \edef\jlreq at next{\unexpanded{\define at key{#1}}{\expandonce{\@tempa}}}%
+ \jlreq at next{\eappto\jlreq at do{\unexpanded{#3}}}%
+ }%
\jlreq at helper@parsekeyval@@@{#1}%
}
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty 2018-06-17 21:03:51 UTC (rev 48038)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty 2018-06-17 21:04:11 UTC (rev 48039)
@@ -1,8 +1,13 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-trimmarks}[2018/05/19 jlreq-trimmarks]
+\ProvidesPackage{jlreq-trimmarks}[2018/06/17 jlreq-trimmarks]
\RequirePackage{xkeyval,etoolbox}
\RequirePackage{jlreq-helpers}
+% check \tombowdatetrue
+\ifx\tombowdatetrue\@undefined
+ \PackageError{jlreq-trimmarks}{This package only works with pLaTeX, upLaTeX or LuaTeX-ja}{\@ehc}
+\fi
+
\newcommand*{\jlreq at trimmarks@undeferr}[1]{\PackageError{jlreq-trimmarks}{Trying to delete \string#1 even though it is not defined, may be a bug}{\@ehc}}
\newcommand*{\jlreq at trimmarks@afterpkg at addtodeletecs}[1]{%
\appto\jlreq at trimmarks@afterpkg at deletecslist{\jlreq at helper@undefcs{#1}{\jlreq at trimmarks@undeferr}}%
@@ -126,7 +131,7 @@
{banner}{\tombowdatetrue}
{digital}{\jlreq at trimmarks@digitaltrue}
{digital*}{\jlreq at trimmarks@digitaltrue\jlreq at trimmarks@show at artboxtrue}
- {no}{\tombowdatefalse\jlreq at trimmarks@showfalse\jlreq at trimmarks@digitafalse}
+ {no}{\tombowdatefalse\jlreq at trimmarks@showfalse\jlreq at trimmarks@digitalfalse}
}[\PackageError{jlreq-trimmarks}{Unknown value `##1' in the option `show'}{\@ehc}]
}
}
Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2018-06-17 21:03:51 UTC (rev 48038)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls 2018-06-17 21:04:11 UTC (rev 48039)
@@ -5,7 +5,7 @@
%%
% (based on JLReq 20120403 https://www.w3.org/TR/2012/NOTE-jlreq-20120403/ja/)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2018/05/19 jlreq]
+\ProvidesClass{jlreq}[2018/06/17 jlreq]
\RequirePackage{xkeyval,everyhook,filehook,etoolbox,ifthen}
\RequirePackage{jlreq-helpers}
@@ -826,8 +826,10 @@
% \item後の行頭括弧のために仕込み．
\jlreq at saveoriginalcs{\list}
\jlreq at saveoriginalcs{\endlist}
- \pretocmd{\list}{\jlreq at pushhook@postpar{\ltjfakeparbegin}}{}{}
- \apptocmd{\endlist}{\jlreq at pophook@postpar}{}{}
+ \PushPostHook{par}{\jlreq at parhook@atbeginlist}
+ \pretocmd{\list}{\def\jlreq at parhook@atbeginlist{\ltjfakeparbegin}}{}{}
+ \apptocmd{\endlist}{\def\jlreq at parhook@atbeginlist{}}{}{}
+ \def\jlreq at parhook@atbeginlist{}
\else
% 非LuaTeXの場合はJFMの入れ替えと\everyparでの処理で対処．
% 行頭括弧に対して\inhibitglueを入れたりする命令を作る
@@ -837,10 +839,13 @@
\expandafter\jlreq at do\jlreq at charlist@openingbrackets\jlreq at endmark
% JFM glueの伸び縮みで行頭括弧が揃わないのを防ぐために常に\inhibitglueを入れる．
\ifthenelse{\equal{\jlreq at open@bracket at pos}{nibu_tentsuki}}{
- \edef\jlreq at openbracket@hook{\noexpand\ifnum0\expandonce{\jlreq at tempa}>0 \unexpanded{\hskip -.5\zw\inhibitglue}\noexpand\fi}
+ \edef\jlreq at openbracket@hook@{\noexpand\ifnum0\expandonce{\jlreq at tempa}>0 \unexpanded{\hskip -.5\zw\inhibitglue}\noexpand\fi}
}{% zenkakunibu_nibu,zenkaku_tentsuki
- \edef\jlreq at openbracket@hook{\noexpand\ifnum0\expandonce{\jlreq at tempa}>0 \unexpanded{\inhibitglue}\noexpand\fi}
+ \edef\jlreq at openbracket@hook@{\noexpand\ifnum0\expandonce{\jlreq at tempa}>0 \unexpanded{\inhibitglue}\noexpand\fi}
}
+ % source special対策
+ \def\jlreq at openbracket@hook{\ifx\jlreq at nextchar\special\expandafter\jlreq at openbracket@hook@@\else\expandafter\jlreq at openbracket@hook@\fi}
+ \def\jlreq at openbracket@hook@@#1#2{#1{#2}\futurelet\jlreq at nextchar\jlreq at openbracket@hook}
\def\jlreq at jfmname@prefix{}
\jlreq at aftercls@addtodeletecs{\jlreq at jfmname@prefix}
\ifjlreq at burasage\edef\jlreq at jfmname@prefix{b\jlreq at jfmname@prefix}\fi
@@ -850,26 +855,6 @@
\edef\jlreq at jfmnameg{\jlreq at jfmname@prefix jlreqg} % ゴシックなJFMの名前
\AtBeginDocument{\PushPostHook{par}{\futurelet\jlreq at nextchar\jlreq at openbracket@hook}}
\fi
-\newcount\jlreq at count@listnest
-\jlreq at count@listnest=0
-% 現在のeveryparへのhookを保存スタックに積んでからPushPostHookする．
-% スタックに積まれたものは\jlreq at pophook@postparで復帰できる
-\def\jlreq at pushhook@postpar#1{%
- \advance\jlreq at count@listnest by 1
- \begingroup
- \edef\jlreq at do{\unexpanded{\SavePostHook{par}}{\expandonce{\csname jlreq at save@posthook at par@\the\jlreq at count@listnest\endcsname}}}%
- \expandafter\endgroup
- \jlreq at do
- \PushPostHook{par}{#1}%
-}
-\def\jlreq at pophook@postpar{%
- \begingroup
- \edef\jlreq at do{\unexpanded{\RestorePostHook{par}}{\expandonce{\csname jlreq at save@posthook at par@\the\jlreq at count@listnest\endcsname}}}%
- \expandafter\endgroup
- \jlreq at do
- \expandafter\let\csname jlreq at save@posthook at par@\the\jlreq at count@listnest\endcsname=\@undefined
- \advance\jlreq at count@listnest by -1
-}
% 行頭の括弧は \jlreq at open@bracket at before@space \inhibitglue 「みたいにする．
\ifthenelse{\equal{\jlreq at open@bracket at pos}{zenkakunibu_nibu}}{
@@ -893,44 +878,43 @@
\def\jlreq at yokokanjiencoding{JY2}
\def\jlreq at tatekanjiencoding{JT2}
\fi
+\ifx l\jlreq at engine
+ \def\jlreq at yokokanjiencoding{JY3}
+ \def\jlreq at tatekanjiencoding{JT3}
+\fi
+\expandafter\let\csname \jlreq at yokokanjiencoding/mc/m/n/10\endcsname\relax
+\expandafter\let\csname \jlreq at tatekanjiencoding/mc/m/n/10\endcsname\relax
\jlreq at divide{\jlreq at jafontsize}{\jlreq at fontsize}
\edef\jlreq at jafontscale{\strip at pt\jlreq at resultdimen}
\jlreq at aftercls@addtodeletecs{\jlreq at jafontscale}
\ifx l\jlreq at engine
- \def\jlreq at yokokanjiencoding{JY3}
- \def\jlreq at tatekanjiencoding{JT3}
- \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
- \expandafter\let\csname JT3/mc/m/n/10\endcsname\relax
\DeclareFontShape{JY3}{mc}{m}{n}{<->s*[\jlreq at jafontscale]\ltj at stdmcfont:jfm=jlreq;script=latn;-kern}{}
\DeclareFontShape{JY3}{gt}{m}{n}{<->s*[\jlreq at jafontscale]\ltj at stdgtfont:jfm=jlreq;script=latn;-kern}{}
\DeclareFontShape{JT3}{mc}{m}{n}{<->s*[\jlreq at jafontscale]\ltj at stdmcfont:jfm=jlreqv;script=latn;-kern}{}
\DeclareFontShape{JT3}{gt}{m}{n}{<->s*[\jlreq at jafontscale]\ltj at stdgtfont:jfm=jlreqv;script=latn;-kern}{}
\else
- \expandafter\let\csname \jlreq at yokokanjiencoding/mc/m/n/10\endcsname\relax
- \expandafter\let\csname \jlreq at tatekanjiencoding/mc/m/n/10\endcsname\relax
\DeclareFontShape{\jlreq at yokokanjiencoding}{mc}{m}{n}{<->s*[\jlreq at jafontscale]\jlreq at jfmname}{}
\DeclareFontShape{\jlreq at yokokanjiencoding}{gt}{m}{n}{<->s*[\jlreq at jafontscale]\jlreq at jfmnameg}{}
\DeclareFontShape{\jlreq at tatekanjiencoding}{mc}{m}{n}{<->s*[\jlreq at jafontscale]\jlreq at jfmname-v}{}
\DeclareFontShape{\jlreq at tatekanjiencoding}{gt}{m}{n}{<->s*[\jlreq at jafontscale]\jlreq at jfmnameg-v}{}
\fi
-\DeclareFontShape{\jlreq at yokokanjiencoding}{mc}{bx}{n}{<->ssub*gt/m/n}{}
-\DeclareFontShape{\jlreq at yokokanjiencoding}{gt}{bx}{n}{<->ssub*gt/m/n}{}
-\DeclareFontShape{\jlreq at yokokanjiencoding}{mc}{m}{it}{<->ssub*mc/m/n}{}
-\DeclareFontShape{\jlreq at yokokanjiencoding}{mc}{m}{sl}{<->ssub*mc/m/n}{}
-\DeclareFontShape{\jlreq at yokokanjiencoding}{mc}{m}{sc}{<->ssub*mc/m/n}{}
-\DeclareFontShape{\jlreq at yokokanjiencoding}{gt}{m}{it}{<->ssub*gt/m/n}{}
-\DeclareFontShape{\jlreq at yokokanjiencoding}{gt}{m}{sl}{<->ssub*gt/m/n}{}
-\DeclareFontShape{\jlreq at yokokanjiencoding}{mc}{bx}{it}{<->ssub*gt/m/n}{}
-\DeclareFontShape{\jlreq at yokokanjiencoding}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
-\DeclareFontShape{\jlreq at tatekanjiencoding}{mc}{bx}{n}{<->ssub*gt/m/n}{}
-\DeclareFontShape{\jlreq at tatekanjiencoding}{gt}{bx}{n}{<->ssub*gt/m/n}{}
-\DeclareFontShape{\jlreq at tatekanjiencoding}{mc}{m}{it}{<->ssub*mc/m/n}{}
-\DeclareFontShape{\jlreq at tatekanjiencoding}{mc}{m}{sl}{<->ssub*mc/m/n}{}
-\DeclareFontShape{\jlreq at tatekanjiencoding}{mc}{m}{sc}{<->ssub*mc/m/n}{}
-\DeclareFontShape{\jlreq at tatekanjiencoding}{gt}{m}{it}{<->ssub*gt/m/n}{}
-\DeclareFontShape{\jlreq at tatekanjiencoding}{gt}{m}{sl}{<->ssub*gt/m/n}{}
-\DeclareFontShape{\jlreq at tatekanjiencoding}{mc}{bx}{it}{<->ssub*gt/m/n}{}
-\DeclareFontShape{\jlreq at tatekanjiencoding}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\@for\jlreq at encoding:=\jlreq at yokokanjiencoding,\jlreq at tatekanjiencoding\do{
+ \@for\jlreq at shape:=n,it,sl,sc\do{
+ \@for\jlreq at series:=m,b,bx,sb,c\do{
+ \ifthenelse{\equal{\jlreq at shape}{n} \AND \equal{\jlreq at series}{m}}{}{
+ \DeclareFontShape{\jlreq at encoding}{gt}{\jlreq at series}{\jlreq at shape}{<->ssub*gt/m/n}{}
+ }
+ }
+ \@for\jlreq at series:=bx,b,sb\do{
+ \DeclareFontShape{\jlreq at encoding}{mc}{\jlreq at series}{\jlreq at shape}{<->ssub*gt/m/n}{}
+ }
+ \@for\jlreq at series:=m,c\do{
+ \ifthenelse{\equal{\jlreq at shape}{n} \AND \equal{\jlreq at series}{m}}{}{
+ \DeclareFontShape{\jlreq at encoding}{mc}{\jlreq at series}{\jlreq at shape}{<->ssub*mc/m/n}{}
+ }
+ }
+ }
+}
% 和文ファミリと欧文ファミリの連動
\DeclareRobustCommand\rmfamily{%
@@ -1855,11 +1839,19 @@
\dp\jlreq at tempboxa=\dimexpr\dp\jlreq at tempboxa + \ht\jlreq at tempboxa\relax
\ht\jlreq at tempboxa=0pt
\box\jlreq at tempboxa
- \par
\jlreq at ifempty{#4}{\ifodd\jlreq at currentpage\nobreak\fi}{\nobreak}%
\ifx r\jlreq at ushiroakitype\prevdepth=-1000pt\else\prevdepth=0pt\fi
\jlreq at ifgluezero\jlreq at tempskipb{}{\vskip\jlreq at tempskipb}%
-}}
+ \edef\jlreq at do{%
+ \unexpanded{\def\jlreq at parhook@gyodori}{%
+ \noexpand\parskip=\the\parskip
+ \unexpanded{\def\jlreq at parhook@gyodori{}}%
+ }%
+ \unexpanded{\parskip=0pt plus 1pt}%
+ }%
+\expandafter}\jlreq at do}
+\PushPostHook{par}{\jlreq at parhook@gyodori}
+\def\jlreq at parhook@gyodori{}
% 行取り情報をゲットだぜ
% \jlreq at resultに{1 = 前空き}{2 = 後ろ空き}{3 = トータル行数}を入れる
@@ -1974,7 +1966,7 @@
}
{format}{\edef\jlreq at format{\unexpanded{##1}}}
{after_label_space}{\def\jlreq at after@label at space{##1}}
- {second_heading_text_indent}{%
+ {second_heading_text_indent,heading_text_second_indent}{%
\jlreq at parsecomma{##1}{%
\jlreq at iffirsttoken{####1}{*}{%
\jlreq at hangfalse
@@ -2160,10 +2152,9 @@
% : 現在いくつ目の連続する見出しを処理しているかのカウンター
\newcount\jlreq at BlockHeading@spaces at current@count
\jlreq at BlockHeading@spaces at current@count=0
+\def\jlreq at BlockHeading@spaces at current@sequence{}
+\def\jlreq at BlockHeading@spaces at headingslist{}
-\def\jlreq at BlockHeading@spaces at current@sequence{}%
-
-\def\jlreq at BlockHeading@spaces at headingslist{}
\newcommand{\SetBlockHeadingSpaces}[1]{%
\begingroup
% 現段階の情報をクリアする
@@ -2401,8 +2392,9 @@
}
% {1 = 命令名}{2 = レベル}{3 = *}{4 = running head}{5 = 見出し}{6 = ラベルフォーマット}{7 = ラベルありフォーマット}{8 = ラベルなしフォーマット}
\long\def\jlreq at RuninHeading@start@@#1#2#3#4#5#6#7#8{%
+ \if at noskipsec\leavevmode\fi
\begingroup
- \def\jlreq at do{}%
+ \def\jlreq at do{\global\@noskipsectrue}%
\ifnum0\jlreq at ifempty{#3}{}{1}\ifnum #2>\c at secnumdepth 1\fi>0
\def\jlreq at tempa##1{#8}%
\else
@@ -2412,12 +2404,16 @@
\par
\eappto\jlreq at do{%
\noexpand\everypar{%
- \unexpanded{\everypar{}}%
- \unexpanded{{\setbox\jlreq at tempboxa\lastbox}}%
- \noexpand\begingroup
- \expandonce{\jlreq at tempa{#5}}%
- \expandonce{\csname jlreq at heading@maketoc@#1\endcsname}{#3}{#6}{#4}%
- \noexpand\endgroup
+ \noexpand\if at noskipsec
+ \unexpanded{\global\@noskipsecfalse}%
+ \unexpanded{{\setbox\jlreq at tempboxa\lastbox}}%
+ \noexpand\begingroup
+ \expandonce{\jlreq at tempa{#5}}%
+ \expandonce{\csname jlreq at heading@maketoc@#1\endcsname}{#3}{#6}{#4}%
+ \noexpand\endgroup
+ \noexpand\else
+ \unexpanded{\everypar{}}%
+ \noexpand\fi
}%
}%
\expandafter\endgroup
@@ -2882,6 +2878,36 @@
\jlreqsetup{footnote_indent=0pt}% （4.2.5.b）
\fi
+\newcommand{\@makefntext}[1]{\jlreq at makefntext{#1}}
+\jlreq at jlreqsetup@add{footnote_second_indent}{%
+ \if at tate\else
+ \ifthenelse{
+ \( \lengthtest{0.99\zw < \dimexpr #1\relax} \AND \lengthtest{\dimexpr #1\relax < 1.01\zw} \) \OR
+ \( \lengthtest{-1.01\zw < \dimexpr #1\relax} \AND \lengthtest{\dimexpr #1\relax < -0.99\zw} \)
+ }{}{\jlreq at note{脚注が2行以上となった場合，脚注の2行目以下の字下げを1行目より，脚注の文字サイズの全角アキとするか，逆に，1行目の字下げを2行目より，脚注の文字サイズの全角アキとする (4.2.5.d)．}}
+ \fi
+ \ifdim\dimexpr #1\relax<0pt
+ \def\jlreq at makefntext{}
+ \else
+ \def\jlreq at makefntext{\addtolength{\leftskip}{\glueexpr #1\relax}}
+ \fi
+ \long\edef\jlreq at makefntext##1{\expandonce{\jlreq at makefntext}%
+ \unexpanded{%
+ \addtolength{\leftskip}{\jlreq at footnoteindent}%
+ \parindent=1\zw
+ \noindent
+ \hskip-\glueexpr #1\relax
+ \jlreq at referencemark@format{\@thefnmark}%
+ \hskip\glueexpr 1\zw\relax
+ }##1%
+ }
+}
+\jlreqsetup{footnote_second_indent=1\zw}
+
+\jlreq at jlreqsetup@add{footnotetext_indent}{
+ \ClassWarningNoLine{jlreq}{footnotetext_indent was removed}
+}
+
\ifx l\jlreq at engine
\fnfixbottomtrue
\fi
@@ -2998,20 +3024,6 @@
\jlreq at hook@postnote
}
-% 4.2.5.d
-\newcommand{\@makefntext}[1]{\jlreq at makefntext{#1}}
-\jlreq at jlreqsetup@add{footnotetext_indent}{
- \ifthenelse{\equal{#1}{one}}{
- \long\def\jlreq at makefntext##1{\parindent 1\zw
- \addtolength{\leftskip}{\dimexpr\jlreq at footnoteindent + 1\zw\relax}% 全体をインデント+1文字分下げる
- \noindent\hskip\glueexpr-1\zw\relax\jlreq at referencemark@format{\@thefnmark}\hskip\glueexpr1\zw\relax##1}% 見出し出力と一文字分の空き
- }{
- \long\def\jlreq at makefntext##1{\parindent 1\zw
- \addtolength{\leftskip}{\jlreq at footnoteindent}% 全体をインデント
- \noindent\hskip\glueexpr1\zw\relax\jlreq at referencemark@format{\@thefnmark}\hskip\glueexpr1\zw\relax##1}% 見出し出力と一文字分の空き
- }
-}
-\jlreqsetup{footnotetext_indent=one}
% 合印
\renewcommand*{\@makefnmark}{%
\jlreq at ifydir{\jlreq at notemark{\@thefnmark}}{\hbox{\jlreq at notemark{\@thefnmark}}}%
@@ -3098,7 +3110,7 @@
\parsep=0pt\relax
\partopsep=0pt\relax
\topsep=0pt\relax
- \leftmargin=\dimexpr\linewidth - \jlreq at tempdima\relax
+ \leftmargin=\dimexpr\linewidth - \jlreq at tempdima + \jlreq at endnote@second at indent\relax
\itemindent=0pt\relax
\topsep=\jlreq at endnote@beforeafterspace
}%
@@ -3110,10 +3122,17 @@
}
% 4.2.4.b
\jlreq at endnote@indent=2\jlreq at mol
-% 二行目以降を全角分下げる（4.2.4.d：TODO: 選択できるべき）
-\newcommand{\@makeendtext}[1]{\parindent 1\jlreq at mol
- \hskip\glueexpr-1\jlreq at mol\relax\csname\jlreq at endnotemarkname\endcsname\hskip\glueexpr1\zw\relax#1}% 見出し出力と一文字分の空き（4.2.4.c）
-\def\@makeendmark{\@makefnmark}
+\jlreq at jlreqsetup@add{endnote_second_indent}{
+ \def\jlreq at endnote@second at indent{#1}
+ \ifthenelse{
+ \( \lengthtest{0.99\zw < #1} \AND \lengthtest{#1 < 1.01\zw} \) \OR
+ \( \lengthtest{1.99\zw < #1} \AND \lengthtest{#1 < 2.01\zw} \)
+ }{}{\jlreq at note{後注が2行以上となった場合，後注の2行目以下の字下げは，1行目より，後注の文字サイズの2倍又は全角とする (4.2.4.d)．}}
+}
+\jlreqsetup{endnote_second_indent=2\zw}
+\newcommand{\@makeendtext}[1]{\parindent 1\zw
+ \hskip\glueexpr-\jlreq at endnote@second at indent\relax\csname\jlreq at endnotemarkname\endcsname\hskip\glueexpr1\zw\relax#1}% 見出し出力と一文字分の空き（4.2.4.c）
+\let\@makeendmark=\@makefnmark
% \theendnoteの出力を仕込む
\apptocmd{\jlreq at hook@beforeheadings}{\jlreq at endnote@hook at beforeheadings{#1}}{}{}
@@ -3226,7 +3245,7 @@
% thefootnote = \inhibitglue （...だと\inhibitglueが効かないので空白を挟む
\long\def\@makesidetext#1{ \kern-1\zw\csname\jlreq at sidenotemarkname\endcsname\hspace{0.5\jlreq at mol}#1}
\fi
- \def\@makesidemark{\@makefnmark}
+ \let\@makesidemark=\@makefnmark
}{% sidenote_type = symbol
\long\def\sidenote#1#2{\jlreq at sidenote{#1}{#2}}
\def\sidenotemark#1{\jlreq at sidenotemark{#1}}
@@ -3246,7 +3265,7 @@
\@sidenotetext{#2}%
}
\long\def\@makesidetext#1{{\sffamily\bfseries\csname\jlreq at sidenotemarkname\endcsname}\hspace*{1\jlreq at mol}#1}
- \def\@makesidemark{\@makefnmark}
+ \let\@makesidemark=\@makefnmark
\apptocmd{\sidenote}{\jlreq at hook@postnote}{}{}
\apptocmd{\sidenotemark}{\jlreq at hook@postnote}{}{}
@@ -4198,6 +4217,7 @@
}
%.. abstract
+\def\jlreq at parhook@abstract{}
\ifthenelse{\equal{\jlreq at article@type}{book}}{}{% article,report
\newbox\jlreq at abstractbox
\newcommand*{\abstractname}{概要}
@@ -4220,7 +4240,8 @@
\ifnum0\if at twocolumn\else1\fi\ifjlreq at preamble1\fi>0
\ifjlreq at preamble
\ifx l\jlreq at engine\else
- \jlreq at pushhook@postpar{\futurelet\jlreq at nextchar\jlreq at openbracket@hook}%
+ \def\jlreq at parhook@abstract{\futurelet\jlreq at nextchar\jlreq at openbracket@hook}%
+ \PushPostHook{par}{\jlreq at parhook@abstract}%
\fi
\fi
% とりあえず全部ボックスに入れる．
@@ -4275,7 +4296,7 @@
\fi
\ifjlreq at preamble
\ifx l\jlreq at engine\else
- \jlreq at pophook@postpar
+ \def\jlreq at parhook@abstract{}%
\fi
\else
\unvbox\jlreq at abstractbox
More information about the tex-live-commits
mailing list