OSDN Git Service

Fix #28968.
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 10 Jul 2012 21:48:47 +0000 (06:48 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 10 Jul 2012 21:48:47 +0000 (06:48 +0900)
src/luatexja-core.sty
src/patches/lltjfont.sty

index f1baada..23d51e3 100644 (file)
   \fi\next
 }
 
-\protected\def\ltjsetparameter#1{%
+\protected\def\ltj@setpar@global{%
   \ifnum\globaldefs>0\directlua{luatexja.isglobal='global'}\else\directlua{luatexja.isglobal=''}\fi
-  \setkeys[ltj]{japaram}{#1}\ignorespaces}
+}
+\protected\def\ltjsetparameter#1{%
+  \ltj@setpar@global\setkeys[ltj]{japaram}{#1}\ignorespaces}
 \protected\def\ltjglobalsetparameter#1{%
   \ifnum\globaldefs<0\directlua{luatexja.isglobal=''}\else\directlua{luatexja.isglobal='global'}\fi
   \setkeys[ltj]{japaram}{#1}\ignorespaces}
index de5e38e..c4ff18b 100644 (file)
   \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}}}%
+  \ltj@temptoks{\ltj@@set@stackfont}
+  \edef\math@fonts{\math@fonts\ltj@setpar@global%
+    \the\ltj@temptoks#1,\textfont@name:{mjtext}%
+    \the\ltj@temptoks#1,\scriptfont@name:{mjscr}%
+    \the\ltj@temptoks#1,\font@name:{mjss}%
+  }%
 }
 
 \def\getanddefine@fonts#1#2{%