summaryrefslogtreecommitdiff
path: root/language/japanese/jlreq/jlreq.cls
diff options
context:
space:
mode:
Diffstat (limited to 'language/japanese/jlreq/jlreq.cls')
-rw-r--r--language/japanese/jlreq/jlreq.cls34
1 files changed, 8 insertions, 26 deletions
diff --git a/language/japanese/jlreq/jlreq.cls b/language/japanese/jlreq/jlreq.cls
index 2f94644b9e..36c7377893 100644
--- a/language/japanese/jlreq/jlreq.cls
+++ b/language/japanese/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
}