diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/README-ja.md | 3 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/README.md | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf | bin | 371465 -> 371495 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/jlreq.html | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/jlreq/jlreq.pdf | bin | 119712 -> 119744 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/latex/jlreq/jlreq.cls | 34 |
7 files changed, 21 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/latex/jlreq/README-ja.md b/Master/texmf-dist/doc/latex/jlreq/README-ja.md index 192995610f3..c2dc666329e 100644 --- a/Master/texmf-dist/doc/latex/jlreq/README-ja.md +++ b/Master/texmf-dist/doc/latex/jlreq/README-ja.md @@ -536,6 +536,9 @@ JFMの名前は次の通りです.`[]`で囲まれている文字は設定に - 二番目の柱を使うと不自然に消えることがあるバグの修正.ついでに`\DeclarePageStyle`を書き直した. - `\@makefntext`を調整. - その他バグ修正. +* 2022-04-11 + - バグ修正. + -------------- Noriyuki Abe diff --git a/Master/texmf-dist/doc/latex/jlreq/README.md b/Master/texmf-dist/doc/latex/jlreq/README.md index 9c4454ef739..b1df695c653 100644 --- a/Master/texmf-dist/doc/latex/jlreq/README.md +++ b/Master/texmf-dist/doc/latex/jlreq/README.md @@ -171,6 +171,8 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS - Rewrote `\DeclarePageStyle`. - Deleted `\@makefntext`, define `\@makefntext` directly. - Fixed other bugs. +* 2022-04-11 + - Fixed a bug. -------------- Noriyuki Abe diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html index 374adf12641..7d440ca2767 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html @@ -650,6 +650,10 @@ <li><code>\@makefntext</code>を調整.</li> <li>その他バグ修正.</li> </ul></li> +<li>2022-04-11 +<ul> +<li>バグ修正.</li> +</ul></li> </ul> <hr /> <p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p> diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf Binary files differindex f6d242e3551..4c4501ca626 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.html b/Master/texmf-dist/doc/latex/jlreq/jlreq.html index ee802f83264..2c7242c445b 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq.html @@ -297,6 +297,10 @@ <li>Deleted <code>\@makefntext</code>, define <code>\@makefntext</code> directly.</li> <li>Fixed other bugs.</li> </ul></li> +<li>2022-04-11 +<ul> +<li>Fixed a bug.</li> +</ul></li> </ul> <hr /> <p>Noriyuki Abe <a href="https://github.com/abenori/jlreq">https://github.com/abenori/jlreq</a></p> diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf b/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf Binary files differindex a0e4e66fdbb..453d785a3f9 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls index 2f94644b9e8..36c73778935 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls @@ -5,7 +5,7 @@ %% % (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/) \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jlreq}[2022/04/05 jlreq] +\ProvidesClass{jlreq}[2022/04/11 jlreq] \RequirePackage{l3keys2e} \RequirePackage{etoolbox} \RequirePackage{jlreq-helpers}[2021/08/12] @@ -79,23 +79,6 @@ {\csname jlreq@original@#1\endcsname}% {#1}% } -\def\jlreq@useoriginalcs@witharguments#1#2{% - \group_begin: - \tl_set:Nx \l__jlreq_do_tl { - \exp_not:n{\escapechar=`\\\relax}% - \exp_not:n{\catcode`@=11\relax}% - \exp_not:N \scantokens{% - \jlreq@if{\ifcsname jlreq@original@#1\endcsname\fi}% - {\exp_not:o {\csname jlreq@original@#1\endcsname}}% - {\exp_not:o {\csname #1\endcsname}}% - \exp_not:n {#2}% - } - \exp_not:N \catcode`@=\the\catcode`@\exp_not:N \relax - \exp_not:N \escapechar=\the\escapechar\exp_not:N \relax - } - \exp_after:wN \group_end: - \l__jlreq_do_tl -} \def\jlreq@restoreoriginalcs#1{% \jlreq@if{\ifcsname jlreq@original@\expandafter\@gobble\string#1\endcsname\fi}% {\expandafter\let\expandafter#1\csname jlreq@original@\expandafter\@gobble\string#1\endcsname}{}% @@ -825,33 +808,32 @@ \edef\jlreq@jafontscale{\strip@pt\jlreq@resultdimen} \__jlreq_aftercls_addtodeletecs:N \jlreq@jafontscale \ifx l\jlreq@engine - \jlreq@saveoriginalcs{DeclareFontShape} - \def\DeclareFontShape#1#2#3#4#5#6{ + \jlreq@saveoriginalcs{DeclareFontShape@} + \def\DeclareFontShape@#1#2#3#4#5#6{ \group_begin: \bool_if:nT { \str_if_eq_p:nn {#1} {JY3} || \str_if_eq_p:nn {#1} {JT3} } { \tl_set:Nx \l__jlreq_tmpa_tl {#5} - \tl_if_in:NnTF \l__jlreq_tmpa_tl { jfm=jlreq} { + \tl_if_in:NnTF \l__jlreq_tmpa_tl { jfm=jlreq } { \tl_if_in:NnTF \l__jlreq_tmpa_tl { jfm=jlreqv }{ \tl_replace_all:Nnn \l__jlreq_tmpa_tl { jfm=jlreqv } { jfm=jlreqv-jidori } }{ \tl_replace_all:Nnn \l__jlreq_tmpa_tl { jfm=jlreq } { jfm=jlreq-jidori } } \cs_set:Nx \l_jlreq_do: { - \exp_not:N \jlreq@useoriginalcs@witharguments{DeclareFontShape} { + \exp_not:N \jlreq@useoriginalcs{DeclareFontShape@} \exp_not:n { {#1} {#2} {#3} { #4-jidori } } { \tl_use:N \l__jlreq_tmpa_tl } { \exp_not:n {#6} } - } } }{ \tl_if_in:NnT \l__jlreq_tmpa_tl {<->ssub} { \cs_set:Nn \l_jlreq_do: { - \jlreq@useoriginalcs@witharguments{DeclareFontShape} { {#1} {#2} {#3} { #4-jidori } {#5} {#6} } + \jlreq@useoriginalcs{DeclareFontShape@} {#1} {#2} {#3} { #4-jidori } {#5} {#6} } } } } \exp_after:wN \group_end: \l_jlreq_do: - \jlreq@useoriginalcs@witharguments{DeclareFontShape} { {#1} {#2} {#3} {#4} {#5} {#6} } + \jlreq@useoriginalcs{DeclareFontShape@} {#1} {#2} {#3} {#4} {#5} {#6} } \DeclareFontShape{JY3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont :jfm=jlreq;script=latn;-kern}{} \DeclareFontShape{JY3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont :jfm=jlreq;script=latn;-kern}{} @@ -6184,7 +6166,7 @@ \hbox_to_wd:nn {##1} { \def#1 { } \kanjishape{n-jidori}\selectfont - \def\kanjishape####1{\jlreq@useoriginalcs@witharguments{kanjishape}{{####1-jidori}}} + \def\kanjishape####1{\jlreq@useoriginalcs{kanjishape}{####1-jidori}} ##2 \hskip\glueexpr 0pt~minus~1fil\relax } |