From c937607e765ab21df28a0a8c03d3f44a500cd519 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 28 May 2020 21:59:10 +0000 Subject: bxjscls (28may20) git-svn-id: svn://tug.org/texlive/trunk@55320 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/bxjscls/bxjsarticle.cls | 28 +++++++++++++++++++++- Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls | 28 +++++++++++++++++++++- 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 | 28 +++++++++++++++++++++- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 28 +++++++++++++++++++++- 11 files changed, 122 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index 2cec72e76d8..6c100b7a5ad 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/04/04 v2.0a BXJS document classes] + [2020/05/28 v2.1 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsarticle} \newif\ifjsc@needsp@tch @@ -435,6 +435,18 @@ \bxjs@oldfontcommandsfalse} \DeclareOption{oldfontcommands}{% \bxjs@oldfontcommandstrue} +\DeclareOption{winjis}{% + \ClassWarningNoLine\bxjs@clsname + {This class does not support `winjis' option}% +} +\DeclareOption{mingoth}{% + \ClassWarningNoLine\bxjs@clsname + {This class does not support `mingoth' option}% +} +\DeclareOption{jis}{% + \ClassWarningNoLine\bxjs@clsname + {This class does not support `jis' option}% +} \DeclareOption*{% \def\bxjs@next{\bxjs@safe@setkeys{bxjs}}% \expandafter\bxjs@next\expandafter{\CurrentOption}} @@ -614,6 +626,10 @@ \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}% @@ -908,6 +924,16 @@ \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 617f57c2e1c..f5c7db8a9b0 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/04/04 v2.0a BXJS document classes] + [2020/05/28 v2.1 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsbook} \newif\ifjsc@needsp@tch @@ -441,6 +441,18 @@ \bxjs@oldfontcommandsfalse} \DeclareOption{oldfontcommands}{% \bxjs@oldfontcommandstrue} +\DeclareOption{winjis}{% + \ClassWarningNoLine\bxjs@clsname + {This class does not support `winjis' option}% +} +\DeclareOption{mingoth}{% + \ClassWarningNoLine\bxjs@clsname + {This class does not support `mingoth' option}% +} +\DeclareOption{jis}{% + \ClassWarningNoLine\bxjs@clsname + {This class does not support `jis' option}% +} \DeclareOption*{% \def\bxjs@next{\bxjs@safe@setkeys{bxjs}}% \expandafter\bxjs@next\expandafter{\CurrentOption}} @@ -623,6 +635,10 @@ \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}% @@ -917,6 +933,16 @@ \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 8cdb102b017..bc4f3f04266 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/04/04 v2.0a BXJS document classes] + [2020/05/28 v2.1 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 4128007d8a2..6ee46d89413 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/04/04 v2.0a BXJS document classes] + [2020/05/28 v2.1 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 26c44dd4c75..5ab9ee8de2b 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/04/04 v2.0a BXJS document classes] + [2020/05/28 v2.1 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 9a81f9f0c3f..bda1098a7b2 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/04/04 v2.0a BXJS document classes] + [2020/05/28 v2.1 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 8d8bc4d5add..ec3339effc2 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/04/04 v2.0a BXJS document classes] + [2020/05/28 v2.1 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 2ecc13a5f2c..5520becb21f 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/04/04 v2.0a BXJS document classes] + [2020/05/28 v2.1 BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse @@ -592,6 +592,7 @@ \noexpand\RequirePackage[\bxjs@tmpa]{luatexja-preset}% }\bxjs@next \fi +\@ifpackagelater{luatexja}{2016/03/31}{}{%else \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont} @@ -601,8 +602,13 @@ \DeclareRobustCommand\ttfamily {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} +} +\long\def\jttdefault{\gtdefault} +\unless\ifx\@ltj@match@familytrue\@undefined + \@ltj@match@familytrue +\fi \g@addto@macro\bxjs@begin@document@hook{% - \reDeclareMathAlphabet{\mathrm}{\mathrm}{\mathmc} + \reDeclareMathAlphabet{\mathrm}{\mathrm}{\mathmc}% \reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}% \reDeclareMathAlphabet{\mathsf}{\mathsf}{\mathgt}}% \bxjs@if@sf@default{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty index 5b2751e8b55..95e9c8cf329 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/04/04 v2.0a BXJS document classes] + [2020/05/28 v2.1 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 c7bd476a3b2..855a68ed8ed 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/04/04 v2.0a BXJS document classes] + [2020/05/28 v2.1 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch @@ -441,6 +441,18 @@ \bxjs@oldfontcommandsfalse} \DeclareOption{oldfontcommands}{% \bxjs@oldfontcommandstrue} +\DeclareOption{winjis}{% + \ClassWarningNoLine\bxjs@clsname + {This class does not support `winjis' option}% +} +\DeclareOption{mingoth}{% + \ClassWarningNoLine\bxjs@clsname + {This class does not support `mingoth' option}% +} +\DeclareOption{jis}{% + \ClassWarningNoLine\bxjs@clsname + {This class does not support `jis' option}% +} \DeclareOption*{% \def\bxjs@next{\bxjs@safe@setkeys{bxjs}}% \expandafter\bxjs@next\expandafter{\CurrentOption}} @@ -622,6 +634,10 @@ \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}% @@ -916,6 +932,16 @@ \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 3d0d5aaa0c8..cc7bddecedc 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/04/04 v2.0a BXJS document classes] + [2020/05/28 v2.1 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch @@ -435,6 +435,18 @@ \bxjs@oldfontcommandsfalse} \DeclareOption{oldfontcommands}{% \bxjs@oldfontcommandstrue} +\DeclareOption{winjis}{% + \ClassWarningNoLine\bxjs@clsname + {This class does not support `winjis' option}% +} +\DeclareOption{mingoth}{% + \ClassWarningNoLine\bxjs@clsname + {This class does not support `mingoth' option}% +} +\DeclareOption{jis}{% + \ClassWarningNoLine\bxjs@clsname + {This class does not support `jis' option}% +} \DeclareOption*{% \def\bxjs@next{\bxjs@safe@setkeys{bxjs}}% \expandafter\bxjs@next\expandafter{\CurrentOption}} @@ -614,6 +626,10 @@ \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}% @@ -907,6 +923,16 @@ \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}% -- cgit v1.2.3