test-zh-maqiyuan.tex: CRLF -> LF.

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

diff --git a/src/lltjfont.sty b/src/lltjfont.sty
index d62536a..70cace2 100644 (file)
--- a/src/lltjfont.sty
+++ b/src/lltjfont.sty
@@ -146,8 +146,7 @@
 \def\DeclareFontFamily#1#2#3{%
  \@ifundefined{T@#1}%
     {\@latex@error{Encoding scheme `#1' unknown}\@eha}%
-    {\edef\tmp@item{{#2}}%
-     \def\reserved@a{#3}%
+    {\def\reserved@a{#3}%
      \global
      \expandafter\let\csname #1+#2\expandafter\endcsname
             \ifx \reserved@a\@empty
@@ -159,8 +158,7 @@
 \def\DeclareKanjiFamily#1#2#3{%
  \@ifundefined{T@#1}%
     {\@latex@error{KANJI Encoding scheme `#1' unknown}\@eha}%
-    {\edef\tmp@item{{#2}}%
-     \def\reserved@a{#3}%
+    {\def\reserved@a{#3}%
      \global
      \expandafter\let\csname #1+#2\expandafter\endcsname
             \ifx \reserved@a\@empty
@@ -471,8 +469,8 @@
     \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
+       \expandafter\gdef\csname kfam@list@\k@encoding\endcsname{}
+       \expandafter\gdef\csname notkfam@list@\k@encoding\endcsname{}
      \fi
      \edef\@templist{\@nameuse{kfam@list@\k@encoding}}%
      \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
@@ -497,8 +495,8 @@
     \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
+       \expandafter\gdef\csname ffam@list@\f@encoding\endcsname{}
+       \expandafter\gdef\csname notffam@list@\f@encoding\endcsname{}
      \fi
      \edef\@templist{\@nameuse{ffam@list@\f@encoding}}%
      \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
@@ -520,7 +518,10 @@
      \fi
   \fi
   \if@notkfam\if@notffam
-      \edef\k@family{#1}\edef\f@family{#1}%
+      {\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}}