texlive[63004] Master/texmf-dist: jlreq (11apr22)

commits+karl at tug.org commits+karl at tug.org
Mon Apr 11 22:10:55 CEST 2022 

Revision: 63004
          http://tug.org/svn/texlive?view=revision&revision=63004
Author:   karl
Date:     2022-04-11 22:10:55 +0200 (Mon, 11 Apr 2022)
Log Message:
-----------
jlreq (11apr22)

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	2022-04-11 20:10:17 UTC (rev 63003)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README-ja.md	2022-04-11 20:10:55 UTC (rev 63004)
@@ -536,7 +536,10 @@
     - 二番目の柱を使うと不自然に消えることがあるバグの修正．ついでに`\DeclarePageStyle`を書き直した．
     - `\@makefntext`を調整．
     - その他バグ修正．
+* 2022-04-11
+    - バグ修正．
 
+
 --------------
 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	2022-04-11 20:10:17 UTC (rev 63003)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/README.md	2022-04-11 20:10:55 UTC (rev 63004)
@@ -171,6 +171,8 @@
     - Rewrote `\DeclarePageStyle`.
     - Deleted `\@makefntext`, define `\@makefntext` directly.
     - Fixed other bugs.
+* 2022-04-11
+    - Fixed a bug.
 
 --------------
 Noriyuki Abe

Modified: trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html	2022-04-11 20:10:17 UTC (rev 63003)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html	2022-04-11 20:10:55 UTC (rev 63004)
@@ -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>

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	2022-04-11 20:10:17 UTC (rev 63003)
+++ trunk/Master/texmf-dist/doc/latex/jlreq/jlreq.html	2022-04-11 20:10:55 UTC (rev 63004)
@@ -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>

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	2022-04-11 20:10:17 UTC (rev 63003)
+++ trunk/Master/texmf-dist/tex/latex/jlreq/jlreq.cls	2022-04-11 20:10:55 UTC (rev 63004)
@@ -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 at original@#1\endcsname}%
     {#1}%
 }
-\def\jlreq at 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 at if{\ifcsname jlreq at original@#1\endcsname\fi}%
-          {\exp_not:o {\csname jlreq at 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 at restoreoriginalcs#1{%
   \jlreq at if{\ifcsname jlreq at original@\expandafter\@gobble\string#1\endcsname\fi}%
     {\expandafter\let\expandafter#1\csname jlreq at original@\expandafter\@gobble\string#1\endcsname}{}%
@@ -825,12 +808,12 @@
 \edef\jlreq at jafontscale{\strip at pt\jlreq at resultdimen}
 \__jlreq_aftercls_addtodeletecs:N \jlreq at jafontscale
 \ifx l\jlreq at engine
-  \jlreq at saveoriginalcs{DeclareFontShape}
-    \def\DeclareFontShape#1#2#3#4#5#6{
+  \jlreq at 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 }
           }{
@@ -837,21 +820,20 @@
             \tl_replace_all:Nnn \l__jlreq_tmpa_tl { jfm=jlreq  } { jfm=jlreq-jidori  }
           }
           \cs_set:Nx \l_jlreq_do: {
-            \exp_not:N \jlreq at useoriginalcs@witharguments{DeclareFontShape} {
+            \exp_not:N \jlreq at 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 at useoriginalcs@witharguments{DeclareFontShape} { {#1} {#2} {#3} { #4-jidori } {#5} {#6} }
+              \jlreq at useoriginalcs{DeclareFontShape@} {#1} {#2} {#3} { #4-jidori } {#5} {#6}
             }
           }
         }
       }
     \exp_after:wN \group_end: \l_jlreq_do:
-    \jlreq at useoriginalcs@witharguments{DeclareFontShape} { {#1} {#2} {#3} {#4} {#5} {#6} }
+    \jlreq at useoriginalcs{DeclareFontShape@} {#1} {#2} {#3} {#4} {#5} {#6}
   }
   \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}{}
@@ -6184,7 +6166,7 @@
         \hbox_to_wd:nn {##1} {
           \def#1 {　}
           \kanjishape{n-jidori}\selectfont
-          \def\kanjishape####1{\jlreq at useoriginalcs@witharguments{kanjishape}{{####1-jidori}}}
+          \def\kanjishape####1{\jlreq at useoriginalcs{kanjishape}{####1-jidori}}
           ##2
           \hskip\glueexpr 0pt~minus~1fil\relax
         }

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