Warning messages for obsolete options in ltjclasses and ltjsclasses.

[luatex-ja/luatexja.git] / src / lltjfont.sty

diff --git a/src/lltjfont.sty b/src/lltjfont.sty
index 203b4a6..da35c15 100644 (file)
--- a/src/lltjfont.sty
+++ b/src/lltjfont.sty
@@ -12,17 +12,17 @@
 \let\k@shape\@empty
 \def\curr@kfontshape{\k@encoding/\k@family/\k@series/\k@shape}
 \def\rel@fontshape{\f@encoding/\f@family/\f@series/\f@shape}
-\newdimen\Cht
-\newdimen\cht
-\newdimen\Cdp
-\newdimen\cdp
-\newdimen\Cwd
-\newdimen\cwd
-\newdimen\Cvs
-\newdimen\cvs
-\newdimen\Chs
-\newdimen\chs
-\newdimen\cHT
+\ifdefined\Cht\else\newdimen\Cht\fi
+\ifdefined\cht\else\newdimen\cht\fi
+\ifdefined\Cdp\else\newdimen\Cdp\fi
+\ifdefined\cdp\else\newdimen\cdp\fi
+\ifdefined\Cwd\else\newdimen\Cwd\fi
+\ifdefined\cwd\else\newdimen\cwd\fi
+\ifdefined\Cvs\else\newdimen\Cvs\fi
+\ifdefined\cvs\else\newdimen\cvs\fi
+\ifdefined\Chs\else\newdimen\Chs\fi
+\ifdefined\chs\else\newdimen\chs\fi
+\ifdefined\cHT\else\newdimen\cHT\fi
 %\let\afont\font
 \def\inlist@#1#2{%
   \def\in@@##1<#1>##2##3\in@@{%
@@ -630,7 +630,7 @@
      \ltj@@al@do@subst@correction
    \fi
 }
-
+\let\@@italiccorr=\/
 
 %%%%%% Japanese font for math mode
 
@@ -654,8 +654,9 @@
 
 \def\getanddefine@fonts#1#2{%
   \ltj@tempcnta=#1\ltj@@IsFontJapanese{\string#2}%
-  \ifin@\ltj@@ja@getanddefine@fonts{#1}{#2}%
-  \else \ltj@@al@getanddefine@fonts{#1}{#2}\fi
+  \ifin@\let\ltj@temp=\ltj@@ja@getanddefine@fonts%
+  \else \let\ltj@temp=\ltj@@al@getanddefine@fonts\fi
+  \ltj@temp{#1}{#2}%
 }
 \def\use@mathgroup#1#2{\relax\ifmmode
   \math@bgroup