fix \ltjsetkanjiskip etc.

[luatex-ja/luatexja.git] / src / luatexja-core.sty

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index 6f50e34..4638366 100644 (file)
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -146,13 +146,16 @@
 \newluatexattribute\ltj@tablshift % attribute for talbaselineshift
 \newluatexattribute\ltj@tkblshift % attribute for tjabaselineshift
 \newluatexattribute\jfam          % index for current jfam
-\newluatexattribute\ltj@dir       % temp attr for indicating box direction
+
+\newcount\ltj@dir@count           % counter for indicating direction
+\newluatexattribute\ltj@dir
 
 \ltj@dir=0
 \ltj@icflag=0
 \ltj@origchar=0
 \ltj@charclass=0
 \ltj@curjfnt=-1
+\ltj@curtfnt=-1
 
 %%%%%%%% Attributes for character ranges
 \newcount\ltj@tempcnta
@@ -265,6 +268,7 @@
     \ltj@safe@num@or{nil}{#1},\ltj@safe@num@or{nil}{#2},#4,#5)}}
 
 % jatextfont = {<char_code>, <font_cs>}
+% only horizontal font is supported
 \define@key[ltj]{japaram}{jatextfont}{%
   \expandafter\ltj@@set@stackfont#1:{MJT}}
 \define@key[ltj]{japaram}{jascriptfont}{%
@@ -354,16 +358,19 @@
   \fi}
 
 % [x]]kanjiskip = <dimen>
-\define@key[ltj]{japaram}{kanjiskip}{%              % SKIP
+\define@key[ltj]{japaram}{kanjiskip}{\ltjsetkanjiskip{#1}}
+\define@key[ltj]{japaram}{xkanjiskip}{\ltjsetxkanjiskip{#1}}
+\protected\def\ltjsetkanjiskip#1{%                  % SKIP
   \directlua{%
     local d = \ltj@safe@glue{#1}
     luatexja.stack.set_stack_skip(luatexja.stack_table_index.KSK, d); node.free(d)
-}}
-\define@key[ltj]{japaram}{xkanjiskip}{%             % SKIP
+}\ignorespaces}
+\protected\def\ltjsetxkanjiskip#1{%                  % SKIP
   \directlua{%
     local d = \ltj@safe@glue{#1}
     luatexja.stack.set_stack_skip(luatexja.stack_table_index.XSK, d); node.free(d)
-}}
+}\ignorespaces}
+
 
 % jcharwidowpenalty = <count>
 \define@key[ltj]{japaram}{jcharwidowpenalty}{%      %COUNT
@@ -402,11 +409,17 @@
     \else\directlua{luatexja.isglobal=''}\fi
 }
 \protected\def\ltjsetparameter#1{%
-  \ltj@setpar@global\setkeys[ltj]{japaram}{#1}\ignorespaces}
+  \directlua{luatexja.base.start_time_measure('set_par')}%
+  \ltj@setpar@global\setkeys[ltj]{japaram}{#1}%
+  \directlua{luatexja.base.stop_time_measure('set_par')}%
+  \ignorespaces}
 \protected\def\ltjglobalsetparameter#1{%
   \relax\ifnum\globaldefs<0\directlua{luatexja.isglobal=''}%
     \else\directlua{luatexja.isglobal='global'}\fi%
-  \setkeys[ltj]{japaram}{#1}\ignorespaces}
+  \directlua{luatexja.base.start_time_measure('set_par')}%
+  \setkeys[ltj]{japaram}{#1}%
+  \directlua{luatexja.base.stop_time_measure('set_par')}%
+  \ignorespaces}
 
 %%%%%%%% \ltjgetparameter
 \def\ltj@@decl@array@param#1{%
@@ -420,6 +433,7 @@
 \ltj@@decl@array@param{jacharrange}
 \ltj@@decl@array@param{chartorange}
 \def\ltjgetparameter#1{%
+  \directlua{luatexja.base.start_time_measure('get_par')}%
   \ifcsname ltj@@array@param/#1\endcsname
     \expandafter\ltx@firstoftwo
   \else
@@ -429,9 +443,12 @@
   {\ltj@@getparam@one{#1}}%
 }
 \def\ltj@@getparam@one#1{%
-  \directlua{luatexja.ext_get_parameter_unary('#1')}}%
+  \directlua{luatexja.ext_get_parameter_unary('#1')}%
+  \directlua{luatexja.base.stop_time_measure('get_par')}%
+}%
 \def\ltj@@getparam@two#1#2{%
   \directlua{luatexja.ext_get_parameter_binary('#1', \ltj@safe@num@or{nil}{#2})}%
+  \directlua{luatexja.base.stop_time_measure('get_par')}%
 }
 
 %%%%%%%% \ltjalchar<number>, \ltjjachar<number>
@@ -473,13 +490,13 @@
 % いつも global
 \def\ltj@@getjfontnumber#1{% result in \ltj@tempcntc 
   \ltj@reset@globaldefs
-  \begingroup\ltj@curjfnt=-1\relax
-  #1\directlua{luatexja.__temp = \the\ltj@curjfnt}\endgroup
+  \begingroup\ltj@curjfnt=-1 \ltj@curtfnt=-1\relax
+  #1\directlua{luatexja.__temp = -\the\ltj@curjfnt*\the\ltj@curtfnt}\endgroup
   \ltj@tempcntc=\directlua{tex.sprint(luatexja.__temp)}\relax
   \ifnum\ltj@tempcntc=-1
     \@PackageError{luatexja-core}%
     {\string#1 is not a control sequence that represents \MessageBreak
-     a Japanese font}{I'll use the current Japanese font instead.^^J}%
+     a Japanese font}{I'll use the current horizontal Japanese font instead.^^J}%
     \ltj@tempcntc=\ltj@curjfnt
   \fi\ltj@restore@globaldefs}
   
@@ -512,6 +529,24 @@
    \directlua{luatexja.jfont.clear_alt_font(\the\ltj@tempcntc)}}\ignorespaces}
 
 
+%%%%%%%% \yoko, \tate, \ifydir, \iftdir
+\newif\ifydir
+\newif\iftdir
+\protected\def\tate{%
+  \directlua{luatexja.direction.set_list_direction(3, 'tate')}%
+  \ltj@dir@count=3 \tdirtrue\ydirfalse
+}
+\protected\def\yoko{%
+  \directlua{luatexja.direction.set_list_direction(4, 'yoko')}%
+  \ltj@dir@count=4 \ydirtrue\tdirfalse
+}
+\yoko
+
+%%%%%%%% \ifybox, \iftbox
+%%%%%%%% \ltjgetwd{<box_num>}
+
+
+
 %%------------------ Load module for the format
 
 \ifltj@in@latex                 %<*LaTeX>
@@ -529,19 +564,6 @@
 \ltj@overwrite@catcodetable\CatcodeTableLaTeXAtLetter
 \ltj@overwrite@catcodetable\CatcodeTableExpl
 
-%%%%%%%% \yoko, \tate, \ifydir, \iftdir
-\protected\def\tate{%
-  \directlua{luatexja.direction.set_list_direction(3, 'tate')}%
-  \ltj@dir=3 
-}
-\protected\def\yoko{%
-  \directlua{luatexja.direction.set_list_direction(4, 'yoko')}%
-  \ltj@dir=4 
-}
-\yoko
-\newif\ifydir\ydirtrue
-\newif\iftdir\tdirfalse
-
 
 %%------------------ all done
 \ltj@core@AtEnd