From 7d4bc4453bed553e5dea689d4752c8a4a453e531 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 25 Jul 2021 20:47:19 +0000 Subject: jlreq (25jul21) git-svn-id: svn://tug.org/texlive/trunk@60060 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/jlreq/README-ja.md | 5 +- Master/texmf-dist/doc/latex/jlreq/README.md | 3 ++ Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html | 69 +++++++++++++----------- Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf | Bin 366748 -> 368161 bytes Master/texmf-dist/doc/latex/jlreq/jlreq.html | 5 ++ Master/texmf-dist/doc/latex/jlreq/jlreq.pdf | Bin 117978 -> 118596 bytes Master/texmf-dist/tex/latex/jlreq/jlreq.cls | 23 ++++---- 7 files changed, 60 insertions(+), 45 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/jlreq/README-ja.md b/Master/texmf-dist/doc/latex/jlreq/README-ja.md index 851bcd5d831..d69d75db412 100644 --- a/Master/texmf-dist/doc/latex/jlreq/README-ja.md +++ b/Master/texmf-dist/doc/latex/jlreq/README-ja.md @@ -512,7 +512,10 @@ JFMの名前は次の通りです.`[]`で囲まれている文字は設定に - `xkeyval`パッケージと`ifthen`パッケージの利用をやめた. - expl3コードとの親和性を高めた. - `\DeclareBlockHeading`に`pagestyle`を追加. - - + - バグ修正 +* 2021-07-25 + - ifthenの読み込みを復活.(Re:VIEWのための一時的なもの.) + - バグ修正 -------------- diff --git a/Master/texmf-dist/doc/latex/jlreq/README.md b/Master/texmf-dist/doc/latex/jlreq/README.md index 86ca8f76606..eef98c2f55e 100644 --- a/Master/texmf-dist/doc/latex/jlreq/README.md +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html index 1062ff46204..b1565868d66 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.html @@ -424,35 +424,35 @@

このパッケージは二条項BSDライセンスの元で配布されています.詳しくはLICENSEをご覧ください.

履歴


diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf index 5f28ab2f332..453488e1d19 100644 Binary files a/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf and b/Master/texmf-dist/doc/latex/jlreq/jlreq-ja.pdf differ diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.html b/Master/texmf-dist/doc/latex/jlreq/jlreq.html index 0b02bda8590..40cffc9aa0a 100644 --- a/Master/texmf-dist/doc/latex/jlreq/jlreq.html +++ b/Master/texmf-dist/doc/latex/jlreq/jlreq.html @@ -265,6 +265,11 @@
  • Added pagestyle to \DeclareBlockHeading.
  • Fixed bugs.
  • +
  • 2021-07-25 +

  • Noriyuki Abe https://github.com/abenori/jlreq

    diff --git a/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf b/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf index a6547be669e..12c18fe4bdb 100644 Binary files a/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf and b/Master/texmf-dist/doc/latex/jlreq/jlreq.pdf differ 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}% -- cgit v1.2.3