texlive[48414] Master: jlreq (16aug18)

commits+karl at tug.org commits+karl at tug.org
Thu Aug 16 22:48:01 CEST 2018 

Revision: 48414
          http://tug.org/svn/texlive?view=revision&revision=48414
Author:   karl
Date:     2018-08-16 22:48:00 +0200 (Thu, 16 Aug 2018)
Log Message:
-----------
jlreq (16aug18)

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.html
    trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty
    trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
    trunk/Master/tlpkg/libexec/ctan2tds

Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md	2018-08-16 04:14:24 UTC (rev 48413)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md	2018-08-16 20:48:00 UTC (rev 48414)
@@ -389,10 +389,12 @@
 * 2018-06-17
     - シリーズbもゴシックにするようにした．
     - バグ修正．
-* 2018-07-31
+* 2018-08-08
     - `\DeclarePageStyle`に`nombre_ii`等を追加．
     - バグ修正．
     - `\jlreqsetup`に`footnote_second_indent`と`endnote_second_indent`を追加．
+* 2018-08-15
+    - バグ修正．
 
 
 --------------

Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README.md	2018-08-16 04:14:24 UTC (rev 48413)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README.md	2018-08-16 20:48:00 UTC (rev 48414)
@@ -91,6 +91,8 @@
     - Added `nombre_ii` etc. to `\DeclarePageStyle`.
     - Fixed bugs.
     - Added `footnote_second_indent` and `endnote_second_indent` to `\jlreqsetup`.
+* 2018-08-15
+    - Fixed bugs.
 
 
 --------------

Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html	2018-08-16 04:14:24 UTC (rev 48413)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html	2018-08-16 20:48:00 UTC (rev 48414)
@@ -102,9 +102,9 @@
 <p>と配置します．<code>make install</code>とすると，$TEXMF=$TEXMFHOMEとしてこのコピーを行います．</p>
 <h2 id="使い方">使い方</h2>
 <p>通常通り</p>
-<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>
+<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>
 <p>とします．これで横書きのarticle相当の文書クラスとなります．エンジンは自動判定されますが，指定する場合はクラスオプションに<code>platex/uplatex/lualatex</code>のいずれかを渡してください．縦書きにするには<code>tate</code>オプションを渡します．また，reportやbook相当の文書クラスとするには，それぞれ<code>report</code>や<code>book</code>オプションを渡します．たとえば，縦書きの本を作成するには</p>
-<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>
+<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>
 <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>
-<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>
+<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>
 <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>
-<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>
+<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>
 <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>
@@ -272,10 +272,10 @@
 </ul>
 <h4 id="連続して掲げる見出しの行取り">連続して掲げる見出しの行取り</h4>
 <p><code>\SetBlockHeadingSpaces</code>により，見出しが連続して掲げられたときの行取りを設定することができます．<code>\SetBlockHeadingSpaces</code>は</p>
-<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>
+<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>
 <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>
+<a class="sourceLine" id="cb7-4" data-line-number="4">}</a></code></pre></div>
 <p>のように使います．この意味は次の通りです．</p>
 <ul>
 <li><code>\part</code>，<code>\section</code>，<code>\subsection</code>という順番で見出しが掲げられていて，その前後が見出しでない場合は，<code>\part</code>は三行取り＋前に一行空き，<code>\section</code>と<code>\subsection</code>は二行取りとなります．</li>
@@ -309,14 +309,14 @@
 </ul>
 <h3 id="modifyheading"><code>\ModifyHeading</code></h3>
 <p>既に（上のどれかを使い）定義された見出し命令の設定を変更します．たとえば</p>
-<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>
+<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>
 <p>とすると，<code>\section</code>のフォントなどの設定はそのままに，行取りのみが10行に変更されます．見出しの種類を変更することはできません．</p>
 <h3 id="saveheading"><code>\SaveHeading</code></h3>
 <p>見出し命令の定義を待避します．</p>
-<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>
+<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>
 <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>
+<a class="sourceLine" id="cb9-4" data-line-number="4"><span class="fu">\restoresection</span> <span class="co">% \sectionの中身を元に戻す．</span></a></code></pre></div>
 <p>のように使います．</p>
 <h2 id="ページスタイル">ページスタイル</h2>
 <pre><code>\DeclarePageStyle{<ページスタイル名>}{<設定>}
@@ -339,7 +339,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>
-<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>
+<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>
 <p>のようにオプションで指定する必要があります．</p>
 <h3 id="platexuplatexの場合">pLaTeX/upLaTeXの場合</h3>
 <p>JFMの名前は次の通りです．<code>[]</code>で囲まれている文字は設定により入ったり入らなかったりします．</p>
@@ -467,12 +467,16 @@
 <li>シリーズbもゴシックにするようにした．</li>
 <li>バグ修正．</li>
 </ul></li>
-<li>2018-07-31
+<li>2018-08-08
 <ul>
 <li><code>\DeclarePageStyle</code>に<code>nombre_ii</code>等を追加．</li>
 <li>バグ修正．</li>
 <li><code>\jlreqsetup</code>に<code>footnote_second_indent</code>と<code>endnote_second_indent</code>を追加．</li>
 </ul></li>
+<li>2018-08-15
+<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.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html	2018-08-16 04:14:24 UTC (rev 48413)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html	2018-08-16 20:48:00 UTC (rev 48414)
@@ -179,6 +179,10 @@
 <li>Fixed bugs.</li>
 <li>Added <code>footnote_second_indent</code> and <code>endnote_second_indent</code> to <code>\jlreqsetup</code>.</li>
 </ul></li>
+<li>2018-08-15
+<ul>
+<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-08-16 04:14:24 UTC (rev 48413)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty	2018-08-16 20:48:00 UTC (rev 48414)
@@ -1,7 +1,7 @@
 % エンジン非依存のマクロ集
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-helpers}[2018/08/08 jlreq-helpers]
+\ProvidesPackage{jlreq-helpers}[2018/08/15 jlreq-helpers]
 \RequirePackage{xkeyval,etoolbox}
 
 %. helper1
@@ -162,9 +162,15 @@
 % もしカンマがない場合は\ifjlreq at resultがfalseになる．
 \newcommand*{\jlreq at helper@dividebycomma}[1]{\jlreq at helper@dividebycomma@#1,\jlreq at endmark}
 \def\jlreq at helper@dividebycomma@#1,#2\jlreq at endmark{%
-  \def\jlreq at resulta{#1}%
-  \def\jlreq at resultb{#2}%
-  \ifx\jlreq at resultb\@empty\jlreq at resultfalse\else\jlreq at resulttrue\expandafter\def\expandafter\jlreq at resultb\expandafter{\jlreq at helper@removelastcomma#2\jlreq at endmark}\fi
+  \jlreq at remove@spaceandbracket{#1}{\jlreq at resulta}%
+  \jlreq at remove@spaceandbracket{#2}{\jlreq at resultb}%
+  \ifx\jlreq at resultb\@empty\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{%
+    \jlreq at resultfalse
+  }{%
+    \jlreq at resulttrue
+    \expandafter\def\expandafter\jlreq at resultb\expandafter{\jlreq at helper@removelastcomma#2\jlreq at endmark}%
+    \expandafter\jlreq at remove@spaceandbracket\expandafter{\jlreq at resultb}{\jlreq at resultb}%
+  }%
 }
 \def\jlreq at helper@removelastcomma#1,\jlreq at endmark{#1}
 
@@ -243,22 +249,61 @@
   \begingroup
     \def\jlreq at do{}%
     \def\jlreq at parsekeyval@nokey at execute##1##2{#1}%
-    \expandafter\jlreq at parsekeyval@nokey@#2,\jlreq at endmark,%
+    \expandafter\jlreq at parsekeyval@nokey at i#2,\jlreq at endmark,%
   \expandafter\endgroup
   \jlreq at do
 }
-\long\def\jlreq at parsekeyval@nokey@#1,{%
-  \jlreq at ifendmark{#1}{}{\jlreq at ifempty{#1}{\jlreq at parsekeyval@nokey@}{\jlreq at parsekeyval@nokey@@#1=\jlreq at endmark}}%
+\long\def\jlreq at parsekeyval@nokey at i#1,{\jlreq at ifendmark{#1}{}{\jlreq at parsekeyval@nokey at ii#1=\jlreq at endmark}}
+\long\def\jlreq at parsekeyval@nokey at ii#1=#2\jlreq at endmark{%
+  \jlreq at ifempty{#2}{\jlreq at parsekeyval@nokey at iii{#2}{#1}}{%
+    \edef\jlreq at tempa{%
+      \noexpand\jlreq at parsekeyval@nokey at iii{\jlreq at parsekeyval@nokey at removeequal{#2}}{\unexpanded{#1}}%
+    }%
+    \jlreq at tempa
+  }%
 }
-\long\def\jlreq at parsekeyval@nokey@@#1=#2\jlreq at endmark{%
-  \jlreq at ifempty{#2}{\jlreq at parsekeyval@nokey@@@{}{#1}}{\expandafter\jlreq at parsekeyval@nokey@@@\expandafter{\jlreq at parsekeyval@nokey@@@@#2\jlreq at endmark}{#1}}%
+\long\def\jlreq at parsekeyval@nokey at iii#1#2{%
+  \jlreq at remove@spaceandbracket{#1}{\jlreq at tempa}%
+  \jlreq at remove@spaceandbracket{#2}{\jlreq at tempb}%
+  \ifx\jlreq at tempa\@empty\expandafter\@gobble\else\expandafter\@firstofone\fi
+    {%
+      \edef\@tempa{\noexpand\jlreq at parsekeyval@nokey at iv{\expandonce{\jlreq at tempb}}{\expandonce{\jlreq at tempa}}}%
+      \@tempa
+    }%
+  \jlreq at parsekeyval@nokey at i
 }
-\long\def\jlreq at parsekeyval@nokey@@@#1#2{%
-  \eappto\jlreq at do{\expandonce{\jlreq at parsekeyval@nokey at execute{#2}{#1}}}%
-  \jlreq at parsekeyval@nokey@
+\long\def\jlreq at parsekeyval@nokey at iv#1#2{%
+  \eappto\jlreq at do{\expandonce{\jlreq at parsekeyval@nokey at execute{#1}{#2}}}%
 }
-\long\def\jlreq at parsekeyval@nokey@@@@#1=\jlreq at endmark{#1}
+\long\def\jlreq at parsekeyval@nokey at removeequal#1{\jlreq at parsekeyval@nokey at removeequal@\jlreq at uniqtoken#1\jlreq at endmark}
+\long\def\jlreq at parsekeyval@nokey at removeequal@#1=\jlreq at endmark{\expandafter\unexpanded\expandafter{\@gobble#1}}
 
+% #1の先頭のスペースを削除し，#2に入れる．ただし#1={ X}の時は" X"が入る．
+\def\jlreq at do#1{% #1 = " "として後で実行
+  \long\def\jlreq at remove@spaceandbracket##1##2{%
+    \begingroup
+      \def\jlreq at tempa{}%
+      \futurelet\jlreq at nextchar\jlreq at remove@spaceandbracket at i##1\jlreq at uniqtoken#1\jlreq at uniqtoken\jlreq at endmark
+      \edef\jlreq at do{\noexpand\edef\noexpand##2{\noexpand\unexpanded{\expandonce{\jlreq at tempa}}}}%
+    \expandafter\endgroup
+    \jlreq at do
+  }
+  \def\jlreq at remove@spaceandbracket at i{%
+    \ifx#1\jlreq at nextchar\expandafter\jlreq at remove@spaceandbracket at ii\else\expandafter\jlreq at remove@spaceandbracket at iii\fi
+  }%
+  \def\jlreq at remove@spaceandbracket at ii#1{\futurelet\jlreq at nextchar\jlreq at remove@spaceandbracket at i}%
+  \long\def\jlreq at remove@spaceandbracket at iii##1#1\jlreq at uniqtoken##2\jlreq at endmark{%
+    \jlreq at ifempty{##2}{%
+      \expandafter\jlreq at remove@spaceandbracket at iv\expandafter{\jlreq at removelastuniqtoken##1}%
+    }{%
+      \jlreq at remove@spaceandbracket at iv{##1}%
+    }%
+  }%
+}
+\jlreq at do{ }
+\long\def\jlreq at removelastuniqtoken#1\jlreq at uniqtoken{#1}
+\long\def\jlreq at remove@spaceandbracket at iv#1{\edef\jlreq at tempa{\unexpanded{#1}}}
+
 % \jlreq at switch{str}{
 %   {str}{abcd}
 %   {str1}{xyz}

Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls	2018-08-16 04:14:24 UTC (rev 48413)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls	2018-08-16 20:48:00 UTC (rev 48414)
@@ -5,7 +5,7 @@
 %%
 % (based on JLReq 20120403 https://www.w3.org/TR/2012/NOTE-jlreq-20120403/ja/)
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2018/08/08 jlreq]
+\ProvidesClass{jlreq}[2018/08/15 jlreq]
 \RequirePackage{xkeyval,everyhook,filehook,etoolbox,ifthen}
 \RequirePackage{jlreq-helpers}
 
@@ -1948,18 +1948,13 @@
     \newif\ifjlreq at column@spanning at possible\jlreq at column@spanning at possiblefalse
     % 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{%
+        \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}{}}%
+      }%
       \def\jlreq at tempa####1####2{##2}%
-      \def\@tempa####1,####2\jlreq at endmark{%
-        \jlreq at ifempty{####2}{%
-          \def\@tempa{}%
-        }{%
-          \def\@tempa########1,\jlreq at endmark{\def\@tempa{########1}}%
-          \@tempa####2\jlreq at endmark
-        }%
-        \edef\@tempa{\unexpanded{\jlreq at tempa{####1}}{\expandonce{\@tempa}}}%
-        \edef\jlreq at do{\jlreq at expandtwice{\@tempa}}%
-      }%
-      \@tempa##1,\jlreq at endmark
       \jlreq at do
     }%
     \jlreq at parsekeyval[BlockHeading:#1]{
@@ -2173,14 +2168,15 @@
 \newcommand{\SetBlockHeadingSpaces}[1]{%
   \begingroup
     % 現段階の情報をクリアする
-    \@for\jlreq at tempa:=\jlreq at BlockHeading@spaces at headingslist\do{%
-      \expandafter\let\csname jlreq at BlockHeading@spaces at setlist@\jlreq at tempa\endcsname=\@undefined
-    }%
-    \def\jlreq at BlockHeading@spaces at headingslist{}%
     \def\jlreq at tempa{}% 見出しリスト
     \def\jlreq at tempb{}% 設定リスト \def\jlreq at BlockHeading@spaces@***{{**}{**}...}ってのを入れる
     \jlreq at SetBlockHeadingSpaces#1\jlreq at endmark
     \edef\jlreq at do{%
+      \unexpanded{%
+        \@for\@tempa:=\jlreq at BlockHeading@spaces at headingslist\do{%
+          \expandafter\let\csname jlreq at BlockHeading@spaces at setlist@\@tempa\endcsname=\@undefined
+        }%
+      }%
       \unexpanded{\def\jlreq at BlockHeading@spaces at headingslist}{\expandonce{\jlreq at tempa}}%
       \expandonce{\jlreq at tempb}%
     }%
@@ -2188,12 +2184,12 @@
   \jlreq at do
 }
 \def\jlreq at SetBlockHeadingSpaces{% カンマを無視する処理
-  \@ifnextchar,{\expandafter\jlreq at SetBlockHeadingSpaces@\@gobble}{\jlreq at SetBlockHeadingSpaces@}%
+  \@ifnextchar,{\expandafter\jlreq at SetBlockHeadingSpaces@i\@gobble}{\jlreq at SetBlockHeadingSpaces@i}%
 }
-\def\jlreq at SetBlockHeadingSpaces@{%
-  \@ifnextchar[{\jlreq at SetBlockHeadingSpaces@@}{\jlreq at SetBlockHeadingSpaces@@[]}%
+\def\jlreq at SetBlockHeadingSpaces@i{%
+  \@ifnextchar[{\jlreq at SetBlockHeadingSpaces@ii}{\jlreq at SetBlockHeadingSpaces@ii[]}%
 }
-\def\jlreq at SetBlockHeadingSpaces@@[#1]#2{%
+\def\jlreq at SetBlockHeadingSpaces@ii[#1]#2{%
   \jlreq at ifendmark{#2}{}{%
     \def\jlreq at headings{}% 見出し名リスト
     \jlreq at BlockHeading@gyodori at parsekeyval[BlockHeadingSpaces]{#1}{}{}{}%
@@ -2205,7 +2201,7 @@
       \jlreq at ifempty{##2}{\jlreq at tempbtrue}{\jlreq at tempbfalse}% 後ろ開きが空ならば\jlreq at tempbtrue
     }%
     \expandafter\jlreq at do\jlreq at totalset
-    \jlreq at SetBlockHeadingSpaces@@@{#2}%
+    \jlreq at SetBlockHeadingSpaces@iii{#2}%
     \eappto\jlreq at tempa{,\expandonce{\jlreq at headings}}% \jlreq at tempaに\jlreq at headingsを追加
     \ifjlreq at tempb
       \ifx\jlreq at lastdimen\@empty\else % 最後が寸法だったので\jlreq at SetBlockHeadingSpaces@totalsetを改変
@@ -2226,12 +2222,13 @@
     \jlreq at SetBlockHeadingSpaces
   }%
 }
-\def\jlreq at SetBlockHeadingSpaces@@@#1{%
+\def\jlreq at SetBlockHeadingSpaces@iii#1{%
   \@for\@tempa:=#1\do{%
+    \expandafter\jlreq at remove@spaceandbracket\expandafter{\@tempa}{\@tempa}%
     \expandafter\jlreq at iffirsttoken@ignorespaces\expandafter{\@tempa}{_}{%
       \ifx\jlreq at lastdimen\@empty\else\eappto\jlreq at set{{\expandonce{\jlreq at lastdimen}}}\fi%
       \def\jlreq at lastdimen{}%
-      \expandafter\jlreq at SetBlockHeadingSpaces@@@@\@tempa{\jlreq at endmark}%
+      \expandafter\jlreq at SetBlockHeadingSpaces@iv\@tempa{\jlreq at endmark}%
     }{%
       \ifjlreq at tempa
         % 最初が寸法なので，全体の設定（\jlreq at totalset）に組み込む．
@@ -2247,7 +2244,7 @@
     \jlreq at tempafalse
   }%
 }
-\def\jlreq at SetBlockHeadingSpaces@@@@#1#{%
+\def\jlreq at SetBlockHeadingSpaces@iv#1#{%
   \expandafter\jlreq at ifcontains\expandafter{\@gobble #1}{_}{%
     \ClassWarning{jlreq}{Unusual heading name `\@gobble #1' is found. You forgot a comma? (in SetBlockHeadingSpaces)}%
   }{}%
@@ -2257,9 +2254,9 @@
     \ClassWarning{jlreq}{The heading name `\@gobble #1' ends with `*'. Do you mean `\@tempa{*}'? (in SetBlockHeadingSpaces)}%
   }}{}%
   \appto\jlreq at headings{#1}%
-  \jlreq at SetBlockHeadingSpaces@@@@@
+  \jlreq at SetBlockHeadingSpaces@v
 }
-\def\jlreq at SetBlockHeadingSpaces@@@@@#1{%
+\def\jlreq at SetBlockHeadingSpaces@v#1{%
   % 空っぽの場合は{_{r:0pt}{r:0pt}{}}
   \jlreq at ifendmark{#1}{\appto\jlreq at set{{_{r:0pt}{r:0pt}{}}}}{%
     \jlreq at iffirsttoken{#1}{*}{% *始まりの場合は{_*{}{}{}}
@@ -3163,6 +3160,7 @@
   % \jlreq at tempcにセクション名たちを入れていく
   \def\jlreq at tempc{}
   \@for\jlreq at tempa:=#1\do{
+    \expandafter\jlreq at remove@spaceandbracket\expandafter{\jlreq at tempa}{\jlreq at tempa}%
     \jlreq at switch{\jlreq at tempa}{
       {headings}{\jlreq at tempatrue}
       {paragraph}{
@@ -4015,7 +4013,7 @@
     % _iiが存在するか調べて\ifjlreq at headii@existに入れる
     \newif\ifjlreq at headii@exist
     \jlreq at headii@existfalse
-    \@for\jlreq at tempa:=\jlreq at odd@running at head@ii,\jlreq at odd@running at head@ii\do{%
+    \jlreq at for@noexpand\jlreq at tempa:=\jlreq at odd@running at head@ii,\jlreq at odd@running at head@ii\do{%
       \expandafter\ifx\jlreq at tempa\@empty\else\jlreq at headii@existtrue\fi
     }%
     % markの処理
@@ -4026,7 +4024,7 @@
     % * 例えば_<見出し命令>が_sectionならば，\jlreq at markdata@sectionに{{<I1>}{<I2>}{<I3>}}を追加する．ここで<I1>，<I2>，<I3>は
     %   - I1: @iiが無いときにodd or even
     %   - I2: @iiが無ければ0，あれば1．
-    %   - I3: マーク出力命令がleftかrightか．（上述のようにoddかevenかで判定される．）
+    %   - I3: マーク出力命令がleftかrightに応じて l or r．（上述のようにoddかevenかで判定される．）
     % * 他にも_sectionが指定されている柱があれば，\jlreq at markdata@sectionにさらに追加で加えていく．
     % * \jlreq@(odd|even)@running at head(@ii)@heading at levelに<見出し命令>のレベルを入れる．レベルが不明な時は\relaxになる．
     % また，\jlreq at headingmarklistに<見出し命令>の一覧を入れる．
@@ -4696,6 +4694,7 @@
     \def\jlreq at do{}%
     \def\jlreq at keyvallist{}%
     \@for\@tempa:=#1\do{%
+      \expandafter\jlreq at remove@spaceandbracket\expandafter{\@tempa}{\@tempa}%
       \expandafter\jlreq at ifcontains\expandafter{\@tempa}{=}{%
         \expandafter\appto\expandafter\jlreq at keyvallist\expandafter{\@tempa,}%
       }{%

Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds	2018-08-16 04:14:24 UTC (rev 48413)
+++ trunk/Master/tlpkg/libexec/ctan2tds	2018-08-16 20:48:00 UTC (rev 48414)
@@ -180,6 +180,7 @@
  'bibtool',     "die 'skipping, requires compilation'",
  'bibtools',    "die 'skipping, ca.2000, await request'",
  'bibtopicprefix', "&MAKEflatten",
+ 'bibutils',	"die 'skipping, requires compilation'",
  'bickham',     "die 'skipping, support for nonfree font'",
  'bigints',     "&MAKEflatten",
  'bin-cjkutils',"&MAKEbin_cjkutils",

More information about the tex-live-commits mailing list