X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=src%2Fltjtbook.cls;h=328fd0ffc4d96a24995808f7c078c0ea3b3d54b5;hb=26142dfa8cafe366a32dff1459c8f0f4c60c83d3;hp=32a6ab7610c0f8e292872298105ceea283f6733f;hpb=871900f0dca66ffbd2b0d6802c5d83a119b89448;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls
index 32a6ab7..328fd0f 100644
--- a/src/ltjtbook.cls
+++ b/src/ltjtbook.cls
@@ -21,9 +21,10 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %% File: ltjclasses.dtx
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtbook}
-  [2018/10/08 v1.8-ltj-16
+  [2019/08/12 v1.8b-ltj-17
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -156,6 +157,7 @@
 \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.962216] \ltj@stdgtfont:jfm=min;jfmvar=goth}{}
 \ltjglobalsetparameter{differentjfm=both}
 \directlua{luatexbase.remove_from_callback('luatexja.load_jfm', 'ltj.jclasses_load_jfm')}
+\DeclareOption{disablejfam}{}
 \ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright,tate}
 \ProcessOptions\relax
 \input{ltjtbk1\@ptsize.clo}
@@ -792,7 +794,7 @@
 \def\addcontentsline#1#2#3{%
   \protected@write\@auxout
     {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble
-\@temptokena{\rensuji{\thepage}}}%
+     \@temptokena{\rensuji{\thepage}}}%
     {\string\@writefile{#1}%
        {\protect\contentsline{#2}{#3}{\the\@temptokena}%
 \protected@file@percent}}%
@@ -902,32 +904,37 @@
 \newif\if西暦 \西暦true
 \def\西暦{\西暦true}
 \def\和暦{\西暦false}
+\newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\pltx@today@year@#1{%
   \ifnum\numexpr\year-#1=1 元\else
-\ifnum\ltjgetparameter{direction}=3 \kansuji\numexpr\year-#1\relax
-\else \number\numexpr\year-#1\relax\fi
+    \ifnum\ltjgetparameter{direction}=3
+      \kansuji\numexpr\year-#1\relax
+    \else
+      \number\numexpr\year-#1\relax\nobreak
+    \fi
   \fi å¹´
 }
 \def\pltx@today@year{%
   \ifnum\numexpr\year*10000+\month*100+\day<19890108
-昭和\pltx@today@year@{1925}%
+    昭和\pltx@today@year@{1925}%
   \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
-平成\pltx@today@year@{1988}%
+    平成\pltx@today@year@{1988}%
   \else
-〓〓\pltx@today@year@{2018}%
+    令和\pltx@today@year@{2018}%
   \fi\fi}
 \def\today{{%
   \if西暦
-    \ifnum\ltjgetparameter{direction}=3 \kansuji\year\else\number\year\fi å¹´
+    \ifnum\ltjgetparameter{direction}=3 \kansuji\year
+    \else\number\year\nobreak\fi å¹´
   \else
-\pltx@today@year
+    \pltx@today@year
   \fi
   \ifnum\ltjgetparameter{direction}=3
-\kansuji\month 月
+    \kansuji\month 月
     \kansuji\day 日
   \else
-    \number\month~月
-    \number\day~日
+    \number\month\nobreak 月
+    \number\day\nobreak 日
   \fi}}
 \newcommand{\prepartname}{第}
 \newcommand{\postpartname}{部}