Merge branch 'kitagawa_jfm_opt'

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

diff --git a/src/lltjfont.sty b/src/lltjfont.sty
index a4ad74c..da35c15 100644 (file)
--- a/src/lltjfont.sty
+++ b/src/lltjfont.sty
@@ -1,5 +1,5 @@
 %%
-%% luatexja-latex-fonts.sty: derived from plfonts.dtx in pLaTeX.
+%% lltjfont.sty: derived from plfonts.dtx in pLaTeX.
 %% 
 \makeatletter
 \let\k@encoding\@empty
@@ -7,23 +7,22 @@
 % LuaTeX-ja uses JY3 and JT3 encodings.
 \def\cy@encoding{JY3}\def\ct@encoding{JT3}
 
-
 \let\k@family\@empty
 \let\k@series\@empty
 \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@@{%
@@ -48,7 +47,8 @@
     \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi
   \else
     \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
-  \fi}
+  \fi
+}
 \def\tstrut{\relax\hbox{\tate
    \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}}
 \def\zstrut{\relax\hbox{\tate
@@ -495,20 +495,20 @@
     \inlist@\expandafter\tmp@item\expandafter{\notkfam@list}%
     \ifin@ \@notkfamtrue
     \else
-      \@tempswzfalse
-      \def\fam@elt{\noexpand\fam@elt}%
-      \message{(I search kanjifont definition file:}%
-      \def\enc@elt<##1>{\message{.}%
-        \edef\reserved@a{\lowercase{\noexpand\IfFileExists{##1#1.fd}}}%
-        \reserved@a{\@tempswztrue}{}\relax}%
-      \kenc@list
-      \message{)}%
-      \if@tempswz
-        \edef\k@family{#1}%
-      \else
+      %% \@tempswzfalse
+      %% \def\fam@elt{\noexpand\fam@elt}%
+      %% \message{(I search kanjifont definition file:}%
+      %% \def\enc@elt<##1>{\message{.}%
+      %%   \edef\reserved@a{\lowercase{\noexpand\IfFileExists{##1#1.fd}}}%
+      %%   \reserved@a{\@tempswztrue}{}\relax}%
+      %% \kenc@list
+      %% \message{)}%
+      %% \if@tempswz
+      %%   \edef\k@family{#1}%
+      %% \else
         \@notkfamtrue
         \xdef\notkfam@list{\notkfam@list\fam@elt<#1>}%
-      \fi
+      %% \fi
   \fi\fi
   \expandafter\expandafter\expandafter
   \inlist@\expandafter\tmp@item\expandafter{\ffam@list}%
@@ -611,7 +611,7 @@
 \def\extract@jfont{%
     \get@external@font
     \expandafter\globaljfont\font@name\external@font\relax
-    \font@name\global\zw=\zw\global\zh=\zh
+    \font@name%\global\zw=\zw\global\zh=\zh
     \csname \f@encoding+\f@family\endcsname
     \csname\curr@fontshape\endcsname}
 
@@ -630,7 +630,7 @@
      \ltj@@al@do@subst@correction
    \fi
 }
-
+\let\@@italiccorr=\/
 
 %%%%%% Japanese font for math mode
 
@@ -641,27 +641,27 @@
 \let\ltj@@al@getanddefine@fonts=\getanddefine@fonts
 \def\ltj@@ja@getanddefine@fonts#1#2{%
   \xdef\font@name{\csname \string#2/\tf@size\endcsname}%
-  \pickup@jfont \let\textfont@name\font@name
+  \pickup@jfont\let\textfont@name\font@name
   \xdef\font@name{\csname \string#2/\sf@size\endcsname}%
-  \pickup@jfont \let\scriptfont@name\font@name
+  \pickup@jfont\let\scriptfont@name\font@name
   \xdef\font@name{\csname \string#2/\ssf@size\endcsname}%
   \pickup@jfont
   \edef\math@fonts{\math@fonts\ltjsetparameter{%
     jatextfont={#1,\textfont@name},%
     jascriptfont={#1,\scriptfont@name},%
-    jascriptscriptfont={#1,\font@name}}}
+    jascriptscriptfont={#1,\font@name}}}%
 }
 
 \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
+  \ltj@tempcnta=#1\ltj@@IsFontJapanese{\string#2}%
+  \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
     \expandafter\ifx\csname M@\f@encoding\endcsname#1\else
-    #1\fi \ltj@tempcnta=#2 \expandafter\ltj@@mathJapaneseFonts\string#1\relax%
+    #1\fi\ltj@tempcnta=#2 \expandafter\ltj@@mathJapaneseFonts\string#1\relax%
     \ifin@\jfam#2\relax\else\mathgroup#2\relax\fi
   \expandafter\math@egroup\fi}%