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 a3fec95..de5e38e 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -230,42 +230,22 @@
       \fi
    \endgroup
   }
+\def\DLMfontsw@standard#1#2#3{#1{#2{#3}}}
 \def\reDeclareMathAlphabet#1#2#3{%
-  \edef#1{\noexpand\protect\expandafter\noexpand\csname%
-    \expandafter\@gobble\string#1\space\space\endcsname}%
-  \edef\@tempa{\expandafter\@gobble\string#2}%
-  \edef\@tempb{\expandafter\@gobble\string#3}%
-  \edef\@tempc{\string @\expandafter\@gobbletwo\string#2}%
-  \ifx\@tempc\@tempa%
-    \edef\@tempa{\expandafter\@gobbletwo\string#2}%
-    \edef\@tempb{\expandafter\@gobbletwo\string#3}%
+  \ifdefined#2 
+    \@temptokena\expandafter{#2}%
+  \else
+    \@temptokena{#2}%
   \fi
-  \expandafter\edef\csname\expandafter\@gobble\string#1\space\space\endcsname%
-    {\noexpand\DualLang@mathalph@bet%
-      {\expandafter\noexpand\csname\@tempa\space\endcsname}%
-      {\expandafter\noexpand\csname\@tempb\space\endcsname}%
-  }%
-}
-\@onlypreamble\reDeclareMathAlphabet
-\def\DualLang@mathalph@bet#1#2{%
-  \relax\ifmmode
-    \ifx\math@bgroup\bgroup%     2e normal style     (\mathrm{...})
-      \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard
-    \else
-      \ifx\math@bgroup\relax%    2e two letter style (\rm->\mathrm)
-        \let\DualLang@Mfontsw\DLMfontsw@oldstyle
-      \else
-        \bgroup\let\DualLang@Mfontsw\DLMfontsw@standard
-      \fi
-    \fi
+  \ifdefined#3
+    \toks0\expandafter{#3}%
   \else
-    \let\DualLang@Mfontsw\@firstoftwo
+    \toks0{#3}%
   \fi
-  \DualLang@Mfontsw{#1}{#2}%
+  \long\protected\edef#1{%
+    \noexpand\DLMfontsw@standard{\the\@temptokena}{\the\toks0}}%
 }
-\def\DLMfontsw@standard#1#2#3{#1{#2{#3}}\egroup}
-\def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}}
-\def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax}
+\@onlypreamble\reDeclareMathAlphabet
 \def\all@shape{all}%
 \def\DeclareRelationFont#1#2#3#4#5#6#7#8{%
   \def\rel@shape{#4}%
@@ -589,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