From aef0ab66561e93d019e3cd7e3ffd80ae2e35b616 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 25 Mar 2020 21:09:59 +0000 Subject: bxjscls (25mar20) git-svn-id: svn://tug.org/texlive/trunk@54542 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/bxjscls/bxjsarticle.cls | 97 ++++++++-------------- Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls | 97 ++++++++-------------- Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty | 2 +- .../tex/latex/bxjscls/bxjsja-minimal.def | 2 +- .../texmf-dist/tex/latex/bxjscls/bxjsja-modern.def | 2 +- .../texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def | 2 +- .../tex/latex/bxjscls/bxjsja-standard.def | 10 +-- Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 97 ++++++++-------------- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 97 ++++++++-------------- 11 files changed, 147 insertions(+), 263 deletions(-) (limited to 'Master/texmf-dist/tex/latex/bxjscls') diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index ba6bde27cd6..ff1c5dc7160 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsarticle} - [2020/02/15 v1.9k BXJS document classes] + [2020/03/25 v2.0 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsarticle} \newif\ifjsc@needsp@tch @@ -316,17 +316,9 @@ \define@key{bxjs}{enablejfam}[true]{% \bxjs@set@keyval{enablejfam}{#1}{}} \DeclareOption{disablejfam}{\let\bxjs@enablejfam=f} -\let\ifjsDraft\iffalse -\@onlypreamble\bxjs@draft -\def\bxjs@draft#1{% - \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname} -\DeclareOption{draft}{\bxjs@draft{true}\setlength\overfullrule{5pt}} -\DeclareOption{final}{\bxjs@draft{false}\setlength\overfullrule{0pt}} -\g@addto@macro\bxjs@begin@document@hook{% - \expandafter\ifx\csname ifdraft\endcsname\relax - \expandafter\let\csname ifdraft\expandafter\endcsname - \csname ifjsDraft\endcsname - \fi} +\newif\ifjsDraft +\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt } +\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt } \newif\ifbxjs@papersize \bxjs@papersizetrue \DeclareOption{nopapersize}{\bxjs@papersizefalse} @@ -428,11 +420,7 @@ \let\bxjs@driver@given\bxjs@driver@@xetex} \DeclareOption{dvipdfmx-if-dvi}{% \setkeys{bxjs}{dvi=dvipdfmx}} -\newif\ifbxjs@bigcode \bxjs@bigcodefalse -\edef\bxjs@tmpa{\expandafter\noexpand\csname\endcsname} -\def\bxjs@tmpb#1 #2#3\@nil{% - \ifx1#2\bxjs@bigcodetrue \fi} -\expandafter\bxjs@tmpb\meaning\bxjs@tmpa1 0\@nil +\newif\ifbxjs@bigcode \bxjs@bigcodetrue \DeclareOption{nobigcode}{% \bxjs@bigcodefalse} \DeclareOption{bigcode}{% @@ -1144,14 +1132,10 @@ \bxjs@postproc@layout \g@addto@macro\bxjs@bd@pre@geometry@hook{% \@ifpackagelater{geometry}{2010/02/12}{}{%else - \PackageWarningNoLine\bxjs@clsname - {The 'geometry' package installed\MessageBreak - is too old (< v5.0)}% - \if x\jsEngine \ifnum\mag=\@m\else - \def\bxjs@Gm@driver{pdftex} - \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi - \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi - \fi\fi}% + \PackageError\bxjs@clsname + {Your 'geometry' package is too old (< v5.0)}% + {\@ehc}% + \let\Gm@driver\relax}% \ifjsWithpTeXng \ifx\Gm@driver\@empty \def\Gm@driver{pdftex}% @@ -2290,67 +2274,54 @@ \@tempswafalse \if p\jsEngine \@tempswatrue \fi \if n\jsEngine \@tempswatrue \fi -\if@tempswa \expandafter\@firstoftwo -\else \expandafter\@secondoftwo -\fi -{% +\bxjs@cond\if@tempswa\fi{% \newif\ifjsSeireki \jsSeirekitrue \def\bxjs@decl@Seireki@cmds{% \def\西暦{\jsSeirekitrue}% - \def\和暦{\jsSeirekifalse}} + \def\和暦{\jsSeirekifalse\bxjs@wareki@used}} \def\Seireki{\jsSeirekitrue} -\def\Wareki{\jsSeirekifalse} -\def\bxjs@if@use@seireki{% - \ifjsSeireki \expandafter\@firstoftwo - \else \expandafter\@secondoftwo \fi} +\def\Wareki{\jsSeirekifalse\bxjs@wareki@used} +\def\bxjs@if@use@seireki{\bxjs@cond\ifjsSeireki\fi} +\def\bxjs@iai{\noexpand~} }{% \newif\if西暦 \西暦true \def\bxjs@decl@Seireki@cmds{% \def\西暦{\西暦true}% - \def\和暦{\西暦false}} + \def\和暦{\西暦false\bxjs@wareki@used}} \def\Seireki{\西暦true} -\def\Wareki{\西暦false} -\def\bxjs@if@use@seireki{% - \if西暦 \expandafter\@firstoftwo - \else \expandafter\@secondoftwo \fi} +\def\Wareki{\西暦false\bxjs@wareki@used} +\def\bxjs@if@use@seireki{\bxjs@cond\if西暦\fi} +\let\bxjs@iai\@empty } \bxjs@decl@Seireki@cmds \let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone -\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded - \def\bxjs@onxp{\unexpanded\expandafter}} -\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T - \def\bxjs@iai{\noexpand~} -\else \def\bxjs@iai{} -\fi +\bxjs@test@engine\unexpanded{% + \let\bxjs@unxp\unexpanded \def\bxjs@onxp{\unexpanded\expandafter}} \newif\ifbxjs@bxwareki@avail \IfFileExists{bxwareki.sty}{% \RequirePackage{bxwareki}[]% \bxjs@bxwareki@availtrue}{} +\ifbxjs@bxwareki@avail \let\bxjs@wareki@used\@empty +\else + \bxjs@robust@def\bxjs@wareki@used{% + \global\let\bxjs@wareki@used\@empty + \ClassWarning\bxjs@clsname + {Wareki mode is not supported, since\MessageBreak + 'bxwareki' is unavailable, found}} + \g@addto@macro\bxjs@begin@document@hook{% + \let\bxjs@wareki@used\@empty} +\fi \ifbxjs@bxwareki@avail \let\jayear\warekiyear \def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial \newcount\heisei \heisei=\value{warekiyear} \fi \else - \@tempcnta=\the\year\two@digits\month\two@digits\day\relax - \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501 - \newcount\heisei \heisei\year \advance\heisei-1988\relax - \fi\fi - \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne - \edef\jayear{\bxjs@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai} - \else \edef\jayear{\the\year \bxjs@iai} - \fi + \edef\jayear{\the\year \bxjs@iai} \fi \let\bxjs@next\relax -\ifbxjs@bxwareki@avail - \ifx\warekigengo\@empty\else - \def\bxjs@next{\bxjs@onxp{\warekitoday}} - \fi -\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne - \def\bxjs@next{% - \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}% - \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% - \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}} +\ifbxjs@bxwareki@avail \ifx\warekigengo\@empty\else + \def\bxjs@next{\bxjs@onxp{\warekitoday}} \fi\fi \edef\bxjs@today{% \if@english @@ -2369,7 +2340,7 @@ \fi} \let\today\bxjs@today \g@addto@macro\bxjs@begin@document@hook{% - \ifx\bbl@jpn@Seirekitrue\@undefined\else + \ifx\bbl@jpn@maybekansuji\@undefined\else \bxjs@decl@Seireki@cmds \g@addto@macro\datejapanese{% \let\today\bxjs@today}% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index fd64e7a3369..bfc6bef9fe5 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsbook} - [2020/02/15 v1.9k BXJS document classes] + [2020/03/25 v2.0 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsbook} \newif\ifjsc@needsp@tch @@ -322,17 +322,9 @@ \define@key{bxjs}{enablejfam}[true]{% \bxjs@set@keyval{enablejfam}{#1}{}} \DeclareOption{disablejfam}{\let\bxjs@enablejfam=f} -\let\ifjsDraft\iffalse -\@onlypreamble\bxjs@draft -\def\bxjs@draft#1{% - \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname} -\DeclareOption{draft}{\bxjs@draft{true}\setlength\overfullrule{5pt}} -\DeclareOption{final}{\bxjs@draft{false}\setlength\overfullrule{0pt}} -\g@addto@macro\bxjs@begin@document@hook{% - \expandafter\ifx\csname ifdraft\endcsname\relax - \expandafter\let\csname ifdraft\expandafter\endcsname - \csname ifjsDraft\endcsname - \fi} +\newif\ifjsDraft +\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt } +\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt } \newif\ifbxjs@papersize \bxjs@papersizetrue \DeclareOption{nopapersize}{\bxjs@papersizefalse} @@ -434,11 +426,7 @@ \let\bxjs@driver@given\bxjs@driver@@xetex} \DeclareOption{dvipdfmx-if-dvi}{% \setkeys{bxjs}{dvi=dvipdfmx}} -\newif\ifbxjs@bigcode \bxjs@bigcodefalse -\edef\bxjs@tmpa{\expandafter\noexpand\csname\endcsname} -\def\bxjs@tmpb#1 #2#3\@nil{% - \ifx1#2\bxjs@bigcodetrue \fi} -\expandafter\bxjs@tmpb\meaning\bxjs@tmpa1 0\@nil +\newif\ifbxjs@bigcode \bxjs@bigcodetrue \DeclareOption{nobigcode}{% \bxjs@bigcodefalse} \DeclareOption{bigcode}{% @@ -1178,14 +1166,10 @@ \bxjs@postproc@layout \g@addto@macro\bxjs@bd@pre@geometry@hook{% \@ifpackagelater{geometry}{2010/02/12}{}{%else - \PackageWarningNoLine\bxjs@clsname - {The 'geometry' package installed\MessageBreak - is too old (< v5.0)}% - \if x\jsEngine \ifnum\mag=\@m\else - \def\bxjs@Gm@driver{pdftex} - \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi - \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi - \fi\fi}% + \PackageError\bxjs@clsname + {Your 'geometry' package is too old (< v5.0)}% + {\@ehc}% + \let\Gm@driver\relax}% \ifjsWithpTeXng \ifx\Gm@driver\@empty \def\Gm@driver{pdftex}% @@ -2396,67 +2380,54 @@ \@tempswafalse \if p\jsEngine \@tempswatrue \fi \if n\jsEngine \@tempswatrue \fi -\if@tempswa \expandafter\@firstoftwo -\else \expandafter\@secondoftwo -\fi -{% +\bxjs@cond\if@tempswa\fi{% \newif\ifjsSeireki \jsSeirekitrue \def\bxjs@decl@Seireki@cmds{% \def\西暦{\jsSeirekitrue}% - \def\和暦{\jsSeirekifalse}} + \def\和暦{\jsSeirekifalse\bxjs@wareki@used}} \def\Seireki{\jsSeirekitrue} -\def\Wareki{\jsSeirekifalse} -\def\bxjs@if@use@seireki{% - \ifjsSeireki \expandafter\@firstoftwo - \else \expandafter\@secondoftwo \fi} +\def\Wareki{\jsSeirekifalse\bxjs@wareki@used} +\def\bxjs@if@use@seireki{\bxjs@cond\ifjsSeireki\fi} +\def\bxjs@iai{\noexpand~} }{% \newif\if西暦 \西暦true \def\bxjs@decl@Seireki@cmds{% \def\西暦{\西暦true}% - \def\和暦{\西暦false}} + \def\和暦{\西暦false\bxjs@wareki@used}} \def\Seireki{\西暦true} -\def\Wareki{\西暦false} -\def\bxjs@if@use@seireki{% - \if西暦 \expandafter\@firstoftwo - \else \expandafter\@secondoftwo \fi} +\def\Wareki{\西暦false\bxjs@wareki@used} +\def\bxjs@if@use@seireki{\bxjs@cond\if西暦\fi} +\let\bxjs@iai\@empty } \bxjs@decl@Seireki@cmds \let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone -\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded - \def\bxjs@onxp{\unexpanded\expandafter}} -\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T - \def\bxjs@iai{\noexpand~} -\else \def\bxjs@iai{} -\fi +\bxjs@test@engine\unexpanded{% + \let\bxjs@unxp\unexpanded \def\bxjs@onxp{\unexpanded\expandafter}} \newif\ifbxjs@bxwareki@avail \IfFileExists{bxwareki.sty}{% \RequirePackage{bxwareki}[]% \bxjs@bxwareki@availtrue}{} +\ifbxjs@bxwareki@avail \let\bxjs@wareki@used\@empty +\else + \bxjs@robust@def\bxjs@wareki@used{% + \global\let\bxjs@wareki@used\@empty + \ClassWarning\bxjs@clsname + {Wareki mode is not supported, since\MessageBreak + 'bxwareki' is unavailable, found}} + \g@addto@macro\bxjs@begin@document@hook{% + \let\bxjs@wareki@used\@empty} +\fi \ifbxjs@bxwareki@avail \let\jayear\warekiyear \def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial \newcount\heisei \heisei=\value{warekiyear} \fi \else - \@tempcnta=\the\year\two@digits\month\two@digits\day\relax - \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501 - \newcount\heisei \heisei\year \advance\heisei-1988\relax - \fi\fi - \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne - \edef\jayear{\bxjs@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai} - \else \edef\jayear{\the\year \bxjs@iai} - \fi + \edef\jayear{\the\year \bxjs@iai} \fi \let\bxjs@next\relax -\ifbxjs@bxwareki@avail - \ifx\warekigengo\@empty\else - \def\bxjs@next{\bxjs@onxp{\warekitoday}} - \fi -\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne - \def\bxjs@next{% - \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}% - \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% - \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}} +\ifbxjs@bxwareki@avail \ifx\warekigengo\@empty\else + \def\bxjs@next{\bxjs@onxp{\warekitoday}} \fi\fi \edef\bxjs@today{% \if@english @@ -2475,7 +2446,7 @@ \fi} \let\today\bxjs@today \g@addto@macro\bxjs@begin@document@hook{% - \ifx\bbl@jpn@Seirekitrue\@undefined\else + \ifx\bbl@jpn@maybekansuji\@undefined\else \bxjs@decl@Seireki@cmds \g@addto@macro\datejapanese{% \let\today\bxjs@today}% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index f2ca9ee1ded..7ac8a1e8e76 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjscjkcat} - [2020/02/15 v1.9k BXJS document classes] + [2020/03/25 v2.0 BXJS document classes] \def\bxjx@pkgname{bxjscjkcat} \newcount\bxjx@cnta \@onlypreamble\bxjx@tmpdo diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty index f09767b37b5..de126ac708c 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjscompat} - [2020/02/15 v1.9k BXJS document classes] + [2020/03/25 v2.0 BXJS document classes] \def\bxac@pkgname{bxjscompat} \let\bxac@engine=n \def\bxac@do#1#2{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def index ab755bb8197..3026210eaab 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-minimal.def} - [2020/02/15 v1.9k BXJS document classes] + [2020/03/25 v2.0 BXJS document classes] %% このファイルは日本語文字を含みます \def\DeclareJaTextFontCommand#1#2{% \DeclareRobustCommand#1[1]{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def index 9007c8f0dde..7624053fc86 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-modern.def} - [2020/02/15 v1.9k BXJS document classes] + [2020/03/25 v2.0 BXJS document classes] \input{bxjsja-standard.def} \ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi=\z@ \def\encodingdefault{T1}% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def index 0a56088e4f8..9b1a03f89e9 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-pandoc.def} - [2020/02/15 v1.9k BXJS document classes] + [2020/03/25 v2.0 BXJS document classes] \input{bxjsja-standard.def} \RequirePackage{bxjspandoc} \@onlypreamble\bxjs@endpreamble@hook diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def index 28c30ac6371..07b7d9648f1 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-standard.def} - [2020/02/15 v1.9k BXJS document classes] + [2020/03/25 v2.0 BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse @@ -486,8 +486,8 @@ \bxjs@resolve@jafont@paren\bxjs@tmpa \edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font} \ifx\bxjs@tmpa\@empty - \setCJKmainfont[BoldFont=ipaexg.ttf]{ipaexm.ttf} - \setCJKsansfont[BoldFont=ipaexg.ttf]{ipaexg.ttf} + \setCJKmainfont[BoldFont=HaranoAjiGothic-Medium.otf]{HaranoAjiMincho-Regular.otf} + \setCJKsansfont[BoldFont=HaranoAjiGothic-Medium.otf]{HaranoAjiGothic-Medium.otf} \else \edef\bxjs@next{% \noexpand\RequirePackage[\bxjs@tmpa]{zxjafont}[2013/01/28]% v0.2a @@ -585,8 +585,8 @@ \edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font} \ifx\bxjs@tmpa\@empty \defaultjfontfeatures{ Kerning=Off } - \setmainjfont[BoldFont=IPAexGothic,JFM=ujis]{IPAexMincho} - \setsansjfont[BoldFont=IPAexGothic,JFM=ujis]{IPAexGothic} + \setmainjfont[BoldFont=HaranoAjiGothic-Medium.otf,JFM=ujis]{HaranoAjiMincho-Regular.otf} + \setsansjfont[BoldFont=HaranoAjiGothic-Medium.otf,JFM=ujis]{HaranoAjiGothic-Medium.otf} \else \edef\bxjs@next{% \noexpand\RequirePackage[\bxjs@tmpa]{luatexja-preset}% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty index b639f6ba87b..ca2d484c1b0 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjspandoc} - [2020/02/15 v1.9k BXJS document classes] + [2020/03/25 v2.0 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjsp@pkgname{bxjscjkcat} \let\bxjsp@engine=n diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls index f398c4993f8..07c4ce14cc0 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsreport} - [2020/02/15 v1.9k BXJS document classes] + [2020/03/25 v2.0 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch @@ -322,17 +322,9 @@ \define@key{bxjs}{enablejfam}[true]{% \bxjs@set@keyval{enablejfam}{#1}{}} \DeclareOption{disablejfam}{\let\bxjs@enablejfam=f} -\let\ifjsDraft\iffalse -\@onlypreamble\bxjs@draft -\def\bxjs@draft#1{% - \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname} -\DeclareOption{draft}{\bxjs@draft{true}\setlength\overfullrule{5pt}} -\DeclareOption{final}{\bxjs@draft{false}\setlength\overfullrule{0pt}} -\g@addto@macro\bxjs@begin@document@hook{% - \expandafter\ifx\csname ifdraft\endcsname\relax - \expandafter\let\csname ifdraft\expandafter\endcsname - \csname ifjsDraft\endcsname - \fi} +\newif\ifjsDraft +\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt } +\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt } \newif\ifbxjs@papersize \bxjs@papersizetrue \DeclareOption{nopapersize}{\bxjs@papersizefalse} @@ -434,11 +426,7 @@ \let\bxjs@driver@given\bxjs@driver@@xetex} \DeclareOption{dvipdfmx-if-dvi}{% \setkeys{bxjs}{dvi=dvipdfmx}} -\newif\ifbxjs@bigcode \bxjs@bigcodefalse -\edef\bxjs@tmpa{\expandafter\noexpand\csname\endcsname} -\def\bxjs@tmpb#1 #2#3\@nil{% - \ifx1#2\bxjs@bigcodetrue \fi} -\expandafter\bxjs@tmpb\meaning\bxjs@tmpa1 0\@nil +\newif\ifbxjs@bigcode \bxjs@bigcodetrue \DeclareOption{nobigcode}{% \bxjs@bigcodefalse} \DeclareOption{bigcode}{% @@ -1152,14 +1140,10 @@ \bxjs@postproc@layout \g@addto@macro\bxjs@bd@pre@geometry@hook{% \@ifpackagelater{geometry}{2010/02/12}{}{%else - \PackageWarningNoLine\bxjs@clsname - {The 'geometry' package installed\MessageBreak - is too old (< v5.0)}% - \if x\jsEngine \ifnum\mag=\@m\else - \def\bxjs@Gm@driver{pdftex} - \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi - \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi - \fi\fi}% + \PackageError\bxjs@clsname + {Your 'geometry' package is too old (< v5.0)}% + {\@ehc}% + \let\Gm@driver\relax}% \ifjsWithpTeXng \ifx\Gm@driver\@empty \def\Gm@driver{pdftex}% @@ -2419,67 +2403,54 @@ \@tempswafalse \if p\jsEngine \@tempswatrue \fi \if n\jsEngine \@tempswatrue \fi -\if@tempswa \expandafter\@firstoftwo -\else \expandafter\@secondoftwo -\fi -{% +\bxjs@cond\if@tempswa\fi{% \newif\ifjsSeireki \jsSeirekitrue \def\bxjs@decl@Seireki@cmds{% \def\西暦{\jsSeirekitrue}% - \def\和暦{\jsSeirekifalse}} + \def\和暦{\jsSeirekifalse\bxjs@wareki@used}} \def\Seireki{\jsSeirekitrue} -\def\Wareki{\jsSeirekifalse} -\def\bxjs@if@use@seireki{% - \ifjsSeireki \expandafter\@firstoftwo - \else \expandafter\@secondoftwo \fi} +\def\Wareki{\jsSeirekifalse\bxjs@wareki@used} +\def\bxjs@if@use@seireki{\bxjs@cond\ifjsSeireki\fi} +\def\bxjs@iai{\noexpand~} }{% \newif\if西暦 \西暦true \def\bxjs@decl@Seireki@cmds{% \def\西暦{\西暦true}% - \def\和暦{\西暦false}} + \def\和暦{\西暦false\bxjs@wareki@used}} \def\Seireki{\西暦true} -\def\Wareki{\西暦false} -\def\bxjs@if@use@seireki{% - \if西暦 \expandafter\@firstoftwo - \else \expandafter\@secondoftwo \fi} +\def\Wareki{\西暦false\bxjs@wareki@used} +\def\bxjs@if@use@seireki{\bxjs@cond\if西暦\fi} +\let\bxjs@iai\@empty } \bxjs@decl@Seireki@cmds \let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone -\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded - \def\bxjs@onxp{\unexpanded\expandafter}} -\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T - \def\bxjs@iai{\noexpand~} -\else \def\bxjs@iai{} -\fi +\bxjs@test@engine\unexpanded{% + \let\bxjs@unxp\unexpanded \def\bxjs@onxp{\unexpanded\expandafter}} \newif\ifbxjs@bxwareki@avail \IfFileExists{bxwareki.sty}{% \RequirePackage{bxwareki}[]% \bxjs@bxwareki@availtrue}{} +\ifbxjs@bxwareki@avail \let\bxjs@wareki@used\@empty +\else + \bxjs@robust@def\bxjs@wareki@used{% + \global\let\bxjs@wareki@used\@empty + \ClassWarning\bxjs@clsname + {Wareki mode is not supported, since\MessageBreak + 'bxwareki' is unavailable, found}} + \g@addto@macro\bxjs@begin@document@hook{% + \let\bxjs@wareki@used\@empty} +\fi \ifbxjs@bxwareki@avail \let\jayear\warekiyear \def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial \newcount\heisei \heisei=\value{warekiyear} \fi \else - \@tempcnta=\the\year\two@digits\month\two@digits\day\relax - \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501 - \newcount\heisei \heisei\year \advance\heisei-1988\relax - \fi\fi - \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne - \edef\jayear{\bxjs@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai} - \else \edef\jayear{\the\year \bxjs@iai} - \fi + \edef\jayear{\the\year \bxjs@iai} \fi \let\bxjs@next\relax -\ifbxjs@bxwareki@avail - \ifx\warekigengo\@empty\else - \def\bxjs@next{\bxjs@onxp{\warekitoday}} - \fi -\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne - \def\bxjs@next{% - \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}% - \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% - \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}} +\ifbxjs@bxwareki@avail \ifx\warekigengo\@empty\else + \def\bxjs@next{\bxjs@onxp{\warekitoday}} \fi\fi \edef\bxjs@today{% \if@english @@ -2498,7 +2469,7 @@ \fi} \let\today\bxjs@today \g@addto@macro\bxjs@begin@document@hook{% - \ifx\bbl@jpn@Seirekitrue\@undefined\else + \ifx\bbl@jpn@maybekansuji\@undefined\else \bxjs@decl@Seireki@cmds \g@addto@macro\datejapanese{% \let\today\bxjs@today}% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index 77054520414..b7dd8d0066a 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsslide} - [2020/02/15 v1.9k BXJS document classes] + [2020/03/25 v2.0 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch @@ -316,17 +316,9 @@ \define@key{bxjs}{enablejfam}[true]{% \bxjs@set@keyval{enablejfam}{#1}{}} \DeclareOption{disablejfam}{\let\bxjs@enablejfam=f} -\let\ifjsDraft\iffalse -\@onlypreamble\bxjs@draft -\def\bxjs@draft#1{% - \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname} -\DeclareOption{draft}{\bxjs@draft{true}\setlength\overfullrule{5pt}} -\DeclareOption{final}{\bxjs@draft{false}\setlength\overfullrule{0pt}} -\g@addto@macro\bxjs@begin@document@hook{% - \expandafter\ifx\csname ifdraft\endcsname\relax - \expandafter\let\csname ifdraft\expandafter\endcsname - \csname ifjsDraft\endcsname - \fi} +\newif\ifjsDraft +\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt } +\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt } \newif\ifbxjs@papersize \bxjs@papersizetrue \DeclareOption{nopapersize}{\bxjs@papersizefalse} @@ -428,11 +420,7 @@ \let\bxjs@driver@given\bxjs@driver@@xetex} \DeclareOption{dvipdfmx-if-dvi}{% \setkeys{bxjs}{dvi=dvipdfmx}} -\newif\ifbxjs@bigcode \bxjs@bigcodefalse -\edef\bxjs@tmpa{\expandafter\noexpand\csname\endcsname} -\def\bxjs@tmpb#1 #2#3\@nil{% - \ifx1#2\bxjs@bigcodetrue \fi} -\expandafter\bxjs@tmpb\meaning\bxjs@tmpa1 0\@nil +\newif\ifbxjs@bigcode \bxjs@bigcodetrue \DeclareOption{nobigcode}{% \bxjs@bigcodefalse} \DeclareOption{bigcode}{% @@ -1142,14 +1130,10 @@ \bxjs@postproc@layout \g@addto@macro\bxjs@bd@pre@geometry@hook{% \@ifpackagelater{geometry}{2010/02/12}{}{%else - \PackageWarningNoLine\bxjs@clsname - {The 'geometry' package installed\MessageBreak - is too old (< v5.0)}% - \if x\jsEngine \ifnum\mag=\@m\else - \def\bxjs@Gm@driver{pdftex} - \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi - \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi - \fi\fi}% + \PackageError\bxjs@clsname + {Your 'geometry' package is too old (< v5.0)}% + {\@ehc}% + \let\Gm@driver\relax}% \ifjsWithpTeXng \ifx\Gm@driver\@empty \def\Gm@driver{pdftex}% @@ -2288,67 +2272,54 @@ \@tempswafalse \if p\jsEngine \@tempswatrue \fi \if n\jsEngine \@tempswatrue \fi -\if@tempswa \expandafter\@firstoftwo -\else \expandafter\@secondoftwo -\fi -{% +\bxjs@cond\if@tempswa\fi{% \newif\ifjsSeireki \jsSeirekitrue \def\bxjs@decl@Seireki@cmds{% \def\西暦{\jsSeirekitrue}% - \def\和暦{\jsSeirekifalse}} + \def\和暦{\jsSeirekifalse\bxjs@wareki@used}} \def\Seireki{\jsSeirekitrue} -\def\Wareki{\jsSeirekifalse} -\def\bxjs@if@use@seireki{% - \ifjsSeireki \expandafter\@firstoftwo - \else \expandafter\@secondoftwo \fi} +\def\Wareki{\jsSeirekifalse\bxjs@wareki@used} +\def\bxjs@if@use@seireki{\bxjs@cond\ifjsSeireki\fi} +\def\bxjs@iai{\noexpand~} }{% \newif\if西暦 \西暦true \def\bxjs@decl@Seireki@cmds{% \def\西暦{\西暦true}% - \def\和暦{\西暦false}} + \def\和暦{\西暦false\bxjs@wareki@used}} \def\Seireki{\西暦true} -\def\Wareki{\西暦false} -\def\bxjs@if@use@seireki{% - \if西暦 \expandafter\@firstoftwo - \else \expandafter\@secondoftwo \fi} +\def\Wareki{\西暦false\bxjs@wareki@used} +\def\bxjs@if@use@seireki{\bxjs@cond\if西暦\fi} +\let\bxjs@iai\@empty } \bxjs@decl@Seireki@cmds \let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone -\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded - \def\bxjs@onxp{\unexpanded\expandafter}} -\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T - \def\bxjs@iai{\noexpand~} -\else \def\bxjs@iai{} -\fi +\bxjs@test@engine\unexpanded{% + \let\bxjs@unxp\unexpanded \def\bxjs@onxp{\unexpanded\expandafter}} \newif\ifbxjs@bxwareki@avail \IfFileExists{bxwareki.sty}{% \RequirePackage{bxwareki}[]% \bxjs@bxwareki@availtrue}{} +\ifbxjs@bxwareki@avail \let\bxjs@wareki@used\@empty +\else + \bxjs@robust@def\bxjs@wareki@used{% + \global\let\bxjs@wareki@used\@empty + \ClassWarning\bxjs@clsname + {Wareki mode is not supported, since\MessageBreak + 'bxwareki' is unavailable, found}} + \g@addto@macro\bxjs@begin@document@hook{% + \let\bxjs@wareki@used\@empty} +\fi \ifbxjs@bxwareki@avail \let\jayear\warekiyear \def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial \newcount\heisei \heisei=\value{warekiyear} \fi \else - \@tempcnta=\the\year\two@digits\month\two@digits\day\relax - \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501 - \newcount\heisei \heisei\year \advance\heisei-1988\relax - \fi\fi - \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne - \edef\jayear{\bxjs@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai} - \else \edef\jayear{\the\year \bxjs@iai} - \fi + \edef\jayear{\the\year \bxjs@iai} \fi \let\bxjs@next\relax -\ifbxjs@bxwareki@avail - \ifx\warekigengo\@empty\else - \def\bxjs@next{\bxjs@onxp{\warekitoday}} - \fi -\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne - \def\bxjs@next{% - \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}% - \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% - \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}} +\ifbxjs@bxwareki@avail \ifx\warekigengo\@empty\else + \def\bxjs@next{\bxjs@onxp{\warekitoday}} \fi\fi \edef\bxjs@today{% \if@english @@ -2367,7 +2338,7 @@ \fi} \let\today\bxjs@today \g@addto@macro\bxjs@begin@document@hook{% - \ifx\bbl@jpn@Seirekitrue\@undefined\else + \ifx\bbl@jpn@maybekansuji\@undefined\else \bxjs@decl@Seireki@cmds \g@addto@macro\datejapanese{% \let\today\bxjs@today}% -- cgit v1.2.3