Fixed the behavior of \ltjsetparameter when \globaldefs is 1.

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index 233bd13..66e03aa 100644 (file)
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -245,8 +245,8 @@
 \define@key[ltj]{japaram}{jascriptscriptfont}{%
   \expandafter\ltj@@set@stackfont#1:{mjss}}
 \def\ltj@@set@stackfont#1,#2:#3{%
-  {\ltj@tempcntb=\ltj@curjfnt\ltj@curjfnt=-1 #2%
-   \global\ltj@tempcnta=\ltj@curjfnt\global\ltj@curjfnt=\ltj@tempcntb}%
+  \ltj@tempcntb=\globaldefs{\globaldefs0 \ltj@curjfnt=-1 #2%
+   \global\ltj@tempcnta=\ltj@curjfnt}\globaldefs\ltj@tempcntb%
   \ifnum\ltj@tempcnta=-1
     \@PackageError{luatexja-core}%
     {\string#2 is not a control sequence that represents \MessageBreak
@@ -348,7 +348,8 @@
   \fi\next
 }
 
-\protected\def\ltjsetparameter#1{\directlua{ltj.isglobal=''}%
+\protected\def\ltjsetparameter#1{%
+  \ifnum\globaldefs=0\directlua{ltj.isglobal=''}\else\directlua{ltj.isglobal='global'}\fi
   \setkeys[ltj]{japaram}{#1}\ignorespaces}
 \protected\def\ltjglobalsetparameter#1{\directlua{ltj.isglobal='global'}%
   \setkeys[ltj]{japaram}{#1}\ignorespaces}

diff --git a/test/test03-after.pdf b/test/test03-after.pdf
index 021230e..548d8b6 100644 (file)
Binary files a/test/test03-after.pdf and b/test/test03-after.pdf differ

diff --git a/test/test03-after.tex b/test/test03-after.tex
index ab2fc8d..5de30b0 100644 (file)
--- a/test/test03-after.tex
+++ b/test/test03-after.tex
@@ -103,4 +103,14 @@ xspmode
 \ltjgetparameter{jacharrange}{3298677}
 あいうえお\par}
 
+
+{\tengt ■globaldefs}
+
+abc\ltjgetparameter{yalbaselineshift}
+{\globaldefs1\ltjsetparameter{yalbaselineshift=2pt}}% global (by \globaldefs)
+\ltjgetparameter{yalbaselineshift}
+{\ltjglobalsetparameter{yalbaselineshift=1pt}}% global (explicit)
+\ltjgetparameter{yalbaselineshift}
+{\ltjglobalsetparameter{yalbaselineshift=4pt}}% local
+\ltjgetparameter{yalbaselineshift}
 \end