diff options
18 files changed, 176 insertions, 91 deletions
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md index 3a71f43a4cd..a52f63f2dfe 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md +++ b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md @@ -99,6 +99,11 @@ XeLaTeX / LuaLaTeX の上でも日本語処理パッケージと連携して使 更新履歴 -------- + * Version 2.3 〈2020/10/10〉 + - jsclasses の 2020/10/05 と同期。 + - minijs パッケージの読込をブロックする。 + - `jafont=auto` 指定で、updmap で `jaVariant` が `-04` に指定されて + いる場合は `jis2004` 和文パラメタ指定時と同等の動作をする。 * Version 2.2c 〈2020/10/04〉 - バグ修正。 * Version 2.2b 〈2020/09/29〉 diff --git a/Master/texmf-dist/doc/latex/bxjscls/README.md b/Master/texmf-dist/doc/latex/bxjscls/README.md index 87f717d1d5c..acd69b1d056 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/README.md +++ b/Master/texmf-dist/doc/latex/bxjscls/README.md @@ -89,6 +89,8 @@ This package is distributed under the BSD 2-Clause License. Revision History ---------------- + * Version 2.3 〈2020/10/10〉 + - Sync with jsclasses 2020/10/05. * Version 2.2c 〈2020/10/04〉 * Version 2.2b 〈2020/09/29〉 - Support LaTeX kernel 2020/10/01. diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf Binary files differindex 1522dd685fd..250272dadb1 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf +++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex index a93aeede274..cec1bf665d8 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex +++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex @@ -11,8 +11,8 @@ \bxtexlogoimport{*} \usepackage{shortvrb} \MakeShortVerb{\|} -\newcommand{\PkgVersion}{2.2c} -\newcommand{\PkgDate}{2020/10/04} +\newcommand{\PkgVersion}{2.3} +\newcommand{\PkgDate}{2020/10/10} \newcommand{\Pkg}[1]{\textsf{#1}} \newcommand{\Meta}[1]{$\langle$\mbox{}\nobr#1\nobr\mbox{}$\rangle$} \newcommand{\Note}{\par\noindent ※} diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf Binary files differindex 8a3abf0ea61..dceb12a49fa 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf +++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf diff --git a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx index 9d44ced9498..e3e7a21d007 100644 --- a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx +++ b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx @@ -25,7 +25,7 @@ % %--------------------------------------- % -% Copyright 1993-2019 +% Copyright 1993-2020 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -41,7 +41,7 @@ % \iffalse % % \begin{macrocode} -%<article|report|book|slide>\NeedsTeXFormat{LaTeX2e} +%<class|anc>\NeedsTeXFormat{LaTeX2e} %<article>\ProvidesClass{bxjsarticle} %<report>\ProvidesClass{bxjsreport} %<book>\ProvidesClass{bxjsbook} @@ -56,7 +56,9 @@ %<*driver> \ProvidesFile{bxjscls.dtx} %</driver> - [2020/10/04 v2.2c BXJS document classes] + [2020/10/10 v2.3 BXJS document classes] +% based on jsclasses [2020/10/05] +% [2020/10/04 v2.2c BXJS document classes] % [2020/09/29 v2.2b BXJS document classes] % [2020/09/22 v2.2a BXJS document classes] % [2020/09/04 v2.2 BXJS document classes] @@ -273,9 +275,19 @@ % \StopEventually{} % % 以下では実際のコードに即して説明します。 +% +% \texttt{minijs}は，\texttt{jsclasses}に似た設定を行うパッケージです。 +% % \begin{macrocode} -%<*cls> -%% このファイルは日本語文字を含みます. +%<*minijs> +%% if jsclasses loaded, abort loading this package +\ifx\@jsc@uplatextrue\@undefined\else + \PackageInfo{minijs}{jsclasses does not need minijs, exiting} + \expandafter\endinput +\fi +%% "fake" jsarticle +\expandafter\def\csname ver@jsarticle.cls\endcsname{} +%</minijs> % \end{macrocode} % % \begin{macro}{\bxjs@clsname} @@ -283,6 +295,8 @@ % 文書クラスの名前です。エラーメッセージ表示などで使われます。 % % \begin{macrocode} +%<*class> +%% このファイルは日本語文字を含みます. %<article>\def\bxjs@clsname{bxjsarticle} %<book>\def\bxjs@clsname{bxjsbook} %<report>\def\bxjs@clsname{bxjsreport} @@ -2427,6 +2441,11 @@ % [2017-01-11] トンボオプションが指定されているとき「だけ」|\stockwidth|， % |\stockheight|を定義するようにしました。 % +% [2020-10-04] \LaTeXe~2020-10-01でカーネルの |\shipout| コードが拡張され +% |\AtBeginDvi| の実行タイミングが変化したので，この時点で +% 発行する |\special| の中身を展開しておくようにしました。 +% こうしないと，用紙サイズ設定を間違ってしまいます(Issue \#72)。 +% % \begin{ZRnote} % BXJSでは出力用紙サイズ記録は |geometry| パッケージが行う。 % @@ -2953,7 +2972,12 @@ % ここで実際に標準フォントサイズで初期化します。 % % \begin{macrocode} +%</class> +%<*class|minijs> +%% initialize \normalsize +%</class|minijs> +%<*class> % \end{macrocode} % % \end{macro} @@ -8112,12 +8136,11 @@ % \end{macrocode} % % おしまい。 +% \end{ZRnote} % \begin{macrocode} -%</cls> +%</class> % \end{macrocode} % -% \end{ZRnote} -% % 以上です。 % %^^A//////////////////////////////////////////////////////// @@ -8533,6 +8556,9 @@ % \Note 2020-02-02のNFSSの改修に対する |jsclasses| の対策を % 取り入れた。 % \begin{macrocode} +\@ifl@t@r\fmtversion{2020/10/01} + {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue} +\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN \ifx\@rmfamilyhook\@undefined % old \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm @@ -8562,6 +8588,14 @@ \g@addto@macro\@ttfamilyhook {\prepare@family@series@update@kanji{gt}\gtdefault} \fi +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +\AddToHook{rmfamily}% + {\prepare@family@series@update@kanji{mc}\mcdefault} +\AddToHook{sffamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\AddToHook{ttfamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\fi % --- for 2020-10-01 END \ifx\DeclareFixJFMCJKTextFontCommand\@undefined \DeclareJaTextFontCommand{\textmc}{\mcfamily} \DeclareJaTextFontCommand{\textgt}{\gtfamily} @@ -8645,11 +8679,18 @@ !else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}!fi} \fi % \end{macrocode} -% +% エスケープ文字の変更はここまで。 % \begin{macrocode} \endgroup % \end{macrocode} % +% \paragraph{minijsパッケージのブロック} +% +% やっておく。 +% \begin{macrocode} +\@namedef{ver@minijs.sty}{} +% \end{macrocode} +% %^^A---------------- % \subsection{pdf{\TeX}用の処理} % @@ -9056,11 +9097,13 @@ % \Note |otf| や |luatexja-preset| 等のパッケージがこのオプションを % 利用する。 % \begin{macrocode} -\ifbxjs@jp@jismmiv +\@onlypreamble\bxjs@apply@mmiv +\def\bxjs@apply@mmiv{% \g@addto@macro\@classoptionslist{,jis2004} % \@ifpackagewith 判定への対策 \PassOptionsToPackage{jis2004}{otf} -\fi + \global\let\bxjs@apply@mmiv\relax} +\ifbxjs@jp@jismmiv \bxjs@apply@mmiv \fi % \end{macrocode} % % \paragraph{和文用単位のサポート} @@ -9354,10 +9397,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 @@ -9371,24 +9417,41 @@ } \def\bxjs@@auto{auto} \def\bxjs@@noEmbed{noEmbed} +\def\bxjs@@hziv{-04} % \end{macrocode} % \end{macro} % -% \begin{macro}{\bxjs@kanjiEmbed} -% 現在の |updmap| の |kanjiEmbed| パラメタの値。 +% \begin{macro}{\bxjs@jaEmbed} +% \begin{macro}{\bxjs@jaVariant} +% 現在の |updmap| の |jaEmbed|・|jaVariant| パラメタの値。 % |\bxjs@get@kanjiEmbed| により実際の設定値が取得されてここに設定される。 +% \Note 古い版の |updmap| では |kanjiEmbed|・|kanjiVariant| であった。 % \begin{macrocode} -\let\bxjs@kanjiEmbed\relax +\let\bxjs@jaEmbed\relax +\let\bxjs@jaVariant\relax % \end{macrocode} % \end{macro} +% \end{macro} % % \begin{macro}{\bxjs@get@kanjiEmbed} -% 現在の |updmap| の |kanjiEmbed| パラメタの値を取得する。 +% 現在の |updmap| の |jaEmbed|・|jaVariant| パラメタの値を取得する。 % \begin{macrocode} \@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 @@ -9403,32 +9466,14 @@ \@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} % \end{macrocode} % \end{macro} % @@ -9440,10 +9485,10 @@ \@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 @@ -9738,6 +9783,11 @@ % \begin{macrocode} \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 @@ -9748,9 +9798,11 @@ \PassOptionsToPackage{bigcode}{pxjahyper} \else \bxjs@urgent@special{pdf:tounicode UTF8-UCS2} + \PassOptionsToPackage{nobigcode}{pxjahyper} \fi \fi\fi\fi \let\bxToUnicodeSpecialDone=t + \fi \fi % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/bxjscls/bxjscls.ins b/Master/texmf-dist/source/latex/bxjscls/bxjscls.ins index 0e533ebe34f..d763620d126 100644 --- a/Master/texmf-dist/source/latex/bxjscls/bxjscls.ins +++ b/Master/texmf-dist/source/latex/bxjscls/bxjscls.ins @@ -2,10 +2,10 @@ \def\batchfile{bxjscls.ins} \input docstrip.tex \keepsilent -\generateFile{bxjsarticle.cls}{f}{\from{bxjscls.dtx}{cls,article}} -\generateFile{bxjsreport.cls}{f}{\from{bxjscls.dtx}{cls,report}} -\generateFile{bxjsbook.cls}{f}{\from{bxjscls.dtx}{cls,book}} -\generateFile{bxjsslide.cls}{f}{\from{bxjscls.dtx}{cls,slide}} +\generateFile{bxjsarticle.cls}{f}{\from{bxjscls.dtx}{class,article}} +\generateFile{bxjsreport.cls}{f}{\from{bxjscls.dtx}{class,report}} +\generateFile{bxjsbook.cls}{f}{\from{bxjscls.dtx}{class,book}} +\generateFile{bxjsslide.cls}{f}{\from{bxjscls.dtx}{class,slide}} \generateFile{bxjsja-minimal.def}{f}{\from{bxjscls.dtx}{drv,minimal}} \generateFile{bxjsja-standard.def}{f}{\from{bxjscls.dtx}{drv,standard}} \generateFile{bxjsja-modern.def}{f}{\from{bxjscls.dtx}{drv,modern}} diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index 99020392510..a0ce52858b4 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% bxjscls.dtx (with options: `cls,article') +%% bxjscls.dtx (with options: `class,article') %% %% IMPORTANT NOTICE: %% @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsarticle} - [2020/10/04 v2.2c BXJS document classes] + [2020/10/10 v2.3 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsarticle} \newif\ifjsc@needsp@tch @@ -1004,6 +1004,7 @@ \belowdisplayskip 9\p@? \@plus3\p@? \@minus4\p@? \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} +%% initialize \normalsize \ifx\Cht\@undefined \newdimen\Cht \fi \ifx\Cdp\@undefined \newdimen\Cdp \fi diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index 18b90488af6..2192ed1e64f 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% bxjscls.dtx (with options: `cls,book') +%% bxjscls.dtx (with options: `class,book') %% %% IMPORTANT NOTICE: %% @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsbook} - [2020/10/04 v2.2c BXJS document classes] + [2020/10/10 v2.3 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsbook} \newif\ifjsc@needsp@tch @@ -1013,6 +1013,7 @@ \belowdisplayskip 9\p@? \@plus3\p@? \@minus4\p@? \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} +%% initialize \normalsize \ifx\Cht\@undefined \newdimen\Cht \fi \ifx\Cdp\@undefined \newdimen\Cdp \fi diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index 3c24d340f35..e67f6d7de59 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty @@ -20,8 +20,9 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) +\NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bxjscjkcat} - [2020/10/04 v2.2c BXJS document classes] + [2020/10/10 v2.3 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 e61104fa7ff..e6a9d4b80df 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty @@ -20,8 +20,9 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) +\NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bxjscompat} - [2020/10/04 v2.2c BXJS document classes] + [2020/10/10 v2.3 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 2d808752679..c9c0eb883c1 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/10/04 v2.2c BXJS document classes] + [2020/10/10 v2.3 BXJS document classes] %% このファイルは日本語文字を含みます \def\DeclareJaTextFontCommand#1#2{% \DeclareRobustCommand#1[1]{% @@ -195,6 +195,9 @@ \DeclareFontShape{\jsc@JTn}{gt}{b}{n}{<->ssub*gt/bx/n}{} \DeclareFontShape{\jsc@JTn}{gt}{b}{it}{<->ssub*gt/bx/n}{} \DeclareFontShape{\jsc@JTn}{gt}{b}{sl}{<->ssub*gt/bx/n}{} +\@ifl@t@r\fmtversion{2020/10/01} + {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue} +\ifjsc@needsp@tch % --- for 2020-02-02 or older BEGIN \ifx\@rmfamilyhook\@undefined % old \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm @@ -224,6 +227,14 @@ \g@addto@macro\@ttfamilyhook {\prepare@family@series@update@kanji{gt}\gtdefault} \fi +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +\AddToHook{rmfamily}% + {\prepare@family@series@update@kanji{mc}\mcdefault} +\AddToHook{sffamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\AddToHook{ttfamily}% + {\prepare@family@series@update@kanji{gt}\gtdefault} +\fi % --- for 2020-10-01 END \ifx\DeclareFixJFMCJKTextFontCommand\@undefined \DeclareJaTextFontCommand{\textmc}{\mcfamily} \DeclareJaTextFontCommand{\textgt}{\gtfamily} @@ -260,6 +271,7 @@ !else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}!fi} \fi \endgroup +\@namedef{ver@minijs.sty}{} \else\ifx p\jsEngine \let\bxjs@let@hchar@chr\bxjs@let@hchar@chr@ue \@onlypreamble\bxjs@cjk@loaded diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def index c8ebee27d80..4b84d2e6eac 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/10/04 v2.2c BXJS document classes] + [2020/10/10 v2.3 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 d52fa76fad2..fe9b67dd698 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/10/04 v2.2c BXJS document classes] + [2020/10/10 v2.3 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 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 diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty index a367a0c4949..f295571f9da 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty @@ -20,8 +20,9 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) +\NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bxjspandoc} - [2020/10/04 v2.2c BXJS document classes] + [2020/10/10 v2.3 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 5cdc283de6e..c12704d5459 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% bxjscls.dtx (with options: `cls,report') +%% bxjscls.dtx (with options: `class,report') %% %% IMPORTANT NOTICE: %% @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsreport} - [2020/10/04 v2.2c BXJS document classes] + [2020/10/10 v2.3 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch @@ -1012,6 +1012,7 @@ \belowdisplayskip 9\p@? \@plus3\p@? \@minus4\p@? \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} +%% initialize \normalsize \ifx\Cht\@undefined \newdimen\Cht \fi \ifx\Cdp\@undefined \newdimen\Cdp \fi diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index 63dbc7c0447..164e6cd1e3c 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls @@ -4,7 +4,7 @@ %% %% The original source files were: %% -%% bxjscls.dtx (with options: `cls,slide') +%% bxjscls.dtx (with options: `class,slide') %% %% IMPORTANT NOTICE: %% @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsslide} - [2020/10/04 v2.2c BXJS document classes] + [2020/10/10 v2.3 BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch @@ -1003,6 +1003,7 @@ \belowdisplayskip 9\p@? \@plus3\p@? \@minus4\p@? \belowdisplayshortskip \belowdisplayskip \let\@listi\@listI} +%% initialize \normalsize \ifx\Cht\@undefined \newdimen\Cht \fi \ifx\Cdp\@undefined \newdimen\Cdp \fi |