diff options
17 files changed, 232 insertions, 258 deletions
diff --git a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md index f2c9e578f59..42b9660678b 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md +++ b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md @@ -98,6 +98,9 @@ XeLaTeX / LuaLaTeX の上でも日本語処理パッケージと連携して使 更新履歴 -------- + * Version 1.9d 〈2018/10/03〉 + - 原則的に和暦の処理を bxwareki パッケージに任せる。 + - バグ修正。 * Version 1.9c 〈2018/09/04〉 - pandoc 和文ドライバの Babel 対策を改良。 - バグ修正。 diff --git a/Master/texmf-dist/doc/latex/bxjscls/README.md b/Master/texmf-dist/doc/latex/bxjscls/README.md index 0b946488930..3f451438f68 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/README.md +++ b/Master/texmf-dist/doc/latex/bxjscls/README.md @@ -88,6 +88,7 @@ This package is distributed under the BSD 2-Clause License. Revision History ---------------- + * Version 1.9d 〈2018/10/03〉 * Version 1.9c 〈2018/09/04〉 * Version 1.9b 〈2018/08/20〉 * Version 1.9a 〈2018/07/20〉 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 774b444df86..4ca03087020 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 9f1c048be46..3fd381fa726 100644 --- a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex +++ b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex @@ -12,8 +12,8 @@ \renewcommand*{\XeLaTeX}{XeLaTeX}} \usepackage{shortvrb} \MakeShortVerb{\|} -\newcommand{\PkgVersion}{1.9c} -\newcommand{\PkgDate}{2018/09/04} +\newcommand{\PkgVersion}{1.9d} +\newcommand{\PkgDate}{2018/10/03} \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 594e134c26a..e42f661698b 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 25c2ebb2b99..1570a052166 100644 --- a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx +++ b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx @@ -56,7 +56,8 @@ %<*driver> \ProvidesFile{bxjscls.dtx} %</driver> - [2018/09/04 v1.9c BXJS document classes] + [2018/10/03 v1.9d BXJS document classes] +% [2018/09/04 v1.9c BXJS document classes] % [2018/08/20 v1.9b BXJS document classes] % [2018/07/20 v1.9a BXJS document classes] % based on jsclasses [2018/06/23] @@ -7870,8 +7871,9 @@ % \begin{ZRnote} % 環境変数 |SOURCE_DATE_EPOCH|／|FORCE_SOURCE_DATE| が % 設定されている場合は“今日”が過去・未来の日付になる可能性がある。 -% その場合、和暦表記は1970年から平成の終わりまでの期間でのみサポートする。 -% \Note 新元号が公表されたら対応する。 +% BXJSクラスでは、和暦の扱いは |bxwareki| パッケージに任せることを +% 原則とする。 +% ただし、|bxwareki| が使えない場合は自前で処理する。 % \end{ZRnote} % % \begin{macrocode} @@ -7914,52 +7916,41 @@ \fi % \end{macrocode} % +% \begin{macro}{\ifbxjs@bxwareki@avail} +% |bxwareki| パッケージが使用できるか。 +% \begin{macrocode} +\newif\ifbxjs@bxwareki@avail +\IfFileExists{bxwareki.sty}{% + \RequirePackage{bxwareki}[]% + \bxjs@bxwareki@availtrue}{} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\jayear} % 和暦における年の表記（元号+年数）。 % \begin{macro}{\heisei} % 年数を表す整数レジスタで、 % 元号が「平成」である場合にのみ定義される。 -% \Note 一般の年数の整数レジスタは |\bxjs@jayear| で、 -% |\heisei| はこれの別名になる。 -% \begin{macrocode} -\newcount\bxjs@jayear -\let\bxjs@gengo\@empty \bxjs@jayear\year -\@tempcnta=\the\year\two@digits\month\two@digits\day\relax -\ifnum\@tempcnta<19700101 -\else\ifnum\@tempcnta<19890108 - \def\bxjs@gengo{昭和}\advance\bxjs@jayear-1925\relax - \let\heisei\bxjs@jayear -\else\ifnum\@tempcnta<20190501 - \def\bxjs@gengo{平成}\advance\bxjs@jayear-1988\relax - \let\heisei\bxjs@jayear -\else -% \end{macrocode} -% 現在が新元号である場合。 -% |bxwareki| とかムニャムニャとかを試してみる。 -% \begin{macrocode} - \IfFileExists{bxwareki.sty}{\IfFileExists{bxwareki2019.def}{% - \RequirePackage{bxwareki}[]% - \let\bxjs@gengo\WarekiGengo - }{}}{}% - \if l\jsEngine \ifx\bxjs@gengo\@empty - \toks@{} - \directlua{pcall(function() - tex.toks[0] = bxjs.get_new_gengo() - end)} - \edef\bxjs@gengo{\the\toks@} - \fi\fi +% \begin{macrocode} +\ifbxjs@bxwareki@avail + \let\jayear\warekiyear + \def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial + \newcount\heisei \heisei=\value{warekiyear} + \fi % \end{macrocode} -% 新元号が既知の場合にのみ、和暦の年を求める。 +% |bxwareki| が使えない場合のフォールバック処理。 +% 平成のみに対応する。 % \begin{macrocode} - \ifx\bxjs@gengo\@empty\else \advance\bxjs@jayear-2018\relax \fi -\fi\fi\fi -\edef\jayear{% - \ifx\bxjs@gengo\@empty \the\bxjs@jayear\bxjs@iai - \else \bxjs@onxp{\bxjs@gengo}% - \ifnum\bxjs@jayear=\@ne \bxjs@unxp{元}% - \else \bxjs@iai\the\bxjs@jayear\bxjs@iai - \fi - \fi} +\else + \@tempcnta=\the\year\two@digits\month\two@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@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai} + \else \edef\jayear{\the\year \bxjs@iai} + \fi +\fi % \end{macrocode} % \end{macro} % \end{macro} @@ -7967,6 +7958,17 @@ % \begin{macro}{\today} % 英語、西暦、和暦で場合分けをする。 % \begin{macrocode} +\let\bxjs@next\relax +\ifbxjs@bxwareki@avail + \ifx\warekigengo\@empty\else + \def\bxjs@next{\bxjs@onxp{\warekitoday}} + \fi +\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne + \def\bxjs@next{% + \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}% + \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% + \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}} +\fi\fi \edef\bxjs@today{% \if@english \ifcase\month\or @@ -7974,15 +7976,13 @@ July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \noexpand\bxjs@if@use@seireki{% + \ifx\bxjs@next\relax \expandafter\@firstoftwo + \else \noexpand\bxjs@if@use@seireki + \fi {% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% - }{% - \bxjs@onxp{\jayear}\bxjs@unxp{年}% - \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% - \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% - }% + }{\bxjs@next}% \fi} \let\today\bxjs@today % \end{macrocode} @@ -10497,9 +10497,13 @@ \def\bxjs@pandoc@lang@ja{% \expandafter\let\csname ver@babel.sty\endcsname\@undefined \edef\bxjs@next{% - \noexpand\RequirePackage[\bxjs@lang@pkg@options]{babel}[]% + \noexpand\RequirePackage[\bxjs@lang@pkg@options,english]{babel}[]% }\bxjs@next - \RequirePackage[main=japanese]{pxbabel}[]} + \if j\jsEngine + \RequirePackage[main=japanese]{pxbabel}[]% + \else + \RequirePackage{bxorigcapt}[]% + \fi} % \end{macrocode} % \end{macro} % @@ -10787,32 +10791,6 @@ }\fi % \end{macrocode} % -% 新元号のムニャムニャ。 -% \begin{macrocode} -\begingroup - \catcode`\~=12 \let\0\relax \let\1\relax \let\2\relax - \directlua{ - if not bxjs then bxjs = {} end - function bxjs.get_new_gengo() - local lc_time = nil - local ok, ret = pcall(function() - assert(os.type == "unix") - lc_time = os.setlocale(nil, "time") - assert(os.setlocale("ja_JP.utf8", "time") or - os.setlocale("ja_JP.UTF-8", "time")) - local heisei = "\229\185\179\230\136\144" - local kanji = "[\228-\233][\128-\191][\128-\191]" - local gh = os.date("\037EC", 1500000000) - local gn = os.date("\037EC", 1600000000) - assert(gh == heisei and gn ~= heisei and - gn:match("^"..kanji..kanji.."$")) - return gn - end) - os.setlocale(lc_time, "time") - return ok and ret or "" - end} -\endgroup -% \end{macrocode} % 以上。 % \begin{macrocode} \fi @@ -11417,6 +11395,25 @@ FE70,FFF0,% % \end{macro} % %^^A---------------- +%\subsection{パッケージオプション} +% +% |english| オプションが指定されている場合、|\ldots| の調整を抑止する。 +% \Note つまり、「グローバルの |english| オプション」が指定されている +% 場合も抑止の対象になる。 +% BXJSクラスの英語モードを想定しているが、それ以外の場合でも、 +% 一般的な{\LaTeX}の習慣として、グローバルの |english| は +% 「その文書の基底言語が英語である」ことを示す。 +% \begin{macrocode} +\newif\ifbxjsp@english +\DeclareOption{english}{\bxjsp@englishtrue} +% \end{macrocode} +% +% オプション定義はおしまい。 +% \begin{macrocode} +\ProcessOptions* +% \end{macrocode} +% +%^^A---------------- %\subsection{パッケージ読込の阻止} % % \begin{macro}{\pandocSkipLoadFile} @@ -11547,10 +11544,11 @@ FE70,FFF0,% % \end{macro} % % |\ldots| の実装を置き換える。 +% \Note B|english| オプション指定時は置き換えない。 % \begin{macrocode} -\g@addto@macro\bxjs@begin@document@hook{% +\AtBeginDocument{% \let\bxjsp@org@ldots\ldots - \let\ldots\pandocLdots} + \ifbxjsp@english\else \let\ldots\pandocLdots \fi} % \end{macrocode} % %^^A---------------- diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index dcaca65ca4c..fd82e3edf76 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsarticle} - [2018/09/04 v1.9c BXJS document classes] + [2018/10/03 v1.9d BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsarticle} \newif\ifjsc@needsp@tch @@ -2320,37 +2320,36 @@ \def\bxjs@iai{\noexpand~} \else \def\bxjs@iai{} \fi -\newcount\bxjs@jayear -\let\bxjs@gengo\@empty \bxjs@jayear\year -\@tempcnta=\the\year\two@digits\month\two@digits\day\relax -\ifnum\@tempcnta<19700101 -\else\ifnum\@tempcnta<19890108 - \def\bxjs@gengo{昭和}\advance\bxjs@jayear-1925\relax - \let\heisei\bxjs@jayear -\else\ifnum\@tempcnta<20190501 - \def\bxjs@gengo{平成}\advance\bxjs@jayear-1988\relax - \let\heisei\bxjs@jayear +\newif\ifbxjs@bxwareki@avail +\IfFileExists{bxwareki.sty}{% + \RequirePackage{bxwareki}[]% + \bxjs@bxwareki@availtrue}{} +\ifbxjs@bxwareki@avail + \let\jayear\warekiyear + \def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial + \newcount\heisei \heisei=\value{warekiyear} + \fi \else - \IfFileExists{bxwareki.sty}{\IfFileExists{bxwareki2019.def}{% - \RequirePackage{bxwareki}[]% - \let\bxjs@gengo\WarekiGengo - }{}}{}% - \if l\jsEngine \ifx\bxjs@gengo\@empty - \toks@{} - \directlua{pcall(function() - tex.toks[0] = bxjs.get_new_gengo() - end)} - \edef\bxjs@gengo{\the\toks@} + \@tempcnta=\the\year\two@digits\month\two@digits\day\relax + \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501 + \newcount\heisei \heisei\year \advance\heisei-1988\relax \fi\fi - \ifx\bxjs@gengo\@empty\else \advance\bxjs@jayear-2018\relax \fi -\fi\fi\fi -\edef\jayear{% - \ifx\bxjs@gengo\@empty \the\bxjs@jayear\bxjs@iai - \else \bxjs@onxp{\bxjs@gengo}% - \ifnum\bxjs@jayear=\@ne \bxjs@unxp{元}% - \else \bxjs@iai\the\bxjs@jayear\bxjs@iai - \fi - \fi} + \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne + \edef\jayear{\bxjs@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai} + \else \edef\jayear{\the\year \bxjs@iai} + \fi +\fi +\let\bxjs@next\relax +\ifbxjs@bxwareki@avail + \ifx\warekigengo\@empty\else + \def\bxjs@next{\bxjs@onxp{\warekitoday}} + \fi +\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne + \def\bxjs@next{% + \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}% + \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% + \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}} +\fi\fi \edef\bxjs@today{% \if@english \ifcase\month\or @@ -2358,15 +2357,13 @@ July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \noexpand\bxjs@if@use@seireki{% + \ifx\bxjs@next\relax \expandafter\@firstoftwo + \else \noexpand\bxjs@if@use@seireki + \fi {% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% - }{% - \bxjs@onxp{\jayear}\bxjs@unxp{年}% - \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% - \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% - }% + }{\bxjs@next}% \fi} \let\today\bxjs@today \g@addto@macro\bxjs@begin@document@hook{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index 8f3a81de906..2d17c19866d 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsbook} - [2018/09/04 v1.9c BXJS document classes] + [2018/10/03 v1.9d BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsbook} \newif\ifjsc@needsp@tch @@ -2426,37 +2426,36 @@ \def\bxjs@iai{\noexpand~} \else \def\bxjs@iai{} \fi -\newcount\bxjs@jayear -\let\bxjs@gengo\@empty \bxjs@jayear\year -\@tempcnta=\the\year\two@digits\month\two@digits\day\relax -\ifnum\@tempcnta<19700101 -\else\ifnum\@tempcnta<19890108 - \def\bxjs@gengo{昭和}\advance\bxjs@jayear-1925\relax - \let\heisei\bxjs@jayear -\else\ifnum\@tempcnta<20190501 - \def\bxjs@gengo{平成}\advance\bxjs@jayear-1988\relax - \let\heisei\bxjs@jayear +\newif\ifbxjs@bxwareki@avail +\IfFileExists{bxwareki.sty}{% + \RequirePackage{bxwareki}[]% + \bxjs@bxwareki@availtrue}{} +\ifbxjs@bxwareki@avail + \let\jayear\warekiyear + \def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial + \newcount\heisei \heisei=\value{warekiyear} + \fi \else - \IfFileExists{bxwareki.sty}{\IfFileExists{bxwareki2019.def}{% - \RequirePackage{bxwareki}[]% - \let\bxjs@gengo\WarekiGengo - }{}}{}% - \if l\jsEngine \ifx\bxjs@gengo\@empty - \toks@{} - \directlua{pcall(function() - tex.toks[0] = bxjs.get_new_gengo() - end)} - \edef\bxjs@gengo{\the\toks@} + \@tempcnta=\the\year\two@digits\month\two@digits\day\relax + \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501 + \newcount\heisei \heisei\year \advance\heisei-1988\relax \fi\fi - \ifx\bxjs@gengo\@empty\else \advance\bxjs@jayear-2018\relax \fi -\fi\fi\fi -\edef\jayear{% - \ifx\bxjs@gengo\@empty \the\bxjs@jayear\bxjs@iai - \else \bxjs@onxp{\bxjs@gengo}% - \ifnum\bxjs@jayear=\@ne \bxjs@unxp{元}% - \else \bxjs@iai\the\bxjs@jayear\bxjs@iai - \fi - \fi} + \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne + \edef\jayear{\bxjs@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai} + \else \edef\jayear{\the\year \bxjs@iai} + \fi +\fi +\let\bxjs@next\relax +\ifbxjs@bxwareki@avail + \ifx\warekigengo\@empty\else + \def\bxjs@next{\bxjs@onxp{\warekitoday}} + \fi +\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne + \def\bxjs@next{% + \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}% + \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% + \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}} +\fi\fi \edef\bxjs@today{% \if@english \ifcase\month\or @@ -2464,15 +2463,13 @@ July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \noexpand\bxjs@if@use@seireki{% + \ifx\bxjs@next\relax \expandafter\@firstoftwo + \else \noexpand\bxjs@if@use@seireki + \fi {% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% - }{% - \bxjs@onxp{\jayear}\bxjs@unxp{年}% - \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% - \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% - }% + }{\bxjs@next}% \fi} \let\today\bxjs@today \g@addto@macro\bxjs@begin@document@hook{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index 5ad00519b95..0347e57183f 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjscjkcat} - [2018/09/04 v1.9c BXJS document classes] + [2018/10/03 v1.9d 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 9e87d7cbb30..f1b09a68eba 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjscompat} - [2018/09/04 v1.9c BXJS document classes] + [2018/10/03 v1.9d BXJS document classes] \def\bxac@pkgname{bxjscompat} \let\bxac@engine=n \def\bxac@do#1#2{% @@ -119,29 +119,6 @@ range(0x2B820, 0x2CEA1, 11, false) range(0x2CEA2, 0x2FFFD, 11, true) }\fi -\begingroup - \catcode`\~=12 \let\0\relax \let\1\relax \let\2\relax - \directlua{ - if not bxjs then bxjs = {} end - function bxjs.get_new_gengo() - local lc_time = nil - local ok, ret = pcall(function() - assert(os.type == "unix") - lc_time = os.setlocale(nil, "time") - assert(os.setlocale("ja_JP.utf8", "time") or - os.setlocale("ja_JP.UTF-8", "time")) - local heisei = "\229\185\179\230\136\144" - local kanji = "[\228-\233][\128-\191][\128-\191]" - local gh = os.date("\037EC", 1500000000) - local gn = os.date("\037EC", 1600000000) - assert(gh == heisei and gn ~= heisei and - gn:match("^"..kanji..kanji.."$")) - return gn - end) - os.setlocale(lc_time, "time") - return ok and ret or "" - end} -\endgroup \fi \endinput %% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def index 0cd877f885f..ec30cf930eb 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} - [2018/09/04 v1.9c BXJS document classes] + [2018/10/03 v1.9d BXJS document classes] %% このファイルは日本語文字を含みます \def\DeclareJaTextFontCommand#1#2{% \DeclareRobustCommand#1[1]{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def index 8d412cedc9b..d8e38446087 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} - [2018/09/04 v1.9c BXJS document classes] + [2018/10/03 v1.9d 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 2de6829c0c3..91899aaeeca 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} - [2018/09/04 v1.9c BXJS document classes] + [2018/10/03 v1.9d BXJS document classes] \input{bxjsja-standard.def} \RequirePackage{bxjspandoc} \@onlypreamble\bxjs@endpreamble@hook @@ -134,9 +134,13 @@ \def\bxjs@pandoc@lang@ja{% \expandafter\let\csname ver@babel.sty\endcsname\@undefined \edef\bxjs@next{% - \noexpand\RequirePackage[\bxjs@lang@pkg@options]{babel}[]% + \noexpand\RequirePackage[\bxjs@lang@pkg@options,english]{babel}[]% }\bxjs@next - \RequirePackage[main=japanese]{pxbabel}[]} + \if j\jsEngine + \RequirePackage[main=japanese]{pxbabel}[]% + \else + \RequirePackage{bxorigcapt}[]% + \fi} \fi \bxjs@set@dupload@proc{geometry.sty}{% \setpagelayout*{#1}} diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def index e13b55658d3..f74ede1e179 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} - [2018/09/04 v1.9c BXJS document classes] + [2018/10/03 v1.9d BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty index 780593de978..d6bc773426b 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjspandoc} - [2018/09/04 v1.9c BXJS document classes] + [2018/10/03 v1.9d BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjsp@pkgname{bxjscjkcat} \let\bxjsp@engine=n @@ -34,6 +34,9 @@ \bxjsp@do\XeTeXversion{\let\bxjsp@engine=x} \bxjsp@do\pdftexversion{\let\bxjsp@engine=p} \bxjsp@do\luatexversion{\let\bxjsp@engine=l} +\newif\ifbxjsp@english +\DeclareOption{english}{\bxjsp@englishtrue} +\ProcessOptions* \@onlypreamble\pandocSkipLoadFile \newcommand*\pandocSkipLoadFile[1]{% \expandafter\bxjsp@skip@load@file@a\csname ver@#1\endcsname{#1}} @@ -83,9 +86,9 @@ \bxjsp@ja@ellipsis \let\bxjsp@tok=} \def\bxjsp@ldots@g{% \expandafter\bxjsp@org@ldots\expandafter{\romannumeral-`} } -\g@addto@macro\bxjs@begin@document@hook{% +\AtBeginDocument{% \let\bxjsp@org@ldots\ldots - \let\ldots\pandocLdots} + \ifbxjsp@english\else \let\ldots\pandocLdots \fi} \IfFileExists{bxpandola.sty}{% \RequirePackage{bxpandola}\relax \PackageInfo\bxjsp@pkgname diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls index b051929376c..01fdb6a86ff 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsreport} - [2018/09/04 v1.9c BXJS document classes] + [2018/10/03 v1.9d BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch @@ -2449,37 +2449,36 @@ \def\bxjs@iai{\noexpand~} \else \def\bxjs@iai{} \fi -\newcount\bxjs@jayear -\let\bxjs@gengo\@empty \bxjs@jayear\year -\@tempcnta=\the\year\two@digits\month\two@digits\day\relax -\ifnum\@tempcnta<19700101 -\else\ifnum\@tempcnta<19890108 - \def\bxjs@gengo{昭和}\advance\bxjs@jayear-1925\relax - \let\heisei\bxjs@jayear -\else\ifnum\@tempcnta<20190501 - \def\bxjs@gengo{平成}\advance\bxjs@jayear-1988\relax - \let\heisei\bxjs@jayear +\newif\ifbxjs@bxwareki@avail +\IfFileExists{bxwareki.sty}{% + \RequirePackage{bxwareki}[]% + \bxjs@bxwareki@availtrue}{} +\ifbxjs@bxwareki@avail + \let\jayear\warekiyear + \def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial + \newcount\heisei \heisei=\value{warekiyear} + \fi \else - \IfFileExists{bxwareki.sty}{\IfFileExists{bxwareki2019.def}{% - \RequirePackage{bxwareki}[]% - \let\bxjs@gengo\WarekiGengo - }{}}{}% - \if l\jsEngine \ifx\bxjs@gengo\@empty - \toks@{} - \directlua{pcall(function() - tex.toks[0] = bxjs.get_new_gengo() - end)} - \edef\bxjs@gengo{\the\toks@} + \@tempcnta=\the\year\two@digits\month\two@digits\day\relax + \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501 + \newcount\heisei \heisei\year \advance\heisei-1988\relax \fi\fi - \ifx\bxjs@gengo\@empty\else \advance\bxjs@jayear-2018\relax \fi -\fi\fi\fi -\edef\jayear{% - \ifx\bxjs@gengo\@empty \the\bxjs@jayear\bxjs@iai - \else \bxjs@onxp{\bxjs@gengo}% - \ifnum\bxjs@jayear=\@ne \bxjs@unxp{元}% - \else \bxjs@iai\the\bxjs@jayear\bxjs@iai - \fi - \fi} + \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne + \edef\jayear{\bxjs@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai} + \else \edef\jayear{\the\year \bxjs@iai} + \fi +\fi +\let\bxjs@next\relax +\ifbxjs@bxwareki@avail + \ifx\warekigengo\@empty\else + \def\bxjs@next{\bxjs@onxp{\warekitoday}} + \fi +\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne + \def\bxjs@next{% + \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}% + \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% + \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}} +\fi\fi \edef\bxjs@today{% \if@english \ifcase\month\or @@ -2487,15 +2486,13 @@ July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \noexpand\bxjs@if@use@seireki{% + \ifx\bxjs@next\relax \expandafter\@firstoftwo + \else \noexpand\bxjs@if@use@seireki + \fi {% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% - }{% - \bxjs@onxp{\jayear}\bxjs@unxp{年}% - \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% - \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% - }% + }{\bxjs@next}% \fi} \let\today\bxjs@today \g@addto@macro\bxjs@begin@document@hook{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index dc2e4981198..0c5ab74cecf 100644 --- a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls +++ b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsslide} - [2018/09/04 v1.9c BXJS document classes] + [2018/10/03 v1.9d BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch @@ -2318,37 +2318,36 @@ \def\bxjs@iai{\noexpand~} \else \def\bxjs@iai{} \fi -\newcount\bxjs@jayear -\let\bxjs@gengo\@empty \bxjs@jayear\year -\@tempcnta=\the\year\two@digits\month\two@digits\day\relax -\ifnum\@tempcnta<19700101 -\else\ifnum\@tempcnta<19890108 - \def\bxjs@gengo{昭和}\advance\bxjs@jayear-1925\relax - \let\heisei\bxjs@jayear -\else\ifnum\@tempcnta<20190501 - \def\bxjs@gengo{平成}\advance\bxjs@jayear-1988\relax - \let\heisei\bxjs@jayear +\newif\ifbxjs@bxwareki@avail +\IfFileExists{bxwareki.sty}{% + \RequirePackage{bxwareki}[]% + \bxjs@bxwareki@availtrue}{} +\ifbxjs@bxwareki@avail + \let\jayear\warekiyear + \def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial + \newcount\heisei \heisei=\value{warekiyear} + \fi \else - \IfFileExists{bxwareki.sty}{\IfFileExists{bxwareki2019.def}{% - \RequirePackage{bxwareki}[]% - \let\bxjs@gengo\WarekiGengo - }{}}{}% - \if l\jsEngine \ifx\bxjs@gengo\@empty - \toks@{} - \directlua{pcall(function() - tex.toks[0] = bxjs.get_new_gengo() - end)} - \edef\bxjs@gengo{\the\toks@} + \@tempcnta=\the\year\two@digits\month\two@digits\day\relax + \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501 + \newcount\heisei \heisei\year \advance\heisei-1988\relax \fi\fi - \ifx\bxjs@gengo\@empty\else \advance\bxjs@jayear-2018\relax \fi -\fi\fi\fi -\edef\jayear{% - \ifx\bxjs@gengo\@empty \the\bxjs@jayear\bxjs@iai - \else \bxjs@onxp{\bxjs@gengo}% - \ifnum\bxjs@jayear=\@ne \bxjs@unxp{元}% - \else \bxjs@iai\the\bxjs@jayear\bxjs@iai - \fi - \fi} + \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne + \edef\jayear{\bxjs@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai} + \else \edef\jayear{\the\year \bxjs@iai} + \fi +\fi +\let\bxjs@next\relax +\ifbxjs@bxwareki@avail + \ifx\warekigengo\@empty\else + \def\bxjs@next{\bxjs@onxp{\warekitoday}} + \fi +\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne + \def\bxjs@next{% + \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}% + \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% + \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}} +\fi\fi \edef\bxjs@today{% \if@english \ifcase\month\or @@ -2356,15 +2355,13 @@ July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \noexpand\bxjs@if@use@seireki{% + \ifx\bxjs@next\relax \expandafter\@firstoftwo + \else \noexpand\bxjs@if@use@seireki + \fi {% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% - }{% - \bxjs@onxp{\jayear}\bxjs@unxp{年}% - \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% - \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% - }% + }{\bxjs@next}% \fi} \let\today\bxjs@today \g@addto@macro\bxjs@begin@document@hook{% |