texlive[46027] Master/texmf-dist: bxjscls (9dec17)
commits+karl at tug.org
commits+karl at tug.org
Sun Dec 10 01:36:54 CET 2017
Revision: 46027
http://tug.org/svn/texlive?view=revision&revision=46027
Author: karl
Date: 2017-12-10 01:36:54 +0100 (Sun, 10 Dec 2017)
Log Message:
-----------
bxjscls (9dec17)
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 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/doc/latex/bxjscls/README-ja.md 2017-12-10 00:36:54 UTC (rev 46027)
@@ -98,6 +98,9 @@
更新履歴
--------
+ * Version 1.7a 〈2017/12/09〉
+ - 〈試験的〉新元号対応の準備。`\jayear` 命令を追加。
+ - `\@` の定義を修正。`fix-ja-cmd` オプションを追加。
* Version 1.7 〈2017/10/21〉
- 和文空白命令（`\jaenspace` 等）を追加。
- `everyparhook` オプションを新設。
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 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex 2017-12-10 00:36:54 UTC (rev 46027)
@@ -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 @@
|\jaenspace|、|\jathinspace|、|\>|、
|\＿|（|\|\,+\,全角空白）
\end{quote}
+\item |fix-at-cmd=|\Meta{真偽値}\Means
+ |\@| 命令に対してJSクラスと同様の拡張を施すか否か。
\item |layout=|\Meta{値}\Means
レイアウトの変種を選択する。
現状では、過去の版との互換性を維持するために用いられている。
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 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx 2017-12-10 00:36:54 UTC (rev 46027)
@@ -68,7 +68,8 @@
%<*driver>
\ProvidesFile{bxjscls.dtx}
%</driver>
- [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 at fix@at at cmd}
+% 〔スイッチ〕 |fix-at-cmd| の指定値。
+% \begin{macrocode}
+\newif\ifbxjs at fix@at at cmd \bxjs at fix@at at cmdtrue
+\let\bxjs at kv@fixatcmd at true\bxjs at fix@at at cmdtrue
+\let\bxjs at kv@fixatcmd at false\bxjs at fix@at at cmdfalse
+\define at key{bxjs}{fix-at-cmd}[true]{\bxjs at set@keyval{fixatcmd}{#1}{}}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\ifbxjs at 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 at periodchar=`\.
-\bxjs at protected\def\bxjs at SE{\spacefactor\sfcode\bxjs at periodchar}
-\def\@{\bxjs at SE{}}
+\bxjs at protected\def\bxjs at SE{%
+ \ifnum\spacefactor<\@m \spacefactor\@m
+ \else \spacefactor\sfcode\bxjs at periodchar
+ \fi}
+\ifbxjs at fix@at at cmd
+ \def\@{\bxjs at 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 at decl@Seireki at cmds
-% \bxjs at unxp
-\let\bxjs at unxp\@firstofone
-\bxjs at test@engine\unexpanded{\let\bxjs at unxp\unexpanded}
-% \bxjs at iai
+\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
-% \heisei
-\newcount\heisei \heisei\year \advance\heisei-1988\relax
-% \today
+% \end{macrocode}
+%
+% \begin{macro}{\jayear}
+% 和暦における年の表記（元号+年数）。
+% \begin{macro}{\heisei}
+% 年数を表す整数レジスタで、
+% 元号が「平成」である場合にのみ定義される。
+% \Note 一般の年数の整数レジスタは |\bxjs at jayear| で、
+% |\heisei| はこれの別名になる。
+% \begin{macrocode}
+\newcount\bxjs at jayear
+\let\bxjs at gengo\@empty \bxjs at jayear\year
+\@tempcnta=\the\year\two at digits\month\two at digits\day\relax
+\ifnum\@tempcnta<19700101
+\else\ifnum\@tempcnta<19890108
+ \def\bxjs at gengo{昭和}\advance\bxjs at jayear-1925\relax
+ \let\heisei\bxjs at jayear
+\else\ifnum\@tempcnta<20190501
+ \def\bxjs at gengo{平成}\advance\bxjs at jayear-1988\relax
+ \let\heisei\bxjs at jayear
+\else
+% 新元号対応
+% \def\bxjs at gengo{新元号}\advance\bxjs at jayear-2018\relax
+\fi\fi\fi
+\edef\jayear{%
+ \ifx\bxjs at gengo\@empty \the\bxjs at jayear\bxjs at iai
+ \else \bxjs at onxp{\bxjs at gengo}%
+ \ifnum\bxjs at jayear=\@ne \bxjs at unxp{元}%
+ \else \bxjs at iai\the\bxjs at jayear\bxjs at iai
+ \fi
+ \fi}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\today}
+% 英語、西暦、和暦で場合分けをする。
+% \begin{macrocode}
\edef\bxjs at today{%
\if at 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 at if@use at seireki
- \else \expandafter\@firstoftwo
- \fi {%
+ \noexpand\bxjs at if@use at seireki{%
\number\year\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{日}%
}{%
- \bxjs at unxp{平成}\bxjs at iai\number\heisei\bxjs at iai\bxjs at unxp{年}%
+ \bxjs at onxp{\jayear}\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{日}%
}%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls 2017-12-10 00:36:54 UTC (rev 46027)
@@ -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 at clsname{bxjsarticle}
\newif\ifjsc at needsp@tch
@@ -546,6 +546,10 @@
\let\bxjs at kv@jaspacecmd at false\bxjs at jaspace@cmdfalse
\define at key{bxjs}{jaspace-cmd}[true]{\bxjs at set@keyval{jaspacecmd}{#1}{}}
\define at key{bxjs}{xkanjiskip-cmd}[true]{\bxjs at set@keyval{jaspacecmd}{#1}{}}
+\newif\ifbxjs at fix@at at cmd \bxjs at fix@at at cmdtrue
+\let\bxjs at kv@fixatcmd at true\bxjs at fix@at at cmdtrue
+\let\bxjs at kv@fixatcmd at false\bxjs at fix@at at cmdfalse
+\define at key{bxjs}{fix-at-cmd}[true]{\bxjs at set@keyval{fixatcmd}{#1}{}}
\newif\ifbxjs at hyperref@enc \bxjs at hyperref@enctrue
\let\bxjs at kv@hyperrefenc at true\bxjs at hyperref@enctrue
\let\bxjs at kv@hyperrefenc at false\bxjs at hyperref@encfalse
@@ -825,8 +829,13 @@
\newskip\jsc at smallskipamount
\jsc at smallskipamount=3\jsc at mpt plus 1\jsc at mpt minus 1\jsc at mpt
\chardef\bxjs at periodchar=`\.
-\bxjs at protected\def\bxjs at SE{\spacefactor\sfcode\bxjs at periodchar}
-\def\@{\bxjs at SE{}}
+\bxjs at protected\def\bxjs at SE{%
+ \ifnum\spacefactor<\@m \spacefactor\@m
+ \else \spacefactor\sfcode\bxjs at periodchar
+ \fi}
+\ifbxjs at fix@at at cmd
+ \def\@{\bxjs at SE{}}
+\fi
\def\bxjs at tmpa{\def\set at fontsize##1##2##3}
\expandafter\bxjs at tmpa\expandafter{%
\set at fontsize{#1}{#2}{#3}%
@@ -2186,13 +2195,32 @@
\else \expandafter\@secondoftwo \fi}
}
\bxjs at decl@Seireki at cmds
-\let\bxjs at unxp\@firstofone
-\bxjs at test@engine\unexpanded{\let\bxjs at unxp\unexpanded}
+\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
-\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\newcount\bxjs at jayear
+\let\bxjs at gengo\@empty \bxjs at jayear\year
+\@tempcnta=\the\year\two at digits\month\two at digits\day\relax
+\ifnum\@tempcnta<19700101
+\else\ifnum\@tempcnta<19890108
+ \def\bxjs at gengo{昭和}\advance\bxjs at jayear-1925\relax
+ \let\heisei\bxjs at jayear
+\else\ifnum\@tempcnta<20190501
+ \def\bxjs at gengo{平成}\advance\bxjs at jayear-1988\relax
+ \let\heisei\bxjs at jayear
+\else
+\fi\fi\fi
+\edef\jayear{%
+ \ifx\bxjs at gengo\@empty \the\bxjs at jayear\bxjs at iai
+ \else \bxjs at onxp{\bxjs at gengo}%
+ \ifnum\bxjs at jayear=\@ne \bxjs at unxp{元}%
+ \else \bxjs at iai\the\bxjs at jayear\bxjs at iai
+ \fi
+ \fi}
\edef\bxjs at today{%
\if at 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 at if@use at seireki
- \else \expandafter\@firstoftwo
- \fi {%
+ \noexpand\bxjs at if@use at seireki{%
\number\year\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{日}%
}{%
- \bxjs at unxp{平成}\bxjs at iai\number\heisei\bxjs at iai\bxjs at unxp{年}%
+ \bxjs at onxp{\jayear}\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{日}%
}%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsbook.cls 2017-12-10 00:36:54 UTC (rev 46027)
@@ -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 at clsname{bxjsbook}
\newif\ifjsc at needsp@tch
@@ -555,6 +555,10 @@
\let\bxjs at kv@jaspacecmd at false\bxjs at jaspace@cmdfalse
\define at key{bxjs}{jaspace-cmd}[true]{\bxjs at set@keyval{jaspacecmd}{#1}{}}
\define at key{bxjs}{xkanjiskip-cmd}[true]{\bxjs at set@keyval{jaspacecmd}{#1}{}}
+\newif\ifbxjs at fix@at at cmd \bxjs at fix@at at cmdtrue
+\let\bxjs at kv@fixatcmd at true\bxjs at fix@at at cmdtrue
+\let\bxjs at kv@fixatcmd at false\bxjs at fix@at at cmdfalse
+\define at key{bxjs}{fix-at-cmd}[true]{\bxjs at set@keyval{fixatcmd}{#1}{}}
\newif\ifbxjs at hyperref@enc \bxjs at hyperref@enctrue
\let\bxjs at kv@hyperrefenc at true\bxjs at hyperref@enctrue
\let\bxjs at kv@hyperrefenc at false\bxjs at hyperref@encfalse
@@ -834,8 +838,13 @@
\newskip\jsc at smallskipamount
\jsc at smallskipamount=3\jsc at mpt plus 1\jsc at mpt minus 1\jsc at mpt
\chardef\bxjs at periodchar=`\.
-\bxjs at protected\def\bxjs at SE{\spacefactor\sfcode\bxjs at periodchar}
-\def\@{\bxjs at SE{}}
+\bxjs at protected\def\bxjs at SE{%
+ \ifnum\spacefactor<\@m \spacefactor\@m
+ \else \spacefactor\sfcode\bxjs at periodchar
+ \fi}
+\ifbxjs at fix@at at cmd
+ \def\@{\bxjs at SE{}}
+\fi
\def\bxjs at tmpa{\def\set at fontsize##1##2##3}
\expandafter\bxjs at tmpa\expandafter{%
\set at fontsize{#1}{#2}{#3}%
@@ -2294,13 +2303,32 @@
\else \expandafter\@secondoftwo \fi}
}
\bxjs at decl@Seireki at cmds
-\let\bxjs at unxp\@firstofone
-\bxjs at test@engine\unexpanded{\let\bxjs at unxp\unexpanded}
+\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
-\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\newcount\bxjs at jayear
+\let\bxjs at gengo\@empty \bxjs at jayear\year
+\@tempcnta=\the\year\two at digits\month\two at digits\day\relax
+\ifnum\@tempcnta<19700101
+\else\ifnum\@tempcnta<19890108
+ \def\bxjs at gengo{昭和}\advance\bxjs at jayear-1925\relax
+ \let\heisei\bxjs at jayear
+\else\ifnum\@tempcnta<20190501
+ \def\bxjs at gengo{平成}\advance\bxjs at jayear-1988\relax
+ \let\heisei\bxjs at jayear
+\else
+\fi\fi\fi
+\edef\jayear{%
+ \ifx\bxjs at gengo\@empty \the\bxjs at jayear\bxjs at iai
+ \else \bxjs at onxp{\bxjs at gengo}%
+ \ifnum\bxjs at jayear=\@ne \bxjs at unxp{元}%
+ \else \bxjs at iai\the\bxjs at jayear\bxjs at iai
+ \fi
+ \fi}
\edef\bxjs at today{%
\if at 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 at if@use at seireki
- \else \expandafter\@firstoftwo
- \fi {%
+ \noexpand\bxjs at if@use at seireki{%
\number\year\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{日}%
}{%
- \bxjs at unxp{平成}\bxjs at iai\number\heisei\bxjs at iai\bxjs at unxp{年}%
+ \bxjs at onxp{\jayear}\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{日}%
}%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty 2017-12-10 00:36:54 UTC (rev 46027)
@@ -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 at pkgname{bxjscjkcat}
\newcount\bxjx at cnta
\let\bxjx at engine=n
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjscompat.sty 2017-12-10 00:36:54 UTC (rev 46027)
@@ -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 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 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def 2017-12-10 00:36:54 UTC (rev 46027)
@@ -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]{%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def 2017-12-10 00:36:54 UTC (rev 46027)
@@ -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}%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def 2017-12-10 00:36:54 UTC (rev 46027)
@@ -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 at set@dupload at proc
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def 2017-12-10 00:36:54 UTC (rev 46027)
@@ -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 at simplejasetupfalse
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty 2017-12-10 00:36:54 UTC (rev 46027)
@@ -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 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 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsreport.cls 2017-12-10 00:36:54 UTC (rev 46027)
@@ -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 at clsname{bxjsreport}
\newif\ifjsc at needsp@tch
@@ -554,6 +554,10 @@
\let\bxjs at kv@jaspacecmd at false\bxjs at jaspace@cmdfalse
\define at key{bxjs}{jaspace-cmd}[true]{\bxjs at set@keyval{jaspacecmd}{#1}{}}
\define at key{bxjs}{xkanjiskip-cmd}[true]{\bxjs at set@keyval{jaspacecmd}{#1}{}}
+\newif\ifbxjs at fix@at at cmd \bxjs at fix@at at cmdtrue
+\let\bxjs at kv@fixatcmd at true\bxjs at fix@at at cmdtrue
+\let\bxjs at kv@fixatcmd at false\bxjs at fix@at at cmdfalse
+\define at key{bxjs}{fix-at-cmd}[true]{\bxjs at set@keyval{fixatcmd}{#1}{}}
\newif\ifbxjs at hyperref@enc \bxjs at hyperref@enctrue
\let\bxjs at kv@hyperrefenc at true\bxjs at hyperref@enctrue
\let\bxjs at kv@hyperrefenc at false\bxjs at hyperref@encfalse
@@ -833,8 +837,13 @@
\newskip\jsc at smallskipamount
\jsc at smallskipamount=3\jsc at mpt plus 1\jsc at mpt minus 1\jsc at mpt
\chardef\bxjs at periodchar=`\.
-\bxjs at protected\def\bxjs at SE{\spacefactor\sfcode\bxjs at periodchar}
-\def\@{\bxjs at SE{}}
+\bxjs at protected\def\bxjs at SE{%
+ \ifnum\spacefactor<\@m \spacefactor\@m
+ \else \spacefactor\sfcode\bxjs at periodchar
+ \fi}
+\ifbxjs at fix@at at cmd
+ \def\@{\bxjs at SE{}}
+\fi
\def\bxjs at tmpa{\def\set at fontsize##1##2##3}
\expandafter\bxjs at tmpa\expandafter{%
\set at fontsize{#1}{#2}{#3}%
@@ -2325,13 +2334,32 @@
\else \expandafter\@secondoftwo \fi}
}
\bxjs at decl@Seireki at cmds
-\let\bxjs at unxp\@firstofone
-\bxjs at test@engine\unexpanded{\let\bxjs at unxp\unexpanded}
+\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
-\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\newcount\bxjs at jayear
+\let\bxjs at gengo\@empty \bxjs at jayear\year
+\@tempcnta=\the\year\two at digits\month\two at digits\day\relax
+\ifnum\@tempcnta<19700101
+\else\ifnum\@tempcnta<19890108
+ \def\bxjs at gengo{昭和}\advance\bxjs at jayear-1925\relax
+ \let\heisei\bxjs at jayear
+\else\ifnum\@tempcnta<20190501
+ \def\bxjs at gengo{平成}\advance\bxjs at jayear-1988\relax
+ \let\heisei\bxjs at jayear
+\else
+\fi\fi\fi
+\edef\jayear{%
+ \ifx\bxjs at gengo\@empty \the\bxjs at jayear\bxjs at iai
+ \else \bxjs at onxp{\bxjs at gengo}%
+ \ifnum\bxjs at jayear=\@ne \bxjs at unxp{元}%
+ \else \bxjs at iai\the\bxjs at jayear\bxjs at iai
+ \fi
+ \fi}
\edef\bxjs at today{%
\if at 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 at if@use at seireki
- \else \expandafter\@firstoftwo
- \fi {%
+ \noexpand\bxjs at if@use at seireki{%
\number\year\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{日}%
}{%
- \bxjs at unxp{平成}\bxjs at iai\number\heisei\bxjs at iai\bxjs at unxp{年}%
+ \bxjs at onxp{\jayear}\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{日}%
}%
Modified: trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls 2017-12-10 00:36:39 UTC (rev 46026)
+++ trunk/Master/texmf-dist/tex/latex/bxjscls/bxjsslide.cls 2017-12-10 00:36:54 UTC (rev 46027)
@@ -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 at clsname{bxjsslide}
\newif\ifjsc at needsp@tch
@@ -546,6 +546,10 @@
\let\bxjs at kv@jaspacecmd at false\bxjs at jaspace@cmdfalse
\define at key{bxjs}{jaspace-cmd}[true]{\bxjs at set@keyval{jaspacecmd}{#1}{}}
\define at key{bxjs}{xkanjiskip-cmd}[true]{\bxjs at set@keyval{jaspacecmd}{#1}{}}
+\newif\ifbxjs at fix@at at cmd \bxjs at fix@at at cmdtrue
+\let\bxjs at kv@fixatcmd at true\bxjs at fix@at at cmdtrue
+\let\bxjs at kv@fixatcmd at false\bxjs at fix@at at cmdfalse
+\define at key{bxjs}{fix-at-cmd}[true]{\bxjs at set@keyval{fixatcmd}{#1}{}}
\newif\ifbxjs at hyperref@enc \bxjs at hyperref@enctrue
\let\bxjs at kv@hyperrefenc at true\bxjs at hyperref@enctrue
\let\bxjs at kv@hyperrefenc at false\bxjs at hyperref@encfalse
@@ -824,8 +828,13 @@
\newskip\jsc at smallskipamount
\jsc at smallskipamount=3\jsc at mpt plus 1\jsc at mpt minus 1\jsc at mpt
\chardef\bxjs at periodchar=`\.
-\bxjs at protected\def\bxjs at SE{\spacefactor\sfcode\bxjs at periodchar}
-\def\@{\bxjs at SE{}}
+\bxjs at protected\def\bxjs at SE{%
+ \ifnum\spacefactor<\@m \spacefactor\@m
+ \else \spacefactor\sfcode\bxjs at periodchar
+ \fi}
+\ifbxjs at fix@at at cmd
+ \def\@{\bxjs at SE{}}
+\fi
\def\bxjs at tmpa{\def\set at fontsize##1##2##3}
\expandafter\bxjs at tmpa\expandafter{%
\set at fontsize{#1}{#2}{#3}%
@@ -2184,13 +2193,32 @@
\else \expandafter\@secondoftwo \fi}
}
\bxjs at decl@Seireki at cmds
-\let\bxjs at unxp\@firstofone
-\bxjs at test@engine\unexpanded{\let\bxjs at unxp\unexpanded}
+\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
-\newcount\heisei \heisei\year \advance\heisei-1988\relax
+\newcount\bxjs at jayear
+\let\bxjs at gengo\@empty \bxjs at jayear\year
+\@tempcnta=\the\year\two at digits\month\two at digits\day\relax
+\ifnum\@tempcnta<19700101
+\else\ifnum\@tempcnta<19890108
+ \def\bxjs at gengo{昭和}\advance\bxjs at jayear-1925\relax
+ \let\heisei\bxjs at jayear
+\else\ifnum\@tempcnta<20190501
+ \def\bxjs at gengo{平成}\advance\bxjs at jayear-1988\relax
+ \let\heisei\bxjs at jayear
+\else
+\fi\fi\fi
+\edef\jayear{%
+ \ifx\bxjs at gengo\@empty \the\bxjs at jayear\bxjs at iai
+ \else \bxjs at onxp{\bxjs at gengo}%
+ \ifnum\bxjs at jayear=\@ne \bxjs at unxp{元}%
+ \else \bxjs at iai\the\bxjs at jayear\bxjs at iai
+ \fi
+ \fi}
\edef\bxjs at today{%
\if at 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 at if@use at seireki
- \else \expandafter\@firstoftwo
- \fi {%
+ \noexpand\bxjs at if@use at seireki{%
\number\year\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{日}%
}{%
- \bxjs at unxp{平成}\bxjs at iai\number\heisei\bxjs at iai\bxjs at unxp{年}%
+ \bxjs at onxp{\jayear}\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{日}%
}%
More information about the tex-live-commits
mailing list