texlive[54542] Master/texmf-dist: bxjscls (25mar20)
commits+karl at tug.org
commits+karl at tug.org
Wed Mar 25 22:09:59 CET 2020
Revision: 54542
http://tug.org/svn/texlive?view=revision&revision=54542
Author: karl
Date: 2020-03-25 22:09:59 +0100 (Wed, 25 Mar 2020)
Log Message:
-----------
bxjscls (25mar20)
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/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-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md 2020-03-25 21:09:59 UTC (rev 54542)
@@ -21,7 +21,7 @@
* 必須パッケージ：
- keyval
- calc
- - geometry
+ - geometry（v5.0以降）
* standard 和文ドライバで連携するパッケージ：
- (pdf)LaTeX の場合：
CJK / bxcjkjatype（v0.2c以降）
@@ -33,6 +33,7 @@
- type1cm ： `magstyle` が `real`/`xreal` である場合
- pxchfon（v0.5以降）： pLaTeX で `jafont` を指定した場合
- zxjafont（v0.2a以降）： XeLaTeX で `jafont` を指定した場合
+ - bxwareki ： 日付の和暦表示機能を使う場合
* エンジンが (u)pTeX 以外で、かつ和文ドライバが standard 以外の場合、
そのエンジンに対応する日本語処理パッケージが必要となる。
@@ -98,6 +99,12 @@
更新履歴
--------
+ * Version 2.0 〈2020/03/25〉
+ - geometry 4.x 版のサポートを廃止した。
+ - 開発者命令 `\ifdraft` を廃止した。
+ - 和暦の処理に関して bxwareki パッケージを必須とする。
+ - 旧版との互換性のためのオプション（`dvipdfmx-if-dvi` など）を
+ 非推奨の扱いとする。
* Version 1.9k 〈2020/02/15〉
- バグ修正。（`12Q` 等を使えるようにする。）
* Version 1.9j 〈2020/02/05〉
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-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex 2020-03-25 21:09:59 UTC (rev 54542)
@@ -12,8 +12,8 @@
\renewcommand*{\XeLaTeX}{XeLaTeX}}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.9k}
-\newcommand{\PkgDate}{2020/02/15}
+\newcommand{\PkgVersion}{2.0}
+\newcommand{\PkgDate}{2020/03/25}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}\nobr#1\nobr\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
@@ -262,8 +262,8 @@
\begin{quote}\small\begin{verbatim}
\documentclass[a4paper,twocolumn]{article}
\usepackage{zxjatype}
-\setCJKmainfont[BoldFont=IPAexGothic]{IPAexMincho}% 明朝→IPAex明朝
-\setCJKsansfont[BoldFont=IPAexGothic]{IPAexGothic}% ゴシック→IPAexゴシック
+\setCJKmainfont[BoldFont=HaranoAjiGothic-Medium.otf]{HaranoAjiMincho-Regular.otf}
+\setCJKsansfont[BoldFont=HaranoAjiGothic-Medium.otf]{HaranoAjiGothic-Medium.otf}
\end{verbatim}\end{quote}
|jafont| を指定した場合は：
@@ -291,7 +291,7 @@
\begin{quote}\small\begin{verbatim}
\documentclass[b5paper,9pt]{ltjsarticle}
\usepackage{luatexja-fontspec}
-\usepackage[ipaex]{luatexja-preset}
+\usepackage[haranoaji]{luatexja-preset}
\end{verbatim}\end{quote}
|jafont| を指定した場合は：
@@ -364,8 +364,8 @@
\Note \Pkg{hyperref}のパッケージオプションで和文文字を含む文書情報を
指定することはできない。
（\Pkg{hyperref}の制限仕様。）
-\item |jafont| が無い場合の既定のフォント設定は多くのエンジンに
- おいて「IPAexフォント使用」であるが、(u){\pLaTeX}だけは異なっていて
+\item (u){\pLaTeX}において、
+ |jafont| が無い場合の既定のフォント設定は
「何も指定しない状態」（JSクラスと同様）である。
すなわち実際に使われる物理フォントの選択はDVIウェアの設定に
委ねられている。
@@ -590,7 +590,8 @@
エンジンが |platex| か |uplatex| の時は |ja| の
既定値は |standard| である。
それ以外の場合は、一応 |minimal| とするが、
- 明示的な指定が推奨される。
+ 明示的な指定が推奨される
+ （2.0版で正式に非推奨の扱いとなった）。
\item |jafont=|\Meta{名前}\Means
「和文フォントプリセット指定」の名前を設定する。
\Note \ref{sec:Basic}節で解説した通り、standard和文ドライバでは |jafont|
@@ -839,6 +840,8 @@
\paragraph{旧版との互換用のオプション}\mbox{}
+2.0版以降では、これらのオプションの使用は\jemph{非推奨}である。
+
\begin{itemize}
\item |zw|\Means
|use-zw=true| と同値。
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-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx 2020-03-25 21:09:59 UTC (rev 54542)
@@ -56,7 +56,8 @@
%<*driver>
\ProvidesFile{bxjscls.dtx}
%</driver>
- [2020/02/15 v1.9k BXJS document classes]
+ [2020/03/25 v2.0 BXJS document classes]
+% [2020/02/15 v1.9k BXJS document classes]
% [2020/02/05 v1.9j BXJS document classes]
% based on jsclasses [2020/02/02]
% [2019/11/24 v1.9i BXJS document classes]
@@ -1150,24 +1151,13 @@
%
% \begin{ZRnote}
% \begin{macro}{\ifjsDraft}
-% JSクラスは |\ifdraft| という公開名のスイッチを用いているが、
-% これは |ifdraft| パッケージと衝突するので、代わりに |\ifjsDraft|
-% の名前を用い、本文開始時に |\ifdraft| が未定義の場合に限り、
-% |\ifjsDraft| を |\ifdraft| にコピーする処理にする。
+% |draft| オプションが指定されているか。
% \Note JSクラスの |\ifdraft| が廃止されたので、
-% |\ifdraft| は2.0版で廃止を予定する。
+% BXJSクラスでも |\ifdraft| を2.0版で廃止した。
% \begin{macrocode}
-\let\ifjsDraft\iffalse
-\@onlypreamble\bxjs at draft
-\def\bxjs at draft#1{%
- \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname}
-\DeclareOption{draft}{\bxjs at draft{true}\setlength\overfullrule{5pt}}
-\DeclareOption{final}{\bxjs at draft{false}\setlength\overfullrule{0pt}}
-\g at addto@macro\bxjs at begin@document at hook{%
- \expandafter\ifx\csname ifdraft\endcsname\relax
- \expandafter\let\csname ifdraft\expandafter\endcsname
- \csname ifjsDraft\endcsname
- \fi}
+\newif\ifjsDraft
+\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt }
+\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt }
% \end{macrocode}
% \end{macro}
% \end{ZRnote}
@@ -1448,21 +1438,11 @@
% 「|UTF8-UCS2|」の代わりに「|UTF8-UTF16|」を使うか。
% BMP外の文字に対応できる「|UTF8-UTF16|」の方が望ましいのであるが、
% このファイルが利用可能かの確実な判定が困難であるため、
-% オプションで指定することとする。
+% 既定を真とした上で、オプションで指定することとする。
+% \Note 2.0版より、既定値を常に真とする。
% \begin{macrocode}
-\newif\ifbxjs at bigcode \bxjs at bigcodefalse
+\newif\ifbxjs at bigcode \bxjs at bigcodetrue
% \end{macrocode}
-% その上で、「{\TeX}環境がある程度新しければ利用可能であろう」
-% と判断し |bxjs at bigcode| の既定値を真とする。
-% 具体的な判断基準として、
-% 「{\TeX}のバージョンが3.14159265（2014年1月）以上であるか」
-% を採用する。
-% \begin{macrocode}
-\edef\bxjs at tmpa{\expandafter\noexpand\csname\endcsname}
-\def\bxjs at tmpb#1 #2#3\@nil{%
- \ifx1#2\bxjs at bigcodetrue \fi}
-\expandafter\bxjs at tmpb\meaning\bxjs at tmpa1 0\@nil
-% \end{macrocode}
% \end{macro}
%
% |nobigcode|／|bigcode| オプションの定義。
@@ -3497,19 +3477,13 @@
% \begin{macrocode}
\g at addto@macro\bxjs at bd@pre at geometry@hook{%
% \end{macrocode}
-% |geometry| の4.x版に関する対策。
-% \Note |geometry| の4.x版の使用はBXJS 1.2版より非推奨とし、
-% 2.0版でサポートを廃止する予定。
+% BXJS2.0版より、|geometry| の4.x版のサポートは廃止された。
% \begin{macrocode}
\@ifpackagelater{geometry}{2010/02/12}{}{%else
- \PackageWarningNoLine\bxjs at clsname
- {The 'geometry' package installed\MessageBreak
- is too old (< v5.0)}%
- \if x\jsEngine \ifnum\mag=\@m\else
- \def\bxjs at Gm@driver{pdftex}
- \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi
- \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi
- \fi\fi}%
+ \PackageError\bxjs at clsname
+ {Your 'geometry' package is too old (< v5.0)}%
+ {\@ehc}%
+ \let\Gm at driver\relax}%
% \end{macrocode}
% エンジンが |platex-ng| の時は |geometry| のドライバを |pdftex| にする。
% \begin{macrocode}
@@ -7887,9 +7861,8 @@
% \begin{ZRnote}
% 環境変数 |SOURCE_DATE_EPOCH|／|FORCE_SOURCE_DATE| が
% 設定されている場合は“今日”が過去・未来の日付になる可能性がある。
-% BXJSクラスでは、和暦の扱いは |bxwareki| パッケージに任せることを
-% 原則とする。
-% ただし、|bxwareki| が使えない場合は自前で処理する。
+% BXJSクラスでは、和暦の扱いは |bxwareki| パッケージに任せる。
+% \Note 2.0版より、\textbf{完全に} |bxwareki| に任せる。
% \end{ZRnote}
%
% \begin{macrocode}
@@ -7897,39 +7870,30 @@
\@tempswafalse
\if p\jsEngine \@tempswatrue \fi
\if n\jsEngine \@tempswatrue \fi
-\if at tempswa \expandafter\@firstoftwo
-\else \expandafter\@secondoftwo
-\fi
-{%
+\bxjs at cond\if at tempswa\fi{%
% 欧文8bitTeXの場合
\newif\ifjsSeireki \jsSeirekitrue
\def\bxjs at decl@Seireki at cmds{%
\def\西暦{\jsSeirekitrue}%
- \def\和暦{\jsSeirekifalse}}
+ \def\和暦{\jsSeirekifalse\bxjs at wareki@used}}
\def\Seireki{\jsSeirekitrue}
-\def\Wareki{\jsSeirekifalse}
-\def\bxjs at if@use at seireki{%
- \ifjsSeireki \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\jsSeirekifalse\bxjs at wareki@used}
+\def\bxjs at if@use at seireki{\bxjs at cond\ifjsSeireki\fi}
+\def\bxjs at iai{\noexpand~}
}{%
\newif\if西暦 \西暦true
\def\bxjs at decl@Seireki at cmds{%
\def\西暦{\西暦true}%
- \def\和暦{\西暦false}}
+ \def\和暦{\西暦false\bxjs at wareki@used}}
\def\Seireki{\西暦true}
-\def\Wareki{\西暦false}
-\def\bxjs at if@use at seireki{%
- \if西暦 \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\西暦false\bxjs at wareki@used}
+\def\bxjs at if@use at seireki{\bxjs at cond\if西暦\fi}
+\let\bxjs at iai\@empty
}
\bxjs at decl@Seireki at cmds
\let\bxjs at unxp\@firstofone \let\bxjs at onxp\@firstofone
-\bxjs at test@engine\unexpanded{\let\bxjs at unxp\unexpanded
- \def\bxjs at onxp{\unexpanded\expandafter}}
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \def\bxjs at iai{\noexpand~}
-\else \def\bxjs at iai{}
-\fi
+\bxjs at test@engine\unexpanded{%
+ \let\bxjs at unxp\unexpanded \def\bxjs at onxp{\unexpanded\expandafter}}
% \end{macrocode}
%
% \begin{macro}{\ifbxjs at bxwareki@avail}
@@ -7942,11 +7906,26 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\bxjs at wareki@used}
+% 和暦が非対応の場合に警告を出す。
+% \begin{macrocode}
+\ifbxjs at bxwareki@avail \let\bxjs at wareki@used\@empty
+\else
+ \bxjs at robust@def\bxjs at wareki@used{%
+ \global\let\bxjs at wareki@used\@empty
+ \ClassWarning\bxjs at clsname
+ {Wareki mode is not supported, since\MessageBreak
+ 'bxwareki' is unavailable, found}}
+ \g at addto@macro\bxjs at begin@document at hook{%
+ \let\bxjs at wareki@used\@empty}
+\fi
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\jayear}
% 和暦における年の表記（元号+年数）。
% \begin{macro}{\heisei}
-% 年数を表す整数レジスタで、
-% 元号が「平成」である場合にのみ定義される。
+% 年数を表す整数レジスタで、元号が「平成」である場合にのみ定義される。
% \begin{macrocode}
\ifbxjs at bxwareki@avail
\let\jayear\warekiyear
@@ -7954,18 +7933,10 @@
\newcount\heisei \heisei=\value{warekiyear}
\fi
% \end{macrocode}
-% |bxwareki| が使えない場合のフォールバック処理。
-% 平成のみに対応する。
+% |bxwareki| が使えない場合は西暦表示にする。
% \begin{macrocode}
\else
- \@tempcnta=\the\year\two at digits\month\two at digits\day\relax
- \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501
- \newcount\heisei \heisei\year \advance\heisei-1988\relax
- \fi\fi
- \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \edef\jayear{\bxjs at unxp{平成}\bxjs at iai \the\heisei \bxjs at iai}
- \else \edef\jayear{\the\year \bxjs at iai}
- \fi
+ \edef\jayear{\the\year \bxjs at iai}
\fi
% \end{macrocode}
% \end{macro}
@@ -7975,15 +7946,8 @@
% 英語、西暦、和暦で場合分けをする。
% \begin{macrocode}
\let\bxjs at next\relax
-\ifbxjs at bxwareki@avail
- \ifx\warekigengo\@empty\else
- \def\bxjs at next{\bxjs at onxp{\warekitoday}}
- \fi
-\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \def\bxjs at next{%
- \bxjs at unxp{平成}\bxjs at iai\number\heisei\bxjs at iai\bxjs at unxp{年}%
- \bxjs at iai\number\month\bxjs at iai\bxjs at unxp{月}%
- \bxjs at iai\number\day\bxjs at iai\bxjs at unxp{日}}
+\ifbxjs at bxwareki@avail \ifx\warekigengo\@empty\else
+ \def\bxjs at next{\bxjs at onxp{\warekitoday}}
\fi\fi
\edef\bxjs at today{%
\if at english
@@ -8009,7 +7973,7 @@
% 場合に影響を受けないようにする。
% \begin{macrocode}
\g at addto@macro\bxjs at begin@document at hook{%
- \ifx\bbl at jpn@Seirekitrue\@undefined\else
+ \ifx\bbl at jpn@maybekansuji\@undefined\else
\bxjs at decl@Seireki at cmds
\g at addto@macro\datejapanese{%
\let\today\bxjs at today}%
@@ -9809,7 +9773,8 @@
%
% |\jsJaFont| が指定された場合は、その値をオプションと
% して |zxjafont| を読み込む。
-% 非指定の場合はIPAexフォントを使用する。
+% 非指定の場合は原ノ味フォントを使用する。
+% \Note 2.0版より既定をIPAexから原ノ味に変更。
% \begin{macrocode}
\bxjs at adjust@jafont{f}
\let\bxjs at jafont@paren\@gobble
@@ -9816,8 +9781,8 @@
\bxjs at resolve@jafont at paren\bxjs at tmpa
\edef\bxjs at tmpa{\bxjs at catopt\bxjs at tmpa\bxjs at jp@font}
\ifx\bxjs at tmpa\@empty
- \setCJKmainfont[BoldFont=ipaexg.ttf]{ipaexm.ttf}
- \setCJKsansfont[BoldFont=ipaexg.ttf]{ipaexg.ttf}
+ \setCJKmainfont[BoldFont=HaranoAjiGothic-Medium.otf]{HaranoAjiMincho-Regular.otf}
+ \setCJKsansfont[BoldFont=HaranoAjiGothic-Medium.otf]{HaranoAjiGothic-Medium.otf}
\else
\edef\bxjs at next{%
\noexpand\RequirePackage[\bxjs at tmpa]{zxjafont}[2013/01/28]% v0.2a
@@ -10004,9 +9969,9 @@
%
% |\jsJaFont| が指定された場合は、その値をオプションと
% して |luatexja-preset| を読み込む。
-% 非指定の場合は、|luatexja-preset| パッケージの |ipaex|
-% オプション（IPAexフォント使用）と等価な設定を用いる
+% 非指定の場合は原ノ味フォントを指定する
% （|luatexja-preset| は読み込まない）。
+% \Note 2.0版より既定をIPAexから原ノ味に変更。
% \begin{macrocode}
\bxjs at adjust@jafont{t}
\ifx\bxjs at tmpa\bxjs@@noEmbed
@@ -10017,8 +9982,8 @@
\edef\bxjs at tmpa{\bxjs at catopt\bxjs at tmpa\bxjs at jp@font}
\ifx\bxjs at tmpa\@empty
\defaultjfontfeatures{ Kerning=Off }
- \setmainjfont[BoldFont=IPAexGothic,JFM=ujis]{IPAexMincho}
- \setsansjfont[BoldFont=IPAexGothic,JFM=ujis]{IPAexGothic}
+ \setmainjfont[BoldFont=HaranoAjiGothic-Medium.otf,JFM=ujis]{HaranoAjiMincho-Regular.otf}
+ \setsansjfont[BoldFont=HaranoAjiGothic-Medium.otf,JFM=ujis]{HaranoAjiGothic-Medium.otf}
\else
\edef\bxjs at next{%
\noexpand\RequirePackage[\bxjs at tmpa]{luatexja-preset}%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls 2020-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls 2020-03-25 21:09:59 UTC (rev 54542)
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsarticle}
- [2020/02/15 v1.9k BXJS document classes]
+ [2020/03/25 v2.0 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs at clsname{bxjsarticle}
\newif\ifjsc at needsp@tch
@@ -316,17 +316,9 @@
\define at key{bxjs}{enablejfam}[true]{%
\bxjs at set@keyval{enablejfam}{#1}{}}
\DeclareOption{disablejfam}{\let\bxjs at enablejfam=f}
-\let\ifjsDraft\iffalse
-\@onlypreamble\bxjs at draft
-\def\bxjs at draft#1{%
- \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname}
-\DeclareOption{draft}{\bxjs at draft{true}\setlength\overfullrule{5pt}}
-\DeclareOption{final}{\bxjs at draft{false}\setlength\overfullrule{0pt}}
-\g at addto@macro\bxjs at begin@document at hook{%
- \expandafter\ifx\csname ifdraft\endcsname\relax
- \expandafter\let\csname ifdraft\expandafter\endcsname
- \csname ifjsDraft\endcsname
- \fi}
+\newif\ifjsDraft
+\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt }
+\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt }
\newif\ifbxjs at papersize
\bxjs at papersizetrue
\DeclareOption{nopapersize}{\bxjs at papersizefalse}
@@ -428,11 +420,7 @@
\let\bxjs at driver@given\bxjs at driver@@xetex}
\DeclareOption{dvipdfmx-if-dvi}{%
\setkeys{bxjs}{dvi=dvipdfmx}}
-\newif\ifbxjs at bigcode \bxjs at bigcodefalse
-\edef\bxjs at tmpa{\expandafter\noexpand\csname\endcsname}
-\def\bxjs at tmpb#1 #2#3\@nil{%
- \ifx1#2\bxjs at bigcodetrue \fi}
-\expandafter\bxjs at tmpb\meaning\bxjs at tmpa1 0\@nil
+\newif\ifbxjs at bigcode \bxjs at bigcodetrue
\DeclareOption{nobigcode}{%
\bxjs at bigcodefalse}
\DeclareOption{bigcode}{%
@@ -1144,14 +1132,10 @@
\bxjs at postproc@layout
\g at addto@macro\bxjs at bd@pre at geometry@hook{%
\@ifpackagelater{geometry}{2010/02/12}{}{%else
- \PackageWarningNoLine\bxjs at clsname
- {The 'geometry' package installed\MessageBreak
- is too old (< v5.0)}%
- \if x\jsEngine \ifnum\mag=\@m\else
- \def\bxjs at Gm@driver{pdftex}
- \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi
- \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi
- \fi\fi}%
+ \PackageError\bxjs at clsname
+ {Your 'geometry' package is too old (< v5.0)}%
+ {\@ehc}%
+ \let\Gm at driver\relax}%
\ifjsWithpTeXng
\ifx\Gm at driver\@empty
\def\Gm at driver{pdftex}%
@@ -2290,42 +2274,43 @@
\@tempswafalse
\if p\jsEngine \@tempswatrue \fi
\if n\jsEngine \@tempswatrue \fi
-\if at tempswa \expandafter\@firstoftwo
-\else \expandafter\@secondoftwo
-\fi
-{%
+\bxjs at cond\if at tempswa\fi{%
\newif\ifjsSeireki \jsSeirekitrue
\def\bxjs at decl@Seireki at cmds{%
\def\西暦{\jsSeirekitrue}%
- \def\和暦{\jsSeirekifalse}}
+ \def\和暦{\jsSeirekifalse\bxjs at wareki@used}}
\def\Seireki{\jsSeirekitrue}
-\def\Wareki{\jsSeirekifalse}
-\def\bxjs at if@use at seireki{%
- \ifjsSeireki \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\jsSeirekifalse\bxjs at wareki@used}
+\def\bxjs at if@use at seireki{\bxjs at cond\ifjsSeireki\fi}
+\def\bxjs at iai{\noexpand~}
}{%
\newif\if西暦 \西暦true
\def\bxjs at decl@Seireki at cmds{%
\def\西暦{\西暦true}%
- \def\和暦{\西暦false}}
+ \def\和暦{\西暦false\bxjs at wareki@used}}
\def\Seireki{\西暦true}
-\def\Wareki{\西暦false}
-\def\bxjs at if@use at seireki{%
- \if西暦 \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\西暦false\bxjs at wareki@used}
+\def\bxjs at if@use at seireki{\bxjs at cond\if西暦\fi}
+\let\bxjs at iai\@empty
}
\bxjs at decl@Seireki at cmds
\let\bxjs at unxp\@firstofone \let\bxjs at onxp\@firstofone
-\bxjs at test@engine\unexpanded{\let\bxjs at unxp\unexpanded
- \def\bxjs at onxp{\unexpanded\expandafter}}
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \def\bxjs at iai{\noexpand~}
-\else \def\bxjs at iai{}
-\fi
+\bxjs at test@engine\unexpanded{%
+ \let\bxjs at unxp\unexpanded \def\bxjs at onxp{\unexpanded\expandafter}}
\newif\ifbxjs at bxwareki@avail
\IfFileExists{bxwareki.sty}{%
\RequirePackage{bxwareki}[]%
\bxjs at bxwareki@availtrue}{}
+\ifbxjs at bxwareki@avail \let\bxjs at wareki@used\@empty
+\else
+ \bxjs at robust@def\bxjs at wareki@used{%
+ \global\let\bxjs at wareki@used\@empty
+ \ClassWarning\bxjs at clsname
+ {Wareki mode is not supported, since\MessageBreak
+ 'bxwareki' is unavailable, found}}
+ \g at addto@macro\bxjs at begin@document at hook{%
+ \let\bxjs at wareki@used\@empty}
+\fi
\ifbxjs at bxwareki@avail
\let\jayear\warekiyear
\def\bxjs at tmpa{H}\ifx\bxjs at tmpa\warekigengoinitial
@@ -2332,25 +2317,11 @@
\newcount\heisei \heisei=\value{warekiyear}
\fi
\else
- \@tempcnta=\the\year\two at digits\month\two at digits\day\relax
- \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501
- \newcount\heisei \heisei\year \advance\heisei-1988\relax
- \fi\fi
- \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \edef\jayear{\bxjs at unxp{平成}\bxjs at iai \the\heisei \bxjs at iai}
- \else \edef\jayear{\the\year \bxjs at iai}
- \fi
+ \edef\jayear{\the\year \bxjs at iai}
\fi
\let\bxjs at next\relax
-\ifbxjs at bxwareki@avail
- \ifx\warekigengo\@empty\else
- \def\bxjs at next{\bxjs at onxp{\warekitoday}}
- \fi
-\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \def\bxjs at next{%
- \bxjs at unxp{平成}\bxjs at iai\number\heisei\bxjs at iai\bxjs at unxp{年}%
- \bxjs at iai\number\month\bxjs at iai\bxjs at unxp{月}%
- \bxjs at iai\number\day\bxjs at iai\bxjs at unxp{日}}
+\ifbxjs at bxwareki@avail \ifx\warekigengo\@empty\else
+ \def\bxjs at next{\bxjs at onxp{\warekitoday}}
\fi\fi
\edef\bxjs at today{%
\if at english
@@ -2369,7 +2340,7 @@
\fi}
\let\today\bxjs at today
\g at addto@macro\bxjs at begin@document at hook{%
- \ifx\bbl at jpn@Seirekitrue\@undefined\else
+ \ifx\bbl at jpn@maybekansuji\@undefined\else
\bxjs at decl@Seireki at cmds
\g at addto@macro\datejapanese{%
\let\today\bxjs at today}%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls 2020-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls 2020-03-25 21:09:59 UTC (rev 54542)
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsbook}
- [2020/02/15 v1.9k BXJS document classes]
+ [2020/03/25 v2.0 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs at clsname{bxjsbook}
\newif\ifjsc at needsp@tch
@@ -322,17 +322,9 @@
\define at key{bxjs}{enablejfam}[true]{%
\bxjs at set@keyval{enablejfam}{#1}{}}
\DeclareOption{disablejfam}{\let\bxjs at enablejfam=f}
-\let\ifjsDraft\iffalse
-\@onlypreamble\bxjs at draft
-\def\bxjs at draft#1{%
- \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname}
-\DeclareOption{draft}{\bxjs at draft{true}\setlength\overfullrule{5pt}}
-\DeclareOption{final}{\bxjs at draft{false}\setlength\overfullrule{0pt}}
-\g at addto@macro\bxjs at begin@document at hook{%
- \expandafter\ifx\csname ifdraft\endcsname\relax
- \expandafter\let\csname ifdraft\expandafter\endcsname
- \csname ifjsDraft\endcsname
- \fi}
+\newif\ifjsDraft
+\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt }
+\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt }
\newif\ifbxjs at papersize
\bxjs at papersizetrue
\DeclareOption{nopapersize}{\bxjs at papersizefalse}
@@ -434,11 +426,7 @@
\let\bxjs at driver@given\bxjs at driver@@xetex}
\DeclareOption{dvipdfmx-if-dvi}{%
\setkeys{bxjs}{dvi=dvipdfmx}}
-\newif\ifbxjs at bigcode \bxjs at bigcodefalse
-\edef\bxjs at tmpa{\expandafter\noexpand\csname\endcsname}
-\def\bxjs at tmpb#1 #2#3\@nil{%
- \ifx1#2\bxjs at bigcodetrue \fi}
-\expandafter\bxjs at tmpb\meaning\bxjs at tmpa1 0\@nil
+\newif\ifbxjs at bigcode \bxjs at bigcodetrue
\DeclareOption{nobigcode}{%
\bxjs at bigcodefalse}
\DeclareOption{bigcode}{%
@@ -1178,14 +1166,10 @@
\bxjs at postproc@layout
\g at addto@macro\bxjs at bd@pre at geometry@hook{%
\@ifpackagelater{geometry}{2010/02/12}{}{%else
- \PackageWarningNoLine\bxjs at clsname
- {The 'geometry' package installed\MessageBreak
- is too old (< v5.0)}%
- \if x\jsEngine \ifnum\mag=\@m\else
- \def\bxjs at Gm@driver{pdftex}
- \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi
- \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi
- \fi\fi}%
+ \PackageError\bxjs at clsname
+ {Your 'geometry' package is too old (< v5.0)}%
+ {\@ehc}%
+ \let\Gm at driver\relax}%
\ifjsWithpTeXng
\ifx\Gm at driver\@empty
\def\Gm at driver{pdftex}%
@@ -2396,42 +2380,43 @@
\@tempswafalse
\if p\jsEngine \@tempswatrue \fi
\if n\jsEngine \@tempswatrue \fi
-\if at tempswa \expandafter\@firstoftwo
-\else \expandafter\@secondoftwo
-\fi
-{%
+\bxjs at cond\if at tempswa\fi{%
\newif\ifjsSeireki \jsSeirekitrue
\def\bxjs at decl@Seireki at cmds{%
\def\西暦{\jsSeirekitrue}%
- \def\和暦{\jsSeirekifalse}}
+ \def\和暦{\jsSeirekifalse\bxjs at wareki@used}}
\def\Seireki{\jsSeirekitrue}
-\def\Wareki{\jsSeirekifalse}
-\def\bxjs at if@use at seireki{%
- \ifjsSeireki \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\jsSeirekifalse\bxjs at wareki@used}
+\def\bxjs at if@use at seireki{\bxjs at cond\ifjsSeireki\fi}
+\def\bxjs at iai{\noexpand~}
}{%
\newif\if西暦 \西暦true
\def\bxjs at decl@Seireki at cmds{%
\def\西暦{\西暦true}%
- \def\和暦{\西暦false}}
+ \def\和暦{\西暦false\bxjs at wareki@used}}
\def\Seireki{\西暦true}
-\def\Wareki{\西暦false}
-\def\bxjs at if@use at seireki{%
- \if西暦 \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\西暦false\bxjs at wareki@used}
+\def\bxjs at if@use at seireki{\bxjs at cond\if西暦\fi}
+\let\bxjs at iai\@empty
}
\bxjs at decl@Seireki at cmds
\let\bxjs at unxp\@firstofone \let\bxjs at onxp\@firstofone
-\bxjs at test@engine\unexpanded{\let\bxjs at unxp\unexpanded
- \def\bxjs at onxp{\unexpanded\expandafter}}
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \def\bxjs at iai{\noexpand~}
-\else \def\bxjs at iai{}
-\fi
+\bxjs at test@engine\unexpanded{%
+ \let\bxjs at unxp\unexpanded \def\bxjs at onxp{\unexpanded\expandafter}}
\newif\ifbxjs at bxwareki@avail
\IfFileExists{bxwareki.sty}{%
\RequirePackage{bxwareki}[]%
\bxjs at bxwareki@availtrue}{}
+\ifbxjs at bxwareki@avail \let\bxjs at wareki@used\@empty
+\else
+ \bxjs at robust@def\bxjs at wareki@used{%
+ \global\let\bxjs at wareki@used\@empty
+ \ClassWarning\bxjs at clsname
+ {Wareki mode is not supported, since\MessageBreak
+ 'bxwareki' is unavailable, found}}
+ \g at addto@macro\bxjs at begin@document at hook{%
+ \let\bxjs at wareki@used\@empty}
+\fi
\ifbxjs at bxwareki@avail
\let\jayear\warekiyear
\def\bxjs at tmpa{H}\ifx\bxjs at tmpa\warekigengoinitial
@@ -2438,25 +2423,11 @@
\newcount\heisei \heisei=\value{warekiyear}
\fi
\else
- \@tempcnta=\the\year\two at digits\month\two at digits\day\relax
- \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501
- \newcount\heisei \heisei\year \advance\heisei-1988\relax
- \fi\fi
- \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \edef\jayear{\bxjs at unxp{平成}\bxjs at iai \the\heisei \bxjs at iai}
- \else \edef\jayear{\the\year \bxjs at iai}
- \fi
+ \edef\jayear{\the\year \bxjs at iai}
\fi
\let\bxjs at next\relax
-\ifbxjs at bxwareki@avail
- \ifx\warekigengo\@empty\else
- \def\bxjs at next{\bxjs at onxp{\warekitoday}}
- \fi
-\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \def\bxjs at next{%
- \bxjs at unxp{平成}\bxjs at iai\number\heisei\bxjs at iai\bxjs at unxp{年}%
- \bxjs at iai\number\month\bxjs at iai\bxjs at unxp{月}%
- \bxjs at iai\number\day\bxjs at iai\bxjs at unxp{日}}
+\ifbxjs at bxwareki@avail \ifx\warekigengo\@empty\else
+ \def\bxjs at next{\bxjs at onxp{\warekitoday}}
\fi\fi
\edef\bxjs at today{%
\if at english
@@ -2475,7 +2446,7 @@
\fi}
\let\today\bxjs at today
\g at addto@macro\bxjs at begin@document at hook{%
- \ifx\bbl at jpn@Seirekitrue\@undefined\else
+ \ifx\bbl at jpn@maybekansuji\@undefined\else
\bxjs at decl@Seireki at cmds
\g at addto@macro\datejapanese{%
\let\today\bxjs at today}%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty 2020-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty 2020-03-25 21:09:59 UTC (rev 54542)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{bxjscjkcat}
- [2020/02/15 v1.9k BXJS document classes]
+ [2020/03/25 v2.0 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-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty 2020-03-25 21:09:59 UTC (rev 54542)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{bxjscompat}
- [2020/02/15 v1.9k BXJS document classes]
+ [2020/03/25 v2.0 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-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def 2020-03-25 21:09:59 UTC (rev 54542)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-minimal.def}
- [2020/02/15 v1.9k BXJS document classes]
+ [2020/03/25 v2.0 BXJS document classes]
%% このファイルは日本語文字を含みます
\def\DeclareJaTextFontCommand#1#2{%
\DeclareRobustCommand#1[1]{%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def 2020-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def 2020-03-25 21:09:59 UTC (rev 54542)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-modern.def}
- [2020/02/15 v1.9k BXJS document classes]
+ [2020/03/25 v2.0 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-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def 2020-03-25 21:09:59 UTC (rev 54542)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-pandoc.def}
- [2020/02/15 v1.9k BXJS document classes]
+ [2020/03/25 v2.0 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-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def 2020-03-25 21:09:59 UTC (rev 54542)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-standard.def}
- [2020/02/15 v1.9k BXJS document classes]
+ [2020/03/25 v2.0 BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs at simplejasetupfalse
@@ -486,8 +486,8 @@
\bxjs at resolve@jafont at paren\bxjs at tmpa
\edef\bxjs at tmpa{\bxjs at catopt\bxjs at tmpa\bxjs at jp@font}
\ifx\bxjs at tmpa\@empty
- \setCJKmainfont[BoldFont=ipaexg.ttf]{ipaexm.ttf}
- \setCJKsansfont[BoldFont=ipaexg.ttf]{ipaexg.ttf}
+ \setCJKmainfont[BoldFont=HaranoAjiGothic-Medium.otf]{HaranoAjiMincho-Regular.otf}
+ \setCJKsansfont[BoldFont=HaranoAjiGothic-Medium.otf]{HaranoAjiGothic-Medium.otf}
\else
\edef\bxjs at next{%
\noexpand\RequirePackage[\bxjs at tmpa]{zxjafont}[2013/01/28]% v0.2a
@@ -585,8 +585,8 @@
\edef\bxjs at tmpa{\bxjs at catopt\bxjs at tmpa\bxjs at jp@font}
\ifx\bxjs at tmpa\@empty
\defaultjfontfeatures{ Kerning=Off }
- \setmainjfont[BoldFont=IPAexGothic,JFM=ujis]{IPAexMincho}
- \setsansjfont[BoldFont=IPAexGothic,JFM=ujis]{IPAexGothic}
+ \setmainjfont[BoldFont=HaranoAjiGothic-Medium.otf,JFM=ujis]{HaranoAjiMincho-Regular.otf}
+ \setsansjfont[BoldFont=HaranoAjiGothic-Medium.otf,JFM=ujis]{HaranoAjiGothic-Medium.otf}
\else
\edef\bxjs at next{%
\noexpand\RequirePackage[\bxjs at tmpa]{luatexja-preset}%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty 2020-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty 2020-03-25 21:09:59 UTC (rev 54542)
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{bxjspandoc}
- [2020/02/15 v1.9k BXJS document classes]
+ [2020/03/25 v2.0 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-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls 2020-03-25 21:09:59 UTC (rev 54542)
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsreport}
- [2020/02/15 v1.9k BXJS document classes]
+ [2020/03/25 v2.0 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs at clsname{bxjsreport}
\newif\ifjsc at needsp@tch
@@ -322,17 +322,9 @@
\define at key{bxjs}{enablejfam}[true]{%
\bxjs at set@keyval{enablejfam}{#1}{}}
\DeclareOption{disablejfam}{\let\bxjs at enablejfam=f}
-\let\ifjsDraft\iffalse
-\@onlypreamble\bxjs at draft
-\def\bxjs at draft#1{%
- \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname}
-\DeclareOption{draft}{\bxjs at draft{true}\setlength\overfullrule{5pt}}
-\DeclareOption{final}{\bxjs at draft{false}\setlength\overfullrule{0pt}}
-\g at addto@macro\bxjs at begin@document at hook{%
- \expandafter\ifx\csname ifdraft\endcsname\relax
- \expandafter\let\csname ifdraft\expandafter\endcsname
- \csname ifjsDraft\endcsname
- \fi}
+\newif\ifjsDraft
+\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt }
+\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt }
\newif\ifbxjs at papersize
\bxjs at papersizetrue
\DeclareOption{nopapersize}{\bxjs at papersizefalse}
@@ -434,11 +426,7 @@
\let\bxjs at driver@given\bxjs at driver@@xetex}
\DeclareOption{dvipdfmx-if-dvi}{%
\setkeys{bxjs}{dvi=dvipdfmx}}
-\newif\ifbxjs at bigcode \bxjs at bigcodefalse
-\edef\bxjs at tmpa{\expandafter\noexpand\csname\endcsname}
-\def\bxjs at tmpb#1 #2#3\@nil{%
- \ifx1#2\bxjs at bigcodetrue \fi}
-\expandafter\bxjs at tmpb\meaning\bxjs at tmpa1 0\@nil
+\newif\ifbxjs at bigcode \bxjs at bigcodetrue
\DeclareOption{nobigcode}{%
\bxjs at bigcodefalse}
\DeclareOption{bigcode}{%
@@ -1152,14 +1140,10 @@
\bxjs at postproc@layout
\g at addto@macro\bxjs at bd@pre at geometry@hook{%
\@ifpackagelater{geometry}{2010/02/12}{}{%else
- \PackageWarningNoLine\bxjs at clsname
- {The 'geometry' package installed\MessageBreak
- is too old (< v5.0)}%
- \if x\jsEngine \ifnum\mag=\@m\else
- \def\bxjs at Gm@driver{pdftex}
- \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi
- \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi
- \fi\fi}%
+ \PackageError\bxjs at clsname
+ {Your 'geometry' package is too old (< v5.0)}%
+ {\@ehc}%
+ \let\Gm at driver\relax}%
\ifjsWithpTeXng
\ifx\Gm at driver\@empty
\def\Gm at driver{pdftex}%
@@ -2419,42 +2403,43 @@
\@tempswafalse
\if p\jsEngine \@tempswatrue \fi
\if n\jsEngine \@tempswatrue \fi
-\if at tempswa \expandafter\@firstoftwo
-\else \expandafter\@secondoftwo
-\fi
-{%
+\bxjs at cond\if at tempswa\fi{%
\newif\ifjsSeireki \jsSeirekitrue
\def\bxjs at decl@Seireki at cmds{%
\def\西暦{\jsSeirekitrue}%
- \def\和暦{\jsSeirekifalse}}
+ \def\和暦{\jsSeirekifalse\bxjs at wareki@used}}
\def\Seireki{\jsSeirekitrue}
-\def\Wareki{\jsSeirekifalse}
-\def\bxjs at if@use at seireki{%
- \ifjsSeireki \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\jsSeirekifalse\bxjs at wareki@used}
+\def\bxjs at if@use at seireki{\bxjs at cond\ifjsSeireki\fi}
+\def\bxjs at iai{\noexpand~}
}{%
\newif\if西暦 \西暦true
\def\bxjs at decl@Seireki at cmds{%
\def\西暦{\西暦true}%
- \def\和暦{\西暦false}}
+ \def\和暦{\西暦false\bxjs at wareki@used}}
\def\Seireki{\西暦true}
-\def\Wareki{\西暦false}
-\def\bxjs at if@use at seireki{%
- \if西暦 \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\西暦false\bxjs at wareki@used}
+\def\bxjs at if@use at seireki{\bxjs at cond\if西暦\fi}
+\let\bxjs at iai\@empty
}
\bxjs at decl@Seireki at cmds
\let\bxjs at unxp\@firstofone \let\bxjs at onxp\@firstofone
-\bxjs at test@engine\unexpanded{\let\bxjs at unxp\unexpanded
- \def\bxjs at onxp{\unexpanded\expandafter}}
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \def\bxjs at iai{\noexpand~}
-\else \def\bxjs at iai{}
-\fi
+\bxjs at test@engine\unexpanded{%
+ \let\bxjs at unxp\unexpanded \def\bxjs at onxp{\unexpanded\expandafter}}
\newif\ifbxjs at bxwareki@avail
\IfFileExists{bxwareki.sty}{%
\RequirePackage{bxwareki}[]%
\bxjs at bxwareki@availtrue}{}
+\ifbxjs at bxwareki@avail \let\bxjs at wareki@used\@empty
+\else
+ \bxjs at robust@def\bxjs at wareki@used{%
+ \global\let\bxjs at wareki@used\@empty
+ \ClassWarning\bxjs at clsname
+ {Wareki mode is not supported, since\MessageBreak
+ 'bxwareki' is unavailable, found}}
+ \g at addto@macro\bxjs at begin@document at hook{%
+ \let\bxjs at wareki@used\@empty}
+\fi
\ifbxjs at bxwareki@avail
\let\jayear\warekiyear
\def\bxjs at tmpa{H}\ifx\bxjs at tmpa\warekigengoinitial
@@ -2461,25 +2446,11 @@
\newcount\heisei \heisei=\value{warekiyear}
\fi
\else
- \@tempcnta=\the\year\two at digits\month\two at digits\day\relax
- \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501
- \newcount\heisei \heisei\year \advance\heisei-1988\relax
- \fi\fi
- \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \edef\jayear{\bxjs at unxp{平成}\bxjs at iai \the\heisei \bxjs at iai}
- \else \edef\jayear{\the\year \bxjs at iai}
- \fi
+ \edef\jayear{\the\year \bxjs at iai}
\fi
\let\bxjs at next\relax
-\ifbxjs at bxwareki@avail
- \ifx\warekigengo\@empty\else
- \def\bxjs at next{\bxjs at onxp{\warekitoday}}
- \fi
-\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \def\bxjs at next{%
- \bxjs at unxp{平成}\bxjs at iai\number\heisei\bxjs at iai\bxjs at unxp{年}%
- \bxjs at iai\number\month\bxjs at iai\bxjs at unxp{月}%
- \bxjs at iai\number\day\bxjs at iai\bxjs at unxp{日}}
+\ifbxjs at bxwareki@avail \ifx\warekigengo\@empty\else
+ \def\bxjs at next{\bxjs at onxp{\warekitoday}}
\fi\fi
\edef\bxjs at today{%
\if at english
@@ -2498,7 +2469,7 @@
\fi}
\let\today\bxjs at today
\g at addto@macro\bxjs at begin@document at hook{%
- \ifx\bbl at jpn@Seirekitrue\@undefined\else
+ \ifx\bbl at jpn@maybekansuji\@undefined\else
\bxjs at decl@Seireki at cmds
\g at addto@macro\datejapanese{%
\let\today\bxjs at today}%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls 2020-03-25 21:09:40 UTC (rev 54541)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls 2020-03-25 21:09:59 UTC (rev 54542)
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsslide}
- [2020/02/15 v1.9k BXJS document classes]
+ [2020/03/25 v2.0 BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs at clsname{bxjsslide}
\newif\ifjsc at needsp@tch
@@ -316,17 +316,9 @@
\define at key{bxjs}{enablejfam}[true]{%
\bxjs at set@keyval{enablejfam}{#1}{}}
\DeclareOption{disablejfam}{\let\bxjs at enablejfam=f}
-\let\ifjsDraft\iffalse
-\@onlypreamble\bxjs at draft
-\def\bxjs at draft#1{%
- \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname}
-\DeclareOption{draft}{\bxjs at draft{true}\setlength\overfullrule{5pt}}
-\DeclareOption{final}{\bxjs at draft{false}\setlength\overfullrule{0pt}}
-\g at addto@macro\bxjs at begin@document at hook{%
- \expandafter\ifx\csname ifdraft\endcsname\relax
- \expandafter\let\csname ifdraft\expandafter\endcsname
- \csname ifjsDraft\endcsname
- \fi}
+\newif\ifjsDraft
+\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt }
+\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt }
\newif\ifbxjs at papersize
\bxjs at papersizetrue
\DeclareOption{nopapersize}{\bxjs at papersizefalse}
@@ -428,11 +420,7 @@
\let\bxjs at driver@given\bxjs at driver@@xetex}
\DeclareOption{dvipdfmx-if-dvi}{%
\setkeys{bxjs}{dvi=dvipdfmx}}
-\newif\ifbxjs at bigcode \bxjs at bigcodefalse
-\edef\bxjs at tmpa{\expandafter\noexpand\csname\endcsname}
-\def\bxjs at tmpb#1 #2#3\@nil{%
- \ifx1#2\bxjs at bigcodetrue \fi}
-\expandafter\bxjs at tmpb\meaning\bxjs at tmpa1 0\@nil
+\newif\ifbxjs at bigcode \bxjs at bigcodetrue
\DeclareOption{nobigcode}{%
\bxjs at bigcodefalse}
\DeclareOption{bigcode}{%
@@ -1142,14 +1130,10 @@
\bxjs at postproc@layout
\g at addto@macro\bxjs at bd@pre at geometry@hook{%
\@ifpackagelater{geometry}{2010/02/12}{}{%else
- \PackageWarningNoLine\bxjs at clsname
- {The 'geometry' package installed\MessageBreak
- is too old (< v5.0)}%
- \if x\jsEngine \ifnum\mag=\@m\else
- \def\bxjs at Gm@driver{pdftex}
- \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi
- \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi
- \fi\fi}%
+ \PackageError\bxjs at clsname
+ {Your 'geometry' package is too old (< v5.0)}%
+ {\@ehc}%
+ \let\Gm at driver\relax}%
\ifjsWithpTeXng
\ifx\Gm at driver\@empty
\def\Gm at driver{pdftex}%
@@ -2288,42 +2272,43 @@
\@tempswafalse
\if p\jsEngine \@tempswatrue \fi
\if n\jsEngine \@tempswatrue \fi
-\if at tempswa \expandafter\@firstoftwo
-\else \expandafter\@secondoftwo
-\fi
-{%
+\bxjs at cond\if at tempswa\fi{%
\newif\ifjsSeireki \jsSeirekitrue
\def\bxjs at decl@Seireki at cmds{%
\def\西暦{\jsSeirekitrue}%
- \def\和暦{\jsSeirekifalse}}
+ \def\和暦{\jsSeirekifalse\bxjs at wareki@used}}
\def\Seireki{\jsSeirekitrue}
-\def\Wareki{\jsSeirekifalse}
-\def\bxjs at if@use at seireki{%
- \ifjsSeireki \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\jsSeirekifalse\bxjs at wareki@used}
+\def\bxjs at if@use at seireki{\bxjs at cond\ifjsSeireki\fi}
+\def\bxjs at iai{\noexpand~}
}{%
\newif\if西暦 \西暦true
\def\bxjs at decl@Seireki at cmds{%
\def\西暦{\西暦true}%
- \def\和暦{\西暦false}}
+ \def\和暦{\西暦false\bxjs at wareki@used}}
\def\Seireki{\西暦true}
-\def\Wareki{\西暦false}
-\def\bxjs at if@use at seireki{%
- \if西暦 \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\西暦false\bxjs at wareki@used}
+\def\bxjs at if@use at seireki{\bxjs at cond\if西暦\fi}
+\let\bxjs at iai\@empty
}
\bxjs at decl@Seireki at cmds
\let\bxjs at unxp\@firstofone \let\bxjs at onxp\@firstofone
-\bxjs at test@engine\unexpanded{\let\bxjs at unxp\unexpanded
- \def\bxjs at onxp{\unexpanded\expandafter}}
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \def\bxjs at iai{\noexpand~}
-\else \def\bxjs at iai{}
-\fi
+\bxjs at test@engine\unexpanded{%
+ \let\bxjs at unxp\unexpanded \def\bxjs at onxp{\unexpanded\expandafter}}
\newif\ifbxjs at bxwareki@avail
\IfFileExists{bxwareki.sty}{%
\RequirePackage{bxwareki}[]%
\bxjs at bxwareki@availtrue}{}
+\ifbxjs at bxwareki@avail \let\bxjs at wareki@used\@empty
+\else
+ \bxjs at robust@def\bxjs at wareki@used{%
+ \global\let\bxjs at wareki@used\@empty
+ \ClassWarning\bxjs at clsname
+ {Wareki mode is not supported, since\MessageBreak
+ 'bxwareki' is unavailable, found}}
+ \g at addto@macro\bxjs at begin@document at hook{%
+ \let\bxjs at wareki@used\@empty}
+\fi
\ifbxjs at bxwareki@avail
\let\jayear\warekiyear
\def\bxjs at tmpa{H}\ifx\bxjs at tmpa\warekigengoinitial
@@ -2330,25 +2315,11 @@
\newcount\heisei \heisei=\value{warekiyear}
\fi
\else
- \@tempcnta=\the\year\two at digits\month\two at digits\day\relax
- \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501
- \newcount\heisei \heisei\year \advance\heisei-1988\relax
- \fi\fi
- \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \edef\jayear{\bxjs at unxp{平成}\bxjs at iai \the\heisei \bxjs at iai}
- \else \edef\jayear{\the\year \bxjs at iai}
- \fi
+ \edef\jayear{\the\year \bxjs at iai}
\fi
\let\bxjs at next\relax
-\ifbxjs at bxwareki@avail
- \ifx\warekigengo\@empty\else
- \def\bxjs at next{\bxjs at onxp{\warekitoday}}
- \fi
-\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \def\bxjs at next{%
- \bxjs at unxp{平成}\bxjs at iai\number\heisei\bxjs at iai\bxjs at unxp{年}%
- \bxjs at iai\number\month\bxjs at iai\bxjs at unxp{月}%
- \bxjs at iai\number\day\bxjs at iai\bxjs at unxp{日}}
+\ifbxjs at bxwareki@avail \ifx\warekigengo\@empty\else
+ \def\bxjs at next{\bxjs at onxp{\warekitoday}}
\fi\fi
\edef\bxjs at today{%
\if at english
@@ -2367,7 +2338,7 @@
\fi}
\let\today\bxjs at today
\g at addto@macro\bxjs at begin@document at hook{%
- \ifx\bbl at jpn@Seirekitrue\@undefined\else
+ \ifx\bbl at jpn@maybekansuji\@undefined\else
\bxjs at decl@Seireki at cmds
\g at addto@macro\datejapanese{%
\let\today\bxjs at today}%
More information about the tex-live-commits
mailing list.