summaryrefslogtreecommitdiff
path: root/language
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-07-26 03:01:05 +0000
committerNorbert Preining <norbert@preining.info>2021-07-26 03:01:05 +0000
commit84465d50d746dfed1bfbe7bb5065279665fa87de (patch)
treeda55fef72f0ee348f2d7d0cfdde6a7b4aa9fa263 /language
parent70e05e80042e1e0b40202c65384883b446f03654 (diff)
CTAN sync 202107260301
Diffstat (limited to 'language')
-rw-r--r--language/japanese/jlreq/README-ja.md5
-rw-r--r--language/japanese/jlreq/README.md3
-rw-r--r--language/japanese/jlreq/jlreq-ja.pdfbin366748 -> 368161 bytes
-rw-r--r--language/japanese/jlreq/jlreq.cls23
-rw-r--r--language/japanese/jlreq/jlreq.pdfbin117978 -> 118596 bytes
5 files changed, 18 insertions, 13 deletions
diff --git a/language/japanese/jlreq/README-ja.md b/language/japanese/jlreq/README-ja.md
index 851bcd5d83..d69d75db41 100644
--- a/language/japanese/jlreq/README-ja.md
+++ b/language/japanese/jlreq/README-ja.md
@@ -512,7 +512,10 @@ JFMの名前は次の通りです.`[]`で囲まれている文字は設定に
- `xkeyval`パッケージと`ifthen`パッケージの利用をやめた.
- expl3コードとの親和性を高めた.
- `\DeclareBlockHeading`に`pagestyle`を追加.
- -
+ - バグ修正
+* 2021-07-25
+ - ifthenの読み込みを復活.(Re:VIEWのための一時的なもの.)
+ - バグ修正
--------------
diff --git a/language/japanese/jlreq/README.md b/language/japanese/jlreq/README.md
index 86ca8f7660..eef98c2f55 100644
--- a/language/japanese/jlreq/README.md
+++ b/language/japanese/jlreq/README.md
@@ -149,6 +149,9 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS
- It has more compatibility with expl3.
- Added `pagestyle` to `\DeclareBlockHeading`.
- Fixed bugs.
+* 2021-07-25
+ - Load `ifthen` again. (Only for Re:VIEW, will be removed in future.)
+ - Fixed bugs.
--------------
diff --git a/language/japanese/jlreq/jlreq-ja.pdf b/language/japanese/jlreq/jlreq-ja.pdf
index 5f28ab2f33..453488e1d1 100644
--- a/language/japanese/jlreq/jlreq-ja.pdf
+++ b/language/japanese/jlreq/jlreq-ja.pdf
Binary files differ
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}%
diff --git a/language/japanese/jlreq/jlreq.pdf b/language/japanese/jlreq/jlreq.pdf
index a6547be669..12c18fe4bd 100644
--- a/language/japanese/jlreq/jlreq.pdf
+++ b/language/japanese/jlreq/jlreq.pdf
Binary files differ