bxjscls (9dec17)

git-svn-id: svn://tug.org/texlive/trunk@46027 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 151 insertions, 51 deletions

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{日}%
     }%