diff options
author | Karl Berry <karl@freefriends.org> | 2012-05-06 23:12:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-05-06 23:12:06 +0000 |
commit | ec4155a8b435806195767c2047ab6b3f9f2a1052 (patch) | |
tree | c7c5a7ca784c6239ddb222248150a53843427b63 /Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty | |
parent | 3c6cdccdf8a900337b27e6c4099aeea5dbc86dcb (diff) |
luatexja 20120506.0
git-svn-id: svn://tug.org/texlive/trunk@26229 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty index 3b57139116d..2559aaf4b67 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja-core.sty @@ -195,8 +195,8 @@ \def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY()}} %%%%%%%% \zw, \zh -\def\zw{\directlua{luatexja.jfont.load_zw()}\ltj@zw} -\def\zh{\directlua{luatexja.jfont.load_zh()}\ltj@zh} +\protected\def\zw{\directlua{luatexja.jfont.load_zw()}\ltj@zw} +\protected\def\zh{\directlua{luatexja.jfont.load_zh()}\ltj@zh} %%%%%%%% \inhibitglue @@ -204,14 +204,7 @@ \directlua{luatexja.global_temp = tex.globaldefs; tex.globaldefs = 0}} \protected\def\ltj@restore@globaldefs{\directlua{tex.globaldefs = luatexja.global_temp}} \let\new@everypar=\everypar -\protected\def\inhibitglue{\relax% - \ifvmode - \ltj@reset@globaldefs - \xdef\@@tempa{\the\everypar}% - \xdef\@@tempb{\everypar={\@@tempa}\@@tempa\noexpand\ltj@@ihb}% - \everypar\expandafter{\@@tempb}% - \ltj@restore@globaldefs - \else\ifhmode\ltj@@ihb\fi\fi} +\protected\def\inhibitglue{\ifhmode\ltj@@ihb\fi} \def\ltj@@ihb{\directlua{luatexja.jfmglue.create_inhibitglue_node()}} %%%%%%%% \yoko, \tate, \ifydir, \iftdir @@ -255,7 +248,7 @@ \expandafter\ltj@@set@stack#1:{post}{-10000}{10000}} \def\ltj@@set@stack#1,#2:#3#4#5{% \directlua{luatexja.stack.set_stack_table(luatexja.isglobal, \asluastring{#3}, - \ltj@safe@num@or\ltj@defnum{#1},\ltj@safe@num@or\ltj@defnum{#2},#4,#5)}} + \ltj@safe@num@or{nil}{#1},\ltj@safe@num@or{nil}{#2},#4,#5)}} % jatextfont = {<char_code>, <font_cs>} \define@key[ltj]{japaram}{jatextfont}{% @@ -273,7 +266,7 @@ a Japanese font}{}% \else \directlua{luatexja.stack.set_stack_font(luatexja.isglobal, \asluastring{#3}, - \ltj@safe@num@or\ltj@defnum{#1}, \the\ltj@curjfnt)}% + \ltj@safe@num@or{nil}{#1}, \the\ltj@curjfnt)}% \fi \ltj@curjfnt=\ltj@tempcnta \ltj@restore@globaldefs @@ -302,8 +295,8 @@ \def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi \def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi \directlua{luatexja.stack.set_stack_table(luatexja.isglobal, 'xsp', - \ltj@safe@num@or\ltj@defnum{#1}, - \ltj@safe@num@or\ltj@defnum{\ltj@temp},0,3)}} + \ltj@safe@num@or{nil}{#1}, + \ltj@safe@num@or{nil}{\ltj@temp},0,3)}} % alxspmode = {<char_code>, <mode>} % mode: inhibit, preonly, postonly, allow @@ -317,8 +310,8 @@ \def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi \def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi \directlua{luatexja.stack.set_stack_table(luatexja.isglobal, 'xsp', - \ltj@safe@num@or\ltj@defnum{#1}, - \ltj@safe@num@or\ltj@defnum{\ltj@temp},0,3)}} + \ltj@safe@num@or{nil}{#1}, + \ltj@safe@num@or{nil}{\ltj@temp},0,3)}} % autospacing = <bool> (default: true) \define@boolkey[ltj]{japaram}{autospacing}[true]{% @@ -367,7 +360,7 @@ \edef\ltj@temp{#1}% \ifx\ltj@temp\empty\let\next=\relax\else\let\next=\ltj@@scrange \directlua{luatexja.charrange.toggle_char_range(% - luatexja.is_global,\ltj@safe@num@or\ltj@defnum{#1})}% + luatexja.is_global,\ltj@safe@num@or{nil}{#1})}% \fi\next } @@ -401,7 +394,7 @@ \def\ltj@@getparam@one#1{% \directlua{luatexja.ext_get_parameter_unary('#1')}}% \def\ltj@@getparam@two#1#2{% - \directlua{luatexja.ext_get_parameter_binary('#1', \ltj@safe@num{#2})}% + \directlua{luatexja.ext_get_parameter_binary('#1', \ltj@safe@num@or{nil}{#2})}% } %%%%%%%% \ltjalchar<number>, \ltjjachar<number> @@ -429,8 +422,8 @@ \def\ltj@@alchar{{\directlua{tex.globaldefs = 0}\ltj@allalchar\ltj@@origchar\ltj@tempcnta}} %%%%%%%% \ltjsetmathletter<number>, \ltjunsetmathletter<number> -\def\ltjsetmathletter#1{\directlua{luatexja.math.is_math_letters[#1]=true}} -\def\ltjunsetmathletter#1{\directlua{luatexja.math.is_math_letters[#1]=false}} +\protected\def\ltjsetmathletter#1{\directlua{luatexja.math.is_math_letters[#1]=true}} +\protected\def\ltjunsetmathletter#1{\directlua{luatexja.math.is_math_letters[#1]=false}} %%------------------ Load module for the format @@ -440,6 +433,15 @@ \input ltj-plain.sty % \fi\fi %</LaTeX|plain> +\newluatexcatcodetable\ltj@temp@cctb +\def\ltj@overwrite@catcodetable#1{% + \setluatexcatcodetable\ltj@temp@cctb{\luatexcatcodetable#1}% + \setluatexcatcodetable#1{\luatexcatcodetable\ltj@temp@cctb\catcode"FFFFF=14}% +} +\ltj@overwrite@catcodetable\CatcodeTableLaTeX +\ltj@overwrite@catcodetable\CatcodeTableLaTeXAtLetter +\ltj@overwrite@catcodetable\CatcodeTableExpl + %%------------------ all done \ltj@core@AtEnd \endinput |