diff options
author | Karl Berry <karl@freefriends.org> | 2020-10-10 20:53:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-10-10 20:53:35 +0000 |
commit | 0ba0dfb9a07bac614756eb2f7ea858e53dc8a255 (patch) | |
tree | 0a226449c98008312d98e87e79cfaa16e305cc49 /Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def | |
parent | 859fac3d4f868a2af1a7004353cfcc165973bf9a (diff) |
bxjscls (10oct20)
git-svn-id: svn://tug.org/texlive/trunk@56620 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def | 67 |
1 files changed, 37 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def index 24c5537c008..b29d28819f1 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/10/04 v2.2c BXJS document classes] + [2020/10/10 v2.3 BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse @@ -44,10 +44,12 @@ \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 +\@onlypreamble\bxjs@apply@mmiv +\def\bxjs@apply@mmiv{% \g@addto@macro\@classoptionslist{,jis2004} \PassOptionsToPackage{jis2004}{otf} -\fi + \global\let\bxjs@apply@mmiv\relax} +\ifbxjs@jp@jismmiv \bxjs@apply@mmiv \fi \if j\jsEngine \bxjs@jp@unitsfalse \fi @@ -170,10 +172,13 @@ \def\bxjs@adjust@jafont#1{% \ifx\jsJaFont\bxjs@@auto \bxjs@get@kanjiEmbed - \ifx\bxjs@kanjiEmbed\relax + \ifx\bxjs@jaEmbed\relax \let\bxjs@tmpa\@empty \else - \let\bxjs@tmpa\bxjs@kanjiEmbed + \let\bxjs@tmpa\bxjs@jaEmbed + \ifx\bxjs@jaVariant\bxjs@@hziv + \bxjs@apply@mmiv + \fi \fi \else \let\bxjs@tmpa\jsJaFont @@ -187,11 +192,24 @@ } \def\bxjs@@auto{auto} \def\bxjs@@noEmbed{noEmbed} -\let\bxjs@kanjiEmbed\relax +\def\bxjs@@hziv{-04} +\let\bxjs@jaEmbed\relax +\let\bxjs@jaVariant\relax \@onlypreamble\bxjs@get@kanjiEmbed \def\bxjs@get@kanjiEmbed{% \begingroup\setbox\z@=\hbox{% + \global\let\bxjs@do\@empty + \def\bxjs@next##1##2##3{% + \def##1####1##3 ####2\@nil####3\@nnil{% + \ifx$####1$\gdef##2{####2}\fi}% + \g@addto@macro\bxjs@do{% + \expandafter##1\bxjs@tmpa\@nil##3 \@nil\@nnil}}% + \bxjs@next\bxjs@do@a\bxjs@g@tmpa{kanjiEmbed}% + \bxjs@next\bxjs@do@b\bxjs@g@tmpa{jaEmbed}% + \bxjs@next\bxjs@do@c\bxjs@g@tmpb{kanjiVariant}% + \bxjs@next\bxjs@do@d\bxjs@g@tmpb{jaVariant}% \global\let\bxjs@g@tmpa\relax + \global\let\bxjs@g@tmpb\relax \endlinechar\m@ne \let\do\@makeother\dospecials \catcode32=10 \catcode12=10 %form-feed @@ -206,39 +224,21 @@ \@tempswatrue \loop\if@tempswa \read\@inputcheck to\bxjs@tmpa - \expandafter\bxjs@get@ke@a\bxjs@tmpa\@nil kanjiEmbed \@nil\@nnil - \ifx\bxjs@tmpb\relax\else - \global\let\bxjs@g@tmpa\bxjs@tmpb - \@tempswafalse - \fi - \expandafter\bxjs@get@ke@b\bxjs@tmpa\@nil jaEmbed \@nil\@nnil - \ifx\bxjs@tmpb\relax\else - \global\let\bxjs@g@tmpa\bxjs@tmpb - \@tempswafalse - \fi + \bxjs@do \ifeof\@inputcheck \@tempswafalse \fi \repeat \fi }\endgroup - \let\bxjs@kanjiEmbed\bxjs@g@tmpa + \let\bxjs@jaEmbed\bxjs@g@tmpa + \let\bxjs@jaVariant\bxjs@g@tmpb } -\@onlypreamble\bxjs@get@ke@a -\def\bxjs@get@ke@a#1kanjiEmbed #2\@nil#3\@nnil{% - \ifx$#1$\def\bxjs@tmpb{#2}% - \else \let\bxjs@tmpb\relax - \fi} -\@onlypreamble\bxjs@get@ke@b -\def\bxjs@get@ke@b#1jaEmbed #2\@nil#3\@nnil{% - \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} + \expandafter\bxjs@resolve@jafont@paren@a#1\@nil()\@nil\@nnil#1} \@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 +\def\bxjs@resolve@jafont@paren@a#1(#2)#3\@nil#4\@nnil#5{% + \ifx\relax#4\relax \bxjs@tmpb#5% \else \edef\bxjs@tmpa{#1\bxjs@jafont@paren{#2}#3}% \bxjs@tmpb\bxjs@tmpa @@ -400,6 +400,11 @@ \fi \if \ifx\bxjs@driver@given\bxjs@driver@@dvipdfmx T% \else\ifjsWithpTeXng T\else F\fi\fi T% + \IfFileExists{pxjahyper-enc.sty}{\@tempswatrue}{\@tempswafalse} + \if@tempswa + \RequirePackage{pxjahyper-enc}[2020/10/05]%v0.6 + \ifbxjs@bigcode\else \suppressbigcode \fi + \else \ifnum\jis"2121="A1A1 %euc \bxjs@urgent@special{pdf:tounicode EUC-UCS2} \else\ifnum\jis"2121="8140 %sjis @@ -410,9 +415,11 @@ \PassOptionsToPackage{bigcode}{pxjahyper} \else \bxjs@urgent@special{pdf:tounicode UTF8-UCS2} + \PassOptionsToPackage{nobigcode}{pxjahyper} \fi \fi\fi\fi \let\bxToUnicodeSpecialDone=t + \fi \fi \ifx f\bxjs@enablejfam\else \@enablejfamtrue |