優先度付き調整処理のテスト (test17-priority.tex)

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

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index de5e38e..06d5f2b 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -452,8 +452,8 @@
     \edef\k@family{#1}%
   \else % search font definition file...
      \ifcsname kfam@list@\k@encoding\endcsname\else
-       \expandafter\gdef\csname kfam@list@\k@encoding\endcsname{}
-       \expandafter\gdef\csname notkfam@list@\k@encoding\endcsname{}
+       \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}%
@@ -478,8 +478,8 @@
     \edef\f@family{#1}%
   \else % search font definition file...
      \ifcsname ffam@list@\f@encoding\endcsname\else
-       \expandafter\gdef\csname ffam@list@\f@encoding\endcsname{}
-       \expandafter\gdef\csname notffam@list@\f@encoding\endcsname{}
+       \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}%
@@ -621,10 +621,11 @@
   \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}}}%
+  \edef\math@fonts{\math@fonts\ltj@setpar@global%
+    \ltj@@set@stackfont#1,\textfont@name:{mjtext}%
+    \ltj@@set@stackfont#1,\scriptfont@name:{mjscr}%
+    \ltj@@set@stackfont#1,\font@name:{mjss}%
+  }%
 }
 
 \def\getanddefine@fonts#1#2{%