texlive[60713] Master/texmf-dist: jlreq (8oct21)

commits+karl at tug.org commits+karl at tug.org
Fri Oct 8 23:12:15 CEST 2021


Revision: 60713
          http://tug.org/svn/texlive?view=revision&revision=60713
Author:   karl
Date:     2021-10-08 23:12:14 +0200 (Fri, 08 Oct 2021)
Log Message:
-----------
jlreq (8oct21)

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-ja.pdf
    trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html
    trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf
    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	2021-10-07 23:49:08 UTC (rev 60712)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md	2021-10-08 21:12:14 UTC (rev 60713)
@@ -521,6 +521,8 @@
 * 2021-08-12
     - `etoolbox`への直接の依存をなくした.
     - バグ修正
+* 2021-10-09
+    - バグ修正
 
 
 --------------

Modified: trunk/Master/texmf-dist/doc/latex/jlreq/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/README.md	2021-10-07 23:49:08 UTC (rev 60712)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README.md	2021-10-08 21:12:14 UTC (rev 60713)
@@ -155,8 +155,9 @@
 * 2021-08-12
     - Removed the direct dependence on `etoolbox` package.
     - Fixed a bug.
+* 2021-10-09
+    - 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	2021-10-07 23:49:08 UTC (rev 60712)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html	2021-10-08 21:12:14 UTC (rev 60713)
@@ -629,6 +629,10 @@
 <li><code>etoolbox</code>への直接の依存をなくした.</li>
 <li>バグ修正</li>
 </ul></li>
+<li>2021-10-09
+<ul>
+<li>バグ修正</li>
+</ul></li>
 </ul>
 <hr />
 <p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>

Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html	2021-10-07 23:49:08 UTC (rev 60712)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html	2021-10-08 21:12:14 UTC (rev 60713)
@@ -275,6 +275,10 @@
 <li>Removed the direct dependence on <code>etoolbox</code> package.</li>
 <li>Fixed a bug.</li>
 </ul></li>
+<li>2021-10-09
+<ul>
+<li>Fixed bugs.</li>
+</ul></li>
 </ul>
 <hr />
 <p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p>

Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls	2021-10-07 23:49:08 UTC (rev 60712)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls	2021-10-08 21:12:14 UTC (rev 60713)
@@ -5,7 +5,7 @@
 %%
 % (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/)
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2021/08/12 jlreq]
+\ProvidesClass{jlreq}[2021/10/09 jlreq]
 \RequirePackage{l3keys2e}
 \RequirePackage{ifthen}
 \RequirePackage{jlreq-helpers}
@@ -81,16 +81,17 @@
 % ものは\jlreq at option@<key>に格納する.
 % _とかは@に変換する.
 % エンジン類
-\keys_define:nn { jlreq } { uplatex .code:n = { \let\jlreq at engine=u }, uplatex .value_forbidden:n = true }
-\keys_define:nn { jlreq } { platex .code:n = { \let\jlreq at engine=p }, platex .value_forbidden:n = true }
-\keys_define:nn { jlreq } { lualatex .code:n = { \let\jlreq at engine=l }, lualatex .value_forbidden:n = true }
+\keys_define:nn { jlreq } {
+  uplatex .code:n = { \let\jlreq at engine=u }, uplatex .value_forbidden:n = true,
+  platex .code:n = { \let\jlreq at engine=p }, platex .value_forbidden:n = true,
+  lualatex .code:n = { \let\jlreq at engine=l }, lualatex .value_forbidden:n = true,
+  % 文書のタイプ
+  article_type .choices:nn = {article,report,book}{\def\jlreq at article@type{#1}},
+  article .code:n = { \def\jlreq at article@type{article} }, article .value_forbidden:n = true,
+  report .code:n = { \def\jlreq at article@type{report} }, report .value_forbidden:n = true,
+  book .code:n = { \def\jlreq at article@type{book} }, book .value_forbidden:n = true
+}
 
-% 文書のタイプ
-\keys_define:nn { jlreq } { article_type .choices:nn = {article,report,book}{\def\jlreq at article@type{#1}} }
-\keys_define:nn { jlreq } { article .code:n = { \def\jlreq at article@type{article} }, article .value_forbidden:n = true }
-\keys_define:nn { jlreq } { report .code:n = { \def\jlreq at article@type{report} }, report .value_forbidden:n = true }
-\keys_define:nn { jlreq } { book .code:n = { \def\jlreq at article@type{book} }, book .value_forbidden:n = true }
-
 %.. 基本版面.まずは紙サイズ.
 \tl_new:N \g__jlreq_papersizelist_tl
 \cs_set:Nn \__jlreq_addpapersize:nnn {
@@ -171,14 +172,14 @@
 
 %.. フォントサイズ,行長,1ページあたりの行数で基本版面のサイズを決める(2.4.1.a)
 \__jlreq_aftercls_addtodeletecs:N \jlreq at option@fontsize
-\keys_define:nn { jlreq } { fontsize .tl_set:N = \jlreq at option@fontsize }
 \keys_define:nn { jlreq } {
+  fontsize .tl_set:N = \jlreq at option@fontsize,
   10pt .code:n = {\def\jlreq at option@fontsize{10pt}}, 10pt .value_forbidden:n = true,
   11pt .code:n = {\def\jlreq at option@fontsize{11pt}}, 11pt .value_forbidden:n = true,
   12pt .code:n = {\def\jlreq at option@fontsize{12pt}}, 12pt .value_forbidden:n = true,
+  jafontsize .tl_set:N = \jlreq at option@jafontsize,
+  jafontscale .tl_set:N = \jlreq at option@jafontscale
 }
-\keys_define:nn { jlreq } { jafontsize .tl_set:N = \jlreq at option@jafontsize }
-\keys_define:nn { jlreq } { jafontscale .tl_set:N = \jlreq at option@jafontscale }
 \__jlreq_aftercls_addtodeletecs:N \jlreq at option@jafontsize
 \__jlreq_aftercls_addtodeletecs:N \jlreq at option@jafontscale
 %.. 行の長さ
@@ -253,29 +254,35 @@
 \newif\if at tate \@tatefalse
 \newif\ifjlreq at option@titlepage \jlreq at option@titlepagefalse % titlepageかnotitlepageかが指定された
 \__jlreq_aftercls_addtodeleteif:N \ifjlreq at option@titlepage
-\keys_define:nn { jlreq } { landscape .code:n = {\@landscapetrue}, landscape .value_forbidden:n = true }
-\keys_define:nn { jlreq } { tombo .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombo'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}} }
-\keys_define:nn { jlreq } { tombow .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombow'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}} }
-\keys_define:nn { jlreq } { mentuke .code:n = {\ClassWarningNoLine{jlreq}{The~option~`mentuke'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}} }
-\keys_define:nn { jlreq } { tate .code:n = { \@tatetrue }, tate .value_forbidden:n = true}
+\keys_define:nn { jlreq } {
+  landscape .code:n = {\@landscapetrue}, landscape .value_forbidden:n = true,
+  tombo .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombo'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}},
+  tombow .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombow'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}}, 
+  mentuke .code:n = {\ClassWarningNoLine{jlreq}{The~option~`mentuke'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}},
+  tate .code:n = { \@tatetrue }, tate .value_forbidden:n = true
+}
 
 \newif\ifjlreq at option@twoside\jlreq at option@twosidefalse % onesideかtwosideが指定された
 \__jlreq_aftercls_addtodeleteif:N \ifjlreq at option@twoside
-\keys_define:nn { jlreq } { oneside .code:n = { \@twosidefalse\@mparswitchfalse\jlreq at option@twosidetrue }, oneside .value_forbidden:n = true }
-\keys_define:nn { jlreq } { twoside .code:n = { \@twosidetrue\@mparswitchtrue\jlreq at option@twosidetrue }, twoside .value_forbidden:n = true }
-\keys_define:nn { jlreq } { onecolumn .code:n = { \@twocolumnfalse }, onecolumn .value_forbidden:n = true }
-\keys_define:nn { jlreq } { twocolumn .code:n = { \@twocolumntrue }, twocolumn .value_forbidden:n = true }
-\keys_define:nn { jlreq } { titlepage .code:n = { \jlreq at option@titlepagetrue\@titlepagetrue }, titlepage .value_forbidden:n = true }
-\keys_define:nn { jlreq } { notitlepage .code:n = { \jlreq at option@titlepagetrue\@titlepagefalse }, notitlepage .value_forbidden:n = true }
-\keys_define:nn { jlreq } { draft .code:n = { \setlength\overfullrule{5pt} }, draft .value_forbidden:n = true }
-\keys_define:nn { jlreq } { final .code:n = { \setlength\overfullrule{0pt} }, final .value_forbidden:n = true }
+\keys_define:nn { jlreq } {
+  oneside .code:n = { \@twosidefalse\@mparswitchfalse\jlreq at option@twosidetrue }, oneside .value_forbidden:n = true,
+  twoside .code:n = { \@twosidetrue\@mparswitchtrue\jlreq at option@twosidetrue }, twoside .value_forbidden:n = true,
+  onecolumn .code:n = { \@twocolumnfalse }, onecolumn .value_forbidden:n = true,
+  twocolumn .code:n = { \@twocolumntrue }, twocolumn .value_forbidden:n = true,
+  titlepage .code:n = { \jlreq at option@titlepagetrue\@titlepagetrue }, titlepage .value_forbidden:n = true,
+  notitlepage .code:n = { \jlreq at option@titlepagetrue\@titlepagefalse }, notitlepage .value_forbidden:n = true,
+  draft .code:n = { \setlength\overfullrule{5pt} }, draft .value_forbidden:n = true,
+  final .code:n = { \setlength\overfullrule{0pt} }, final .value_forbidden:n = true
+}
 \newif\if at openright
 \newif\ifjlreq at option@open \jlreq at option@openfalse % openrightかopenanyが指定された
 \__jlreq_aftercls_addtodeleteif:N \ifjlreq at option@open
-\keys_define:nn { jlreq } { openright .code:n = { \@openrighttrue\jlreq at option@opentrue }, openright .value_forbidden:n = true}
-\keys_define:nn { jlreq } { openany .code:n = { \@openrightfalse\jlreq at option@opentrue }, openany .value_forbidden:n = true}
-\keys_define:nn { jlreq } { leqno .code:n = { \input{leqno.clo } }, leqno .value_forbidden:n = true}
-\keys_define:nn { jlreq } { fleqn .code:n = { \input{fleqn.clo } }, fleqn .value_forbidden:n = true}
+\keys_define:nn { jlreq } {
+  openright .code:n = { \@openrighttrue\jlreq at option@opentrue }, openright .value_forbidden:n = true,
+  openany .code:n = { \@openrightfalse\jlreq at option@opentrue }, openany .value_forbidden:n = true,
+  leqno .code:n = { \input{leqno.clo } }, leqno .value_forbidden:n = true,
+  fleqn .code:n = { \input{fleqn.clo } }, fleqn .value_forbidden:n = true
+}
 \newif\ifjlreq at option@enablejfam \jlreq at option@enablejfamtrue
 \__jlreq_aftercls_addtodeleteif:N \ifjlreq at option@enablejfam
 \keys_define:nn { jlreq } { disablejfam .code:n = { \jlreq at option@enablejfamfalse }, disablejfam .value_forbidden:n = true}
@@ -291,7 +298,7 @@
   sidenote_length=0pt,column_gap={2zw},
   headfoot_verticalposition = {},headfoot_sidemargin={0pt},
   open_bracket_pos=zenkaku_tentsuki,
-  onecolumn,final}
+  onecolumn,final }
 \ProcessKeysOptions { jlreq }
 
 \legacy_if:nF { jlreq at option@titlepage } {
@@ -1042,7 +1049,11 @@
 % 和文ファミリと欧文ファミリの連動
 \AddToHook{rmfamily}{\prepare at family@series at update@kanji{mc}\mcdefault}
 \AddToHook{sffamily}{\prepare at family@series at update@kanji{gt}\gtdefault}
-\AddToHook{ttfamily}{\prepare at family@series at update@kanji{gt}\gtdefault}
+\ifx l\jlreq at engine
+  \AddToHook{ttfamily}{\prepare at family@series at update@kanji{jtt}\jttdefault}
+\else
+  \AddToHook{ttfamily}{\prepare at family@series at update@kanji{gt}\gtdefault}
+\fi
 
 % 数式フォント設定
 \ifjlreq at option@enablejfam
@@ -1060,17 +1071,17 @@
 \fi
 
 % 和文間隔
-\DeclareRobustCommand*\ {\futurelet\jlreq at nextchar\jlreq at zenkakuspace@ignorespaces}
+\NewDocumentCommand{\ } {} {\futurelet\jlreq at nextchar\jlreq at zenkakuspace@ignorespaces}
 % 後続の空白を無視する処理
 \edef\jlreq at zenkakuspace@ignorespaces{%
   \noexpand\ifx\exp_not:o {\space}\unexpanded{\jlreq at nextchar\expandafter\jlreq at zenkakuspace@ignorespaces@\else\expandafter\jlreq at zenkakuspace@main\fi}%
 }
-\expandafter\def\expandafter\jlreq at zenkakuspace@ignorespaces@\space{\ }
+\expandafter\def\expandafter\jlreq at zenkakuspace@ignorespaces@\space{\futurelet\jlreq at nextchar\jlreq at zenkakuspace@ignorespaces}
 \def\jlreq at tempa{}
 \def\jlreq at do#1{\jlreq at ifendmark{#1}{}{\tl_put_right:Nn \jlreq at tempa{\ifnum\lastnodechar=`#1~1\fi}\jlreq at do}}
 \expandafter\jlreq at do\jlreq at charlist@dividingpunctuationmarks\jlreq at endmark
 \edef\@tempa{\noexpand\ifnum0\exp_not:o {\jlreq at tempa}>0~}
-\expandafter\DeclareRobustCommand\expandafter*\expandafter\jlreq at zenkakuspace@main\expandafter{\@tempa
+\expandafter\long\expandafter\def\expandafter\jlreq at zenkakuspace@main\expandafter{\@tempa
     \hskip 1\jlreq at zw\hbox{}%
     \jlreq at lastnodechar=` 
     \expandafter\jlreq at fixjfm
@@ -1103,8 +1114,8 @@
 }
 \def\jlreq at do#1{%
   \jlreq at ifendmark{#1}{}{
-    \expandafter\DeclareRobustCommand\expandafter*\csname #1\endcsname{%
-      \jlreq at ifstar
+    \expandafter\NewDocumentCommand\expandafter{\csname #1\endcsname} { s } {
+      \IfBooleanTF{##1}
         {\hskip .25\jlreq at zw #1\hskip .25\jlreq at zw\ignorespaces}%
         {#1\futurelet\jlreq at nextchar\jlreq at dividingpunctuationmarkscommand}%
     }
@@ -1141,14 +1152,14 @@
 \emergencystretch 3\jlreq at gol
 \setlength{\parindent}{1\zw}
 \hook_gput_code:nnn { cmd/set at fontsize/after } {.} {
-  \expandafter\def\expandafter\size at update\expandafter{\size at update\g__jlreq_setfontsizehook}
+  \expandafter\def\expandafter\size at update\expandafter{\size at update\g__jlreq_setfontsizehook_tl}
 }
-\tl_new:N \g__jlreq_setfontsizehook
-\tl_set:Nn \g__jlreq_setfontsizehook { \dim_compare:nT { \parindent>0pt } { \setlength{\parindent}{1\jlreq at zw} } }
+\tl_new:N \g__jlreq_setfontsizehook_tl
+\tl_set:Nn \g__jlreq_setfontsizehook_tl { \dim_compare:nT { \parindent>0pt } { \setlength{\parindent}{1\jlreq at zw} } }
 \ifx l\jlreq at engine
   \@tempskipa=\ltjgetparameter{kanjiskip}
   \ifdim\@tempskipa=\maxdimen\else
-    \tl_put_right:Nn \g__jlreq_setfontsizehook {%
+    \tl_put_right:Nn \g__jlreq_setfontsizehook_tl {%
       \ltj at setpar@global
       \ltjsetkanjiskip\jlreqkanjiskip
       \@tempskipa=\ltjgetparameter{xkanjiskip}%
@@ -1158,7 +1169,7 @@
     }
   \fi
 \else
-  \tl_put_right:Nn \g__jlreq_setfontsizehook {%
+  \tl_put_right:Nn \g__jlreq_setfontsizehook_tl {%
     \kanjiskip=\jlreqkanjiskip
     \ifdim\xkanjiskip>0pt
       \xkanjiskip=\jlreqxkanjiskip
@@ -1256,7 +1267,6 @@
 \newdimen\jlreq at urakeiwidth
 \jlreq at urakeiwidth=0.4mm
 % 脚注のインデント
-\newdimen\jlreq at footnoteindent
 
 %\RequirePackage{jlreq-debug}
 
@@ -3152,7 +3162,7 @@
 % 罫線の前は行間分,最大+文字サイズ分伸びる(4.2.5.g)
 \setlength{\skip\footins}{\dimexpr\baselineskip - 1\jlreq at gol \relax plus 1\jlreq at gol}
 % 罫線の長さは,基本版面で設定した行長にもよるが,行長の1/3くらいにする.
-\def\jlreq at footnote@rulewidth{.333\textwidth}
+\def\jlreq at footnote@rulewidth{0.333\columnwidth}
 \begingroup
   \footnotesize
   \edef\jlreq at do{
@@ -3167,21 +3177,12 @@
 \expandafter\endgroup
 \jlreq at do
 
-% インデントの計算:脚注の長さが文字の整数倍になるように字下げする(4.2.5.b)
 \keys_define:nn { jlreqsetup } {
   footnote_indent .code:n = {
     \bool_if:nT { \legacy_if_p:n { @tate } && \dim_compare_p:n { #1 = 0pt } } {
       \jlreq at note{脚注は,一般にその前に区切りのための罫線を挿入するので,字下げは行わなくてよい(4.2.5.b).}
     }
-    \begingroup
-      \footnotesize
-      \jlreq at footnoteindent=\dimexpr#1\relax
-      \@tempdima=\dimexpr\textwidth - \jlreq at footnoteindent\relax
-      \@tempdimb=1\jlreq at zw
-      \divide\@tempdima\@tempdimb \multiply\@tempdima\@tempdimb
-      \edef\jlreq at do{\noexpand\jlreq at footnoteindent=\the\dimexpr\textwidth - \@tempdima\relax}%
-    \expandafter\endgroup
-    \jlreq at do
+    \def\jlreq at footnoteindent{#1}
   }
 }
 
@@ -3194,21 +3195,27 @@
         ( \dim_compare_p:n { -1.01\jlreq at zw < #1 } && \dim_compare_p:n { #1 < -0.99\jlreq at zw } )
       }{\jlreq at note{脚注が2行以上となった場合,脚注の2行目以下の字下げを1行目より,脚注の文字サイズの全角アキとするか,逆に,1行目の字下げを2行目より,脚注の文字サイズの全角アキとする~(4.2.5.d).}}
     }
-    \dim_compare:nTF { #1 < 0pt } {
-      \def\jlreq at makefntext{}
-    }{
-      \def\jlreq at makefntext{\addtolength{\leftskip}{\glueexpr #1\relax}}
+    \cs_set:Npn \jlreq at makefntext ##1 {
+      \skip_if_eq:nnF { #1 } { 0pt } { \addtolength{\leftskip}{\glueexpr #1\relax} }
+      % インデントの計算:脚注の長さが文字の整数倍になるように字下げする(4.2.5.b)
+      \group_begin:
+        \@tempdima=\dimexpr\columnwidth - \jlreq at footnoteindent\relax
+        \@tempdimb=1\jlreq at zw
+        \divide\@tempdima\@tempdimb \multiply\@tempdima\@tempdimb
+        \cs_set:Nx \l__jlreq_do: {
+          \exp_not:N \addtolength { \exp_not:N \leftskip } {\dim_eval:n { \columnwidth - \@tempdima - 0.0001pt } }
+          \exp_not:n {
+            \parindent=1\jlreq at zw
+            \noindent
+            \hskip-\glueexpr #1\relax
+            \jlreq at referencemark@format{\@thefnmark}%
+            \hskip\glueexpr 1\jlreq at zw\relax
+          }
+        }
+      \exp_after:wN \group_end:
+      \l__jlreq_do:
+      ##1
     }
-    \long\edef\jlreq at makefntext##1{\exp_not:o {\jlreq at makefntext}%
-      \unexpanded{%
-        \addtolength{\leftskip}{\jlreq at footnoteindent}%
-        \parindent=1\jlreq at zw
-        \noindent
-        \hskip-\glueexpr #1\relax
-        \jlreq at referencemark@format{\@thefnmark}%
-        \hskip\glueexpr 1\jlreq at zw\relax
-      }##1%
-    }
   }
 }
 
@@ -3393,7 +3400,8 @@
 
 %.. 後注(4.2.4)
 \def\jlreq at endnotemarkname{@thefnmark}% 合印用番号を一時的に入れるマクロ名
-\def\jlreq at endnotecounter{footnote}% 後注用のカウンタ名
+\keys_define:nn { jlreqsetup } { endnote_counter .tl_set:N = \jlreq at endnotecounter }
+\keys_set:nn { jlreqsetup } { endnote_counter = footnote }
 % 文字サイズは\footnotesizeを使う
 \newdimen\jlreq at endnote@prepostspace
 % 前の分との間は行間分空ける(4.2.4.f)
@@ -3510,7 +3518,8 @@
 \let\@makeendmark=\@makefnmark
 
 % \theendnoteの出力を仕込む
-\keys_define:nn { jlreqsetup } {endnote_position .code:n = {
+\keys_define:nn { jlreqsetup } {
+  endnote_position .code:n = {
     \AddToHook{jlreq/heading/before}[jlreq/endnote]{}
     \RemoveFromHook{jlreq/heading/before}[jlreq/endnote]
     \jlreq at tempafalse % headingsが指定された
@@ -3583,11 +3592,11 @@
     }%
   }
   \jlreq at setdefaultnotemark\@sidenotemark\@makesidemark
-  \def\jlreq at sidenotecounter{footnote}% 傍注用のカウンタ名
   \keys_define:nn { jlreqsetup } {
-    sidenote_type .choices:nn = { number, symbol } { \def\jlreq at sidenote@type{#1} }
+    sidenote_type .choices:nn = { number, symbol } { \def\jlreq at sidenote@type{#1} },
+    sidenote_counter .tl_set:N = \jlreq at sidenotecounter
   }
-  \def\jlreq at sidenote@type{number}
+  \keys_set:nn { jlreqsetup } { sidenote_type = number, sidenote_counter = footnote}
   \__jlreq_jlreqsetup_addtofinally:n {
     \str_if_eq:VnT \jlreq at sidenote@type { number } {
       \DeclareDocumentCommand { \sidenote } { O{} +m } {
@@ -3656,8 +3665,10 @@
       \let\@makesidemark=\@makefnmark
     }
   }
-  \keys_define:nn { jlreqsetup } { sidenote_symbol .tl_set:N = \jlreq at sidenote@defaultmark }
-  \keys_define:nn { jlreqsetup } { sidenote_keyword_font .tl_set:N = \jlreq at sidenote@keywordfont }
+  \keys_define:nn { jlreqsetup } {
+    sidenote_symbol .tl_set:N = \jlreq at sidenote@defaultmark,
+    sidenote_keyword_font .tl_set:N = \jlreq at sidenote@keywordfont
+  }
 }
 
 %.. 割注(3.4)
@@ -4495,13 +4506,13 @@
         \legacy_if_p:n { @tate } && (
           \str_if_eq_p:ee { \expandafter\@secondoftwo\jlreq at nombre@i at position } { right } ||
           \str_if_eq_p:ee { \expandafter\@secondoftwo\jlreq at running@head at i@position }{ right }
-          ))}{
-      )) || (
+        )
+      ) || (
         (! \legacy_if_p:n { @tate } ) && (
           \str_if_eq_p:ee { \expandafter\@secondoftwo\jlreq at nombre@i at position }{ left } ||
           \str_if_eq_p:ee { \expandafter\@secondoftwo\jlreq at running@head at i@position }{ left }
         )
-      )}{
+      ) } {
         \if at twoside
           \jlreq at note{柱やノンブルは,左ページでは,基本版面の左端の延長線にノンブル又は柱の先頭をそろえて配置するか,基本版面の左端の延長線から基本版面の文字サイズの全角アキだけ右に寄せた位置に配置する (ページスタイル #1 内,2.6.1.b).}%
         \fi
@@ -4793,10 +4804,12 @@
   \vskip\belowcaptionskip
 }}
 
-\keys_define:nn { jlreqsetup } {caption_font .code:n = {\jlreq at jlreqsetup@withenv{jlreq@@makecaption at font@envlist}{jlreq@@makecaption at font@setting}{#1}}}
-\keys_define:nn { jlreqsetup } {caption_label_font .code:n = {\jlreq at jlreqsetup@withenv{jlreq@@makecaption at label@font at envlist}{jlreq@@makecaption at label@font at setting}{#1}}}
-\keys_define:nn { jlreqsetup } {caption_label_format .code:n = {\jlreq at jlreqsetup@withenv{jlreq@@makecaption at label@format at envlist}{jlreq@@makecaption at label@format at setting}{#1}}}
-\keys_define:nn { jlreqsetup } {caption_after_label_space .code:n = {\jlreq at jlreqsetup@withenv{jlreq@@makecaption at after@label at space@envlist}{jlreq@@makecaption at after@label at space@setting}{#1}}}
+\keys_define:nn { jlreqsetup } {
+  caption_font .code:n = {\jlreq at jlreqsetup@withenv{jlreq@@makecaption at font@envlist}{jlreq@@makecaption at font@setting}{#1}},
+  caption_label_font .code:n = {\jlreq at jlreqsetup@withenv{jlreq@@makecaption at label@font at envlist}{jlreq@@makecaption at label@font at setting}{#1}},
+  caption_label_format .code:n = {\jlreq at jlreqsetup@withenv{jlreq@@makecaption at label@format at envlist}{jlreq@@makecaption at label@format at setting}{#1}},
+  caption_after_label_space .code:n = {\jlreq at jlreqsetup@withenv{jlreq@@makecaption at after@label at space@envlist}{jlreq@@makecaption at after@label at space@setting}{#1}}
+}
 
 %% 
 %% \jlreq@@makecaption at align@setting at small(@env)に小さい時のalign,jlreq@@makecaption at align@setting at large(@env)に大きいときのalignを入れる.
@@ -5219,10 +5232,12 @@
 
 
 \def\jlreq at itemization@beforeafter at space@envlist{}
-\keys_define:nn { jlreqsetup } {itemization_beforeafter_space .code:n = {\jlreq at jlreqsetup@itemization{jlreq at itemization@beforeafter at space@envlist}{jlreq at itemization@beforeafter at space@setting}{#1}}}
-\keys_define:nn { jlreqsetup } {itemization_itemsep .code:n = {\jlreq at jlreqsetup@withenv{jlreq at itemization@itemsep at envlist}{jlreq at itemization@itemsep at setting}{#1}}}
-\keys_define:nn { jlreqsetup } {itemization_labelsep .code:n = {\jlreq at jlreqsetup@withenv{jlreq at itemization@labelsep at envlist}{jlreq at itemization@labelsep at setting}{#1}}}
-\keys_define:nn { jlreqsetup } {itemization_label_length .code:n = {\jlreq at jlreqsetup@itemization{jlreq at itemization@label at length@envlist}{jlreq at itemization@label at length@setting}{#1}}}
+\keys_define:nn { jlreqsetup } {
+  itemization_beforeafter_space .code:n = {\jlreq at jlreqsetup@itemization{jlreq at itemization@beforeafter at space@envlist}{jlreq at itemization@beforeafter at space@setting}{#1}},
+  itemization_itemsep .code:n = {\jlreq at jlreqsetup@withenv{jlreq at itemization@itemsep at envlist}{jlreq at itemization@itemsep at setting}{#1}},
+  itemization_labelsep .code:n = {\jlreq at jlreqsetup@withenv{jlreq at itemization@labelsep at envlist}{jlreq at itemization@labelsep at setting}{#1}},
+  itemization_label_length .code:n = {\jlreq at jlreqsetup@itemization{jlreq at itemization@label at length@envlist}{jlreq at itemization@label at length@setting}{#1}}
+}
 % enumerate, itemize用初期化,#1 = i,ii,...
 \def\jlreq at init@list#1{%
   \setlength{\partopsep}{0pt}%
@@ -5245,14 +5260,14 @@
 \def\@listvi{\jlreq at init@list{vi}}
 
 % 引用系.3.5.2の例.
-\keys_define:nn { jlreqsetup } { quote_indent .tl_set:N = \jlreq at quote@indent }
-\keys_define:nn { jlreqsetup } { quote_end_indent .tl_set:N = \jlreq at quote@end at indent }
-\keys_define:nn { jlreqsetup }{
+\keys_define:nn { jlreqsetup } {
+  quote_indent .tl_set:N = \jlreq at quote@indent,
+  quote_end_indent .tl_set:N = \jlreq at quote@end at indent,
   quote_fontsize .choices:nn = {normalsize,small,footnotesize,scriptsize,tiny,{}}{
     \jlreq at ifempty{#1}{\def\jlreq at quote@fontsize{}}{\edef\jlreq at quote@fontsize{\exp_not:c {#1}}}
-  }
+  },
+  quote_beforeafter_space .tl_set:N = \jlreq at quote@beforeafter at space
 }
-\keys_define:nn { jlreqsetup } { quote_beforeafter_space .tl_set:N = \jlreq at quote@beforeafter at space }
 
 \newenvironment{verse}
   {\let\\\@centercr
@@ -5490,7 +5505,8 @@
 \newcommand{\subsubitem}{\@idxitem \hspace*{3\jlreq at mol}}
 \newcommand{\indexspace}{\par \vskip 1\jlreq at gol \@plus .5\jlreq at gol \@minus .3\jlreq at gol\relax}
 \def\jlreq at theindex@pagestyle{}
-\keys_define:nn { jlreqsetup } {theindex_pagestyle .code:n = {
+\keys_define:nn { jlreqsetup } {
+  theindex_pagestyle .code:n = {
     \def\jlreq at tempa{}% ページスタイル名
     \def\jlreq at theindex@pagestyle{}%
     \jlreq at tempafalse % restore
@@ -5595,10 +5611,11 @@
 \str_if_eq:VnT \jlreq at article@type { book } {
   \newif\if at mainmatter
   \@mainmattertrue
-  \keys_define:nn { jlreqsetup } {frontmatter_pagebreak .code:n = {%
-    \edef\jlreq at frontmatter@pagebreak{\jlreq at ifempty{#1}{}{\exp_not:c {#1}}}%
-  }}
-  \keys_define:nn { jlreqsetup } {frontmatter_counter .code:n = {%
+  \keys_define:nn { jlreqsetup } {
+    frontmatter_pagebreak .code:n = {
+      \edef\jlreq at frontmatter@pagebreak{\jlreq at ifempty{#1}{}{\exp_not:c {#1}}}
+    },
+    frontmatter_counter .code:n = {%
       \def\jlreq at frontmatter@counter{}%
       \tl_set:Nn \jlreq at frontmatter@counter { \seq_gclear:N \g__jlreq_frontmatter_resetcounter_seq }
       \jlreq at parsekeyval@nokey{%
@@ -5619,10 +5636,9 @@
         \fi
         \tl_put_right:NV \jlreq at frontmatter@counter \jlreq at tempb
       }{#1}%
-    }
-  }
-  \keys_define:nn { jlreqsetup } {frontmatter_heading .code:n = {\jlreq at matter@heading[\jlreq at frontmatter@restoreheadings]{jlreq at frontmatter@savedheading}{\jlreq at frontmatter@heading}{#1}}}
-  \keys_define:nn { jlreqsetup } {frontmatter_pagestyle .code:n = {%
+    },
+    frontmatter_heading .code:n = {\jlreq at matter@heading[\jlreq at frontmatter@restoreheadings]{jlreq at frontmatter@savedheading}{\jlreq at frontmatter@heading}{#1}},
+    frontmatter_pagestyle .code:n = {%
       \def\jlreq at tempa{}% ページスタイル名
       \def\jlreq at frontmatter@pagestyle{}%
       \jlreq at tempatrue % restore
@@ -5637,11 +5653,10 @@
       \ifx\jlreq at tempa\@empty\else
         \tl_put_right:Nx \jlreq at frontmatter@pagestyle { \exp_not:N \pagestyle{\exp_not:o {\jlreq at tempa}} }%
       \fi
-    }
-  }
-  \keys_define:nn { jlreqsetup } {frontmatter_precode .code:n = {\edef\jlreq at frontmatter@precode{\unexpanded{#1}}}}
-  \keys_define:nn { jlreqsetup } {frontmatter_postcode .code:n = {\edef\jlreq at frontmatter@postcode{\unexpanded{#1}}}}
-  \keys_define:nn { jlreqsetup } {frontmatter_pagination .code:n = {%
+    },
+    frontmatter_precode .code:n = {\edef\jlreq at frontmatter@precode{\unexpanded{#1}}},
+    frontmatter_postcode .code:n = {\edef\jlreq at frontmatter@postcode{\unexpanded{#1}}},
+    frontmatter_pagination .code:n = {%
       \def\jlreq at pagination@frontmatterstyle{arabic}%
       \let\jlreq at pagination@mainmatterpagecommand=\pagenumbering
       \clist_map_variable:nNn {#1} \jlreq at tempa {
@@ -5669,17 +5684,19 @@
   \seq_new:N \g__jlreq_frontmatter_resetcounter_seq
   \def\jlreq at frontmatter@restoreheadings{}
   \def\jlreq at frontmatter@restorecommands{}
-  \keys_define:nn { jlreqsetup } {mainmatter_pagebreak .code:n = {%
-    \edef\jlreq at mainmatter@pagebreak{\jlreq at ifempty{#1}{}{\exp_not:c {#1}}}%
-  }}
-  \keys_define:nn { jlreqsetup } {mainmatter_pagestyle .code:n = {%
-    \edef\jlreq at mainmatter@pagestyle{\jlreq at ifempty{#1}{}{\unexpanded{\pagestyle{#1}}}}%
-  }}
-  \keys_define:nn { jlreqsetup } {mainmatter_counter .code:n = {\jlreq at matter@counter at norestore{\jlreq at mainmatter@counter}{#1}}}
-  \keys_define:nn { jlreqsetup } {mainmatter_heading .code:n = {\jlreq at matter@heading{\jlreq at mainmatter@heading}{#1}}}
-  \keys_define:nn { jlreqsetup } {mainmatter_precode .code:n = {\edef\jlreq at mainmatter@precode{\unexpanded{#1}}}}
-  \keys_define:nn { jlreqsetup } {mainmatter_postcode .code:n = {\edef\jlreq at mainmatter@postcode{\unexpanded{#1}}}}
-  \keys_define:nn { jlreqsetup } {mainmatter_pagination .tl_set:N = \jlreq at pagination@mainmatterstyle}
+  \keys_define:nn { jlreqsetup } {
+    mainmatter_pagebreak .code:n = {%
+      \edef\jlreq at mainmatter@pagebreak{\jlreq at ifempty{#1}{}{\exp_not:c {#1}}}%
+    },
+    mainmatter_pagestyle .code:n = {%
+      \edef\jlreq at mainmatter@pagestyle{\jlreq at ifempty{#1}{}{\unexpanded{\pagestyle{#1}}}}%
+    },
+    mainmatter_counter .code:n = {\jlreq at matter@counter at norestore{\jlreq at mainmatter@counter}{#1}},
+    mainmatter_heading .code:n = {\jlreq at matter@heading{\jlreq at mainmatter@heading}{#1}},
+    mainmatter_precode .code:n = {\edef\jlreq at mainmatter@precode{\unexpanded{#1}}},
+    mainmatter_postcode .code:n = {\edef\jlreq at mainmatter@postcode{\unexpanded{#1}}},
+    mainmatter_pagination .tl_set:N = \jlreq at pagination@mainmatterstyle
+  }
   \NewDocumentCommand{\mainmatter}{}{%
     \jlreq at mainmatter@precode
     \jlreq at mainmatter@pagebreak
@@ -5702,17 +5719,18 @@
     \expandafter\jlreq at pagination@mainmatterpagecommand\expandafter{\jlreq at pagination@mainmatterstyle}%
     \jlreq at mainmatter@postcode
   }
-  \keys_define:nn { jlreqsetup } {backmatter_pagebreak .code:n = {%
-    \edef\jlreq at backmatter@pagebreak{\jlreq at ifempty{#1}{}{\exp_not:c {#1}}}%
-  }}
-  \keys_define:nn { jlreqsetup } {backmatter_pagestyle .code:n = {%
-    \edef\jlreq at backmatter@pagestyle{\jlreq at ifempty{#1}{}{\unexpanded{\pagestyle{#1}}}}%
-  }}
-  \keys_define:nn { jlreqsetup } {backmatter_counter .code:n = {\jlreq at matter@counter at norestore{\jlreq at backmatter@counter}{#1}}}
-  \keys_define:nn { jlreqsetup } {backmatter_heading .code:n = {\jlreq at matter@heading{\jlreq at backmatter@heading}{#1}}}
-  \keys_define:nn { jlreqsetup } {backmatter_precode .code:n = {\edef\jlreq at backmatter@precode{\unexpanded{#1}}}}
-  \keys_define:nn { jlreqsetup } {backmatter_postcode .code:n = {\edef\jlreq at backmatter@postcode{\unexpanded{#1}}}}
-  \keys_define:nn { jlreqsetup } {backmatter_pagination .code:n = {
+  \keys_define:nn { jlreqsetup } {
+    backmatter_pagebreak .code:n = {%
+      \edef\jlreq at backmatter@pagebreak{\jlreq at ifempty{#1}{}{\exp_not:c {#1}}}%
+    },
+    backmatter_pagestyle .code:n = {%
+      \edef\jlreq at backmatter@pagestyle{\jlreq at ifempty{#1}{}{\unexpanded{\pagestyle{#1}}}}%
+    },
+    backmatter_counter .code:n = {\jlreq at matter@counter at norestore{\jlreq at backmatter@counter}{#1}},
+    backmatter_heading .code:n = {\jlreq at matter@heading{\jlreq at backmatter@heading}{#1}},
+    backmatter_precode .code:n = {\edef\jlreq at backmatter@precode{\unexpanded{#1}}},
+    backmatter_postcode .code:n = {\edef\jlreq at backmatter@postcode{\unexpanded{#1}}},
+    backmatter_pagination .code:n = {
       \let\jlreq at pagination@backmatterpagecommand=\pagenumbering
       \def\jlreq at pagination@backmatterstyle{arabic}%
       \clist_map_variable:nNn {#1} \jlreq at tempa {
@@ -5738,10 +5756,12 @@
   }
 }
 
-\keys_define:nn { jlreqsetup } {appendix_counter .code:n = {\jlreq at matter@counter at norestore{\jlreq at appendix@counter}{#1}}}
-\keys_define:nn { jlreqsetup } {appendix_heading .code:n = {\jlreq at matter@heading{\jlreq at appendix@heading}{#1}}}
-\keys_define:nn { jlreqsetup } {appendix_precode .code:n = {\edef\jlreq at appendix@precode{\unexpanded{#1}}}}
-\keys_define:nn { jlreqsetup } {appendix_postcode .code:n = {\edef\jlreq at appendix@postcode{\unexpanded{#1}}}}
+\keys_define:nn { jlreqsetup } {
+  appendix_counter .code:n = {\jlreq at matter@counter at norestore{\jlreq at appendix@counter}{#1}},
+  appendix_heading .code:n = {\jlreq at matter@heading{\jlreq at appendix@heading}{#1}},
+  appendix_precode .code:n = {\edef\jlreq at appendix@precode{\unexpanded{#1}}},
+  appendix_postcode .code:n = {\edef\jlreq at appendix@postcode{\unexpanded{#1}}}
+}
 \NewDocumentCommand{\appendix}{}{%
   \par
   \jlreq at appendix@precode
@@ -5974,29 +5994,27 @@
 \def\jlreq at setupamsthm{
   \newtheoremstyle{jlreq}{\dimexpr\jlreq at theorem@beforeafter at space\relax}{\dimexpr\jlreq at theorem@beforeafter at space\relax}{\jlreq at theorem@font}{\dimexpr\jlreq at theorem@indent\relax}{\jlreq at theorem@label at font}{}{1\jlreq at zw}{\thmname{##1}\thmnumber{\ ##2}\thmnote{(##3)}}
 }
-\keys_define:nn { jlreqsetup } {theorem_beforeafter_space .code:n = {
+\keys_define:nn { jlreqsetup } {
+  theorem_beforeafter_space .code:n = {
     \def\jlreq at theorem@beforeafter at space{#1}
     \begingroup\jlreq at tempdima=\dimexpr\jlreq at theorem@beforeafter at space\relax\endgroup
     \@ifpackageloaded{amsthm}{\jlreq at setupamsthm}{}
-  }
-}
-\keys_define:nn { jlreqsetup } {theorem_indent .code:n = {
+  },
+  theorem_indent .code:n = {
     \def\jlreq at theorem@indent{#1}
     \begingroup\jlreq at tempdima=\dimexpr\jlreq at theorem@indent\relax\endgroup
     \@ifpackageloaded{amsthm}{\jlreq at setupamsthm}{}
-  }
-}
-\keys_define:nn { jlreqsetup } {theorem_font .code:n = {
+  },
+  theorem_font .code:n = {
     \def\jlreq at theorem@font{#1}
     \@ifpackageloaded{amsthm}{\jlreq at setupamsthm}{}
-  }
-}
-\keys_define:nn { jlreqsetup } {theorem_label_font .code:n = {
+  },
+  theorem_label_font .code:n = {
     \def\jlreq at theorem@label at font{#1}
     \@ifpackageloaded{amsthm}{\jlreq at setupamsthm}{}
-  }
+  },
+  proof_label_font .tl_set:N = \jlreq at proof@label at font
 }
-\keys_define:nn { jlreqsetup } {proof_label_font .tl_set:N = \jlreq at proof@label at font}
 
 %. デフォルト設定
 %.. 見出し
@@ -6069,7 +6087,7 @@
 }
 
 %.. ページスタイル
-\RenewPageStyle{empty}{nombre={},odd_running_head={},even_running_head={}}
+\RenewPageStyle{empty}{nombre={},odd_running_head={},even_running_head={},clear_markcommand=false}
 \str_if_eq:VnTF \jlreq at article@type { article } {
   \legacy_if:nTF { @twoside } {
     \NewPageStyle{headings}{odd_running_head={_subsection},even_running_head={_section}}



More information about the tex-live-commits mailing list.