\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-core}[2014/02/01 Core of LuaTeX-ja]
+ \ProvidesPackage{luatexja-core}[2014/06/22 Core of LuaTeX-ja]
\fi %</LaTeX>
%% Load prerequisite packages.
{Package loading is aborted now.\MessageBreak}
\expandafter\endinput\fi\relax
- \@PackageInfoNoLine{luatexja-core}
- {using\space%
- \directlua{if node.direct==node then tex.write('traditional node')
- else tex.write('DIRECT') end} node access model}
-
%! なお、luatexbase-compat の説明に従うと、LuaTeX 拡張プリミティブは
%! plain/LaTeX の両方で \luatex 付の名前（\directlua はそのまま)
%! で使えると考えてよい。
\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
+\newcount\ltj@adjdir@count % counter for indicating direction (for vadjust)
+\newluatexattribute\ltj@dir
\ltj@dir=0
\ltj@icflag=0
\protected\def\/{\relax\directlua{luatexja.jfont.append_italic()}}
%%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont
-\protected\def\jfont{\afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false)}}
+\protected\def\jfont{%
+ \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false)}}
\protected\def\globaljfont{%
\afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true)}}
\def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY('yoko')}}
%%%%%%%% \inhibitglue
\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}}
+\protected\def\ltj@restore@globaldefs{\directlua{tex.globaldefs = luatexja.global_temp}\relax}
\protected\def\inhibitglue{\ifhmode\ltj@@ihb\fi}
\def\ltj@@ihb{\relax\directlua{luatexja.jfmglue.create_inhibitglue_node()}}
luatexja.stack.hmode = -tex.nest[tex.nest.ptr].mode
}%
}
+\setbox0\vbox{%
+ \directlua{% This value depends on the version of LuaTeX.
+ luatexja.stack.vmode = -tex.nest[tex.nest.ptr].mode
+ }%
+}
% prebreakpenalty = {<char_code>, <penalty>}
\define@key[ltj]{japaram}{kcatcode}{%
\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
\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{%
\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
{\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>
%%%%%%%% \yoko, \tate, \ifydir, \iftdir
-\newif\ifydir
-\newif\iftdir
\protected\def\tate{%
\directlua{luatexja.direction.set_list_direction(3, 'tate')}%
- \ltj@dir=3 \tdirtrue\ydirfalse
}
\protected\def\yoko{%
\directlua{luatexja.direction.set_list_direction(4, 'yoko')}%
- \ltj@dir=4 \ydirtrue\tdirfalse
+}
+\protected\def\dtou{%
+ \directlua{luatexja.direction.set_list_direction(1, 'dtou')}%
}
\yoko
+\protected\def\ifydir{\directlua{luatexja.direction.dir_conditional(4)}}
+\protected\def\iftdir{\directlua{luatexja.direction.dir_conditional(3)}}
+\protected\def\ifddir{\directlua{luatexja.direction.dir_conditional(1)}}
+
+\newcount\ltj@adjdir@count@backup
+%%%% insert
+%\let\orig@insert=\insert
+%\protected\def\insert{\begingroup\afterassignment\ltj@@insert@A\ltj@tempcnta}
+%\protected\def\ltj@@insert@A{\orig@insert\ltj@tempcnta\bgroup\aftergroup\endgroup\let\next}
+%%%% vadjust
+\let\ltj@@orig@vadjust=\vadjust
+\protected\def\vadjust{%
+ \ltj@@orig@vadjust\bgroup
+ \ifcase\ltj@adjdir@count\or\dtou\or\or\tate\or\yoko\fi
+ \aftergroup\ltj@@vadjust@check@dir\let\next}
+\protected\def\ltj@@vadjust@check@dir{%
+ \directlua{luatexja.direction.check_adjust_direction()}%
+}
+
+%%%% hbox, vbox, vtop
+\everyhbox{%
+ \directlua{luatexja.direction.set_list_direction()}%
+ \aftergroup\ltj@@reset@badness
+}
+\everyvbox{%
+ \directlua{luatexja.direction.set_list_direction()}%
+ \aftergroup\ltj@@reset@badness
+}
+\protected\def\ltj@@reset@badness{%
+ \directlua{%
+ if luatexja.global_temp then
+ tex.hbadness= tex.hbadness or luatexja.hbadness_temp
+ tex.vbadness= tex.vbadness or luatexja.vbadness_temp
+ tex.globaldefs= luatexja.global_temp or tex.globaldefs
+ end
+ }%
+}
+
+
+%%%% unhbox and unvbox
+\let\ltj@@orig@unhbox=\unhbox
+\let\ltj@@orig@unvbox=\unvbox
+\protected\def\unhbox{\begingroup\afterassignment\ltj@@unhbox\ltj@tempcnta}
+\protected\def\unvbox{\begingroup\afterassignment\ltj@@unvbox\ltj@tempcnta}
+\protected\def\ltj@@unhbox{%
+ \directlua{luatexja.direction.check_dir(\the\ltj@tempcnta)}%
+ \ltj@@orig@unhbox\ltj@tempcnta\endgroup}
+\protected\def\ltj@@unvbox{%
+ \directlua{luatexja.direction.check_dir(\the\ltj@tempcnta)}%
+ \ltj@@orig@unvbox\ltj@tempcnta\endgroup}
+
+
+%%%% lastbox
+\let\ltj@@orig@lastbox=\lastbox
+\protected\def\lastbox{%
+ \directlua{luatexja.direction.lastbox_hook()}\ltj@@orig@lastbox
+}
+
+%%%%%%%% \ltjgetwd<box_num> etc.
+%\def\ltjgetwd{\expandafter\expandafter\expandafter\ltj@@getwd\ltj@grab@num}
+%\def\ltjgetht{\expandafter\expandafter\expandafter\ltj@@getht\ltj@grab@num}
+%\def\ltjgetdp{\expandafter\expandafter\expandafter\ltj@@getdp\ltj@grab@num}
+\def\ltj@@getwd#1{%
+ \directlua{luatexja.direction.get_box_dim('width', \the\numexpr#1\relax)}%
+ \ltj@tempdima%
+}
+\def\ltj@@getht#1{%
+ \directlua{luatexja.direction.get_box_dim('height', \the\numexpr#1\relax)}%
+ \ltj@tempdima%
+}
+\def\ltj@@getdp#1{%
+ \directlua{luatexja.direction.get_box_dim('depth', \the\numexpr#1\relax)}%
+ \ltj@tempdima%
+}
+\let\ltjgetwd=\ltj@@getwd\let\ltjgetht=\ltj@@getht\let\ltjgetdp=\ltj@@getdp
+
+%%%%%%%% \ltjsetwd<box_num>=<dimen> etc.
+\protected\def\ltjsetwd{\begingroup
+ \ltj@reset@globaldefs\afterassignment\ltj@@setwd@a\ltj@tempcnta}
+\def\ltj@@setwd@a{\afterassignment\ltj@@setwd@b\ltj@tempdima}
+\def\ltj@@setwd@b{%
+ \directlua{luatexja.direction.set_box_dim('width')}%
+ \ltj@restore@globaldefs\endgroup}
+\protected\def\ltjsetht{\begingroup
+ \ltj@reset@globaldefs\afterassignment\ltj@@setht@a\ltj@tempcnta}
+\def\ltj@@setht@a{\afterassignment\ltj@@setht@b\ltj@tempdima}
+\def\ltj@@setht@b{%
+ \directlua{luatexja.direction.set_box_dim('height')}%
+ \ltj@restore@globaldefs\endgroup}
+\protected\def\ltjsetdp{\begingroup
+ \ltj@reset@globaldefs\afterassignment\ltj@@setdp@a\ltj@tempcnta}
+\def\ltj@@setdp@a{\afterassignment\ltj@@setdp@b\ltj@tempdima}
+\def\ltj@@setdp@b{%
+ \directlua{luatexja.direction.set_box_dim('depth')}%
+ \ltj@restore@globaldefs\endgroup}
+
+%%%%%%%% \ifybox, \iftbox, \ifdbox
+\def\ltj@@box@cond#1#2\fi{\fi\csname if#1\endcsname}
+\def\ifybox#1{\directlua{luatexja.direction.box_dir_conditional(\the\numexpr #1\relax, 4)}%
+ \ltj@@box@cond{true}\else\ltj@@box@cond{false}\fi}
+\def\iftbox#1{\directlua{luatexja.direction.box_dir_conditional(\the\numexpr #1\relax, 3)}%
+ \ltj@@box@cond{true}\else\ltj@@box@cond{false}\fi}
+\def\ifdbox#1{\directlua{luatexja.direction.box_dir_conditional(\the\numexpr #1\relax, 1)}%
+ \ltj@@box@cond{true}\else\ltj@@box@cond{false}\fi}
+
%%------------------ Load module for the format
\ifltj@in@latex %<*LaTeX>
OSDN Git Service
