\def\ltj@defdimen{0}
%%%%%%%% Attributes for Japanese typesetting.
+\newluatexattribute\ltj@icflag % attribute for italic correction
\newluatexattribute\ltj@curjfnt % index for ``current Japanese font''
-\newluatexattribute\jfam % index for current jfam
-\newluatexattribute\ltj@uniqid % unique id of box/paragraph
+\newluatexattribute\ltj@origchar %
\newluatexattribute\ltj@charclass %
-\newluatexattribute\ltj@yablshift % attribute for \yabaselineshift
-\newluatexattribute\ltj@ykblshift % attribute for \ykbaselineshift
\newluatexattribute\ltj@autospc % attribute for autospacing
\newluatexattribute\ltj@autoxspc % attribute for autoxspacing
-\newluatexattribute\ltj@icflag % attribute for italic correction
+\newluatexattribute\ltj@yablshift % attribute for \yabaselineshift
+\newluatexattribute\ltj@ykblshift % attribute for \ykbaselineshift
+\newluatexattribute\jfam % index for current jfam
+\ltj@icflag=0\ltj@origchar=0
+
+%%%%%%%% Attributes for character ranges
+\newcount\ltj@tempcnta
+\ltj@tempcnta=0
+\loop\ifnum\ltj@tempcnta<7
+ \expandafter\newluatexattribute%
+ \csname ltj@kcat\the\ltj@tempcnta\endcsname
+ \csname ltj@kcat\the\ltj@tempcnta\endcsname=0
+ \advance\ltj@tempcnta by1
+\repeat
+
%%%%%%%% Loading luatexja.lua
%% Quark tokens needed in ltj-base
\fi %</LaTeX>
-%%%%%%%% Attributes for character ranges
-\ltj@tempcnta=0
-\loop\ifnum\ltj@tempcnta<7
- \expandafter\newluatexattribute%
- \csname ltj@kcat\the\ltj@tempcnta\endcsname
- \csname ltj@kcat\the\ltj@tempcnta\endcsname=0
- \advance\ltj@tempcnta by1
-\repeat
-
%%%%%%%% \asluastring
\def\asluastring#1{'\luaescapestring{\detokenize{#1}}'}
\protected\def\ltj@reset@globaldefs{%
\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
- \edef\ltj@@tmp{%
- \everypar={\the\everypar}\the\everypar\noexpand\ltj@@ihb}%
- \everypar\expandafter{\ltj@@tmp}%
- \ltj@restore@globaldefs
- \else\ifhmode\ltj@@ihb\fi\fi}
-\def\ltj@@ihb{\directlua{luatexja.jfmglue.create_inhibitglue_node()}}
+\protected\def\inhibitglue{\ifhmode\ltj@@ihb\fi}
+\def\ltj@@ihb{\relax\directlua{luatexja.jfmglue.create_inhibitglue_node()}}
%%%%%%%% \yoko, \tate, \ifydir, \iftdir
%% At this moment, tategaki mode is not implemented;
\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}{%
\expandafter\ltj@@set@stackfont#1:{mjscr}}
\define@key[ltj]{japaram}{jascriptscriptfont}{%
\expandafter\ltj@@set@stackfont#1:{mjss}}
-\def\ltj@@set@stackfont#1,#2:#3{%
+\protected\def\ltj@@set@stackfont#1,#2:#3{%
\ltj@reset@globaldefs
\ltj@tempcnta=\ltj@curjfnt\ltj@curjfnt=-1 #2%
\ifnum\ltj@curjfnt=-1
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
\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
\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]{%
\define@key[ltj]{japaram}{jcharwidowpenalty}{% %COUNT
\ltj@@set@stack0,#1:{jwp}{-10000}{10000}}
-% differentjfm = { large | small | average | both }
+% differentjfm = { large | small | average | pleft | pright | paverage | both}
\define@choicekey*+[ltj]{japaram}{differentjfm}[\ltj@temp\ltj@tempr]%
- {large,small,average,both}{%
+ {large,small,average,pleft,pright,paverage,both}{%
\ifcase\ltj@tempr
\directlua{luatexja.jfmglue.diffmet_rule = math.max}\or
\directlua{luatexja.jfmglue.diffmet_rule = math.min}\or
\directlua{luatexja.jfmglue.diffmet_rule = math.two_average}\or
+ \directlua{luatexja.jfmglue.diffmet_rule = math.two_pleft}\or
+ \directlua{luatexja.jfmglue.diffmet_rule = math.two_pright}\or
+ \directlua{luatexja.jfmglue.diffmet_rule = math.two_paverage}\or
\directlua{luatexja.jfmglue.diffmet_rule = math.two_add}
\fi
}{\ltj@PackageError{luatexja}{invalid argument `#1' for `differentjfm'}{%
Argument for `differentjfm' must be one of `large', `small', `average',^^J%
- and `both'. }}
- % large, small, average, both
+ `pleft', `pright', 'paverage' or `both'. }}
+ % large, small, average, pleft, pright, paverage, both
% jacharrange = { +-<range_number> }
\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
}
-\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}
\ltj@@decl@array@param{kcatcode}
\ltj@@decl@array@param{jacharrange}
\ltj@@decl@array@param{chartorange}
-\protected\def\ltjgetparameter#1{%
+\def\ltjgetparameter#1{%
\ifcsname ltj@@array@param/#1\endcsname
\expandafter\ltx@firstoftwo
\else
\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>
\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