From 84465d50d746dfed1bfbe7bb5065279665fa87de Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Mon, 26 Jul 2021 03:01:05 +0000
Subject: CTAN sync 202107260301

---
 language/japanese/jlreq/jlreq.cls | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'language/japanese/jlreq/jlreq.cls')

diff --git a/language/japanese/jlreq/jlreq.cls b/language/japanese/jlreq/jlreq.cls
index 434cd4f5b8..c092b74125 100644
--- a/language/japanese/jlreq/jlreq.cls
+++ b/language/japanese/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}%
-- 
cgit v1.2.3

