summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-07-03 20:12:16 +0000
committerKarl Berry <karl@freefriends.org>2023-07-03 20:12:16 +0000
commitd3c5a4dd86e9d62ac12751e4c4f87de5a584c34f (patch)
tree0b6c067b41e6cbf187a80ae8c1622b3361d121c9 /Master/texmf-dist/tex/latex
parentb119c2e33f2d0d3170130a527390c39cfec0d2f2 (diff)
bxjscls (3jul23)
git-svn-id: svn://tug.org/texlive/trunk@67536 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls76
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls76
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty9
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def5
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def3
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls76
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls76
11 files changed, 162 insertions, 167 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 48e1736d573..f2f8f6a1f9f 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}
- [2023/06/20 v2.8a BXJS document classes]
+ [2023/07/01 v2.8b BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsarticle}
\newif\ifjsc@needsp@tch
@@ -471,8 +471,8 @@
\DeclareOption{nodvidriver}{%
\def\bxjs@driver@opt{nodvidriver}%
\let\bxjs@driver@given\bxjs@driver@@none}
-\DeclareOption{nodvidriver*}{%
- \def\bxjs@driver@opt{nodvidriver*}%
+\DeclareOption{class-nodvidriver}{%
+ \def\bxjs@driver@opt{class-nodvidriver}%
\let\bxjs@driver@given\bxjs@driver@@none}
\DeclareOption{pdftex}{%
\def\bxjs@driver@opt{pdftex}%
@@ -528,19 +528,17 @@
\def\bxjs@declare@enum@option#1#2#3{%
\bxjs@csletcs{bxjs@#2}{bxjs@#2@@#3}%
\define@key{bxjs}{#1}{%
- \expandafter\ifx\csname bxjs@#2@@##1\endcsname\relax
+ \@ifundefined{bxjs@#2@@##1}{%
\bxjs@error@keyval{#1}{##1}%
- \else \bxjs@csletcs{bxjs@#2}{bxjs@#2@@##1}%
- \fi}}
+ }{\bxjs@csletcs{bxjs@#2}{bxjs@#2@@##1}}}}
\@onlypreamble\bxjs@declare@bool@option
\def\bxjs@declare@bool@option#1#2#3{%
\csname newif\expandafter\endcsname\csname ifbxjs@#2\endcsname
\@nameuse{bxjs@#2#3}%
\define@key{bxjs}{#1}[true]{%
- \expandafter\ifx\csname bxjs@#2##1\endcsname\relax
+ \@ifundefined{bxjs@#2##1}{%
\bxjs@error@keyval{#1}{##1}%
- \else \@nameuse{bxjs@#2##1}%
- \fi}}
+ }{\@nameuse{bxjs@#2##1}}}}
\def\bxjs@set@keyval#1#2#3{%
\bxjs@csletcs{bxjs@next}{bxjs@kv@#1@#2}%
\ifx\bxjs@next\relax
@@ -613,7 +611,7 @@
\let\bxjs@dvidriver@@dviout=\bxjs@driver@@dvimode
\let\bxjs@dvidriver@@xdvi=\bxjs@driver@@dvimode
\let\bxjs@dvidriver@@nodvidriver=\bxjs@driver@@none
-\bxjs@cslet{bxjs@dvidriver@@nodvidriver*}\bxjs@driver@@none
+\bxjs@cslet{bxjs@dvidriver@@class-nodvidriver}\bxjs@driver@@none
\define@key{bxjs}{dvi}{%
\bxjs@csletcs{bxjs@tmpa}{bxjs@dvidriver@@#1}%
\ifx\bxjs@tmpa\relax
@@ -681,11 +679,6 @@
\if@slide
\def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
\fi
-\if@landscape
- \setlength\@tempdima {\paperheight}
- \setlength\paperheight{\paperwidth}
- \setlength\paperwidth {\@tempdima}
-\fi
\def\bxjs@tmpdo{%
\def\bxjs@tmpa{\@gobble}%
\expandafter\bxjs@tmpdo@a\@classoptionslist,\@nil,%
@@ -858,12 +851,6 @@
\fi
\fi
\let\Cjascale\jsScale
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \@tempcnta="80 \loop \ifnum\@tempcnta<"100
- \catcode\@tempcnta\active
- \advance\@tempcnta\@ne
- \repeat
-\fi
\ifbxjs@disguise@js
\def\bxjs@js@clsname{jsarticle}
\@namedef{ver@\bxjs@js@clsname.cls}{2001/01/01 (bxjs)}
@@ -984,13 +971,20 @@
\ifbxjs@fix@at@cmd
\def\@{\bxjs@SE{}}
\fi
-\def\bxjs@tmpa{\def\set@fontsize##1##2##3}
+\@onlypreamble\bxjs@patch@set@fontsize
+\def\bxjs@patch@set@fontsize{%
+ \ifx\bxjs@prev@set@fontsize\set@fontsize\else
+ \def\bxjs@tmpa{\def\set@fontsize####1####2####3}%
\expandafter\bxjs@tmpa\expandafter{%
- \set@fontsize{#1}{#2}{#3}%
+ \set@fontsize{##1}{##2}{##3}%
\expandafter\def\expandafter\size@update\expandafter{%
\size@update
\jsFontSizeChanged}%
}
+ \let\bxjs@prev@set@fontsize\set@fontsize
+ \fi}
+\bxjs@patch@set@fontsize
+\AtEndOfPackage{\bxjs@patch@set@fontsize}
\newcommand*\jsFontSizeChanged{%
\jsZw=\f@size\p@
\jsZw=\jsScale \jsZw
@@ -1000,7 +994,7 @@
\fi
\fi\relax
\jsResetDimen}
-\newcommand*\jsResetDimen{}
+\providecommand*\jsResetDimen{}
\ifjsc@mag
\let\jsc@setfontsize\@setfontsize
\else
@@ -1522,10 +1516,7 @@
}
\fi
\def\bxjs@label@sect#1{%
- \expandafter\ifx\csname label#1\endcsname\relax
- \csname the#1\endcsname
- \else \csname label#1\endcsname
- \fi}
+ \@ifundefined{label#1}{\@nameuse{the#1}}{\@nameuse{label#1}}}
\def\@seccntformat#1{\bxjs@label@sect{#1}\quad}
\ifnum\bxjs@label@section=\bxjs@label@section@@compat\else
\def\@secapp{\presectionname}
@@ -2010,8 +2001,8 @@
\global\let\bxjs@warnoldfontcmd@final\@empty
\let\@tempa\@empty
\def\do##1{%
- \expandafter\ifx\csname bxjs@ofc/\string##1\endcsname\relax\else
- \edef\@tempa{\@tempa \space\string##1}\fi}
+ \@ifundefined{bxjs@ofc/\string##1}{}{%else
+ \edef\@tempa{\@tempa \space\string##1}}}%
\bxjs@oldfontcmd@list
\ifx\@tempa\@empty\else
\ClassWarningNoLine\bxjs@clsname
@@ -2412,13 +2403,12 @@
\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}}
\newif\ifbxjs@bxwareki@avail
\IfFileExists{bxwareki.sty}{%
- \RequirePackage{bxwareki}[]%
- \bxjs@bxwareki@availtrue}{}
+ \if \if n\jsEngine \ifjsWitheTeX T\else F\fi\else T\fi T%
+ \RequirePackage{bxwareki}[2018/04/08]%v0.2
+ \bxjs@bxwareki@availtrue
+ \fi}{}
\ifbxjs@bxwareki@avail \let\bxjs@wareki@used\@empty
\else
\bxjs@robust@def\bxjs@wareki@used{%
@@ -2437,11 +2427,16 @@
\else
\edef\jayear{\the\year \bxjs@iai}
\fi
+\begingroup
\let\bxjs@next\relax
\ifbxjs@bxwareki@avail \ifx\warekigengo\@empty\else
- \def\bxjs@next{\bxjs@onxp{\warekitoday}}
+ \def\bxjs@next{\warekitoday}
+ \bxjs@test@engine\unexpanded{%
+ \def\bxjs@next{\unexpanded\expandafter{\warekitoday}}}
\fi\fi
-\edef\bxjs@today{%
+\def\!#1#2#3{\noexpand#1\noexpand#2\noexpand#3}
+\ifx\bxjs@iai\@empty \let\!\@empty \fi
+\xdef\bxjs@today{%
\if@english
\ifcase\month\or
January\or February\or March\or April\or May\or June\or
@@ -2451,11 +2446,12 @@
\ifx\bxjs@next\relax \expandafter\@firstoftwo
\else \noexpand\bxjs@if@use@seireki
\fi {%
- \number\year\bxjs@iai\bxjs@unxp{年}%
- \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}%
- \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}%
+ \number\year\bxjs@iai\!年%
+ \bxjs@iai\number\month\bxjs@iai\!月%
+ \bxjs@iai\number\day\bxjs@iai\!日%
}{\bxjs@next}%
\fi}
+\endgroup
\let\today\bxjs@today
\g@addto@macro\bxjs@begin@document@hook{%
\ifx\bbl@jpn@maybekansuji\@undefined\else
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index 9d7140f3951..63cd3297bf7 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}
- [2023/06/20 v2.8a BXJS document classes]
+ [2023/07/01 v2.8b BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsbook}
\newif\ifjsc@needsp@tch
@@ -477,8 +477,8 @@
\DeclareOption{nodvidriver}{%
\def\bxjs@driver@opt{nodvidriver}%
\let\bxjs@driver@given\bxjs@driver@@none}
-\DeclareOption{nodvidriver*}{%
- \def\bxjs@driver@opt{nodvidriver*}%
+\DeclareOption{class-nodvidriver}{%
+ \def\bxjs@driver@opt{class-nodvidriver}%
\let\bxjs@driver@given\bxjs@driver@@none}
\DeclareOption{pdftex}{%
\def\bxjs@driver@opt{pdftex}%
@@ -534,19 +534,17 @@
\def\bxjs@declare@enum@option#1#2#3{%
\bxjs@csletcs{bxjs@#2}{bxjs@#2@@#3}%
\define@key{bxjs}{#1}{%
- \expandafter\ifx\csname bxjs@#2@@##1\endcsname\relax
+ \@ifundefined{bxjs@#2@@##1}{%
\bxjs@error@keyval{#1}{##1}%
- \else \bxjs@csletcs{bxjs@#2}{bxjs@#2@@##1}%
- \fi}}
+ }{\bxjs@csletcs{bxjs@#2}{bxjs@#2@@##1}}}}
\@onlypreamble\bxjs@declare@bool@option
\def\bxjs@declare@bool@option#1#2#3{%
\csname newif\expandafter\endcsname\csname ifbxjs@#2\endcsname
\@nameuse{bxjs@#2#3}%
\define@key{bxjs}{#1}[true]{%
- \expandafter\ifx\csname bxjs@#2##1\endcsname\relax
+ \@ifundefined{bxjs@#2##1}{%
\bxjs@error@keyval{#1}{##1}%
- \else \@nameuse{bxjs@#2##1}%
- \fi}}
+ }{\@nameuse{bxjs@#2##1}}}}
\def\bxjs@set@keyval#1#2#3{%
\bxjs@csletcs{bxjs@next}{bxjs@kv@#1@#2}%
\ifx\bxjs@next\relax
@@ -619,7 +617,7 @@
\let\bxjs@dvidriver@@dviout=\bxjs@driver@@dvimode
\let\bxjs@dvidriver@@xdvi=\bxjs@driver@@dvimode
\let\bxjs@dvidriver@@nodvidriver=\bxjs@driver@@none
-\bxjs@cslet{bxjs@dvidriver@@nodvidriver*}\bxjs@driver@@none
+\bxjs@cslet{bxjs@dvidriver@@class-nodvidriver}\bxjs@driver@@none
\define@key{bxjs}{dvi}{%
\bxjs@csletcs{bxjs@tmpa}{bxjs@dvidriver@@#1}%
\ifx\bxjs@tmpa\relax
@@ -690,11 +688,6 @@
\if@slide
\def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
\fi
-\if@landscape
- \setlength\@tempdima {\paperheight}
- \setlength\paperheight{\paperwidth}
- \setlength\paperwidth {\@tempdima}
-\fi
\def\bxjs@tmpdo{%
\def\bxjs@tmpa{\@gobble}%
\expandafter\bxjs@tmpdo@a\@classoptionslist,\@nil,%
@@ -867,12 +860,6 @@
\fi
\fi
\let\Cjascale\jsScale
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \@tempcnta="80 \loop \ifnum\@tempcnta<"100
- \catcode\@tempcnta\active
- \advance\@tempcnta\@ne
- \repeat
-\fi
\ifbxjs@disguise@js
\def\bxjs@js@clsname{jsbook}
\@namedef{ver@\bxjs@js@clsname.cls}{2001/01/01 (bxjs)}
@@ -993,13 +980,20 @@
\ifbxjs@fix@at@cmd
\def\@{\bxjs@SE{}}
\fi
-\def\bxjs@tmpa{\def\set@fontsize##1##2##3}
+\@onlypreamble\bxjs@patch@set@fontsize
+\def\bxjs@patch@set@fontsize{%
+ \ifx\bxjs@prev@set@fontsize\set@fontsize\else
+ \def\bxjs@tmpa{\def\set@fontsize####1####2####3}%
\expandafter\bxjs@tmpa\expandafter{%
- \set@fontsize{#1}{#2}{#3}%
+ \set@fontsize{##1}{##2}{##3}%
\expandafter\def\expandafter\size@update\expandafter{%
\size@update
\jsFontSizeChanged}%
}
+ \let\bxjs@prev@set@fontsize\set@fontsize
+ \fi}
+\bxjs@patch@set@fontsize
+\AtEndOfPackage{\bxjs@patch@set@fontsize}
\newcommand*\jsFontSizeChanged{%
\jsZw=\f@size\p@
\jsZw=\jsScale \jsZw
@@ -1009,7 +1003,7 @@
\fi
\fi\relax
\jsResetDimen}
-\newcommand*\jsResetDimen{}
+\providecommand*\jsResetDimen{}
\ifjsc@mag
\let\jsc@setfontsize\@setfontsize
\else
@@ -1557,10 +1551,7 @@
}
\fi
\def\bxjs@label@sect#1{%
- \expandafter\ifx\csname label#1\endcsname\relax
- \csname the#1\endcsname
- \else \csname label#1\endcsname
- \fi}
+ \@ifundefined{label#1}{\@nameuse{the#1}}{\@nameuse{label#1}}}
\def\@seccntformat#1{\bxjs@label@sect{#1}\quad}
\ifnum\bxjs@label@section=\bxjs@label@section@@compat\else
\def\@secapp{\presectionname}
@@ -2094,8 +2085,8 @@
\global\let\bxjs@warnoldfontcmd@final\@empty
\let\@tempa\@empty
\def\do##1{%
- \expandafter\ifx\csname bxjs@ofc/\string##1\endcsname\relax\else
- \edef\@tempa{\@tempa \space\string##1}\fi}
+ \@ifundefined{bxjs@ofc/\string##1}{}{%else
+ \edef\@tempa{\@tempa \space\string##1}}}%
\bxjs@oldfontcmd@list
\ifx\@tempa\@empty\else
\ClassWarningNoLine\bxjs@clsname
@@ -2518,13 +2509,12 @@
\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}}
\newif\ifbxjs@bxwareki@avail
\IfFileExists{bxwareki.sty}{%
- \RequirePackage{bxwareki}[]%
- \bxjs@bxwareki@availtrue}{}
+ \if \if n\jsEngine \ifjsWitheTeX T\else F\fi\else T\fi T%
+ \RequirePackage{bxwareki}[2018/04/08]%v0.2
+ \bxjs@bxwareki@availtrue
+ \fi}{}
\ifbxjs@bxwareki@avail \let\bxjs@wareki@used\@empty
\else
\bxjs@robust@def\bxjs@wareki@used{%
@@ -2543,11 +2533,16 @@
\else
\edef\jayear{\the\year \bxjs@iai}
\fi
+\begingroup
\let\bxjs@next\relax
\ifbxjs@bxwareki@avail \ifx\warekigengo\@empty\else
- \def\bxjs@next{\bxjs@onxp{\warekitoday}}
+ \def\bxjs@next{\warekitoday}
+ \bxjs@test@engine\unexpanded{%
+ \def\bxjs@next{\unexpanded\expandafter{\warekitoday}}}
\fi\fi
-\edef\bxjs@today{%
+\def\!#1#2#3{\noexpand#1\noexpand#2\noexpand#3}
+\ifx\bxjs@iai\@empty \let\!\@empty \fi
+\xdef\bxjs@today{%
\if@english
\ifcase\month\or
January\or February\or March\or April\or May\or June\or
@@ -2557,11 +2552,12 @@
\ifx\bxjs@next\relax \expandafter\@firstoftwo
\else \noexpand\bxjs@if@use@seireki
\fi {%
- \number\year\bxjs@iai\bxjs@unxp{年}%
- \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}%
- \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}%
+ \number\year\bxjs@iai\!年%
+ \bxjs@iai\number\month\bxjs@iai\!月%
+ \bxjs@iai\number\day\bxjs@iai\!日%
}{\bxjs@next}%
\fi}
+\endgroup
\let\today\bxjs@today
\g@addto@macro\bxjs@begin@document@hook{%
\ifx\bbl@jpn@maybekansuji\@undefined\else
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index 1675b628718..e3a079af9ee 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bxjscjkcat}
- [2023/06/20 v2.8a BXJS document classes]
+ [2023/07/01 v2.8b 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 9779a6012d2..6b15e3cd6eb 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
@@ -22,13 +22,14 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bxjscompat}
- [2023/06/20 v2.8a BXJS document classes]
+ [2023/07/01 v2.8b BXJS document classes]
\def\bxac@pkgname{bxjscompat}
\let\bxac@engine=n
\def\bxac@do#1#2{%
\edef\bxac@tmpa{\string#1}%
\edef\bxac@tmpb{\meaning#1}%
\ifx\bxac@tmpa\bxac@tmpb #2\fi}
+\bxac@do\kanjiskip{\let\bxac@engine=j}
\bxac@do\XeTeXversion{\let\bxac@engine=x}
\bxac@do\luatexversion{\let\bxac@engine=l}
\ifx\jsAtEndOfClass\@undefined
@@ -38,6 +39,12 @@
\newif\ifbxac@in@old@behavior
\let\ImposeOldLuaTeXBehavior\relax
\let\RevokeOldLuaTeXBehavior\relax
+\ifx n\bxac@engine
+\@tempcnta="80 \loop \ifnum\@tempcnta<"100
+ \catcode\@tempcnta\active
+ \advance\@tempcnta\@ne
+\repeat
+\fi
\ifx x\bxac@engine
\ifx\XeTeXcharclass\@undefined\else
\bxac@delayed@if@bxjs{%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
index 258bb98f958..897ce2bc4ab 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}
- [2023/06/20 v2.8a BXJS document classes]
+ [2023/07/01 v2.8b 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 c6c3a17ec3b..454579014d1 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}
- [2023/06/20 v2.8a BXJS document classes]
+ [2023/07/01 v2.8b 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 bd60cab6484..c56abb4f262 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
@@ -21,7 +21,10 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-pandoc.def}
- [2023/06/20 v2.8a BXJS document classes]
+ [2023/07/01 v2.8b BXJS document classes]
+\if x\jsEngine
+ \PassOptionsToPackage{nospace}{xeCJK}
+\fi
\input{bxjsja-standard.def}
\RequirePackage{bxjspandoc}
\ifjsWitheTeX\else
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index e2c69c1f767..617431aaebc 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}
- [2023/06/20 v2.8a BXJS document classes]
+ [2023/07/01 v2.8b BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs@simplejasetupfalse
@@ -610,6 +610,7 @@
\edef\bxjs@next{%
\noexpand\RequirePackage[scale=\jsScale]{luatexja-fontspec}[2015/08/26]%
}\bxjs@next
+\bxjs@patch@set@fontsize
\DeclareFontShape{JY3}{mc}{m}{it}{<->ssub*mc/m/n}{}
\DeclareFontShape{JY3}{mc}{m}{sl}{<->ssub*mc/m/n}{}
\DeclareFontShape{JY3}{mc}{m}{sc}{<->ssub*mc/m/n}{}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
index b860ea83e46..a9bbd678833 100644
--- a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
+++ b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bxjspandoc}
- [2023/06/20 v2.8a BXJS document classes]
+ [2023/07/01 v2.8b 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 c695c6efcb6..2ad9cb9fae8 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}
- [2023/06/20 v2.8a BXJS document classes]
+ [2023/07/01 v2.8b BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsreport}
\newif\ifjsc@needsp@tch
@@ -477,8 +477,8 @@
\DeclareOption{nodvidriver}{%
\def\bxjs@driver@opt{nodvidriver}%
\let\bxjs@driver@given\bxjs@driver@@none}
-\DeclareOption{nodvidriver*}{%
- \def\bxjs@driver@opt{nodvidriver*}%
+\DeclareOption{class-nodvidriver}{%
+ \def\bxjs@driver@opt{class-nodvidriver}%
\let\bxjs@driver@given\bxjs@driver@@none}
\DeclareOption{pdftex}{%
\def\bxjs@driver@opt{pdftex}%
@@ -534,19 +534,17 @@
\def\bxjs@declare@enum@option#1#2#3{%
\bxjs@csletcs{bxjs@#2}{bxjs@#2@@#3}%
\define@key{bxjs}{#1}{%
- \expandafter\ifx\csname bxjs@#2@@##1\endcsname\relax
+ \@ifundefined{bxjs@#2@@##1}{%
\bxjs@error@keyval{#1}{##1}%
- \else \bxjs@csletcs{bxjs@#2}{bxjs@#2@@##1}%
- \fi}}
+ }{\bxjs@csletcs{bxjs@#2}{bxjs@#2@@##1}}}}
\@onlypreamble\bxjs@declare@bool@option
\def\bxjs@declare@bool@option#1#2#3{%
\csname newif\expandafter\endcsname\csname ifbxjs@#2\endcsname
\@nameuse{bxjs@#2#3}%
\define@key{bxjs}{#1}[true]{%
- \expandafter\ifx\csname bxjs@#2##1\endcsname\relax
+ \@ifundefined{bxjs@#2##1}{%
\bxjs@error@keyval{#1}{##1}%
- \else \@nameuse{bxjs@#2##1}%
- \fi}}
+ }{\@nameuse{bxjs@#2##1}}}}
\def\bxjs@set@keyval#1#2#3{%
\bxjs@csletcs{bxjs@next}{bxjs@kv@#1@#2}%
\ifx\bxjs@next\relax
@@ -619,7 +617,7 @@
\let\bxjs@dvidriver@@dviout=\bxjs@driver@@dvimode
\let\bxjs@dvidriver@@xdvi=\bxjs@driver@@dvimode
\let\bxjs@dvidriver@@nodvidriver=\bxjs@driver@@none
-\bxjs@cslet{bxjs@dvidriver@@nodvidriver*}\bxjs@driver@@none
+\bxjs@cslet{bxjs@dvidriver@@class-nodvidriver}\bxjs@driver@@none
\define@key{bxjs}{dvi}{%
\bxjs@csletcs{bxjs@tmpa}{bxjs@dvidriver@@#1}%
\ifx\bxjs@tmpa\relax
@@ -689,11 +687,6 @@
\if@slide
\def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
\fi
-\if@landscape
- \setlength\@tempdima {\paperheight}
- \setlength\paperheight{\paperwidth}
- \setlength\paperwidth {\@tempdima}
-\fi
\def\bxjs@tmpdo{%
\def\bxjs@tmpa{\@gobble}%
\expandafter\bxjs@tmpdo@a\@classoptionslist,\@nil,%
@@ -866,12 +859,6 @@
\fi
\fi
\let\Cjascale\jsScale
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \@tempcnta="80 \loop \ifnum\@tempcnta<"100
- \catcode\@tempcnta\active
- \advance\@tempcnta\@ne
- \repeat
-\fi
\ifbxjs@disguise@js
\def\bxjs@js@clsname{jsbook}
\@namedef{ver@\bxjs@js@clsname.cls}{2001/01/01 (bxjs)}
@@ -992,13 +979,20 @@
\ifbxjs@fix@at@cmd
\def\@{\bxjs@SE{}}
\fi
-\def\bxjs@tmpa{\def\set@fontsize##1##2##3}
+\@onlypreamble\bxjs@patch@set@fontsize
+\def\bxjs@patch@set@fontsize{%
+ \ifx\bxjs@prev@set@fontsize\set@fontsize\else
+ \def\bxjs@tmpa{\def\set@fontsize####1####2####3}%
\expandafter\bxjs@tmpa\expandafter{%
- \set@fontsize{#1}{#2}{#3}%
+ \set@fontsize{##1}{##2}{##3}%
\expandafter\def\expandafter\size@update\expandafter{%
\size@update
\jsFontSizeChanged}%
}
+ \let\bxjs@prev@set@fontsize\set@fontsize
+ \fi}
+\bxjs@patch@set@fontsize
+\AtEndOfPackage{\bxjs@patch@set@fontsize}
\newcommand*\jsFontSizeChanged{%
\jsZw=\f@size\p@
\jsZw=\jsScale \jsZw
@@ -1008,7 +1002,7 @@
\fi
\fi\relax
\jsResetDimen}
-\newcommand*\jsResetDimen{}
+\providecommand*\jsResetDimen{}
\ifjsc@mag
\let\jsc@setfontsize\@setfontsize
\else
@@ -1531,10 +1525,7 @@
}
\fi
\def\bxjs@label@sect#1{%
- \expandafter\ifx\csname label#1\endcsname\relax
- \csname the#1\endcsname
- \else \csname label#1\endcsname
- \fi}
+ \@ifundefined{label#1}{\@nameuse{the#1}}{\@nameuse{label#1}}}
\def\@seccntformat#1{\bxjs@label@sect{#1}\quad}
\ifnum\bxjs@label@section=\bxjs@label@section@@compat\else
\def\@secapp{\presectionname}
@@ -2116,8 +2107,8 @@
\global\let\bxjs@warnoldfontcmd@final\@empty
\let\@tempa\@empty
\def\do##1{%
- \expandafter\ifx\csname bxjs@ofc/\string##1\endcsname\relax\else
- \edef\@tempa{\@tempa \space\string##1}\fi}
+ \@ifundefined{bxjs@ofc/\string##1}{}{%else
+ \edef\@tempa{\@tempa \space\string##1}}}%
\bxjs@oldfontcmd@list
\ifx\@tempa\@empty\else
\ClassWarningNoLine\bxjs@clsname
@@ -2541,13 +2532,12 @@
\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}}
\newif\ifbxjs@bxwareki@avail
\IfFileExists{bxwareki.sty}{%
- \RequirePackage{bxwareki}[]%
- \bxjs@bxwareki@availtrue}{}
+ \if \if n\jsEngine \ifjsWitheTeX T\else F\fi\else T\fi T%
+ \RequirePackage{bxwareki}[2018/04/08]%v0.2
+ \bxjs@bxwareki@availtrue
+ \fi}{}
\ifbxjs@bxwareki@avail \let\bxjs@wareki@used\@empty
\else
\bxjs@robust@def\bxjs@wareki@used{%
@@ -2566,11 +2556,16 @@
\else
\edef\jayear{\the\year \bxjs@iai}
\fi
+\begingroup
\let\bxjs@next\relax
\ifbxjs@bxwareki@avail \ifx\warekigengo\@empty\else
- \def\bxjs@next{\bxjs@onxp{\warekitoday}}
+ \def\bxjs@next{\warekitoday}
+ \bxjs@test@engine\unexpanded{%
+ \def\bxjs@next{\unexpanded\expandafter{\warekitoday}}}
\fi\fi
-\edef\bxjs@today{%
+\def\!#1#2#3{\noexpand#1\noexpand#2\noexpand#3}
+\ifx\bxjs@iai\@empty \let\!\@empty \fi
+\xdef\bxjs@today{%
\if@english
\ifcase\month\or
January\or February\or March\or April\or May\or June\or
@@ -2580,11 +2575,12 @@
\ifx\bxjs@next\relax \expandafter\@firstoftwo
\else \noexpand\bxjs@if@use@seireki
\fi {%
- \number\year\bxjs@iai\bxjs@unxp{年}%
- \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}%
- \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}%
+ \number\year\bxjs@iai\!年%
+ \bxjs@iai\number\month\bxjs@iai\!月%
+ \bxjs@iai\number\day\bxjs@iai\!日%
}{\bxjs@next}%
\fi}
+\endgroup
\let\today\bxjs@today
\g@addto@macro\bxjs@begin@document@hook{%
\ifx\bbl@jpn@maybekansuji\@undefined\else
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index 42f9f45a4ee..2bb123b9859 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}
- [2023/06/20 v2.8a BXJS document classes]
+ [2023/07/01 v2.8b BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsslide}
\newif\ifjsc@needsp@tch
@@ -471,8 +471,8 @@
\DeclareOption{nodvidriver}{%
\def\bxjs@driver@opt{nodvidriver}%
\let\bxjs@driver@given\bxjs@driver@@none}
-\DeclareOption{nodvidriver*}{%
- \def\bxjs@driver@opt{nodvidriver*}%
+\DeclareOption{class-nodvidriver}{%
+ \def\bxjs@driver@opt{class-nodvidriver}%
\let\bxjs@driver@given\bxjs@driver@@none}
\DeclareOption{pdftex}{%
\def\bxjs@driver@opt{pdftex}%
@@ -528,19 +528,17 @@
\def\bxjs@declare@enum@option#1#2#3{%
\bxjs@csletcs{bxjs@#2}{bxjs@#2@@#3}%
\define@key{bxjs}{#1}{%
- \expandafter\ifx\csname bxjs@#2@@##1\endcsname\relax
+ \@ifundefined{bxjs@#2@@##1}{%
\bxjs@error@keyval{#1}{##1}%
- \else \bxjs@csletcs{bxjs@#2}{bxjs@#2@@##1}%
- \fi}}
+ }{\bxjs@csletcs{bxjs@#2}{bxjs@#2@@##1}}}}
\@onlypreamble\bxjs@declare@bool@option
\def\bxjs@declare@bool@option#1#2#3{%
\csname newif\expandafter\endcsname\csname ifbxjs@#2\endcsname
\@nameuse{bxjs@#2#3}%
\define@key{bxjs}{#1}[true]{%
- \expandafter\ifx\csname bxjs@#2##1\endcsname\relax
+ \@ifundefined{bxjs@#2##1}{%
\bxjs@error@keyval{#1}{##1}%
- \else \@nameuse{bxjs@#2##1}%
- \fi}}
+ }{\@nameuse{bxjs@#2##1}}}}
\def\bxjs@set@keyval#1#2#3{%
\bxjs@csletcs{bxjs@next}{bxjs@kv@#1@#2}%
\ifx\bxjs@next\relax
@@ -613,7 +611,7 @@
\let\bxjs@dvidriver@@dviout=\bxjs@driver@@dvimode
\let\bxjs@dvidriver@@xdvi=\bxjs@driver@@dvimode
\let\bxjs@dvidriver@@nodvidriver=\bxjs@driver@@none
-\bxjs@cslet{bxjs@dvidriver@@nodvidriver*}\bxjs@driver@@none
+\bxjs@cslet{bxjs@dvidriver@@class-nodvidriver}\bxjs@driver@@none
\define@key{bxjs}{dvi}{%
\bxjs@csletcs{bxjs@tmpa}{bxjs@dvidriver@@#1}%
\ifx\bxjs@tmpa\relax
@@ -681,11 +679,6 @@
\if@slide
\def\maybeblue{\@ifundefined{ver@color.sty}{}{\color{blue}}}
\fi
-\if@landscape
- \setlength\@tempdima {\paperheight}
- \setlength\paperheight{\paperwidth}
- \setlength\paperwidth {\@tempdima}
-\fi
\def\bxjs@tmpdo{%
\def\bxjs@tmpa{\@gobble}%
\expandafter\bxjs@tmpdo@a\@classoptionslist,\@nil,%
@@ -858,12 +851,6 @@
\fi
\fi
\let\Cjascale\jsScale
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \@tempcnta="80 \loop \ifnum\@tempcnta<"100
- \catcode\@tempcnta\active
- \advance\@tempcnta\@ne
- \repeat
-\fi
\ifbxjs@disguise@js
\def\bxjs@js@clsname{jsarticle}
\@namedef{ver@\bxjs@js@clsname.cls}{2001/01/01 (bxjs)}
@@ -983,13 +970,20 @@
\ifbxjs@fix@at@cmd
\def\@{\bxjs@SE{}}
\fi
-\def\bxjs@tmpa{\def\set@fontsize##1##2##3}
+\@onlypreamble\bxjs@patch@set@fontsize
+\def\bxjs@patch@set@fontsize{%
+ \ifx\bxjs@prev@set@fontsize\set@fontsize\else
+ \def\bxjs@tmpa{\def\set@fontsize####1####2####3}%
\expandafter\bxjs@tmpa\expandafter{%
- \set@fontsize{#1}{#2}{#3}%
+ \set@fontsize{##1}{##2}{##3}%
\expandafter\def\expandafter\size@update\expandafter{%
\size@update
\jsFontSizeChanged}%
}
+ \let\bxjs@prev@set@fontsize\set@fontsize
+ \fi}
+\bxjs@patch@set@fontsize
+\AtEndOfPackage{\bxjs@patch@set@fontsize}
\newcommand*\jsFontSizeChanged{%
\jsZw=\f@size\p@
\jsZw=\jsScale \jsZw
@@ -999,7 +993,7 @@
\fi
\fi\relax
\jsResetDimen}
-\newcommand*\jsResetDimen{}
+\providecommand*\jsResetDimen{}
\ifjsc@mag
\let\jsc@setfontsize\@setfontsize
\else
@@ -1520,10 +1514,7 @@
}
\fi
\def\bxjs@label@sect#1{%
- \expandafter\ifx\csname label#1\endcsname\relax
- \csname the#1\endcsname
- \else \csname label#1\endcsname
- \fi}
+ \@ifundefined{label#1}{\@nameuse{the#1}}{\@nameuse{label#1}}}
\def\@seccntformat#1{\bxjs@label@sect{#1}\quad}
\ifnum\bxjs@label@section=\bxjs@label@section@@compat\else
\def\@secapp{\presectionname}
@@ -2008,8 +1999,8 @@
\global\let\bxjs@warnoldfontcmd@final\@empty
\let\@tempa\@empty
\def\do##1{%
- \expandafter\ifx\csname bxjs@ofc/\string##1\endcsname\relax\else
- \edef\@tempa{\@tempa \space\string##1}\fi}
+ \@ifundefined{bxjs@ofc/\string##1}{}{%else
+ \edef\@tempa{\@tempa \space\string##1}}}%
\bxjs@oldfontcmd@list
\ifx\@tempa\@empty\else
\ClassWarningNoLine\bxjs@clsname
@@ -2410,13 +2401,12 @@
\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}}
\newif\ifbxjs@bxwareki@avail
\IfFileExists{bxwareki.sty}{%
- \RequirePackage{bxwareki}[]%
- \bxjs@bxwareki@availtrue}{}
+ \if \if n\jsEngine \ifjsWitheTeX T\else F\fi\else T\fi T%
+ \RequirePackage{bxwareki}[2018/04/08]%v0.2
+ \bxjs@bxwareki@availtrue
+ \fi}{}
\ifbxjs@bxwareki@avail \let\bxjs@wareki@used\@empty
\else
\bxjs@robust@def\bxjs@wareki@used{%
@@ -2435,11 +2425,16 @@
\else
\edef\jayear{\the\year \bxjs@iai}
\fi
+\begingroup
\let\bxjs@next\relax
\ifbxjs@bxwareki@avail \ifx\warekigengo\@empty\else
- \def\bxjs@next{\bxjs@onxp{\warekitoday}}
+ \def\bxjs@next{\warekitoday}
+ \bxjs@test@engine\unexpanded{%
+ \def\bxjs@next{\unexpanded\expandafter{\warekitoday}}}
\fi\fi
-\edef\bxjs@today{%
+\def\!#1#2#3{\noexpand#1\noexpand#2\noexpand#3}
+\ifx\bxjs@iai\@empty \let\!\@empty \fi
+\xdef\bxjs@today{%
\if@english
\ifcase\month\or
January\or February\or March\or April\or May\or June\or
@@ -2449,11 +2444,12 @@
\ifx\bxjs@next\relax \expandafter\@firstoftwo
\else \noexpand\bxjs@if@use@seireki
\fi {%
- \number\year\bxjs@iai\bxjs@unxp{年}%
- \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}%
- \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}%
+ \number\year\bxjs@iai\!年%
+ \bxjs@iai\number\month\bxjs@iai\!月%
+ \bxjs@iai\number\day\bxjs@iai\!日%
}{\bxjs@next}%
\fi}
+\endgroup
\let\today\bxjs@today
\g@addto@macro\bxjs@begin@document@hook{%
\ifx\bbl@jpn@maybekansuji\@undefined\else