diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-30 21:07:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-30 21:07:59 +0000 |
commit | a49f9d08021990c92110e43b4dc073e3638c366b (patch) | |
tree | d58e4dde6100231cddf34ce2aef465398f63b73a /Master/texmf-dist/tex | |
parent | fd74b232df8bff4305cfbc279c83539b1e955959 (diff) |
bxjscls (29jan24)
git-svn-id: svn://tug.org/texlive/trunk@69637 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls | 149 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls | 149 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def | 17 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def | 176 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 149 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 149 |
11 files changed, 633 insertions, 166 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index 75be40c9114..0595b52b4ec 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/07/17 v2.9 BXJS document classes] + [2024/01/22 v2.9b BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsarticle} \newif\ifjsc@needsp@tch @@ -155,6 +155,18 @@ \bxjs@cslet{#1/\the\@tempcnta}\relax} \let\c@bxjs@tempcnta\@tempcnta \def\bxjs@gset@tempcnta{\setcounter{bxjs@tempcnta}} +\def\bxjs@advance@qc#1#2{% + \begingroup + \@tempcnta=#1\relax \advance\@tempcnta by#2\relax + \global\chardef\bxjs@g@tmpa\@tempcnta + \endgroup \let#1\bxjs@g@tmpa} +\ifjsWitheTeX + \let\bxjs@new@count\newcount + \def\bxjs@advance@count#1#2{\advance#1by#2\relax} +\else + \def\bxjs@new@count#1{\chardef#1\z@} + \let\bxjs@advance@count\bxjs@advance@qc +\fi \def\jsSetQHLength#1#2{% \begingroup \bxjs@parse@qh{#2}% @@ -1004,7 +1016,7 @@ \newskip\jsc@smallskipamount \jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \chardef\bxjs@periodchar=`\. -\bxjs@protected\def\bxjs@SE{% +\bxjs@robust@def\bxjs@SE{% \ifnum\spacefactor<\@m \spacefactor\@m \else \spacefactor\sfcode\bxjs@periodchar \fi} @@ -2022,9 +2034,9 @@ {Old font command '\string#1' is used!!\MessageBreak The first occurrence is}% } -\newcommand*{\allowoldfontcommands}{% +\DeclareRobustCommand*{\allowoldfontcommands}{% \@jsc@warnoldfontcmdexceptiontrue} -\newcommand*{\disallowoldfontcommands}{% +\DeclareRobustCommand*{\disallowoldfontcommands}{% \@jsc@warnoldfontcmdexceptionfalse} \let\bxjs@oldfontcmd@list\@empty \def\bxjs@oldfontcmd#1{% @@ -2510,6 +2522,135 @@ \onecolumn \raggedbottom \fi +\bxjs@robust@def\jsStrongText{\bxjs@strong@text}% +\chardef\bxjs@strong@level=0 +\DeclareRobustCommand*\jsStrongDeclare[1]{% + \bxjs@set@array@from@clist{bxjs@strong}{#1}% + \chardef\bxjs@strong@level\z@} +\jsStrongDeclare{\bfseries} +\def\bxjs@strong@text{% + \bxjs@csletcs{bxjs@tmpa}{bxjs@strong/\the\bxjs@strong@level}% + \ifx\bxjs@tmpa\relax + \bxjs@advance@qc\bxjs@strong@level\m@ne \bxjs@strong@text + \else \bxjs@advance@qc\bxjs@strong@level\@ne \bxjs@tmpa + \fi} +\@onlypreamble\bxjs@const@unit +\@onlypreamble\bxjs@const@unit@a +\ifjsWitheTeX + \def\bxjs@const@unit#1#2#3{% + \protected\edef#1{\dimexpr\the\dimexpr#3\relax\relax}} +\else + \let\bxjs@Ct\fontdimen \font\bxjs@Ut=cmtex9 at 0.98245pt + \bxjs@Ct8\bxjs@Ut=8sp \bxjs@Ct16\bxjs@Ut=\z@ + \def\bxjs@const@unit#1#2{% + \expandafter\bxjs@const@unit@a\csname bxjs@#2@\endcsname#1} + \def\bxjs@const@unit@a#1#2#3{% + \chardef#1\bxjs@Ct8\bxjs@Ut \bxjs@advance@qc#1\@ne \bxjs@Ct8\bxjs@Ut#1sp + \bxjs@Ct#1\bxjs@Ut=#3\relax \def#2{\bxjs@Ct#1\bxjs@Ut}} +\fi +\bxjs@const@unit\jQ{jQ}{0.25mm} +\let\jH\jQ +\ifjsc@mag + \@tempdimb=\jsBaseFontSize\relax + \edef\bxjs@tmpa{\strip@pt\@tempdimb}% + \@tempdima=2.5mm + \bxjs@invscale\@tempdima\bxjs@tmpa + \bxjs@const@unit\trueQ{trueQ}{\@tempdima} + \@tempdima=10pt + \bxjs@invscale\@tempdima\bxjs@tmpa + \bxjs@const@unit\bxjs@truept{truept}{\@tempdima} +\else \let\trueQ\jQ \let\bxjs@truept\p@ +\fi +\let\trueH\trueQ +\@tempdima\trueQ \bxjs@invscale\@tempdima\jsScale +\bxjs@const@unit\ascQ{ascQ}{\@tempdima} +\@tempdima\bxjs@truept \bxjs@invscale\@tempdima\jsScale +\bxjs@const@unit\ascpt{ascpt}{\@tempdima} +\DeclareRobustCommand*\jsJaFontSize[2]{% + \begingroup + \bxjs@jafontsize@a{#1}% + \@tempdimb\jsInverseScale\@tempdima + \bxjs@jafontsize@a{#2}% + \xdef\bxjs@g@tmpa{% + \noexpand\fontsize{\the\@tempdimb}{\the\@tempdima}}% + \endgroup\bxjs@g@tmpa} +\def\bxjs@jafontsize@a#1{% + \bxjs@parse@qh{#1}% + \ifx\bxjs@tmpb\relax \def\bxjs@tmpb{#1}\fi + \@defaultunits\@tempdima\bxjs@tmpb pt\relax\@nnil} +\def\bxjs@let@lenexpr{\edef} +\def\bxjs@kanjiskip{0pt} +\DeclareRobustCommand*\jsSetKanjiSkip[1]{% + \bxjs@let@lenexpr\bxjs@kanjiskip{#1}% + \bxjs@reset@kanjiskip} +\newcommand*\jsGetKanjiSkip{% + \bxjs@kanjiskip} +\newif\ifbxjs@kanjiskip@enabled \bxjs@kanjiskip@enabledtrue +\bxjs@robust@def\jsEnableKanjiSkip{% + \bxjs@kanjiskip@enabledtrue + \bxjs@reset@kanjiskip} +\bxjs@robust@def\jsDisableKanjiSkip{% + \bxjs@kanjiskip@enabledfalse + \bxjs@reset@kanjiskip} +\bxjs@robust@def\bxjs@reset@kanjiskip{% + \ifbxjs@kanjiskip@enabled + \setlength{\@tempskipa}{\bxjs@kanjiskip}% + \else \@tempskipa\z@ + \fi + \jsApplyKanjiSkip\@tempskipa} +\let\jsApplyKanjiSkip\@gobble +\def\bxjs@xkanjiskip{0pt} +\DeclareRobustCommand*\jsSetXKanjiSkip[1]{% + \bxjs@let@lenexpr\bxjs@xkanjiskip{#1}% + \bxjs@reset@xkanjiskip} +\newcommand*\jsGetXKanjiSkip{% + \bxjs@xkanjiskip} +\newif\ifbxjs@xkanjiskip@enabled \bxjs@xkanjiskip@enabledtrue +\bxjs@robust@def\jsEnableXKanjiSkip{% + \bxjs@xkanjiskip@enabledtrue + \bxjs@reset@xkanjiskip} +\bxjs@robust@def\jsDisableXKanjiSkip{% + \bxjs@xkanjiskip@enabledfalse + \bxjs@reset@xkanjiskip} +\bxjs@robust@def\bxjs@reset@xkanjiskip{% + \ifbxjs@xkanjiskip@enabled + \setlength{\@tempskipa}{\bxjs@xkanjiskip}% + \else \@tempskipa\z@ + \fi + \jsApplyXKanjiSkip\@tempskipa} +\let\jsApplyXKanjiSkip\@gobble +\g@addto@macro\jsResetDimen{% + \bxjs@reset@kanjiskip + \bxjs@reset@xkanjiskip} +\AtEndOfPackage{% +\jsSetKanjiSkip{0pt plus.1\jsZw minus.01\jsZw}% +\ifx\jsDocClass\jsSlide \jsSetXKanjiSkip{0.1em}% +\else \jsSetXKanjiSkip{0.25em plus 0.15em minus 0.06em}% +\fi +} +\ifbxjs@jaspace@cmd + \def\jaenspace{\hskip.5\jsZw\relax} + \def\jathinspace{\hskip\bxjs@xkanjiskip\relax} + \def\ {\zwspace} + \bxjs@protected\def\bxjs@choice@jathinspace{% + \relax\ifmmode \mskip\medmuskip + \else \jathinspace\ignorespaces + \fi} + \jsAtEndOfClass{% + \ifjsWitheTeX \let\>\bxjs@choice@jathinspace + \else \def\>{\protect\bxjs@choice@jathinspace}% + \fi} + \DeclareRobustCommand*{\jaspace}[1]{% + \expandafter\ifx\csname bxjs@jaspace@@#1\endcsname\relax + \ClassError\bxjs@clsname + {Unknown jaspace: #1}{\@eha}% + \else + \csname bxjs@jaspace@@#1\endcsname + \fi} + \def\bxjs@jaspace@@zenkaku{\hskip 1\jsZw\relax} + \def\bxjs@jaspace@@nibu{\hskip .5\jsZw\relax} + \def\bxjs@jaspace@@shibu{\hskip .25\jsZw\relax} +\fi \bxjs@pre@jadriver@hook \input{bxjsja-\bxjs@jadriver.def} \endinput diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index 8c55d51c76e..ed06d493e4e 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/07/17 v2.9 BXJS document classes] + [2024/01/22 v2.9b BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsbook} \newif\ifjsc@needsp@tch @@ -155,6 +155,18 @@ \bxjs@cslet{#1/\the\@tempcnta}\relax} \let\c@bxjs@tempcnta\@tempcnta \def\bxjs@gset@tempcnta{\setcounter{bxjs@tempcnta}} +\def\bxjs@advance@qc#1#2{% + \begingroup + \@tempcnta=#1\relax \advance\@tempcnta by#2\relax + \global\chardef\bxjs@g@tmpa\@tempcnta + \endgroup \let#1\bxjs@g@tmpa} +\ifjsWitheTeX + \let\bxjs@new@count\newcount + \def\bxjs@advance@count#1#2{\advance#1by#2\relax} +\else + \def\bxjs@new@count#1{\chardef#1\z@} + \let\bxjs@advance@count\bxjs@advance@qc +\fi \def\jsSetQHLength#1#2{% \begingroup \bxjs@parse@qh{#2}% @@ -1013,7 +1025,7 @@ \newskip\jsc@smallskipamount \jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \chardef\bxjs@periodchar=`\. -\bxjs@protected\def\bxjs@SE{% +\bxjs@robust@def\bxjs@SE{% \ifnum\spacefactor<\@m \spacefactor\@m \else \spacefactor\sfcode\bxjs@periodchar \fi} @@ -2106,9 +2118,9 @@ {Old font command '\string#1' is used!!\MessageBreak The first occurrence is}% } -\newcommand*{\allowoldfontcommands}{% +\DeclareRobustCommand*{\allowoldfontcommands}{% \@jsc@warnoldfontcmdexceptiontrue} -\newcommand*{\disallowoldfontcommands}{% +\DeclareRobustCommand*{\disallowoldfontcommands}{% \@jsc@warnoldfontcmdexceptionfalse} \let\bxjs@oldfontcmd@list\@empty \def\bxjs@oldfontcmd#1{% @@ -2616,6 +2628,135 @@ \onecolumn \raggedbottom \fi +\bxjs@robust@def\jsStrongText{\bxjs@strong@text}% +\chardef\bxjs@strong@level=0 +\DeclareRobustCommand*\jsStrongDeclare[1]{% + \bxjs@set@array@from@clist{bxjs@strong}{#1}% + \chardef\bxjs@strong@level\z@} +\jsStrongDeclare{\bfseries} +\def\bxjs@strong@text{% + \bxjs@csletcs{bxjs@tmpa}{bxjs@strong/\the\bxjs@strong@level}% + \ifx\bxjs@tmpa\relax + \bxjs@advance@qc\bxjs@strong@level\m@ne \bxjs@strong@text + \else \bxjs@advance@qc\bxjs@strong@level\@ne \bxjs@tmpa + \fi} +\@onlypreamble\bxjs@const@unit +\@onlypreamble\bxjs@const@unit@a +\ifjsWitheTeX + \def\bxjs@const@unit#1#2#3{% + \protected\edef#1{\dimexpr\the\dimexpr#3\relax\relax}} +\else + \let\bxjs@Ct\fontdimen \font\bxjs@Ut=cmtex9 at 0.98245pt + \bxjs@Ct8\bxjs@Ut=8sp \bxjs@Ct16\bxjs@Ut=\z@ + \def\bxjs@const@unit#1#2{% + \expandafter\bxjs@const@unit@a\csname bxjs@#2@\endcsname#1} + \def\bxjs@const@unit@a#1#2#3{% + \chardef#1\bxjs@Ct8\bxjs@Ut \bxjs@advance@qc#1\@ne \bxjs@Ct8\bxjs@Ut#1sp + \bxjs@Ct#1\bxjs@Ut=#3\relax \def#2{\bxjs@Ct#1\bxjs@Ut}} +\fi +\bxjs@const@unit\jQ{jQ}{0.25mm} +\let\jH\jQ +\ifjsc@mag + \@tempdimb=\jsBaseFontSize\relax + \edef\bxjs@tmpa{\strip@pt\@tempdimb}% + \@tempdima=2.5mm + \bxjs@invscale\@tempdima\bxjs@tmpa + \bxjs@const@unit\trueQ{trueQ}{\@tempdima} + \@tempdima=10pt + \bxjs@invscale\@tempdima\bxjs@tmpa + \bxjs@const@unit\bxjs@truept{truept}{\@tempdima} +\else \let\trueQ\jQ \let\bxjs@truept\p@ +\fi +\let\trueH\trueQ +\@tempdima\trueQ \bxjs@invscale\@tempdima\jsScale +\bxjs@const@unit\ascQ{ascQ}{\@tempdima} +\@tempdima\bxjs@truept \bxjs@invscale\@tempdima\jsScale +\bxjs@const@unit\ascpt{ascpt}{\@tempdima} +\DeclareRobustCommand*\jsJaFontSize[2]{% + \begingroup + \bxjs@jafontsize@a{#1}% + \@tempdimb\jsInverseScale\@tempdima + \bxjs@jafontsize@a{#2}% + \xdef\bxjs@g@tmpa{% + \noexpand\fontsize{\the\@tempdimb}{\the\@tempdima}}% + \endgroup\bxjs@g@tmpa} +\def\bxjs@jafontsize@a#1{% + \bxjs@parse@qh{#1}% + \ifx\bxjs@tmpb\relax \def\bxjs@tmpb{#1}\fi + \@defaultunits\@tempdima\bxjs@tmpb pt\relax\@nnil} +\def\bxjs@let@lenexpr{\edef} +\def\bxjs@kanjiskip{0pt} +\DeclareRobustCommand*\jsSetKanjiSkip[1]{% + \bxjs@let@lenexpr\bxjs@kanjiskip{#1}% + \bxjs@reset@kanjiskip} +\newcommand*\jsGetKanjiSkip{% + \bxjs@kanjiskip} +\newif\ifbxjs@kanjiskip@enabled \bxjs@kanjiskip@enabledtrue +\bxjs@robust@def\jsEnableKanjiSkip{% + \bxjs@kanjiskip@enabledtrue + \bxjs@reset@kanjiskip} +\bxjs@robust@def\jsDisableKanjiSkip{% + \bxjs@kanjiskip@enabledfalse + \bxjs@reset@kanjiskip} +\bxjs@robust@def\bxjs@reset@kanjiskip{% + \ifbxjs@kanjiskip@enabled + \setlength{\@tempskipa}{\bxjs@kanjiskip}% + \else \@tempskipa\z@ + \fi + \jsApplyKanjiSkip\@tempskipa} +\let\jsApplyKanjiSkip\@gobble +\def\bxjs@xkanjiskip{0pt} +\DeclareRobustCommand*\jsSetXKanjiSkip[1]{% + \bxjs@let@lenexpr\bxjs@xkanjiskip{#1}% + \bxjs@reset@xkanjiskip} +\newcommand*\jsGetXKanjiSkip{% + \bxjs@xkanjiskip} +\newif\ifbxjs@xkanjiskip@enabled \bxjs@xkanjiskip@enabledtrue +\bxjs@robust@def\jsEnableXKanjiSkip{% + \bxjs@xkanjiskip@enabledtrue + \bxjs@reset@xkanjiskip} +\bxjs@robust@def\jsDisableXKanjiSkip{% + \bxjs@xkanjiskip@enabledfalse + \bxjs@reset@xkanjiskip} +\bxjs@robust@def\bxjs@reset@xkanjiskip{% + \ifbxjs@xkanjiskip@enabled + \setlength{\@tempskipa}{\bxjs@xkanjiskip}% + \else \@tempskipa\z@ + \fi + \jsApplyXKanjiSkip\@tempskipa} +\let\jsApplyXKanjiSkip\@gobble +\g@addto@macro\jsResetDimen{% + \bxjs@reset@kanjiskip + \bxjs@reset@xkanjiskip} +\AtEndOfPackage{% +\jsSetKanjiSkip{0pt plus.1\jsZw minus.01\jsZw}% +\ifx\jsDocClass\jsSlide \jsSetXKanjiSkip{0.1em}% +\else \jsSetXKanjiSkip{0.25em plus 0.15em minus 0.06em}% +\fi +} +\ifbxjs@jaspace@cmd + \def\jaenspace{\hskip.5\jsZw\relax} + \def\jathinspace{\hskip\bxjs@xkanjiskip\relax} + \def\ {\zwspace} + \bxjs@protected\def\bxjs@choice@jathinspace{% + \relax\ifmmode \mskip\medmuskip + \else \jathinspace\ignorespaces + \fi} + \jsAtEndOfClass{% + \ifjsWitheTeX \let\>\bxjs@choice@jathinspace + \else \def\>{\protect\bxjs@choice@jathinspace}% + \fi} + \DeclareRobustCommand*{\jaspace}[1]{% + \expandafter\ifx\csname bxjs@jaspace@@#1\endcsname\relax + \ClassError\bxjs@clsname + {Unknown jaspace: #1}{\@eha}% + \else + \csname bxjs@jaspace@@#1\endcsname + \fi} + \def\bxjs@jaspace@@zenkaku{\hskip 1\jsZw\relax} + \def\bxjs@jaspace@@nibu{\hskip .5\jsZw\relax} + \def\bxjs@jaspace@@shibu{\hskip .25\jsZw\relax} +\fi \bxjs@pre@jadriver@hook \input{bxjsja-\bxjs@jadriver.def} \endinput diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index 0ed1207a27d..ba235ec3ba8 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/07/17 v2.9 BXJS document classes] + [2024/01/22 v2.9b 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 30147d01008..a621868b9d0 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bxjscompat} - [2023/07/17 v2.9 BXJS document classes] + [2024/01/22 v2.9b 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 933fe912aee..44e1b044b0c 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/07/17 v2.9 BXJS document classes] + [2024/01/22 v2.9b BXJS document classes] %% このファイルは日本語文字を含みます \let\bxjs@tmpa\relax \ifx J\jsEngine \def\bxjs@tmpa{NTT-jTeX}\fi @@ -400,21 +400,6 @@ \bxjs@pagestyle@hook \global\let\bxjs@pagestyle@hook\relax} \fi -\ifbxjs@jaspace@cmd - \def\jaenspace{\hskip.5\jsZw\relax} - \def\jathinspace{\hskip\z@skip} - \def\ {\zwspace} - \DeclareRobustCommand*{\jaspace}[1]{% - \expandafter\ifx\csname bxjs@jaspace@@#1\endcsname\relax - \ClassError\bxjs@clsname - {Unknown jaspace: #1}{\@eha}% - \else - \csname bxjs@jaspace@@#1\endcsname - \fi} - \def\bxjs@jaspace@@zenkaku{\hskip 1\jsZw\relax} - \def\bxjs@jaspace@@nibu{\hskip .5\jsZw\relax} - \def\bxjs@jaspace@@shibu{\hskip .25\jsZw\relax} -\fi \endinput %% %% End of file `bxjsja-minimal.def'. diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def index 857674c2b26..799fd1e7cdf 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/07/17 v2.9 BXJS document classes] + [2024/01/22 v2.9b 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 0fed000ffdd..c4f3bf7a64f 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} - [2023/07/17 v2.9 BXJS document classes] + [2024/01/22 v2.9b BXJS document classes] \if x\jsEngine \PassOptionsToPackage{nospace}{xeCJK} \fi diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def index 687bf63b29d..b8862a44301 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/07/17 v2.9 BXJS document classes] + [2024/01/22 v2.9b BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse @@ -49,6 +49,7 @@ \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} +\let\jafontsize\jsJaFontSize \@onlypreamble\bxjs@apply@mmiv \def\bxjs@apply@mmiv{% \g@addto@macro\@classoptionslist{,jis2004} @@ -89,98 +90,11 @@ \fi \ifbxjs@jp@strong@cmd\jsAtEndOfClass{% \ifx\strong\@undefined\ifx\strongenv\@undefined - \DeclareRobustCommand{\strongenv}{\bxjs@strong@font}% - \DeclareTextFontCommand{\strong}{\strongenv}% - \newcommand*{\strongfontdeclare}{\bxjs@strongfontdeclare}% - \newcount\bxjs@strong@level - \bxjs@protected\def\bxjs@strongfontdeclare#1{% - \bxjs@set@array@from@clist{bxjs@strong}{#1}% - \bxjs@strong@level\z@}% - \bxjs@strongfontdeclare{\bfseries}% - \def\bxjs@strong@font{% - \bxjs@csletcs{bxjs@tmpa}{bxjs@strong/\the\bxjs@strong@level}% - \ifx\bxjs@tmpa\relax - \advance\bxjs@strong@level\m@ne \bxjs@strong@font - \else \advance\bxjs@strong@level\@ne \bxjs@tmpa - \fi}% + \newcommand*{\strongenv}{\jsStrongText}% + \DeclareTextFontCommand{\strong}{\jsStrongText}% + \newcommand*{\strongfontdeclare}{\jsStrongDeclare}% \fi\fi }\fi -\ifjsWitheTeX - \@tempdima=0.25mm - \protected\edef\jQ{\dimexpr\the\@tempdima\relax} - \let\jH\jQ - \ifjsc@mag - \@tempdimb=\jsBaseFontSize\relax - \edef\bxjs@tmpa{\strip@pt\@tempdimb}% - \@tempdima=2.5mm - \bxjs@invscale\@tempdima\bxjs@tmpa - \protected\edef\trueQ{\dimexpr\the\@tempdima\relax} - \@tempdima=10pt - \bxjs@invscale\@tempdima\bxjs@tmpa - \protected\edef\bxjs@truept{\dimexpr\the\@tempdima\relax} - \else \let\trueQ\jQ \let\bxjs@truept\p@ - \fi - \let\trueH\trueQ - \@tempdima\trueQ \bxjs@invscale\@tempdima\jsScale - \protected\edef\ascQ{\dimexpr\the\@tempdima\relax} - \@tempdima\bxjs@truept \bxjs@invscale\@tempdima\jsScale - \protected\edef\ascpt{\dimexpr\the\@tempdima\relax} -\fi -\def\jafontsize#1#2{% - \begingroup - \bxjs@jafontsize@a{#1}% - \@tempdimb\jsInverseScale\@tempdima - \bxjs@jafontsize@a{#2}% - \xdef\bxjs@g@tmpa{% - \noexpand\fontsize{\the\@tempdimb}{\the\@tempdima}}% - \endgroup\bxjs@g@tmpa} -\def\bxjs@jafontsize@a#1{% - \bxjs@parse@qh{#1}% - \ifx\bxjs@tmpb\relax \def\bxjs@tmpb{#1}\fi - \@defaultunits\@tempdima\bxjs@tmpb pt\relax\@nnil} -\def\bxjs@kanjiskip{0pt} -\newcommand*\setkanjiskip[1]{% - \bxjs@let@lenexpr\bxjs@kanjiskip{#1}% - \bxjs@reset@kanjiskip} -\newcommand*\getkanjiskip{% - \bxjs@kanjiskip} -\newif\ifbxjs@kanjiskip@enabled \bxjs@kanjiskip@enabledtrue -\bxjs@robust@def\bxjs@enable@kanjiskip{% - \bxjs@kanjiskip@enabledtrue - \bxjs@reset@kanjiskip} -\bxjs@robust@def\bxjs@disable@kanjiskip{% - \bxjs@kanjiskip@enabledfalse - \bxjs@reset@kanjiskip} -\bxjs@robust@def\bxjs@reset@kanjiskip{% - \ifbxjs@kanjiskip@enabled - \setlength{\@tempskipa}{\bxjs@kanjiskip}% - \else \@tempskipa\z@ - \fi - \bxjs@apply@kanjiskip} -\def\bxjs@xkanjiskip{0pt} -\newcommand*\setxkanjiskip[1]{% - \bxjs@let@lenexpr\bxjs@xkanjiskip{#1}% - \bxjs@reset@xkanjiskip} -\newcommand*\getxkanjiskip{% - \bxjs@xkanjiskip} -\newif\ifbxjs@xkanjiskip@enabled \bxjs@xkanjiskip@enabledtrue -\bxjs@robust@def\bxjs@enable@xkanjiskip{% - \bxjs@xkanjiskip@enabledtrue - \bxjs@reset@xkanjiskip} -\bxjs@robust@def\bxjs@disable@xkanjiskip{% - \bxjs@xkanjiskip@enabledfalse - \bxjs@reset@xkanjiskip} -\bxjs@robust@def\bxjs@reset@xkanjiskip{% - \ifbxjs@xkanjiskip@enabled - \setlength{\@tempskipa}{\bxjs@xkanjiskip}% - \else \@tempskipa\z@ - \fi - \bxjs@apply@xkanjiskip} -\g@addto@macro\jsResetDimen{% - \bxjs@reset@kanjiskip - \bxjs@reset@xkanjiskip} -\let\bxjs@apply@kanjiskip\relax -\let\bxjs@apply@xkanjiskip\relax \@onlypreamble\bxjs@adjust@jafont \def\bxjs@adjust@jafont#1{% \ifx\jsJaFont\bxjs@@auto @@ -327,10 +241,14 @@ \global\let\bxjs@urgent@special@a\relax} \fi \if j\jsEngine -\def\bxjs@apply@kanjiskip{% - \kanjiskip\@tempskipa} -\def\bxjs@apply@xkanjiskip{% - \xkanjiskip\@tempskipa} +\newcommand*{\setkanjiskip}{\jsSetKanjiSkip} +\newcommand*{\getkanjiskip}{\jsGetKanjiSkip} +\def\jsApplyKanjiSkip#1{% + \kanjiskip=#1\relax} +\newcommand*{\setxkanjiskip}{\jsSetXKanjiSkip} +\newcommand*{\getxkanjiskip}{\jsGetXKanjiSkip} +\def\jsApplyXKanjiSkip#1{% + \xkanjiskip=#1\relax} \def\bxjs@jachar#1{% \bxjs@jachar@a#1....\@nil} \def\bxjs@jachar@a#1#2#3#4#5\@nil{% @@ -468,9 +386,11 @@ \DeclareMathAlphabet{\mathgt}{\jsc@JYn}{gt}{m}{n} \g@addto@macro\bxjs@begin@document@hook{% \ifx\reDeclareMathAlphabet\@undefined\else + \@ifpackageloaded{bm}{}{%else \reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc}% \reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}% \reDeclareMathAlphabet{\mathsf}{\@mathsf}{\@mathgt}% + }% \fi} \fi \else\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T @@ -517,17 +437,21 @@ \ifx\CJKecglue\@undefined \def\CJKtilde{\CJK@global\def~{\CJKecglue\ignorespaces}} \fi -\let\autospacing\bxjs@enable@kanjiskip -\let\noautospacing\bxjs@disable@kanjiskip +\newcommand*{\setkanjiskip}{\jsSetKanjiSkip} +\newcommand*{\getkanjiskip}{\jsGetKanjiSkip} +\newcommand*{\autospacing}{\jsEnableKanjiSkip} +\newcommand*{\noautospacing}{\jsDisableKanjiSkip} \protected\def\bxjs@CJKglue{\hskip\jsKanjiSkip} -\def\bxjs@apply@kanjiskip{% - \jsKanjiSkip\@tempskipa +\def\jsApplyKanjiSkip#1{% + \jsKanjiSkip=#1\relax \let\CJKglue\bxjs@CJKglue} -\let\autoxspacing\bxjs@enable@xkanjiskip -\let\noautoxspacing\bxjs@disable@xkanjiskip +\newcommand*{\setxkanjiskip}{\jsSetXKanjiSkip} +\newcommand*{\getxkanjiskip}{\jsGetXKanjiSkip} +\newcommand*{\autoxspacing}{\jsEnableXKanjiSkip} +\newcommand*{\noautoxspacing}{\jsDisableXKanjiSkip} \protected\def\bxjs@CJKecglue{\hskip\jsXKanjiSkip} -\def\bxjs@apply@xkanjiskip{% - \jsXKanjiSkip\@tempskipa +\def\jsApplyXKanjiSkip#1{% + \jsXKanjiSkip=#1\relax \let\CJKecglue\bxjs@CJKecglue} \def\bxjs@jachar#1{% \CJKforced{#1}} @@ -581,17 +505,21 @@ \ifx\CJKecglue\@undefined \def\CJKtilde{\CJK@global\def~{\CJKecglue\ignorespaces}} \fi -\let\autospacing\bxjs@enable@kanjiskip -\let\noautospacing\bxjs@disable@kanjiskip +\newcommand*{\setkanjiskip}{\jsSetKanjiSkip} +\newcommand*{\getkanjiskip}{\jsGetKanjiSkip} +\newcommand*{\autospacing}{\jsEnableKanjiSkip} +\newcommand*{\noautospacing}{\jsDisableKanjiSkip} \protected\def\bxjs@CJKglue{\hskip\jsKanjiSkip} -\def\bxjs@apply@kanjiskip{% - \jsKanjiSkip\@tempskipa +\def\jsApplyKanjiSkip#1{% + \jsKanjiSkip=#1\relax \xeCJKsetup{CJKglue={\bxjs@CJKglue}}} -\let\autoxspacing\bxjs@enable@xkanjiskip -\let\noautoxspacing\bxjs@disable@xkanjiskip +\newcommand*{\setxkanjiskip}{\jsSetXKanjiSkip} +\newcommand*{\getxkanjiskip}{\jsGetXKanjiSkip} +\newcommand*{\autoxspacing}{\jsEnableXKanjiSkip} +\newcommand*{\noautoxspacing}{\jsDisableXKanjiSkip} \protected\def\bxjs@CJKecglue{\hskip\jsXKanjiSkip} -\def\bxjs@apply@xkanjiskip{% - \jsXKanjiSkip\@tempskipa +\def\jsApplyXKanjiSkip#1{% + \jsXKanjiSkip=#1\relax \xeCJKsetup{CJKecglue={\bxjs@CJKecglue}}} \ifx\mcfamily\@undefined \protected\def\mcfamily{\CJKfamily{\CJKrmdefault}} @@ -715,6 +643,10 @@ \PassOptionsToPackage{unicode}{hyperref} \bxjs@check@hyperref@unicode{true} \fi +\newcommand*{\setkanjiskip}{\jsSetKanjiSkip} +\newcommand*{\getkanjiskip}{\jsGetKanjiSkip} +\newcommand*{\setxkanjiskip}{\jsSetXKanjiSkip} +\newcommand*{\getxkanjiskip}{\jsGetXKanjiSkip} \protected\def\autospacing{% \ltjsetparameter{autospacing=true}} \protected\def\noautospacing{% @@ -723,10 +655,10 @@ \ltjsetparameter{autoxspacing=true}} \protected\def\noautoxspacing{% \ltjsetparameter{autoxspacing=false}} -\def\bxjs@apply@kanjiskip{% - \ltjsetparameter{kanjiskip={\@tempskipa}}} -\def\bxjs@apply@xkanjiskip{% - \ltjsetparameter{xkanjiskip={\@tempskipa}}} +\def\jsApplyKanjiSkip#1{% + \ltjsetparameter{kanjiskip={#1}}} +\def\jsApplyXKanjiSkip#1{% + \ltjsetparameter{xkanjiskip={#1}}} \def\bxjs@jachar#1{% \ltjjachar`#1\relax} \ifbxjs@jaspace@cmd @@ -747,20 +679,6 @@ \DeclareJaMathFontCommand{\mathmc}{\mcfamily} \DeclareJaMathFontCommand{\mathgt}{\gtfamily} \fi -\ifbxjs@jaspace@cmd - \bxjs@protected\def\bxjs@choice@jathinspace{% - \relax\ifmmode \mskip\medmuskip - \else \jathinspace\ignorespaces - \fi} - \jsAtEndOfClass{% - \ifjsWitheTeX \let\>\bxjs@choice@jathinspace - \else \def\>{\protect\bxjs@choice@jathinspace}% - \fi} -\fi -\setkanjiskip{0pt plus.1\jsZw minus.01\jsZw} -\ifx\jsDocClass\jsSlide \setxkanjiskip{0.1em} -\else \setxkanjiskip{0.25em plus 0.15em minus 0.06em} -\fi \endinput %% %% End of file `bxjsja-standard.def'. diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty index cee228ea20b..04a51b3ed3d 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/07/17 v2.9 BXJS document classes] + [2024/01/22 v2.9b BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjsp@pkgname{bxjspandoc} \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 c9f85b9cb4f..b3c7753c1d3 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/07/17 v2.9 BXJS document classes] + [2024/01/22 v2.9b BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch @@ -155,6 +155,18 @@ \bxjs@cslet{#1/\the\@tempcnta}\relax} \let\c@bxjs@tempcnta\@tempcnta \def\bxjs@gset@tempcnta{\setcounter{bxjs@tempcnta}} +\def\bxjs@advance@qc#1#2{% + \begingroup + \@tempcnta=#1\relax \advance\@tempcnta by#2\relax + \global\chardef\bxjs@g@tmpa\@tempcnta + \endgroup \let#1\bxjs@g@tmpa} +\ifjsWitheTeX + \let\bxjs@new@count\newcount + \def\bxjs@advance@count#1#2{\advance#1by#2\relax} +\else + \def\bxjs@new@count#1{\chardef#1\z@} + \let\bxjs@advance@count\bxjs@advance@qc +\fi \def\jsSetQHLength#1#2{% \begingroup \bxjs@parse@qh{#2}% @@ -1012,7 +1024,7 @@ \newskip\jsc@smallskipamount \jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \chardef\bxjs@periodchar=`\. -\bxjs@protected\def\bxjs@SE{% +\bxjs@robust@def\bxjs@SE{% \ifnum\spacefactor<\@m \spacefactor\@m \else \spacefactor\sfcode\bxjs@periodchar \fi} @@ -2128,9 +2140,9 @@ {Old font command '\string#1' is used!!\MessageBreak The first occurrence is}% } -\newcommand*{\allowoldfontcommands}{% +\DeclareRobustCommand*{\allowoldfontcommands}{% \@jsc@warnoldfontcmdexceptiontrue} -\newcommand*{\disallowoldfontcommands}{% +\DeclareRobustCommand*{\disallowoldfontcommands}{% \@jsc@warnoldfontcmdexceptionfalse} \let\bxjs@oldfontcmd@list\@empty \def\bxjs@oldfontcmd#1{% @@ -2639,6 +2651,135 @@ \onecolumn \raggedbottom \fi +\bxjs@robust@def\jsStrongText{\bxjs@strong@text}% +\chardef\bxjs@strong@level=0 +\DeclareRobustCommand*\jsStrongDeclare[1]{% + \bxjs@set@array@from@clist{bxjs@strong}{#1}% + \chardef\bxjs@strong@level\z@} +\jsStrongDeclare{\bfseries} +\def\bxjs@strong@text{% + \bxjs@csletcs{bxjs@tmpa}{bxjs@strong/\the\bxjs@strong@level}% + \ifx\bxjs@tmpa\relax + \bxjs@advance@qc\bxjs@strong@level\m@ne \bxjs@strong@text + \else \bxjs@advance@qc\bxjs@strong@level\@ne \bxjs@tmpa + \fi} +\@onlypreamble\bxjs@const@unit +\@onlypreamble\bxjs@const@unit@a +\ifjsWitheTeX + \def\bxjs@const@unit#1#2#3{% + \protected\edef#1{\dimexpr\the\dimexpr#3\relax\relax}} +\else + \let\bxjs@Ct\fontdimen \font\bxjs@Ut=cmtex9 at 0.98245pt + \bxjs@Ct8\bxjs@Ut=8sp \bxjs@Ct16\bxjs@Ut=\z@ + \def\bxjs@const@unit#1#2{% + \expandafter\bxjs@const@unit@a\csname bxjs@#2@\endcsname#1} + \def\bxjs@const@unit@a#1#2#3{% + \chardef#1\bxjs@Ct8\bxjs@Ut \bxjs@advance@qc#1\@ne \bxjs@Ct8\bxjs@Ut#1sp + \bxjs@Ct#1\bxjs@Ut=#3\relax \def#2{\bxjs@Ct#1\bxjs@Ut}} +\fi +\bxjs@const@unit\jQ{jQ}{0.25mm} +\let\jH\jQ +\ifjsc@mag + \@tempdimb=\jsBaseFontSize\relax + \edef\bxjs@tmpa{\strip@pt\@tempdimb}% + \@tempdima=2.5mm + \bxjs@invscale\@tempdima\bxjs@tmpa + \bxjs@const@unit\trueQ{trueQ}{\@tempdima} + \@tempdima=10pt + \bxjs@invscale\@tempdima\bxjs@tmpa + \bxjs@const@unit\bxjs@truept{truept}{\@tempdima} +\else \let\trueQ\jQ \let\bxjs@truept\p@ +\fi +\let\trueH\trueQ +\@tempdima\trueQ \bxjs@invscale\@tempdima\jsScale +\bxjs@const@unit\ascQ{ascQ}{\@tempdima} +\@tempdima\bxjs@truept \bxjs@invscale\@tempdima\jsScale +\bxjs@const@unit\ascpt{ascpt}{\@tempdima} +\DeclareRobustCommand*\jsJaFontSize[2]{% + \begingroup + \bxjs@jafontsize@a{#1}% + \@tempdimb\jsInverseScale\@tempdima + \bxjs@jafontsize@a{#2}% + \xdef\bxjs@g@tmpa{% + \noexpand\fontsize{\the\@tempdimb}{\the\@tempdima}}% + \endgroup\bxjs@g@tmpa} +\def\bxjs@jafontsize@a#1{% + \bxjs@parse@qh{#1}% + \ifx\bxjs@tmpb\relax \def\bxjs@tmpb{#1}\fi + \@defaultunits\@tempdima\bxjs@tmpb pt\relax\@nnil} +\def\bxjs@let@lenexpr{\edef} +\def\bxjs@kanjiskip{0pt} +\DeclareRobustCommand*\jsSetKanjiSkip[1]{% + \bxjs@let@lenexpr\bxjs@kanjiskip{#1}% + \bxjs@reset@kanjiskip} +\newcommand*\jsGetKanjiSkip{% + \bxjs@kanjiskip} +\newif\ifbxjs@kanjiskip@enabled \bxjs@kanjiskip@enabledtrue +\bxjs@robust@def\jsEnableKanjiSkip{% + \bxjs@kanjiskip@enabledtrue + \bxjs@reset@kanjiskip} +\bxjs@robust@def\jsDisableKanjiSkip{% + \bxjs@kanjiskip@enabledfalse + \bxjs@reset@kanjiskip} +\bxjs@robust@def\bxjs@reset@kanjiskip{% + \ifbxjs@kanjiskip@enabled + \setlength{\@tempskipa}{\bxjs@kanjiskip}% + \else \@tempskipa\z@ + \fi + \jsApplyKanjiSkip\@tempskipa} +\let\jsApplyKanjiSkip\@gobble +\def\bxjs@xkanjiskip{0pt} +\DeclareRobustCommand*\jsSetXKanjiSkip[1]{% + \bxjs@let@lenexpr\bxjs@xkanjiskip{#1}% + \bxjs@reset@xkanjiskip} +\newcommand*\jsGetXKanjiSkip{% + \bxjs@xkanjiskip} +\newif\ifbxjs@xkanjiskip@enabled \bxjs@xkanjiskip@enabledtrue +\bxjs@robust@def\jsEnableXKanjiSkip{% + \bxjs@xkanjiskip@enabledtrue + \bxjs@reset@xkanjiskip} +\bxjs@robust@def\jsDisableXKanjiSkip{% + \bxjs@xkanjiskip@enabledfalse + \bxjs@reset@xkanjiskip} +\bxjs@robust@def\bxjs@reset@xkanjiskip{% + \ifbxjs@xkanjiskip@enabled + \setlength{\@tempskipa}{\bxjs@xkanjiskip}% + \else \@tempskipa\z@ + \fi + \jsApplyXKanjiSkip\@tempskipa} +\let\jsApplyXKanjiSkip\@gobble +\g@addto@macro\jsResetDimen{% + \bxjs@reset@kanjiskip + \bxjs@reset@xkanjiskip} +\AtEndOfPackage{% +\jsSetKanjiSkip{0pt plus.1\jsZw minus.01\jsZw}% +\ifx\jsDocClass\jsSlide \jsSetXKanjiSkip{0.1em}% +\else \jsSetXKanjiSkip{0.25em plus 0.15em minus 0.06em}% +\fi +} +\ifbxjs@jaspace@cmd + \def\jaenspace{\hskip.5\jsZw\relax} + \def\jathinspace{\hskip\bxjs@xkanjiskip\relax} + \def\ {\zwspace} + \bxjs@protected\def\bxjs@choice@jathinspace{% + \relax\ifmmode \mskip\medmuskip + \else \jathinspace\ignorespaces + \fi} + \jsAtEndOfClass{% + \ifjsWitheTeX \let\>\bxjs@choice@jathinspace + \else \def\>{\protect\bxjs@choice@jathinspace}% + \fi} + \DeclareRobustCommand*{\jaspace}[1]{% + \expandafter\ifx\csname bxjs@jaspace@@#1\endcsname\relax + \ClassError\bxjs@clsname + {Unknown jaspace: #1}{\@eha}% + \else + \csname bxjs@jaspace@@#1\endcsname + \fi} + \def\bxjs@jaspace@@zenkaku{\hskip 1\jsZw\relax} + \def\bxjs@jaspace@@nibu{\hskip .5\jsZw\relax} + \def\bxjs@jaspace@@shibu{\hskip .25\jsZw\relax} +\fi \bxjs@pre@jadriver@hook \input{bxjsja-\bxjs@jadriver.def} \endinput diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index 880590283b7..d4b76d37c83 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/07/17 v2.9 BXJS document classes] + [2024/01/22 v2.9b BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch @@ -155,6 +155,18 @@ \bxjs@cslet{#1/\the\@tempcnta}\relax} \let\c@bxjs@tempcnta\@tempcnta \def\bxjs@gset@tempcnta{\setcounter{bxjs@tempcnta}} +\def\bxjs@advance@qc#1#2{% + \begingroup + \@tempcnta=#1\relax \advance\@tempcnta by#2\relax + \global\chardef\bxjs@g@tmpa\@tempcnta + \endgroup \let#1\bxjs@g@tmpa} +\ifjsWitheTeX + \let\bxjs@new@count\newcount + \def\bxjs@advance@count#1#2{\advance#1by#2\relax} +\else + \def\bxjs@new@count#1{\chardef#1\z@} + \let\bxjs@advance@count\bxjs@advance@qc +\fi \def\jsSetQHLength#1#2{% \begingroup \bxjs@parse@qh{#2}% @@ -1003,7 +1015,7 @@ \newskip\jsc@smallskipamount \jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \chardef\bxjs@periodchar=`\. -\bxjs@protected\def\bxjs@SE{% +\bxjs@robust@def\bxjs@SE{% \ifnum\spacefactor<\@m \spacefactor\@m \else \spacefactor\sfcode\bxjs@periodchar \fi} @@ -2020,9 +2032,9 @@ {Old font command '\string#1' is used!!\MessageBreak The first occurrence is}% } -\newcommand*{\allowoldfontcommands}{% +\DeclareRobustCommand*{\allowoldfontcommands}{% \@jsc@warnoldfontcmdexceptiontrue} -\newcommand*{\disallowoldfontcommands}{% +\DeclareRobustCommand*{\disallowoldfontcommands}{% \@jsc@warnoldfontcmdexceptionfalse} \let\bxjs@oldfontcmd@list\@empty \def\bxjs@oldfontcmd#1{% @@ -2510,6 +2522,135 @@ \fi \renewcommand\familydefault{\sfdefault} \raggedright +\bxjs@robust@def\jsStrongText{\bxjs@strong@text}% +\chardef\bxjs@strong@level=0 +\DeclareRobustCommand*\jsStrongDeclare[1]{% + \bxjs@set@array@from@clist{bxjs@strong}{#1}% + \chardef\bxjs@strong@level\z@} +\jsStrongDeclare{\bfseries} +\def\bxjs@strong@text{% + \bxjs@csletcs{bxjs@tmpa}{bxjs@strong/\the\bxjs@strong@level}% + \ifx\bxjs@tmpa\relax + \bxjs@advance@qc\bxjs@strong@level\m@ne \bxjs@strong@text + \else \bxjs@advance@qc\bxjs@strong@level\@ne \bxjs@tmpa + \fi} +\@onlypreamble\bxjs@const@unit +\@onlypreamble\bxjs@const@unit@a +\ifjsWitheTeX + \def\bxjs@const@unit#1#2#3{% + \protected\edef#1{\dimexpr\the\dimexpr#3\relax\relax}} +\else + \let\bxjs@Ct\fontdimen \font\bxjs@Ut=cmtex9 at 0.98245pt + \bxjs@Ct8\bxjs@Ut=8sp \bxjs@Ct16\bxjs@Ut=\z@ + \def\bxjs@const@unit#1#2{% + \expandafter\bxjs@const@unit@a\csname bxjs@#2@\endcsname#1} + \def\bxjs@const@unit@a#1#2#3{% + \chardef#1\bxjs@Ct8\bxjs@Ut \bxjs@advance@qc#1\@ne \bxjs@Ct8\bxjs@Ut#1sp + \bxjs@Ct#1\bxjs@Ut=#3\relax \def#2{\bxjs@Ct#1\bxjs@Ut}} +\fi +\bxjs@const@unit\jQ{jQ}{0.25mm} +\let\jH\jQ +\ifjsc@mag + \@tempdimb=\jsBaseFontSize\relax + \edef\bxjs@tmpa{\strip@pt\@tempdimb}% + \@tempdima=2.5mm + \bxjs@invscale\@tempdima\bxjs@tmpa + \bxjs@const@unit\trueQ{trueQ}{\@tempdima} + \@tempdima=10pt + \bxjs@invscale\@tempdima\bxjs@tmpa + \bxjs@const@unit\bxjs@truept{truept}{\@tempdima} +\else \let\trueQ\jQ \let\bxjs@truept\p@ +\fi +\let\trueH\trueQ +\@tempdima\trueQ \bxjs@invscale\@tempdima\jsScale +\bxjs@const@unit\ascQ{ascQ}{\@tempdima} +\@tempdima\bxjs@truept \bxjs@invscale\@tempdima\jsScale +\bxjs@const@unit\ascpt{ascpt}{\@tempdima} +\DeclareRobustCommand*\jsJaFontSize[2]{% + \begingroup + \bxjs@jafontsize@a{#1}% + \@tempdimb\jsInverseScale\@tempdima + \bxjs@jafontsize@a{#2}% + \xdef\bxjs@g@tmpa{% + \noexpand\fontsize{\the\@tempdimb}{\the\@tempdima}}% + \endgroup\bxjs@g@tmpa} +\def\bxjs@jafontsize@a#1{% + \bxjs@parse@qh{#1}% + \ifx\bxjs@tmpb\relax \def\bxjs@tmpb{#1}\fi + \@defaultunits\@tempdima\bxjs@tmpb pt\relax\@nnil} +\def\bxjs@let@lenexpr{\edef} +\def\bxjs@kanjiskip{0pt} +\DeclareRobustCommand*\jsSetKanjiSkip[1]{% + \bxjs@let@lenexpr\bxjs@kanjiskip{#1}% + \bxjs@reset@kanjiskip} +\newcommand*\jsGetKanjiSkip{% + \bxjs@kanjiskip} +\newif\ifbxjs@kanjiskip@enabled \bxjs@kanjiskip@enabledtrue +\bxjs@robust@def\jsEnableKanjiSkip{% + \bxjs@kanjiskip@enabledtrue + \bxjs@reset@kanjiskip} +\bxjs@robust@def\jsDisableKanjiSkip{% + \bxjs@kanjiskip@enabledfalse + \bxjs@reset@kanjiskip} +\bxjs@robust@def\bxjs@reset@kanjiskip{% + \ifbxjs@kanjiskip@enabled + \setlength{\@tempskipa}{\bxjs@kanjiskip}% + \else \@tempskipa\z@ + \fi + \jsApplyKanjiSkip\@tempskipa} +\let\jsApplyKanjiSkip\@gobble +\def\bxjs@xkanjiskip{0pt} +\DeclareRobustCommand*\jsSetXKanjiSkip[1]{% + \bxjs@let@lenexpr\bxjs@xkanjiskip{#1}% + \bxjs@reset@xkanjiskip} +\newcommand*\jsGetXKanjiSkip{% + \bxjs@xkanjiskip} +\newif\ifbxjs@xkanjiskip@enabled \bxjs@xkanjiskip@enabledtrue +\bxjs@robust@def\jsEnableXKanjiSkip{% + \bxjs@xkanjiskip@enabledtrue + \bxjs@reset@xkanjiskip} +\bxjs@robust@def\jsDisableXKanjiSkip{% + \bxjs@xkanjiskip@enabledfalse + \bxjs@reset@xkanjiskip} +\bxjs@robust@def\bxjs@reset@xkanjiskip{% + \ifbxjs@xkanjiskip@enabled + \setlength{\@tempskipa}{\bxjs@xkanjiskip}% + \else \@tempskipa\z@ + \fi + \jsApplyXKanjiSkip\@tempskipa} +\let\jsApplyXKanjiSkip\@gobble +\g@addto@macro\jsResetDimen{% + \bxjs@reset@kanjiskip + \bxjs@reset@xkanjiskip} +\AtEndOfPackage{% +\jsSetKanjiSkip{0pt plus.1\jsZw minus.01\jsZw}% +\ifx\jsDocClass\jsSlide \jsSetXKanjiSkip{0.1em}% +\else \jsSetXKanjiSkip{0.25em plus 0.15em minus 0.06em}% +\fi +} +\ifbxjs@jaspace@cmd + \def\jaenspace{\hskip.5\jsZw\relax} + \def\jathinspace{\hskip\bxjs@xkanjiskip\relax} + \def\ {\zwspace} + \bxjs@protected\def\bxjs@choice@jathinspace{% + \relax\ifmmode \mskip\medmuskip + \else \jathinspace\ignorespaces + \fi} + \jsAtEndOfClass{% + \ifjsWitheTeX \let\>\bxjs@choice@jathinspace + \else \def\>{\protect\bxjs@choice@jathinspace}% + \fi} + \DeclareRobustCommand*{\jaspace}[1]{% + \expandafter\ifx\csname bxjs@jaspace@@#1\endcsname\relax + \ClassError\bxjs@clsname + {Unknown jaspace: #1}{\@eha}% + \else + \csname bxjs@jaspace@@#1\endcsname + \fi} + \def\bxjs@jaspace@@zenkaku{\hskip 1\jsZw\relax} + \def\bxjs@jaspace@@nibu{\hskip .5\jsZw\relax} + \def\bxjs@jaspace@@shibu{\hskip .25\jsZw\relax} +\fi \bxjs@pre@jadriver@hook \input{bxjsja-\bxjs@jadriver.def} \endinput |