Merge branch 'zh-maqiyuan' into kitagawa_test

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

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 9de9eb7..de5e38e 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -230,15 +230,20 @@
       \fi
    \endgroup
   }
+\def\DLMfontsw@standard#1#2#3{#1{#2{#3}}}
 \def\reDeclareMathAlphabet#1#2#3{%
   \ifdefined#2 
-    \ifdefined#3
-      \toks0\expandafter{#3}%
-      \@temptokena\expandafter{#2}%
-      \long\protected\edef#1##1{\the\@temptokena{\the\toks0{##1}}}%
-    \else\let#1#2\fi
+    \@temptokena\expandafter{#2}%
   \else
-    \ifdefined#3\let#1#3\fi\fi
+    \@temptokena{#2}%
+  \fi
+  \ifdefined#3
+    \toks0\expandafter{#3}%
+  \else
+    \toks0{#3}%
+  \fi
+  \long\protected\edef#1{%
+    \noexpand\DLMfontsw@standard{\the\@temptokena}{\the\toks0}}%
 }
 \@onlypreamble\reDeclareMathAlphabet
 \def\all@shape{all}%
@@ -564,7 +569,9 @@
   \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')}}}}
+\def\ltj@@IsFontJapaneseX#1/#2/:{\edef\tmp@item{{\directlua{%
+  tex.print(luatexbase.catcodetables["latex-package"], '#1')}%
+}}}
 
 
 \let\extract@afont\extract@font