summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/bxjscls
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-09-07 21:21:12 +0000
committerKarl Berry <karl@freefriends.org>2020-09-07 21:21:12 +0000
commit0f8db6b48459d4fbfa7497448127e65515a2e195 (patch)
tree41a65e78c2c5ea9438c8e834cab193a35e6b9703 /Master/texmf-dist/tex/latex/bxjscls
parent5c122b3fd45bd3b2708e3fc0927e84243d548709 (diff)
bxjscls (7sep20)
git-svn-id: svn://tug.org/texlive/trunk@56285 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/bxjscls')
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls46
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls46
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty2
-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.def63
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def38
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty2
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls46
-rw-r--r--Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls46
11 files changed, 189 insertions, 106 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
index 6c100b7a5ad..401014e722a 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/05/28 v2.1 BXJS document classes]
+ [2020/09/04 v2.2 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsarticle}
\newif\ifjsc@needsp@tch
@@ -185,20 +185,36 @@
\DeclareOption{a4paper}{\bxjs@setpaper{a4paper}}
\DeclareOption{a5paper}{\bxjs@setpaper{a5paper}}
\DeclareOption{a6paper}{\bxjs@setpaper{a6paper}}
-\DeclareOption{b4paper}{\bxjs@setpaper{{257truemm}{364truemm}}}
-\DeclareOption{b5paper}{\bxjs@setpaper{{182truemm}{257truemm}}}
-\DeclareOption{b6paper}{\bxjs@setpaper{{128truemm}{182truemm}}}
+\DeclareOption{b4paper}{\bxjs@setpaper{b4j}}
+\DeclareOption{b5paper}{\bxjs@setpaper{b5j}}
+\DeclareOption{b6paper}{\bxjs@setpaper{b6j}}
\DeclareOption{a4j}{\bxjs@setpaper{a4paper}}
\DeclareOption{a5j}{\bxjs@setpaper{a5paper}}
-\DeclareOption{b4j}{\bxjs@setpaper{{257truemm}{364truemm}}}
-\DeclareOption{b5j}{\bxjs@setpaper{{182truemm}{257truemm}}}
+\DeclareOption{b4j}{\bxjs@setpaper{b4j}}
+\DeclareOption{b5j}{\bxjs@setpaper{b5j}}
\DeclareOption{a4var}{\bxjs@setpaper{{210truemm}{283truemm}}}
\DeclareOption{b5var}{\bxjs@setpaper{{182truemm}{230truemm}}}
-\DeclareOption{a4varpaper}{\bxjs@setpaper{{210truemm}{283truemm}}}
-\DeclareOption{b5varpaper}{\bxjs@setpaper{{182truemm}{230truemm}}}
\DeclareOption{letterpaper}{\bxjs@setpaper{letterpaper}}
\DeclareOption{legalpaper}{\bxjs@setpaper{legalpaper}}
\DeclareOption{executivepaper}{\bxjs@setpaper{executivepaper}}
+\def\bxjs@tmpb#1#2{\DeclareOption{#1}{\bxjs@setpaper{#2}}}
+\@for\bxjs@tmpa:={%
+ a0,a1,a2,c0,c1,c2,c3,c4,c5,c6,ansia,ansib,ansic,ansid,ansie%
+}\do{\edef\bxjs@next{%
+ \noexpand\bxjs@tmpb{\bxjs@tmpa paper}{\bxjs@tmpa paper}%
+}\bxjs@next}
+\bxjs@tmpb{screen}{screen}
+\@for\bxjs@tmpa:={0,1,2,3}\do{\edef\bxjs@next{%
+ \noexpand\bxjs@tmpb{b\bxjs@tmpa paper}{b\bxjs@tmpa j}%
+}\bxjs@next}
+\@for\bxjs@tmpa:={0,1,2,3,4,5,6}\do{\edef\bxjs@next{%
+ \noexpand\bxjs@tmpb{A\bxjs@tmpa paper}{a\bxjs@tmpa paper}%
+ \noexpand\bxjs@tmpb{B\bxjs@tmpa paper}{b\bxjs@tmpa paper}%
+}\bxjs@next}
+\DeclareOption{a4varpaper}{\bxjs@setpaper{{210truemm}{283truemm}}}
+\DeclareOption{b5varpaper}{\bxjs@setpaper{{182truemm}{230truemm}}}
+\DeclareOption{screenpaper}{\bxjs@setpaper{screen}}
+\DeclareOption{custompaper}{}
\newif\if@landscape
\@landscapefalse
\DeclareOption{landscape}{\@landscapetrue}
@@ -626,10 +642,6 @@
\bxjs@declare@bool@option{simple-ja-setup}{simplejasetup}
\DeclareOption{nosimplejasetup}{\setkeys{bxjs}{simple-ja-setup=false}}
\DeclareOption{simplejasetup}{\setkeys{bxjs}{simple-ja-setup=true}}
-\newif\ifbxjs@strong@cmd \bxjs@strong@cmdtrue
-\let\bxjs@kv@strongcmd@true\bxjs@strong@cmdtrue
-\let\bxjs@kv@strongcmd@false\bxjs@strong@cmdfalse
-\define@key{bxjs}{strong-cmd}[true]{\bxjs@set@keyval{strongcmd}{#1}{}}
\let\bxjs@org@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
@@ -924,16 +936,6 @@
\ifbxjs@fix@at@cmd
\def\@{\bxjs@SE{}}
\fi
-\ifbxjs@strong@cmd\jsAtEndOfClass{%
- \ifx\strong\@undefined\ifx\strongenv\@undefined
- \DeclareRobustCommand{\strongenv}{\bxjs@strong@font}%
- \DeclareTextFontCommand{\strong}{\strongenv}%
- \@ifdefinable{\strongfontdeclare}{\bxjs@protected\def\strongfontdeclare#1{%
- \bxjs@strong@font@declare@a#1,\@nil}}%
- \def\bxjs@strong@font@declare@a#1,#2\@nil{\def\bxjs@strong@font{#1}}%
- \def\bxjs@strong@font{\bfseries}%
- \fi\fi
-}\fi
\def\bxjs@tmpa{\def\set@fontsize##1##2##3}
\expandafter\bxjs@tmpa\expandafter{%
\set@fontsize{#1}{#2}{#3}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
index f5c7db8a9b0..c75aef1d42e 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/05/28 v2.1 BXJS document classes]
+ [2020/09/04 v2.2 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsbook}
\newif\ifjsc@needsp@tch
@@ -188,20 +188,36 @@
\DeclareOption{a4paper}{\bxjs@setpaper{a4paper}}
\DeclareOption{a5paper}{\bxjs@setpaper{a5paper}}
\DeclareOption{a6paper}{\bxjs@setpaper{a6paper}}
-\DeclareOption{b4paper}{\bxjs@setpaper{{257truemm}{364truemm}}}
-\DeclareOption{b5paper}{\bxjs@setpaper{{182truemm}{257truemm}}}
-\DeclareOption{b6paper}{\bxjs@setpaper{{128truemm}{182truemm}}}
+\DeclareOption{b4paper}{\bxjs@setpaper{b4j}}
+\DeclareOption{b5paper}{\bxjs@setpaper{b5j}}
+\DeclareOption{b6paper}{\bxjs@setpaper{b6j}}
\DeclareOption{a4j}{\bxjs@setpaper{a4paper}}
\DeclareOption{a5j}{\bxjs@setpaper{a5paper}}
-\DeclareOption{b4j}{\bxjs@setpaper{{257truemm}{364truemm}}}
-\DeclareOption{b5j}{\bxjs@setpaper{{182truemm}{257truemm}}}
+\DeclareOption{b4j}{\bxjs@setpaper{b4j}}
+\DeclareOption{b5j}{\bxjs@setpaper{b5j}}
\DeclareOption{a4var}{\bxjs@setpaper{{210truemm}{283truemm}}}
\DeclareOption{b5var}{\bxjs@setpaper{{182truemm}{230truemm}}}
-\DeclareOption{a4varpaper}{\bxjs@setpaper{{210truemm}{283truemm}}}
-\DeclareOption{b5varpaper}{\bxjs@setpaper{{182truemm}{230truemm}}}
\DeclareOption{letterpaper}{\bxjs@setpaper{letterpaper}}
\DeclareOption{legalpaper}{\bxjs@setpaper{legalpaper}}
\DeclareOption{executivepaper}{\bxjs@setpaper{executivepaper}}
+\def\bxjs@tmpb#1#2{\DeclareOption{#1}{\bxjs@setpaper{#2}}}
+\@for\bxjs@tmpa:={%
+ a0,a1,a2,c0,c1,c2,c3,c4,c5,c6,ansia,ansib,ansic,ansid,ansie%
+}\do{\edef\bxjs@next{%
+ \noexpand\bxjs@tmpb{\bxjs@tmpa paper}{\bxjs@tmpa paper}%
+}\bxjs@next}
+\bxjs@tmpb{screen}{screen}
+\@for\bxjs@tmpa:={0,1,2,3}\do{\edef\bxjs@next{%
+ \noexpand\bxjs@tmpb{b\bxjs@tmpa paper}{b\bxjs@tmpa j}%
+}\bxjs@next}
+\@for\bxjs@tmpa:={0,1,2,3,4,5,6}\do{\edef\bxjs@next{%
+ \noexpand\bxjs@tmpb{A\bxjs@tmpa paper}{a\bxjs@tmpa paper}%
+ \noexpand\bxjs@tmpb{B\bxjs@tmpa paper}{b\bxjs@tmpa paper}%
+}\bxjs@next}
+\DeclareOption{a4varpaper}{\bxjs@setpaper{{210truemm}{283truemm}}}
+\DeclareOption{b5varpaper}{\bxjs@setpaper{{182truemm}{230truemm}}}
+\DeclareOption{screenpaper}{\bxjs@setpaper{screen}}
+\DeclareOption{custompaper}{}
\newif\if@landscape
\@landscapefalse
\DeclareOption{landscape}{\@landscapetrue}
@@ -635,10 +651,6 @@
\bxjs@declare@bool@option{simple-ja-setup}{simplejasetup}
\DeclareOption{nosimplejasetup}{\setkeys{bxjs}{simple-ja-setup=false}}
\DeclareOption{simplejasetup}{\setkeys{bxjs}{simple-ja-setup=true}}
-\newif\ifbxjs@strong@cmd \bxjs@strong@cmdtrue
-\let\bxjs@kv@strongcmd@true\bxjs@strong@cmdtrue
-\let\bxjs@kv@strongcmd@false\bxjs@strong@cmdfalse
-\define@key{bxjs}{strong-cmd}[true]{\bxjs@set@keyval{strongcmd}{#1}{}}
\let\bxjs@org@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
@@ -933,16 +945,6 @@
\ifbxjs@fix@at@cmd
\def\@{\bxjs@SE{}}
\fi
-\ifbxjs@strong@cmd\jsAtEndOfClass{%
- \ifx\strong\@undefined\ifx\strongenv\@undefined
- \DeclareRobustCommand{\strongenv}{\bxjs@strong@font}%
- \DeclareTextFontCommand{\strong}{\strongenv}%
- \@ifdefinable{\strongfontdeclare}{\bxjs@protected\def\strongfontdeclare#1{%
- \bxjs@strong@font@declare@a#1,\@nil}}%
- \def\bxjs@strong@font@declare@a#1,#2\@nil{\def\bxjs@strong@font{#1}}%
- \def\bxjs@strong@font{\bfseries}%
- \fi\fi
-}\fi
\def\bxjs@tmpa{\def\set@fontsize##1##2##3}
\expandafter\bxjs@tmpa\expandafter{%
\set@fontsize{#1}{#2}{#3}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
index bc4f3f04266..ac6f6abcfbe 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/05/28 v2.1 BXJS document classes]
+ [2020/09/04 v2.2 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 6ee46d89413..2377c2a5a7d 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/05/28 v2.1 BXJS document classes]
+ [2020/09/04 v2.2 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 5ab9ee8de2b..3b55fc1e439 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/05/28 v2.1 BXJS document classes]
+ [2020/09/04 v2.2 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 bda1098a7b2..73d7c35bac3 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/05/28 v2.1 BXJS document classes]
+ [2020/09/04 v2.2 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 ec3339effc2..924e9491282 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/05/28 v2.1 BXJS document classes]
+ [2020/09/04 v2.2 BXJS document classes]
\input{bxjsja-standard.def}
\RequirePackage{bxjspandoc}
\@onlypreamble\bxjs@endpreamble@hook
@@ -30,6 +30,24 @@
\RequirePackage{etoolbox}[2010/08/21]% v2.0
\AtEndPreamble{\bxjs@endpreamble@hook}
\fi
+\newif\ifbxjs@jp@fix@strong \bxjs@jp@fix@strongtrue
+\let\bxjs@kv@fixstrong@true\bxjs@jp@fix@strongtrue
+\let\bxjs@kv@fixstrong@false\bxjs@jp@fix@strongfalse
+\define@key{bxjsPan}{fix-strong}[true]{%
+ \bxjs@set@keyval{fixstrong}{#1}{}}
+\newif\ifbxjs@jp@fix@code \bxjs@jp@fix@codetrue
+\let\bxjs@kv@fixcode@true\bxjs@jp@fix@codetrue
+\let\bxjs@kv@fixcode@false\bxjs@jp@fix@codefalse
+\define@key{bxjsPan}{fix-code}[true]{%
+ \bxjs@set@keyval{fixcode}{#1}{}}
+\chardef\bxjs@jp@strong=0
+\def\bxjs@kv@strong@bold{\chardef\bxjs@jp@strong=0 }
+\def\bxjs@kv@strong@sans{\chardef\bxjs@jp@strong=1 }
+\def\bxjs@kv@strong@boldsans{\chardef\bxjs@jp@strong=2 }
+\define@key{bxjsPan}{strong}{%
+ \bxjs@set@keyval{strong}{#1}{}}
+\def\bxjs@next#1{\bxjs@safe@setkeys{bxjsPan}{#1}}
+\expandafter\bxjs@next\expandafter{\jsJaParam}
\@onlypreamble\bxjs@set@dupload@proc
\def\bxjs@set@dupload@proc#1{%
\expandafter\bxjs@set@dupload@proc@a\csname bxjs@dlp/#1\endcsname}
@@ -179,6 +197,49 @@
\else
\bxjs@fix@hyperref@unicode{true}
\fi
+\ifbxjs@jp@fix@strong\ifbxjs@jp@strong@cmd
+ \let\orgtextbf\textbf
+ \DeclareRobustCommand\bxjstextbf[1]{%
+ \begingroup
+ \let\textbf\orgtextbf
+ \strong{#1}%
+ \endgroup}%
+ \g@addto@macro\bxjs@begin@document@hook{%
+ \let\textbf\bxjstextbf}
+\fi\fi
+\jsAtEndOfClass{%
+ \ifx\strongfontdeclare\@undefined\else
+ \ifcase\bxjs@jp@strong
+ \or \strongfontdeclare{\sffamily}%
+ \or \strongfontdeclare{\sffamily\bfseries}%
+ \fi
+ \fi}
+\ifbxjs@jp@fix@code
+ \chardef\bxjs@eghost@c=23
+ \ifx j\jsEngine \xspcode\bxjs@eghost@c=3
+ \else\ifx l\jsEngine \ltjsetparameter{alxspmode={\bxjs@eghost@c,3}}
+ \else\ifx x\jsEngine %no-op
+ \else \let\bxjs@eghost@c\@undefined
+ \fi\fi\fi
+ \ifx\bxjs@eghost@c\@undefined\else
+ \font\bxjs@eghost@f=ec-lmr10 at 1.23456pt
+ \def\bxjs@pan@eghost{\bxjs@eghost@f\bxjs@eghost@c}
+ \let\orgtexttt\texttt
+ \DeclareRobustCommand\bxjstexttt[1]{%
+ \ifmmode \nfss@text{\ttfamily #1}%
+ \else
+ \ifvmode \leavevmode \fi
+ \bxjs@pan@eghost\null
+ \begingroup \ttfamily #1\endgroup
+ \null\bxjs@pan@eghost
+ \fi}
+ \g@addto@macro\bxjs@begin@document@hook{%
+ \let\texttt\bxjstexttt}
+ \expandafter\def\expandafter\verb\expandafter{%
+ \expandafter\bxjs@pan@eghost\verb}
+ \g@addto@macro\verb@egroup{\bxjs@pan@eghost}
+ \fi
+\fi
\endinput
%%
%% End of file `bxjsja-pandoc.def'.
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
index 5520becb21f..49f53cc5b9a 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/05/28 v2.1 BXJS document classes]
+ [2020/09/04 v2.2 BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs@simplejasetupfalse
@@ -38,6 +38,10 @@
\let\bxjs@jp@font\@empty
\define@key{bxjsStd}{font}{%
\edef\bxjs@jp@font{#1}}
+\newif\ifbxjs@jp@strong@cmd \bxjs@jp@strong@cmdtrue
+\let\bxjs@kv@strongcmd@true\bxjs@jp@strong@cmdtrue
+\let\bxjs@kv@strongcmd@false\bxjs@jp@strong@cmdfalse
+\define@key{bxjs}{strong-cmd}[true]{\bxjs@set@keyval{strongcmd}{#1}{}}
\def\bxjs@next#1{\bxjs@safe@setkeys{bxjsStd}{#1}}
\expandafter\bxjs@next\expandafter{\jsJaParam}
\ifbxjs@jp@jismmiv
@@ -76,6 +80,16 @@
\else
\def\bxjs@let@lenexpr{\edef}
\fi
+\ifbxjs@jp@strong@cmd\jsAtEndOfClass{%
+ \ifx\strong\@undefined\ifx\strongenv\@undefined
+ \DeclareRobustCommand{\strongenv}{\bxjs@strong@font}%
+ \DeclareTextFontCommand{\strong}{\strongenv}%
+ \@ifdefinable{\strongfontdeclare}{\bxjs@protected\def\strongfontdeclare#1{%
+ \bxjs@strong@font@declare@a#1,\@nil}}%
+ \def\bxjs@strong@font@declare@a#1,#2\@nil{\def\bxjs@strong@font{#1}}%
+ \def\bxjs@strong@font{\bfseries}%
+ \fi\fi
+}\fi
\ifjsWitheTeX
\@tempdima=0.25mm
\protected\edef\jQ{\dimexpr\the\@tempdima\relax}
@@ -218,6 +232,17 @@
\ifx$#1$\def\bxjs@tmpb{#2}%
\else \let\bxjs@tmpb\relax
\fi}
+\@onlypreamble\bxjs@resolve@jafont@paren
+\def\bxjs@resolve@jafont@paren#1{%
+ \def\bxjs@tmpb{\let#1}%
+ \expandafter\bxjs@resolve@jafont@paren@a#1\@nil()\@nil\relax}
+\@onlypreamble\bxjs@resolve@jafont@paren@a
+\def\bxjs@resolve@jafont@paren@a#1(#2)#3\@nil#4\relax{%
+ \ifx\relax#4\relax \bxjs@tmpb\jsJaFont
+ \else
+ \edef\bxjs@tmpa{#1\bxjs@jafont@paren{#2}#3}%
+ \bxjs@tmpb\bxjs@tmpa
+ \fi}
\newcommand*\jachar[1]{%
\begingroup
\jsLetHeadChar\bxjs@tmpa{#1}%
@@ -278,17 +303,6 @@
}{}%
}%
}
-\@onlypreamble\bxjs@resolve@jafont@paren
-\def\bxjs@resolve@jafont@paren#1{%
- \def\bxjs@tmpb{\let#1}%
- \expandafter\bxjs@resolve@jafont@paren@a#1\@nil()\@nil\relax}
-\@onlypreamble\bxjs@resolve@jafont@paren@a
-\def\bxjs@resolve@jafont@paren@a#1(#2)#3\@nil#4\relax{%
- \ifx\relax#4\relax \bxjs@tmpb\jsJaFont
- \else
- \edef\bxjs@tmpa{#1\bxjs@jafont@paren{#2}#3}%
- \bxjs@tmpb\bxjs@tmpa
- \fi}
\if j\jsEngine
\def\bxjs@apply@kanjiskip{%
\kanjiskip\@tempskipa}
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
index 95e9c8cf329..bb5fc45c0d3 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/05/28 v2.1 BXJS document classes]
+ [2020/09/04 v2.2 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 855a68ed8ed..e5ce35c9efb 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/05/28 v2.1 BXJS document classes]
+ [2020/09/04 v2.2 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsreport}
\newif\ifjsc@needsp@tch
@@ -188,20 +188,36 @@
\DeclareOption{a4paper}{\bxjs@setpaper{a4paper}}
\DeclareOption{a5paper}{\bxjs@setpaper{a5paper}}
\DeclareOption{a6paper}{\bxjs@setpaper{a6paper}}
-\DeclareOption{b4paper}{\bxjs@setpaper{{257truemm}{364truemm}}}
-\DeclareOption{b5paper}{\bxjs@setpaper{{182truemm}{257truemm}}}
-\DeclareOption{b6paper}{\bxjs@setpaper{{128truemm}{182truemm}}}
+\DeclareOption{b4paper}{\bxjs@setpaper{b4j}}
+\DeclareOption{b5paper}{\bxjs@setpaper{b5j}}
+\DeclareOption{b6paper}{\bxjs@setpaper{b6j}}
\DeclareOption{a4j}{\bxjs@setpaper{a4paper}}
\DeclareOption{a5j}{\bxjs@setpaper{a5paper}}
-\DeclareOption{b4j}{\bxjs@setpaper{{257truemm}{364truemm}}}
-\DeclareOption{b5j}{\bxjs@setpaper{{182truemm}{257truemm}}}
+\DeclareOption{b4j}{\bxjs@setpaper{b4j}}
+\DeclareOption{b5j}{\bxjs@setpaper{b5j}}
\DeclareOption{a4var}{\bxjs@setpaper{{210truemm}{283truemm}}}
\DeclareOption{b5var}{\bxjs@setpaper{{182truemm}{230truemm}}}
-\DeclareOption{a4varpaper}{\bxjs@setpaper{{210truemm}{283truemm}}}
-\DeclareOption{b5varpaper}{\bxjs@setpaper{{182truemm}{230truemm}}}
\DeclareOption{letterpaper}{\bxjs@setpaper{letterpaper}}
\DeclareOption{legalpaper}{\bxjs@setpaper{legalpaper}}
\DeclareOption{executivepaper}{\bxjs@setpaper{executivepaper}}
+\def\bxjs@tmpb#1#2{\DeclareOption{#1}{\bxjs@setpaper{#2}}}
+\@for\bxjs@tmpa:={%
+ a0,a1,a2,c0,c1,c2,c3,c4,c5,c6,ansia,ansib,ansic,ansid,ansie%
+}\do{\edef\bxjs@next{%
+ \noexpand\bxjs@tmpb{\bxjs@tmpa paper}{\bxjs@tmpa paper}%
+}\bxjs@next}
+\bxjs@tmpb{screen}{screen}
+\@for\bxjs@tmpa:={0,1,2,3}\do{\edef\bxjs@next{%
+ \noexpand\bxjs@tmpb{b\bxjs@tmpa paper}{b\bxjs@tmpa j}%
+}\bxjs@next}
+\@for\bxjs@tmpa:={0,1,2,3,4,5,6}\do{\edef\bxjs@next{%
+ \noexpand\bxjs@tmpb{A\bxjs@tmpa paper}{a\bxjs@tmpa paper}%
+ \noexpand\bxjs@tmpb{B\bxjs@tmpa paper}{b\bxjs@tmpa paper}%
+}\bxjs@next}
+\DeclareOption{a4varpaper}{\bxjs@setpaper{{210truemm}{283truemm}}}
+\DeclareOption{b5varpaper}{\bxjs@setpaper{{182truemm}{230truemm}}}
+\DeclareOption{screenpaper}{\bxjs@setpaper{screen}}
+\DeclareOption{custompaper}{}
\newif\if@landscape
\@landscapefalse
\DeclareOption{landscape}{\@landscapetrue}
@@ -634,10 +650,6 @@
\bxjs@declare@bool@option{simple-ja-setup}{simplejasetup}
\DeclareOption{nosimplejasetup}{\setkeys{bxjs}{simple-ja-setup=false}}
\DeclareOption{simplejasetup}{\setkeys{bxjs}{simple-ja-setup=true}}
-\newif\ifbxjs@strong@cmd \bxjs@strong@cmdtrue
-\let\bxjs@kv@strongcmd@true\bxjs@strong@cmdtrue
-\let\bxjs@kv@strongcmd@false\bxjs@strong@cmdfalse
-\define@key{bxjs}{strong-cmd}[true]{\bxjs@set@keyval{strongcmd}{#1}{}}
\let\bxjs@org@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
@@ -932,16 +944,6 @@
\ifbxjs@fix@at@cmd
\def\@{\bxjs@SE{}}
\fi
-\ifbxjs@strong@cmd\jsAtEndOfClass{%
- \ifx\strong\@undefined\ifx\strongenv\@undefined
- \DeclareRobustCommand{\strongenv}{\bxjs@strong@font}%
- \DeclareTextFontCommand{\strong}{\strongenv}%
- \@ifdefinable{\strongfontdeclare}{\bxjs@protected\def\strongfontdeclare#1{%
- \bxjs@strong@font@declare@a#1,\@nil}}%
- \def\bxjs@strong@font@declare@a#1,#2\@nil{\def\bxjs@strong@font{#1}}%
- \def\bxjs@strong@font{\bfseries}%
- \fi\fi
-}\fi
\def\bxjs@tmpa{\def\set@fontsize##1##2##3}
\expandafter\bxjs@tmpa\expandafter{%
\set@fontsize{#1}{#2}{#3}%
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
index cc7bddecedc..f6f24404651 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/05/28 v2.1 BXJS document classes]
+ [2020/09/04 v2.2 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsslide}
\newif\ifjsc@needsp@tch
@@ -185,20 +185,36 @@
\DeclareOption{a4paper}{\bxjs@setpaper{a4paper}}
\DeclareOption{a5paper}{\bxjs@setpaper{a5paper}}
\DeclareOption{a6paper}{\bxjs@setpaper{a6paper}}
-\DeclareOption{b4paper}{\bxjs@setpaper{{257truemm}{364truemm}}}
-\DeclareOption{b5paper}{\bxjs@setpaper{{182truemm}{257truemm}}}
-\DeclareOption{b6paper}{\bxjs@setpaper{{128truemm}{182truemm}}}
+\DeclareOption{b4paper}{\bxjs@setpaper{b4j}}
+\DeclareOption{b5paper}{\bxjs@setpaper{b5j}}
+\DeclareOption{b6paper}{\bxjs@setpaper{b6j}}
\DeclareOption{a4j}{\bxjs@setpaper{a4paper}}
\DeclareOption{a5j}{\bxjs@setpaper{a5paper}}
-\DeclareOption{b4j}{\bxjs@setpaper{{257truemm}{364truemm}}}
-\DeclareOption{b5j}{\bxjs@setpaper{{182truemm}{257truemm}}}
+\DeclareOption{b4j}{\bxjs@setpaper{b4j}}
+\DeclareOption{b5j}{\bxjs@setpaper{b5j}}
\DeclareOption{a4var}{\bxjs@setpaper{{210truemm}{283truemm}}}
\DeclareOption{b5var}{\bxjs@setpaper{{182truemm}{230truemm}}}
-\DeclareOption{a4varpaper}{\bxjs@setpaper{{210truemm}{283truemm}}}
-\DeclareOption{b5varpaper}{\bxjs@setpaper{{182truemm}{230truemm}}}
\DeclareOption{letterpaper}{\bxjs@setpaper{letterpaper}}
\DeclareOption{legalpaper}{\bxjs@setpaper{legalpaper}}
\DeclareOption{executivepaper}{\bxjs@setpaper{executivepaper}}
+\def\bxjs@tmpb#1#2{\DeclareOption{#1}{\bxjs@setpaper{#2}}}
+\@for\bxjs@tmpa:={%
+ a0,a1,a2,c0,c1,c2,c3,c4,c5,c6,ansia,ansib,ansic,ansid,ansie%
+}\do{\edef\bxjs@next{%
+ \noexpand\bxjs@tmpb{\bxjs@tmpa paper}{\bxjs@tmpa paper}%
+}\bxjs@next}
+\bxjs@tmpb{screen}{screen}
+\@for\bxjs@tmpa:={0,1,2,3}\do{\edef\bxjs@next{%
+ \noexpand\bxjs@tmpb{b\bxjs@tmpa paper}{b\bxjs@tmpa j}%
+}\bxjs@next}
+\@for\bxjs@tmpa:={0,1,2,3,4,5,6}\do{\edef\bxjs@next{%
+ \noexpand\bxjs@tmpb{A\bxjs@tmpa paper}{a\bxjs@tmpa paper}%
+ \noexpand\bxjs@tmpb{B\bxjs@tmpa paper}{b\bxjs@tmpa paper}%
+}\bxjs@next}
+\DeclareOption{a4varpaper}{\bxjs@setpaper{{210truemm}{283truemm}}}
+\DeclareOption{b5varpaper}{\bxjs@setpaper{{182truemm}{230truemm}}}
+\DeclareOption{screenpaper}{\bxjs@setpaper{screen}}
+\DeclareOption{custompaper}{}
\newif\if@landscape
\@landscapefalse
\DeclareOption{landscape}{\@landscapetrue}
@@ -626,10 +642,6 @@
\bxjs@declare@bool@option{simple-ja-setup}{simplejasetup}
\DeclareOption{nosimplejasetup}{\setkeys{bxjs}{simple-ja-setup=false}}
\DeclareOption{simplejasetup}{\setkeys{bxjs}{simple-ja-setup=true}}
-\newif\ifbxjs@strong@cmd \bxjs@strong@cmdtrue
-\let\bxjs@kv@strongcmd@true\bxjs@strong@cmdtrue
-\let\bxjs@kv@strongcmd@false\bxjs@strong@cmdfalse
-\define@key{bxjs}{strong-cmd}[true]{\bxjs@set@keyval{strongcmd}{#1}{}}
\let\bxjs@org@removeelement\@removeelement
\def\@removeelement#1#2#3{%
\def\reserved@a{#2}%
@@ -923,16 +935,6 @@
\ifbxjs@fix@at@cmd
\def\@{\bxjs@SE{}}
\fi
-\ifbxjs@strong@cmd\jsAtEndOfClass{%
- \ifx\strong\@undefined\ifx\strongenv\@undefined
- \DeclareRobustCommand{\strongenv}{\bxjs@strong@font}%
- \DeclareTextFontCommand{\strong}{\strongenv}%
- \@ifdefinable{\strongfontdeclare}{\bxjs@protected\def\strongfontdeclare#1{%
- \bxjs@strong@font@declare@a#1,\@nil}}%
- \def\bxjs@strong@font@declare@a#1,#2\@nil{\def\bxjs@strong@font{#1}}%
- \def\bxjs@strong@font{\bfseries}%
- \fi\fi
-}\fi
\def\bxjs@tmpa{\def\set@fontsize##1##2##3}
\expandafter\bxjs@tmpa\expandafter{%
\set@fontsize{#1}{#2}{#3}%