OSDN Git Service

Bugfix in \/, and another change in \fontfamily.
[luatex-ja/luatexja.git] / src / lltjfont.sty
index 9f2a0da..d542893 100644 (file)
@@ -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@@{%
   \in@@#2<#1>\in@\in@@}
 \def\fam@elt{\noexpand\fam@elt}
 \def\enc@elt{\noexpand\enc@elt}
-\def\fenc@list{\enc@elt<OML>\enc@elt<T1>\enc@elt<OT1>\enc@elt<OMS>%
-               \enc@elt<OMX>\enc@elt<TS1>\enc@elt<U>}
 \let\kenc@list\@empty
 \let\kyenc@list\@empty
 \let\ktenc@list\@empty
-\def\kfam@list{\fam@elt<mc>\fam@elt<gt>}
-\def\ffam@list{\fam@elt<cmr>\fam@elt<cmss>\fam@elt<cmtt>%
-               \fam@elt<cmm>\fam@elt<cmsy>\fam@elt<cmex>}
-\let\notkfam@list\ffam@list
-\let\notffam@list\kfam@list
 \newbox\tstrutbox
 \newbox\zstrutbox
 \def\strut{\relax
@@ -48,7 +40,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
@@ -67,7 +60,6 @@
                     {\default@shape}}%
      \expandafter\let\csname#1-cmd\endcsname\@changed@cmd
      \def\enc@elt{\noexpand\enc@elt}%
-     \xdef\fenc@list{\fenc@list\enc@elt<#1>}%
   \else
      \@font@info{Redeclaring font encoding #1}%
   \fi
 \def\DeclareFontFamily#1#2#3{%
  \@ifundefined{T@#1}%
     {\@latex@error{Encoding scheme `#1' unknown}\@eha}%
-    {\edef\tmp@item{{#2}}%
-     \expandafter\expandafter\expandafter
-     \inlist@\expandafter\tmp@item\expandafter{\ffam@list}%
-     \ifin@ \else
-        \def\fam@elt{\noexpand\fam@elt}%
-        \xdef\ffam@list{\ffam@list\fam@elt<#2>}%
-     \fi
-     \def\reserved@a{#3}%
+    {\def\reserved@a{#3}%
      \global
      \expandafter\let\csname #1+#2\expandafter\endcsname
             \ifx \reserved@a\@empty
 \def\DeclareKanjiFamily#1#2#3{%
  \@ifundefined{T@#1}%
     {\@latex@error{KANJI Encoding scheme `#1' unknown}\@eha}%
-    {\edef\tmp@item{{#2}}%
-     \expandafter\expandafter\expandafter
-     \inlist@\expandafter\tmp@item\expandafter{\kfam@list}%
-     \ifin@ \else
-        \def\fam@elt{\noexpand\fam@elt}%
-        \xdef\kfam@list{\kfam@list\fam@elt<#2>}%
-     \fi
-     \def\reserved@a{#3}%
+    {\def\reserved@a{#3}%
      \global
      \expandafter\let\csname #1+#2\expandafter\endcsname
             \ifx \reserved@a\@empty
 \newif\if@tempswz
 \DeclareRobustCommand\romanfamily[1]{\edef\f@family{#1}}
 \DeclareRobustCommand\kanjifamily[1]{\edef\k@family{#1}}
+% \notkfam@list@<enc>: list of non-defined kanji families under <enc>
+% \kfam@list@<enc>:    list of kanji families under <enc>, defined in a .fd file
 \DeclareRobustCommand\fontfamily[1]{%
-  \edef\tmp@item{{#1}}%
-  \@notkfamfalse
-  \@notffamfalse
-  \expandafter\expandafter\expandafter
-  \inlist@\expandafter\tmp@item\expandafter{\kfam@list}%
-  \ifin@ \edef\k@family{#1}%
-  \else
-    \expandafter\expandafter\expandafter
-    \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
-        \@notkfamtrue
-        \xdef\notkfam@list{\notkfam@list\fam@elt<#1>}%
-      \fi
-  \fi\fi
-  \expandafter\expandafter\expandafter
-  \inlist@\expandafter\tmp@item\expandafter{\ffam@list}%
-  \ifin@ \edef\f@family{#1}\else
-    \expandafter\expandafter\expandafter
-    \inlist@\expandafter\tmp@item\expandafter{\notffam@list}%
-    \ifin@ \@notffamtrue \else
-      \@tempswzfalse
-      \def\fam@elt{\noexpand\fam@elt}%
-      \message{(I search font definition file:}%
-      \def\enc@elt<##1>{\message{.}%
-        \edef\reserved@a{\lowercase{\noexpand\IfFileExists{##1#1.fd}}}%
-        \reserved@a{\@tempswztrue}{}\relax}%
-      \fenc@list
-      \message{)}%
-      \if@tempswz
-        \edef\f@family{#1}%
-      \else
-        \@notffamtrue
-        \xdef\notffam@list{\notffam@list\fam@elt<#1>}%
-      \fi
-  \fi\fi
+  \@notkfamfalse\@notffamfalse\edef\tmp@item{{#1}}%
+  \ifcsname \k@encoding+#1\endcsname % if \k@encoding+#1 is already defined
+    \edef\k@family{#1}%
+  \else % search font definition file...
+     \ifcsname kfam@list@\k@encoding\endcsname\else
+        \expandafter\let\csname kfam@list@\k@encoding\endcsname\@empty
+       \expandafter\let\csname notkfam@list@\k@encoding\endcsname\@empty
+     \fi
+     \edef\@templist{\@nameuse{kfam@list@\k@encoding}}%
+     \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
+     \ifin@\edef\k@family{#1}\else%
+       \edef\@templist{\@nameuse{notkfam@list@\k@encoding}}%
+       \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
+       \ifin@\@notkfamtrue\else%
+         \def\@temp##1+{\lowercase{\def\@@temp{##1}}}\expandafter\@temp\k@encoding+%
+         \message{(I search kanjifont definition file: \@@temp#1.fd)}%
+         \IfFileExists{\@@temp#1.fd}{\@tempswztrue}{\@tempswzfalse}%
+         \if@tempswz
+           \expandafter\xdef\csname kfam@list@\k@encoding\endcsname
+             {\@nameuse{kfam@list@\k@encoding}\fam@elt<#1>}\edef\k@family{#1}%
+         \else
+           \expandafter\xdef\csname notkfam@list@\k@encoding\endcsname
+             {\@nameuse{notkfam@list@\k@encoding}\fam@elt<#1>}\@notkfamtrue%
+         \fi
+       \fi
+     \fi
+  \fi
+  \ifcsname \f@encoding+#1\endcsname
+    \edef\f@family{#1}%
+  \else % search font definition file...
+     \ifcsname ffam@list@\f@encoding\endcsname\else
+       \expandafter\let\csname ffam@list@\f@encoding\endcsname\@empty
+       \expandafter\let\csname notffam@list@\f@encoding\endcsname\@empty
+     \fi
+     \edef\@templist{\@nameuse{ffam@list@\f@encoding}}%
+     \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
+     \ifin@\edef\f@family{#1}\else
+       \edef\@templist{\@nameuse{notffam@list@\f@encoding}}%
+       \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
+       \ifin@\@notffamtrue\else
+         \def\@temp##1+{\lowercase{\def\@@temp{##1}}}\expandafter\@temp\f@encoding+%
+         \message{(I search font definition file: \@@temp#1.fd)}%
+         \IfFileExists{\@@temp#1.fd}{\@tempswztrue}{\@tempswzfalse}%
+         \if@tempswz
+           \expandafter\xdef\csname ffam@list@\f@encoding\endcsname
+             {\@nameuse{ffam@list@\f@encoding}\fam@elt<#1>}\edef\f@family{#1}%
+         \else
+           \expandafter\xdef\csname notffam@list@\f@encoding\endcsname
+             {\@nameuse{notffam@list@\f@encoding}\fam@elt<#1>}\@notffamtrue%
+         \fi
+       \fi
+     \fi
+  \fi
   \if@notkfam\if@notffam
-      \edef\k@family{#1}\edef\f@family{#1}%
-  \fi\fi}
+      {\ifcsname D@\k@encoding\endcsname\@nameuse{D@\k@encoding}\fi
+        \xdef\@@temp{\default@family}}\edef\k@family{\@@temp}%
+      {\ifcsname D@\f@encoding\endcsname\@nameuse{D@\f@encoding}\fi
+        \xdef\@@temp{\default@family}}\edef\f@family{\@@temp}%
+  \fi\fi
+}
 \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}}
 \DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}}
 \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
   %\iftdir\raise-\tbaselineshift\fi
   \vbox{\hrule\@width.3em}}
 
+%%%%%% LuaTeX-ja specific
+
+% #1 の展開結果から encoding 部分をとりだし,それが和文用かどうかの結果を \ifin@ に代入
+\def\ltj@@IsFontJapanese#1{%
+  \expandafter\ltj@@IsFontJapaneseX#1//:%
+  \expandafter\expandafter\expandafter
+  \inlist@\expandafter\tmp@item\expandafter{\kenc@list}}
+\def\ltj@@IsFontJapaneseX#1/#2/:{\edef\tmp@item{{\directlua{tex.print('#1')}}}}
+
+
 \let\extract@afont\extract@font
 \def\pickup@jfont{%
     \expandafter \ifx \font@name \relax
 \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}
 
+\let\ltj@@al@do@subst@correction=\do@subst@correction
+\def\ltj@@ja@do@subst@correction{%
+    \xdef\subst@correction{%
+      \font@name
+      \global\expandafter\let\csname \curr@fontshape/\f@size\endcsname\font@name%
+      \relax}%
+    \aftergroup\subst@correction
+}
+\def\do@subst@correction{%
+   \ltj@@IsFontJapanese{\curr@fontshape}\ifin@
+     \ltj@@ja@do@subst@correction
+   \else
+     \ltj@@al@do@subst@correction
+   \fi
+}
+\let\@@italiccorr=\/
+
+%%%%%% Japanese font for math mode
+
+% \M@<enc> から その <enc> が和文用か調べる
+{\catcode`M=12%
+\gdef\ltj@@mathJapaneseFonts#1M#2#3\relax{\ltj@@IsFontJapanese{#3}}}
+
+\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
+  \xdef\font@name{\csname \string#2/\sf@size\endcsname}%
+  \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}}}%
+}
+
+\def\getanddefine@fonts#1#2{%
+  \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%
+    \ifin@\jfam#2\relax\else\mathgroup#2\relax\fi
+  \expandafter\math@egroup\fi}%
+
 \endinput