Fix for #31147. 'fullwidthify' proportional glyphs if pwid/palt are not set.

[luatex-ja/luatexja.git] / src / ltjclasses / ltjarticle.cls

diff --git a/src/ltjclasses/ltjarticle.cls b/src/ltjclasses/ltjarticle.cls
index 53a8530..15ba4b8 100644 (file)
--- a/src/ltjclasses/ltjarticle.cls
+++ b/src/ltjclasses/ltjarticle.cls
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjarticle}
-  [2011/10/03 v1.6-ltj
+  [2012/05/08 v1.6-ltj
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -52,7 +52,6 @@
 \@tempcnta\hour \multiply\@tempcnta 60\relax
 \minute\time \advance\minute-\@tempcnta
 \newif\if@stysize \@stysizefalse
-\newif\if@enablejfam \@enablejfamtrue
 \newif\if@mathrmmc \@mathrmmcfalse
 \DeclareOption{a4paper}{\setcounter{@paper}{1}%
   \setlength\paperheight {297mm}%
@@ -140,7 +139,8 @@
 \if@compatibility
   \@mathrmmctrue
 \else
-  \DeclareOption{disablejfam}{\@enablejfamfalse}
+  \DeclareOption{disablejfam}{%
+    \ClassWarningNoLine{\@currname}{The class option 'disablejfam' is obsolete}}
   \DeclareOption{mathrmmc}{\@mathrmmctrue}
 \fi
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
@@ -758,13 +758,13 @@
   \kern 2.6\p@}
 \newcommand\@makefntext[1]{\parindent 1em
   \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
-\newif\ifSeireki \Seirekifalse
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦false
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{{%
   \iftdir
-    \ifSeireki
+    \if西暦
       \kansuji\number\year 年
       \kansuji\number\month 月
       \kansuji\number\day 日
@@ -774,7 +774,7 @@
       \kansuji\number\day 日
     \fi
   \else
-    \ifSeireki
+    \if西暦
       \number\year~年
       \number\month~月
       \number\day~日