From 3a96dfe1775079b04b8fcfd108d2747bea3f835f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 Dec 2017 00:36:54 +0000 Subject: bxjscls (9dec17) git-svn-id: svn://tug.org/texlive/trunk@46027 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/bxjscls/README-ja.md | 3 + Master/texmf-dist/doc/latex/bxjscls/README.md | 1 + .../doc/latex/bxjscls/bxjscls-manual.pdf | Bin 612039 -> 612951 bytes .../doc/latex/bxjscls/bxjscls-manual.tex | 6 +- Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf | Bin 1010660 -> 1012641 bytes Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx | 96 ++++++++++++++++----- .../texmf-dist/tex/latex/bxjscls/bxjsarticle.cls | 47 +++++++--- Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls | 47 +++++++--- Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty | 2 +- .../tex/latex/bxjscls/bxjsja-minimal.def | 2 +- .../texmf-dist/tex/latex/bxjscls/bxjsja-modern.def | 2 +- .../texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def | 2 +- .../tex/latex/bxjscls/bxjsja-standard.def | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty | 2 +- Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls | 47 +++++++--- Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls | 47 +++++++--- 17 files changed, 235 insertions(+), 73 deletions(-) diff --git a/Master/texmf-dist/doc/latex/bxjscls/README-ja.md b/Master/texmf-dist/doc/latex/bxjscls/README-ja.md index 233304ee1bc..add7e65f5ab 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.7a 〈2017/12/09〉 + - 〈試験的〉新元号対応の準備。`\jayear` 命令を追加。 + - `\@` の定義を修正。`fix-ja-cmd` オプションを追加。 * Version 1.7 〈2017/10/21〉 - 和文空白命令(`\jaenspace` 等)を追加。 - `everyparhook` オプションを新設。 diff --git a/Master/texmf-dist/doc/latex/bxjscls/README.md b/Master/texmf-dist/doc/latex/bxjscls/README.md index 8fa22da1b0e..1ba95da1a32 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.7a 〈2017/12/09〉 * Version 1.7 〈2017/10/21〉 * Version 1.6b 〈2017/09/28〉 * Version 1.6a 〈2017/09/24〉 diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf index c6e7e21685b..de4d2c9f882 100644 Binary files a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf and b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf differ diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex b/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex index 4b05743e5a1..91d93909a01 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.7} -\newcommand{\PkgDate}{2017/10/21} +\newcommand{\PkgVersion}{1.7a} +\newcommand{\PkgDate}{2017/12/09} \newcommand{\Pkg}[1]{\textsf{#1}} \newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$} \newcommand{\Note}{\par\noindent ※} @@ -798,6 +798,8 @@ JSクラスには無くBXJSクラスで追加されたクラスオプション |\jaenspace|、|\jathinspace|、|\>|、 |\_|(|\|\,+\,全角空白) \end{quote} +\item |fix-at-cmd=|\Meta{真偽値}\Means + |\@| 命令に対してJSクラスと同様の拡張を施すか否か。 \item |layout=|\Meta{値}\Means レイアウトの変種を選択する。 現状では、過去の版との互換性を維持するために用いられている。 diff --git a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf index 71ab0d79c95..5bea1199eb8 100644 Binary files a/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf and b/Master/texmf-dist/doc/latex/bxjscls/bxjscls.pdf differ diff --git a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx index d0a7daf8242..3c39b42b9c5 100644 --- a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx +++ b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx @@ -68,7 +68,8 @@ %<*driver> \ProvidesFile{bxjscls.dtx} % - [2017/10/21 v1.7 BXJS document classes] + [2017/12/09 v1.7a BXJS document classes] +% [2017/10/21 v1.7 BXJS document classes] % [2017/09/28 v1.6b BXJS document classes] % [2017/09/24 v1.6a BXJS document classes] % [2017/09/09 v1.6 BXJS document classes] @@ -1801,6 +1802,16 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\ifbxjs@fix@at@cmd} +% 〔スイッチ〕 |fix-at-cmd| の指定値。 +% \begin{macrocode} +\newif\ifbxjs@fix@at@cmd \bxjs@fix@at@cmdtrue +\let\bxjs@kv@fixatcmd@true\bxjs@fix@at@cmdtrue +\let\bxjs@kv@fixatcmd@false\bxjs@fix@at@cmdfalse +\define@key{bxjs}{fix-at-cmd}[true]{\bxjs@set@keyval{fixatcmd}{#1}{}} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\ifbxjs@hyperref@enc} % 〔スイッチ〕 |hyperref-enc| の指定値。 % \begin{macrocode} @@ -2464,10 +2475,25 @@ % [2016-07-14] 2015-01-01の\LaTeX で,auxiliary filesに書き出されたときに % スペースが食われないようにする修正が入りました。これに合わせて |{}| を補いました。 % +% \begin{ZRnote} +% BXJSクラスでの変更点: +% \begin{itemize} +% \item |fix-at-cmd| オプションが偽の場合は再定義しない。 +% \item 固定の3000でなく実際のピリオドのsfcode値を使う。 +% \item 「防御的な |\@|」での不具合を防ぐため、大文字直後の |\@| +% は標準と同等の動作にする。 +% \end{itemize} +% \end{ZRnote} +% % \begin{macrocode} \chardef\bxjs@periodchar=`\. -\bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} -\def\@{\bxjs@SE{}} +\bxjs@protected\def\bxjs@SE{% + \ifnum\spacefactor<\@m \spacefactor\@m + \else \spacefactor\sfcode\bxjs@periodchar + \fi} +\ifbxjs@fix@at@cmd + \def\@{\bxjs@SE{}} +\fi % \end{macrocode} % \end{macro} % @@ -7544,13 +7570,12 @@ % 和暦にするには |\和暦| と書いてください。 % % \begin{ZRnote} -% 環境変数 |SOURCE_DATE_EPOCH_TEX_PRIMITIVES| が設定されている場合は -% “今日”が過去の日付になる可能性があるが、その場合、 -% 和暦表記は平成2年(1990年)以降でのみサポートする。 -% \Note “新元号”への対応? +% 環境変数 |SOURCE_DATE_EPOCH|/|FORCE_SOURCE_DATE| が +% 設定されている場合は“今日”が過去・未来の日付になる可能性がある。 +% その場合、和暦表記は1970年から平成の終わりまでの期間でのみサポートする。 +% \Note 新元号が公表されたら対応する。 % \end{ZRnote} % -% \begin{macro}{\today} % \begin{macrocode} \@tempswafalse \if p\jsEngine \@tempswatrue \fi @@ -7581,17 +7606,51 @@ \else \expandafter\@secondoftwo \fi} } \bxjs@decl@Seireki@cmds -% \bxjs@unxp -\let\bxjs@unxp\@firstofone -\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded} -% \bxjs@iai +\let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone +\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded + \def\bxjs@onxp{\unexpanded\expandafter}} \if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T \def\bxjs@iai{\noexpand~} \else \def\bxjs@iai{} \fi -% \heisei -\newcount\heisei \heisei\year \advance\heisei-1988\relax -% \today +% \end{macrocode} +% +% \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 +% 新元号対応 +% \def\bxjs@gengo{新元号}\advance\bxjs@jayear-2018\relax +\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} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\today} +% 英語、西暦、和暦で場合分けをする。 +% \begin{macrocode} \edef\bxjs@today{% \if@english \ifcase\month\or @@ -7599,15 +7658,12 @@ July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \ifnum\heisei>\@ne - \expandafter\noexpand\expandafter\bxjs@if@use@seireki - \else \expandafter\@firstoftwo - \fi {% + \noexpand\bxjs@if@use@seireki{% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% }{% - \bxjs@unxp{平成}\bxjs@iai\number\heisei\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{日}% }% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls index 716134ef316..727695aac20 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} - [2017/10/21 v1.7 BXJS document classes] + [2017/12/09 v1.7a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsarticle} \newif\ifjsc@needsp@tch @@ -546,6 +546,10 @@ \let\bxjs@kv@jaspacecmd@false\bxjs@jaspace@cmdfalse \define@key{bxjs}{jaspace-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}} \define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}} +\newif\ifbxjs@fix@at@cmd \bxjs@fix@at@cmdtrue +\let\bxjs@kv@fixatcmd@true\bxjs@fix@at@cmdtrue +\let\bxjs@kv@fixatcmd@false\bxjs@fix@at@cmdfalse +\define@key{bxjs}{fix-at-cmd}[true]{\bxjs@set@keyval{fixatcmd}{#1}{}} \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse @@ -825,8 +829,13 @@ \newskip\jsc@smallskipamount \jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \chardef\bxjs@periodchar=`\. -\bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} -\def\@{\bxjs@SE{}} +\bxjs@protected\def\bxjs@SE{% + \ifnum\spacefactor<\@m \spacefactor\@m + \else \spacefactor\sfcode\bxjs@periodchar + \fi} +\ifbxjs@fix@at@cmd + \def\@{\bxjs@SE{}} +\fi \def\bxjs@tmpa{\def\set@fontsize##1##2##3} \expandafter\bxjs@tmpa\expandafter{% \set@fontsize{#1}{#2}{#3}% @@ -2186,13 +2195,32 @@ \else \expandafter\@secondoftwo \fi} } \bxjs@decl@Seireki@cmds -\let\bxjs@unxp\@firstofone -\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded} +\let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone +\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded + \def\bxjs@onxp{\unexpanded\expandafter}} \if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T \def\bxjs@iai{\noexpand~} \else \def\bxjs@iai{} \fi -\newcount\heisei \heisei\year \advance\heisei-1988\relax +\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 +\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} \edef\bxjs@today{% \if@english \ifcase\month\or @@ -2200,15 +2228,12 @@ July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \ifnum\heisei>\@ne - \expandafter\noexpand\expandafter\bxjs@if@use@seireki - \else \expandafter\@firstoftwo - \fi {% + \noexpand\bxjs@if@use@seireki{% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% }{% - \bxjs@unxp{平成}\bxjs@iai\number\heisei\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{日}% }% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls index 819886cfca0..16b7789adb3 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} - [2017/10/21 v1.7 BXJS document classes] + [2017/12/09 v1.7a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsbook} \newif\ifjsc@needsp@tch @@ -555,6 +555,10 @@ \let\bxjs@kv@jaspacecmd@false\bxjs@jaspace@cmdfalse \define@key{bxjs}{jaspace-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}} \define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}} +\newif\ifbxjs@fix@at@cmd \bxjs@fix@at@cmdtrue +\let\bxjs@kv@fixatcmd@true\bxjs@fix@at@cmdtrue +\let\bxjs@kv@fixatcmd@false\bxjs@fix@at@cmdfalse +\define@key{bxjs}{fix-at-cmd}[true]{\bxjs@set@keyval{fixatcmd}{#1}{}} \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse @@ -834,8 +838,13 @@ \newskip\jsc@smallskipamount \jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \chardef\bxjs@periodchar=`\. -\bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} -\def\@{\bxjs@SE{}} +\bxjs@protected\def\bxjs@SE{% + \ifnum\spacefactor<\@m \spacefactor\@m + \else \spacefactor\sfcode\bxjs@periodchar + \fi} +\ifbxjs@fix@at@cmd + \def\@{\bxjs@SE{}} +\fi \def\bxjs@tmpa{\def\set@fontsize##1##2##3} \expandafter\bxjs@tmpa\expandafter{% \set@fontsize{#1}{#2}{#3}% @@ -2294,13 +2303,32 @@ \else \expandafter\@secondoftwo \fi} } \bxjs@decl@Seireki@cmds -\let\bxjs@unxp\@firstofone -\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded} +\let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone +\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded + \def\bxjs@onxp{\unexpanded\expandafter}} \if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T \def\bxjs@iai{\noexpand~} \else \def\bxjs@iai{} \fi -\newcount\heisei \heisei\year \advance\heisei-1988\relax +\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 +\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} \edef\bxjs@today{% \if@english \ifcase\month\or @@ -2308,15 +2336,12 @@ July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \ifnum\heisei>\@ne - \expandafter\noexpand\expandafter\bxjs@if@use@seireki - \else \expandafter\@firstoftwo - \fi {% + \noexpand\bxjs@if@use@seireki{% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% }{% - \bxjs@unxp{平成}\bxjs@iai\number\heisei\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{日}% }% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty index 473adb8082d..c1a11c569a9 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} - [2017/10/21 v1.7 BXJS document classes] + [2017/12/09 v1.7a BXJS document classes] \def\bxjx@pkgname{bxjscjkcat} \newcount\bxjx@cnta \let\bxjx@engine=n diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty b/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty index c36f490f226..f89db878fb4 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} - [2017/10/21 v1.7 BXJS document classes] + [2017/12/09 v1.7a BXJS document classes] \def\bxac@pkgname{bxjscompat} \let\bxac@engine=n \def\bxac@do#1#2{% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def index 6e699799db0..7e63ee04f04 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} - [2017/10/21 v1.7 BXJS document classes] + [2017/12/09 v1.7a 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 4e09f6d071f..dfeb783f38a 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} - [2017/10/21 v1.7 BXJS document classes] + [2017/12/09 v1.7a 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 73df73dec2a..46222f227e8 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} - [2017/10/21 v1.7 BXJS document classes] + [2017/12/09 v1.7a BXJS document classes] \input{bxjsja-standard.def} \RequirePackage{bxjspandoc} \@onlypreamble\bxjs@set@dupload@proc diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def b/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def index ad1a5222703..0e2707059e0 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} - [2017/10/21 v1.7 BXJS document classes] + [2017/12/09 v1.7a 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 46cb8f33c87..937c86968c8 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} - [2017/10/21 v1.7 BXJS document classes] + [2017/12/09 v1.7a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjsp@pkgname{bxjscjkcat} \let\bxjsp@engine=n diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls index 512d7ec0b15..dc07cb1c934 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} - [2017/10/21 v1.7 BXJS document classes] + [2017/12/09 v1.7a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch @@ -554,6 +554,10 @@ \let\bxjs@kv@jaspacecmd@false\bxjs@jaspace@cmdfalse \define@key{bxjs}{jaspace-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}} \define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}} +\newif\ifbxjs@fix@at@cmd \bxjs@fix@at@cmdtrue +\let\bxjs@kv@fixatcmd@true\bxjs@fix@at@cmdtrue +\let\bxjs@kv@fixatcmd@false\bxjs@fix@at@cmdfalse +\define@key{bxjs}{fix-at-cmd}[true]{\bxjs@set@keyval{fixatcmd}{#1}{}} \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse @@ -833,8 +837,13 @@ \newskip\jsc@smallskipamount \jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \chardef\bxjs@periodchar=`\. -\bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} -\def\@{\bxjs@SE{}} +\bxjs@protected\def\bxjs@SE{% + \ifnum\spacefactor<\@m \spacefactor\@m + \else \spacefactor\sfcode\bxjs@periodchar + \fi} +\ifbxjs@fix@at@cmd + \def\@{\bxjs@SE{}} +\fi \def\bxjs@tmpa{\def\set@fontsize##1##2##3} \expandafter\bxjs@tmpa\expandafter{% \set@fontsize{#1}{#2}{#3}% @@ -2325,13 +2334,32 @@ \else \expandafter\@secondoftwo \fi} } \bxjs@decl@Seireki@cmds -\let\bxjs@unxp\@firstofone -\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded} +\let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone +\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded + \def\bxjs@onxp{\unexpanded\expandafter}} \if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T \def\bxjs@iai{\noexpand~} \else \def\bxjs@iai{} \fi -\newcount\heisei \heisei\year \advance\heisei-1988\relax +\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 +\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} \edef\bxjs@today{% \if@english \ifcase\month\or @@ -2339,15 +2367,12 @@ July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \ifnum\heisei>\@ne - \expandafter\noexpand\expandafter\bxjs@if@use@seireki - \else \expandafter\@firstoftwo - \fi {% + \noexpand\bxjs@if@use@seireki{% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% }{% - \bxjs@unxp{平成}\bxjs@iai\number\heisei\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{日}% }% diff --git a/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls b/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls index 3227f3b19ee..090ff05019f 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} - [2017/10/21 v1.7 BXJS document classes] + [2017/12/09 v1.7a BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch @@ -546,6 +546,10 @@ \let\bxjs@kv@jaspacecmd@false\bxjs@jaspace@cmdfalse \define@key{bxjs}{jaspace-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}} \define@key{bxjs}{xkanjiskip-cmd}[true]{\bxjs@set@keyval{jaspacecmd}{#1}{}} +\newif\ifbxjs@fix@at@cmd \bxjs@fix@at@cmdtrue +\let\bxjs@kv@fixatcmd@true\bxjs@fix@at@cmdtrue +\let\bxjs@kv@fixatcmd@false\bxjs@fix@at@cmdfalse +\define@key{bxjs}{fix-at-cmd}[true]{\bxjs@set@keyval{fixatcmd}{#1}{}} \newif\ifbxjs@hyperref@enc \bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@true\bxjs@hyperref@enctrue \let\bxjs@kv@hyperrefenc@false\bxjs@hyperref@encfalse @@ -824,8 +828,13 @@ \newskip\jsc@smallskipamount \jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt \chardef\bxjs@periodchar=`\. -\bxjs@protected\def\bxjs@SE{\spacefactor\sfcode\bxjs@periodchar} -\def\@{\bxjs@SE{}} +\bxjs@protected\def\bxjs@SE{% + \ifnum\spacefactor<\@m \spacefactor\@m + \else \spacefactor\sfcode\bxjs@periodchar + \fi} +\ifbxjs@fix@at@cmd + \def\@{\bxjs@SE{}} +\fi \def\bxjs@tmpa{\def\set@fontsize##1##2##3} \expandafter\bxjs@tmpa\expandafter{% \set@fontsize{#1}{#2}{#3}% @@ -2184,13 +2193,32 @@ \else \expandafter\@secondoftwo \fi} } \bxjs@decl@Seireki@cmds -\let\bxjs@unxp\@firstofone -\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded} +\let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone +\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded + \def\bxjs@onxp{\unexpanded\expandafter}} \if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T \def\bxjs@iai{\noexpand~} \else \def\bxjs@iai{} \fi -\newcount\heisei \heisei\year \advance\heisei-1988\relax +\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 +\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} \edef\bxjs@today{% \if@english \ifcase\month\or @@ -2198,15 +2226,12 @@ July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year \else - \ifnum\heisei>\@ne - \expandafter\noexpand\expandafter\bxjs@if@use@seireki - \else \expandafter\@firstoftwo - \fi {% + \noexpand\bxjs@if@use@seireki{% \number\year\bxjs@iai\bxjs@unxp{年}% \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}% \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}% }{% - \bxjs@unxp{平成}\bxjs@iai\number\heisei\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{日}% }% -- cgit v1.2.3