texlive[56620] Master/texmf-dist: bxjscls (10oct20)
commits+karl at tug.org
commits+karl at tug.org
Sat Oct 10 22:53:35 CEST 2020
Revision: 56620
http://tug.org/svn/texlive?view=revision&revision=56620
Author: karl
Date: 2020-10-10 22:53:35 +0200 (Sat, 10 Oct 2020)
Log Message:
-----------
bxjscls (10oct20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
trunk/Master/texmf-dist/doc/latex/bxjscls/README.md
trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.ins
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md 2020-10-10 20:53:35 UTC (rev 56620)
@@ -99,6 +99,11 @@
更新履歴
--------
+ * 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〉
Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/README.md
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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 ※}
Modified: trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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 at uplatextrue\@undefined\else
+ \PackageInfo{minijs}{jsclasses does not need minijs, exiting}
+ \expandafter\endinput
+\fi
+%% "fake" jsarticle
+\expandafter\def\csname ver at jsarticle.cls\endcsname{}
+%</minijs>
% \end{macrocode}
%
% \begin{macro}{\bxjs at clsname}
@@ -283,6 +295,8 @@
% 文書クラスの名前です。エラーメッセージ表示などで使われます。
%
% \begin{macrocode}
+%<*class>
+%% このファイルは日本語文字を含みます.
%<article>\def\bxjs at clsname{bxjsarticle}
%<book>\def\bxjs at clsname{bxjsbook}
%<report>\def\bxjs at 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 at t@r\fmtversion{2020/10/01}
+ {\jsc at needsp@tchfalse}{\jsc at needsp@tchtrue}
+\ifjsc at needsp@tch % --- for 2020-02-02 or older BEGIN
\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not at math@alphabet\rmfamily\mathrm
@@ -8562,6 +8588,14 @@
\g at addto@macro\@ttfamilyhook
{\prepare at family@series at update@kanji{gt}\gtdefault}
\fi
+\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
+\AddToHook{rmfamily}%
+ {\prepare at family@series at update@kanji{mc}\mcdefault}
+\AddToHook{sffamily}%
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\AddToHook{ttfamily}%
+ {\prepare at family@series at 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 at minijs.sty}{}
+% \end{macrocode}
+%
%^^A----------------
% \subsection{pdf{\TeX}用の処理}
%
@@ -9056,11 +9097,13 @@
% \Note |otf| や |luatexja-preset| 等のパッケージがこのオプションを
% 利用する。
% \begin{macrocode}
-\ifbxjs at jp@jismmiv
+\@onlypreamble\bxjs at apply@mmiv
+\def\bxjs at apply@mmiv{%
\g at addto@macro\@classoptionslist{,jis2004}
% \@ifpackagewith 判定への対策
\PassOptionsToPackage{jis2004}{otf}
-\fi
+ \global\let\bxjs at apply@mmiv\relax}
+\ifbxjs at jp@jismmiv \bxjs at apply@mmiv \fi
% \end{macrocode}
%
% \paragraph{和文用単位のサポート}
@@ -9354,10 +9397,13 @@
\def\bxjs at adjust@jafont#1{%
\ifx\jsJaFont\bxjs@@auto
\bxjs at get@kanjiEmbed
- \ifx\bxjs at kanjiEmbed\relax
+ \ifx\bxjs at jaEmbed\relax
\let\bxjs at tmpa\@empty
\else
- \let\bxjs at tmpa\bxjs at kanjiEmbed
+ \let\bxjs at tmpa\bxjs at jaEmbed
+ \ifx\bxjs at jaVariant\bxjs@@hziv
+ \bxjs at apply@mmiv
+ \fi
\fi
\else
\let\bxjs at 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 at kanjiEmbed}
-% 現在の |updmap| の |kanjiEmbed| パラメタの値。
+% \begin{macro}{\bxjs at jaEmbed}
+% \begin{macro}{\bxjs at jaVariant}
+% 現在の |updmap| の |jaEmbed|・|jaVariant| パラメタの値。
% |\bxjs at get@kanjiEmbed| により実際の設定値が取得されてここに設定される。
+% \Note 古い版の |updmap| では |kanjiEmbed|・|kanjiVariant| であった。
% \begin{macrocode}
-\let\bxjs at kanjiEmbed\relax
+\let\bxjs at jaEmbed\relax
+\let\bxjs at jaVariant\relax
% \end{macrocode}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\bxjs at get@kanjiEmbed}
-% 現在の |updmap| の |kanjiEmbed| パラメタの値を取得する。
+% 現在の |updmap| の |jaEmbed|・|jaVariant| パラメタの値を取得する。
% \begin{macrocode}
\@onlypreamble\bxjs at get@kanjiEmbed
\def\bxjs at get@kanjiEmbed{%
\begingroup\setbox\z@=\hbox{%
+ \global\let\bxjs at do\@empty
+ \def\bxjs at next##1##2##3{%
+ \def##1####1##3 ####2\@nil####3\@nnil{%
+ \ifx$####1$\gdef##2{####2}\fi}%
+ \g at addto@macro\bxjs at do{%
+ \expandafter##1\bxjs at tmpa\@nil##3 \@nil\@nnil}}%
+ \bxjs at next\bxjs at do@a\bxjs at g@tmpa{kanjiEmbed}%
+ \bxjs at next\bxjs at do@b\bxjs at g@tmpa{jaEmbed}%
+ \bxjs at next\bxjs at do@c\bxjs at g@tmpb{kanjiVariant}%
+ \bxjs at next\bxjs at do@d\bxjs at g@tmpb{jaVariant}%
+%
\global\let\bxjs at g@tmpa\relax
+ \global\let\bxjs at g@tmpb\relax
\endlinechar\m at ne
\let\do\@makeother\dospecials
\catcode32=10 \catcode12=10 %form-feed
@@ -9403,32 +9466,14 @@
\@tempswatrue
\loop\if at tempswa
\read\@inputcheck to\bxjs at tmpa
- \expandafter\bxjs at get@ke at a\bxjs at tmpa\@nil kanjiEmbed \@nil\@nnil
- \ifx\bxjs at tmpb\relax\else
- \global\let\bxjs at g@tmpa\bxjs at tmpb
- \@tempswafalse
- \fi
- \expandafter\bxjs at get@ke at b\bxjs at tmpa\@nil jaEmbed \@nil\@nnil
- \ifx\bxjs at tmpb\relax\else
- \global\let\bxjs at g@tmpa\bxjs at tmpb
- \@tempswafalse
- \fi
+ \bxjs at do
\ifeof\@inputcheck \@tempswafalse \fi
\repeat
\fi
}\endgroup
- \let\bxjs at kanjiEmbed\bxjs at g@tmpa
+ \let\bxjs at jaEmbed\bxjs at g@tmpa
+ \let\bxjs at jaVariant\bxjs at g@tmpb
}
-\@onlypreamble\bxjs at get@ke at a
-\def\bxjs at get@ke at a#1kanjiEmbed #2\@nil#3\@nnil{%
- \ifx$#1$\def\bxjs at tmpb{#2}%
- \else \let\bxjs at tmpb\relax
- \fi}
-\@onlypreamble\bxjs at get@ke at b
-\def\bxjs at get@ke at b#1jaEmbed #2\@nil#3\@nnil{%
- \ifx$#1$\def\bxjs at tmpb{#2}%
- \else \let\bxjs at tmpb\relax
- \fi}
% \end{macrocode}
% \end{macro}
%
@@ -9440,10 +9485,10 @@
\@onlypreamble\bxjs at resolve@jafont at paren
\def\bxjs at resolve@jafont at paren#1{%
\def\bxjs at tmpb{\let#1}%
- \expandafter\bxjs at resolve@jafont at paren@a#1\@nil()\@nil\relax}
+ \expandafter\bxjs at resolve@jafont at paren@a#1\@nil()\@nil\@nnil#1}
\@onlypreamble\bxjs at resolve@jafont at paren@a
-\def\bxjs at resolve@jafont at paren@a#1(#2)#3\@nil#4\relax{%
- \ifx\relax#4\relax \bxjs at tmpb\jsJaFont
+\def\bxjs at resolve@jafont at paren@a#1(#2)#3\@nil#4\@nnil#5{%
+ \ifx\relax#4\relax \bxjs at tmpb#5%
\else
\edef\bxjs at tmpa{#1\bxjs at jafont@paren{#2}#3}%
\bxjs at tmpb\bxjs at tmpa
@@ -9738,6 +9783,11 @@
% \begin{macrocode}
\if \ifx\bxjs at driver@given\bxjs at driver@@dvipdfmx T%
\else\ifjsWithpTeXng T\else F\fi\fi T%
+ \IfFileExists{pxjahyper-enc.sty}{\@tempswatrue}{\@tempswafalse}
+ \if at tempswa
+ \RequirePackage{pxjahyper-enc}[2020/10/05]%v0.6
+ \ifbxjs at bigcode\else \suppressbigcode \fi
+ \else
\ifnum\jis"2121="A1A1 %euc
\bxjs at urgent@special{pdf:tounicode EUC-UCS2}
\else\ifnum\jis"2121="8140 %sjis
@@ -9748,9 +9798,11 @@
\PassOptionsToPackage{bigcode}{pxjahyper}
\else
\bxjs at urgent@special{pdf:tounicode UTF8-UCS2}
+ \PassOptionsToPackage{nobigcode}{pxjahyper}
\fi
\fi\fi\fi
\let\bxToUnicodeSpecialDone=t
+ \fi
\fi
% \end{macrocode}
%
Modified: trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.ins 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.ins 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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}}
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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 at clsname{bxjsarticle}
\newif\ifjsc at 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
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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 at clsname{bxjsbook}
\newif\ifjsc at 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
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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 at pkgname{bxjscjkcat}
\newcount\bxjx at cnta
\@onlypreamble\bxjx at tmpdo
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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 at pkgname{bxjscompat}
\let\bxac at engine=n
\def\bxac at do#1#2{%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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 at JTn}{gt}{b}{n}{<->ssub*gt/bx/n}{}
\DeclareFontShape{\jsc at JTn}{gt}{b}{it}{<->ssub*gt/bx/n}{}
\DeclareFontShape{\jsc at JTn}{gt}{b}{sl}{<->ssub*gt/bx/n}{}
+\@ifl at t@r\fmtversion{2020/10/01}
+ {\jsc at needsp@tchfalse}{\jsc at needsp@tchtrue}
+\ifjsc at needsp@tch % --- for 2020-02-02 or older BEGIN
\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not at math@alphabet\rmfamily\mathrm
@@ -224,6 +227,14 @@
\g at addto@macro\@ttfamilyhook
{\prepare at family@series at update@kanji{gt}\gtdefault}
\fi
+\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
+\AddToHook{rmfamily}%
+ {\prepare at family@series at update@kanji{mc}\mcdefault}
+\AddToHook{sffamily}%
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\AddToHook{ttfamily}%
+ {\prepare at family@series at 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 at minijs.sty}{}
\else\ifx p\jsEngine
\let\bxjs at let@hchar at chr\bxjs at let@hchar at chr@ue
\@onlypreamble\bxjs at cjk@loaded
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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}%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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 at endpreamble@hook
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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 at simplejasetupfalse
@@ -44,10 +44,12 @@
\define at key{bxjs}{strong-cmd}[true]{\bxjs at set@keyval{strongcmd}{#1}{}}
\def\bxjs at next#1{\bxjs at safe@setkeys{bxjsStd}{#1}}
\expandafter\bxjs at next\expandafter{\jsJaParam}
-\ifbxjs at jp@jismmiv
+\@onlypreamble\bxjs at apply@mmiv
+\def\bxjs at apply@mmiv{%
\g at addto@macro\@classoptionslist{,jis2004}
\PassOptionsToPackage{jis2004}{otf}
-\fi
+ \global\let\bxjs at apply@mmiv\relax}
+\ifbxjs at jp@jismmiv \bxjs at apply@mmiv \fi
\if j\jsEngine
\bxjs at jp@unitsfalse
\fi
@@ -170,10 +172,13 @@
\def\bxjs at adjust@jafont#1{%
\ifx\jsJaFont\bxjs@@auto
\bxjs at get@kanjiEmbed
- \ifx\bxjs at kanjiEmbed\relax
+ \ifx\bxjs at jaEmbed\relax
\let\bxjs at tmpa\@empty
\else
- \let\bxjs at tmpa\bxjs at kanjiEmbed
+ \let\bxjs at tmpa\bxjs at jaEmbed
+ \ifx\bxjs at jaVariant\bxjs@@hziv
+ \bxjs at apply@mmiv
+ \fi
\fi
\else
\let\bxjs at tmpa\jsJaFont
@@ -187,11 +192,24 @@
}
\def\bxjs@@auto{auto}
\def\bxjs@@noEmbed{noEmbed}
-\let\bxjs at kanjiEmbed\relax
+\def\bxjs@@hziv{-04}
+\let\bxjs at jaEmbed\relax
+\let\bxjs at jaVariant\relax
\@onlypreamble\bxjs at get@kanjiEmbed
\def\bxjs at get@kanjiEmbed{%
\begingroup\setbox\z@=\hbox{%
+ \global\let\bxjs at do\@empty
+ \def\bxjs at next##1##2##3{%
+ \def##1####1##3 ####2\@nil####3\@nnil{%
+ \ifx$####1$\gdef##2{####2}\fi}%
+ \g at addto@macro\bxjs at do{%
+ \expandafter##1\bxjs at tmpa\@nil##3 \@nil\@nnil}}%
+ \bxjs at next\bxjs at do@a\bxjs at g@tmpa{kanjiEmbed}%
+ \bxjs at next\bxjs at do@b\bxjs at g@tmpa{jaEmbed}%
+ \bxjs at next\bxjs at do@c\bxjs at g@tmpb{kanjiVariant}%
+ \bxjs at next\bxjs at do@d\bxjs at g@tmpb{jaVariant}%
\global\let\bxjs at g@tmpa\relax
+ \global\let\bxjs at g@tmpb\relax
\endlinechar\m at ne
\let\do\@makeother\dospecials
\catcode32=10 \catcode12=10 %form-feed
@@ -206,39 +224,21 @@
\@tempswatrue
\loop\if at tempswa
\read\@inputcheck to\bxjs at tmpa
- \expandafter\bxjs at get@ke at a\bxjs at tmpa\@nil kanjiEmbed \@nil\@nnil
- \ifx\bxjs at tmpb\relax\else
- \global\let\bxjs at g@tmpa\bxjs at tmpb
- \@tempswafalse
- \fi
- \expandafter\bxjs at get@ke at b\bxjs at tmpa\@nil jaEmbed \@nil\@nnil
- \ifx\bxjs at tmpb\relax\else
- \global\let\bxjs at g@tmpa\bxjs at tmpb
- \@tempswafalse
- \fi
+ \bxjs at do
\ifeof\@inputcheck \@tempswafalse \fi
\repeat
\fi
}\endgroup
- \let\bxjs at kanjiEmbed\bxjs at g@tmpa
+ \let\bxjs at jaEmbed\bxjs at g@tmpa
+ \let\bxjs at jaVariant\bxjs at g@tmpb
}
-\@onlypreamble\bxjs at get@ke at a
-\def\bxjs at get@ke at a#1kanjiEmbed #2\@nil#3\@nnil{%
- \ifx$#1$\def\bxjs at tmpb{#2}%
- \else \let\bxjs at tmpb\relax
- \fi}
-\@onlypreamble\bxjs at get@ke at b
-\def\bxjs at get@ke at b#1jaEmbed #2\@nil#3\@nnil{%
- \ifx$#1$\def\bxjs at tmpb{#2}%
- \else \let\bxjs at tmpb\relax
- \fi}
\@onlypreamble\bxjs at resolve@jafont at paren
\def\bxjs at resolve@jafont at paren#1{%
\def\bxjs at tmpb{\let#1}%
- \expandafter\bxjs at resolve@jafont at paren@a#1\@nil()\@nil\relax}
+ \expandafter\bxjs at resolve@jafont at paren@a#1\@nil()\@nil\@nnil#1}
\@onlypreamble\bxjs at resolve@jafont at paren@a
-\def\bxjs at resolve@jafont at paren@a#1(#2)#3\@nil#4\relax{%
- \ifx\relax#4\relax \bxjs at tmpb\jsJaFont
+\def\bxjs at resolve@jafont at paren@a#1(#2)#3\@nil#4\@nnil#5{%
+ \ifx\relax#4\relax \bxjs at tmpb#5%
\else
\edef\bxjs at tmpa{#1\bxjs at jafont@paren{#2}#3}%
\bxjs at tmpb\bxjs at tmpa
@@ -400,6 +400,11 @@
\fi
\if \ifx\bxjs at driver@given\bxjs at driver@@dvipdfmx T%
\else\ifjsWithpTeXng T\else F\fi\fi T%
+ \IfFileExists{pxjahyper-enc.sty}{\@tempswatrue}{\@tempswafalse}
+ \if at tempswa
+ \RequirePackage{pxjahyper-enc}[2020/10/05]%v0.6
+ \ifbxjs at bigcode\else \suppressbigcode \fi
+ \else
\ifnum\jis"2121="A1A1 %euc
\bxjs at urgent@special{pdf:tounicode EUC-UCS2}
\else\ifnum\jis"2121="8140 %sjis
@@ -410,9 +415,11 @@
\PassOptionsToPackage{bigcode}{pxjahyper}
\else
\bxjs at urgent@special{pdf:tounicode UTF8-UCS2}
+ \PassOptionsToPackage{nobigcode}{pxjahyper}
\fi
\fi\fi\fi
\let\bxToUnicodeSpecialDone=t
+ \fi
\fi
\ifx f\bxjs at enablejfam\else
\@enablejfamtrue
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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 at pkgname{bxjscjkcat}
\let\bxjsp at engine=n
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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 at clsname{bxjsreport}
\newif\ifjsc at 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
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls 2020-10-10 20:40:27 UTC (rev 56619)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls 2020-10-10 20:53:35 UTC (rev 56620)
@@ -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 at clsname{bxjsslide}
\newif\ifjsc at 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
More information about the tex-live-commits
mailing list.