summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/jlreq
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-07-25 20:47:19 +0000
committerKarl Berry <karl@freefriends.org>2021-07-25 20:47:19 +0000
commit7d4bc4453bed553e5dea689d4752c8a4a453e531 (patch)
tree3fa7afe265fcf0dd1d0b481685b993d985091d39 /Master/texmf-dist/tex/latex/jlreq
parent8f0d1e29f8c0f87a87b7b07bc2e0a3196b9dd9b6 (diff)
jlreq (25jul21)
git-svn-id: svn://tug.org/texlive/trunk@60060 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/jlreq')
-rw-r--r--Master/texmf-dist/tex/latex/jlreq/jlreq.cls23
1 files changed, 11 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
index 434cd4f5b83..c092b741250 100644
--- a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
+++ b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls
@@ -5,8 +5,9 @@
%%
% (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2021/07/22 jlreq]
+\ProvidesClass{jlreq}[2021/07/25 jlreq]
\RequirePackage{l3keys2e,etoolbox}
+\RequirePackage{ifthen}
\RequirePackage{jlreq-helpers}
\ExplSyntaxOn
@@ -3930,7 +3931,7 @@
}
\def\jlreq@pagestyle@parse@position@@#1{%
- \jlreq@switch{#1}{
+ \str_case_e:nnF { #1 } {
{top}{\def\jlreq@tempc{#1}}
{bottom}{\def\jlreq@tempc{#1}}
{left}{\def\jlreq@tempd{#1}}
@@ -3939,8 +3940,7 @@
{gutter}{\if@tate\def\jlreq@tempd{right}\else\def\jlreq@tempd{left}\fi}
{fore_edge}{\if@tate\def\jlreq@tempd{left}\else\def\jlreq@tempd{right}\fi}
{fore-edge}{\if@tate\def\jlreq@tempd{left}\else\def\jlreq@tempd{right}\fi}
- {\ClassError{jlreq}{Invalid~position:~#1}{\@ehc}}
- }%
+ }{\ClassError{jlreq}{Invalid~position:~#1}{\@ehc}}
}
% レベル#1より低いレベルの見出しの**markを\markboth{}{}にする
@@ -5495,7 +5495,7 @@
\ifjlreq@parsekeyval@nokey@novalue{%
\eappto\jlreq@headingsettings{\unexpanded{####1}}%
}{%
- \jlreq@switch{####1}{%
+ \str_case_e:nnF {####1} {%
{heading_type}{%
\lowercase{\def\jlreq@tempa{####2}}%
\jlreq@switch{\jlreq@tempa}{
@@ -5508,14 +5508,13 @@
}%
}
{heading_level}{\def\jlreq@level{####2}}
- {%
- \tl_if_empty:nTF {#1} { \@firstofone }{%
- \str_if_eq:nnTF {####1} { restore } {
- \csname jlreq@tempa####2\endcsname\@gobble
- }{\@firstofone}%
- }%
- {\eappto\jlreq@headingsettings{\ifx\jlreq@headingsettings\@empty\else ,\fi\unexpanded{####1={####2}}}}%
+ }{%
+ \tl_if_empty:nTF {#1} { \@firstofone }{%
+ \str_if_eq:nnTF {####1} { restore } {
+ \csname jlreq@tempa####2\endcsname\@gobble
+ }{\@firstofone}%
}%
+ {\eappto\jlreq@headingsettings{\ifx\jlreq@headingsettings\@empty\else ,\fi\unexpanded{####1={####2}}}}%
}%
}%
}{##2}%