\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/09/24 Core of LuaTeX-ja]
\fi %</LaTeX>
%% Load prerequisite packages.
\endlinechar=13 %
+\newif\ifltj@everyhook@avail\ltj@everyhook@availfalse
%! 外部パッケージは普通の \endlinechar で読まないと危険.
\ifltj@in@latex %<*LaTeX>
\RequirePackage{luaotfload} [2013/05/10] % v2.2
- \RequirePackage{infwarerr} [2010/04/08] % v1.3
\RequirePackage{ltxcmds} [2011/11/09] % v1.22
\RequirePackage{pdftexcmds} [2011/11/29] % v0.20
\RequirePackage{xkeyval} [2012/10/14] % v2.6b
+ \RequirePackage{atbegshi}
+ \IfFileExists{everyhook.sty}{\RequirePackage{everyhook}\ltj@everyhook@availtrue}{}
\else %<*!LaTeX>
\input luaotfload.sty
- \input infwarerr.sty
\input ltxcmds.sty
\input pdftexcmds.sty
\input xkeyval
+ \input atbegshi.sty
+ \AtBeginShipoutInit
\fi %</LaTeX>
\endlinechar=-1 %
{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@curtfnt % index for ``current vertical Japanese font''
\newluatexattribute\ltj@origchar %
\newluatexattribute\ltj@charclass %
+\newluatexattribute\ltj@charcode %
\newluatexattribute\ltj@autospc % attribute for autospacing
\newluatexattribute\ltj@autoxspc % attribute for autoxspacing
\newluatexattribute\ltj@yablshift % attribute for yalbaselineshift
\newluatexattribute\ltj@tkblshift % attribute for tjabaselineshift
\newluatexattribute\jfam % index for current jfam
-\newcount\ltj@dir@count % counter for indicating direction
\newluatexattribute\ltj@dir
-
+\newlanguage\ltj@@japanese
\ltj@dir=0
\ltj@icflag=0
\ltj@origchar=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, 'yoko')}}
\protected\def\globaljfont{%
- \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true)}}
-\def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY('yoko')}}
+ \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true, 'yoko')}}
+\def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY()}}
%%%%%%%% \tfont\CS={...:...;jfm=metric;...}, \globaltfont
-\protected\def\tfont{\afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(false)}}
+\protected\def\tfont{%
+ \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(false, 'tate')}}
\protected\def\globaltfont{%
- \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(true)}}
-\def\ltj@@tfont{\directlua{luatexja.jfont.jfontdefY('tate')}}
-
+ \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(true, 'tate')}}
+\def\ltj@@tfont{\directlua{luatexja.jfont.jfontdefY()}}
%%%%%%%% \zw, \zh
\protected\def\zw{\directlua{tex.setdimen('ltj@zw', luatexja.jfont.get_zw())}\ltj@zw}
%%%%%%%% \ltjsetparameter
\newcount\ltj@@stack \newcount\ltj@@group@level
-\ltj@@group@level=0 \ltj@@stack=0
+\ltj@@group@level\z@\ltj@@stack\z@
-\setbox0\hbox{%
+\setbox\z@\hbox{%
\directlua{% This value depends on the version of LuaTeX.
luatexja.stack.hmode = -tex.nest[tex.nest.ptr].mode
}%
}
+\setbox\z@\vbox{%
+ \directlua{% This value depends on the version of LuaTeX.
+ luatexja.stack.vmode = -tex.nest[tex.nest.ptr].mode
+ }%
+}
+\setbox\z@\box\voidb@x
% prebreakpenalty = {<char_code>, <penalty>}
\define@key[ltj]{japaram}{kcatcode}{%
\ltj@@decl@array@param{kcatcode}
\ltj@@decl@array@param{jacharrange}
\ltj@@decl@array@param{chartorange}
+\ltj@@decl@array@param{boxdir}
\def\ltjgetparameter#1{%
\directlua{luatexja.base.start_time_measure('get_par')}%
+ % stop call is moved in luatexja.lua
\ifcsname ltj@@array@param/#1\endcsname
\expandafter\ltx@firstoftwo
\else
}
\def\ltj@@getparam@one#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>
%%%%%%%% \ltjdeclarealtfont<base_font_cs><alt_font_cs>{100-200,3000-,5000,...}
% <base_font_cs> の 第 3 引数の文字達は <alt_font_cs> で組む
% いつも global
-\def\ltj@@getjfontnumber#1{% result in \ltj@tempcntc
+\def\ltj@@getjfontnumber#1{% result in \ltj@tempcntc
\ltj@reset@globaldefs
\begingroup\ltj@curjfnt=-1 \ltj@curtfnt=-1\relax
- #1\directlua{luatexja.__temp = -\the\ltj@curjfnt*\the\ltj@curtfnt}\endgroup
+ #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}%
a Japanese font}{I'll use the current horizontal Japanese font instead.^^J}%
\ltj@tempcntc=\ltj@curjfnt
\fi\ltj@restore@globaldefs}
-
+
\protected\def\ltjdeclarealtfont#1#2#3{%
{\ltj@@getjfontnumber#1\@tempcnta=\ltj@tempcntc% \@tempcnta: 基底フォント
\ltj@@getjfontnumber#2%
\directlua{luatexja.jfont.clear_alt_font(\the\ltj@tempcntc)}}\ignorespaces}
-%%%%%%%% \yoko, \tate, \ifydir, \iftdir
-\newif\ifydir
-\newif\iftdir
-\newif\ifddir
+%%%%%%%% \yoko, \tate,\dtou
\protected\def\tate{%
\directlua{luatexja.direction.set_list_direction(3, 'tate')}%
- \ltj@dir@count=3\tdirtrue\ydirfalse\ddirfalse}
+}
\protected\def\yoko{%
\directlua{luatexja.direction.set_list_direction(4, 'yoko')}%
- \ltj@dir@count=4\ydirtrue\tdirfalse\ddirfalse}
+}
\protected\def\dtou{%
\directlua{luatexja.direction.set_list_direction(1, 'dtou')}%
- \ltj@dir@count=1\ydirfalse\tdirfalse\ddirtrue}
+}
+\protected\def\utod{% 「縦数式ディレクション」
+ \directlua{luatexja.direction.set_list_direction(11, 'utod')}%
+}
+\define@key[ltj]{japaram}{direction}{%% always local
+ \directlua{luatexja.direction.set_list_direction(1, 'ltjsetparameter')}%
+}
+
\yoko
+%%%% 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\ltj@@insert@B\let\next}
+\protected\def\ltj@@insert@B{\directlua{luatexja.direction.populate_insertion_dir_whatsit()}\endgroup}
+
+%%%% vadjust
+\let\ltj@@orig@vadjust=\vadjust
+\protected\def\vadjust{%
+ \ltj@@orig@vadjust\bgroup
+ \directlua{luatexja.direction.set_list_direction_hook('adj')}%
+ \aftergroup\ltj@@vadjust@check@dir\let\next}
+\protected\def\ltj@@vadjust@check@dir{%
+ \directlua{luatexja.direction.check_adjust_direction()}%
+}
+
+%%%% \hbox, \vbox, \vtop
+\setbox\z@\hbox{%
+ $\directlua{% This value depends on the version of LuaTeX.
+ luatexja.stack.mmode = -tex.nest[tex.nest.ptr].mode
+ }$%
+}
+\setbox\z@\box\voidb@x
+\ifltj@everyhook@avail% using everyhook package
+ \PushPreHook{hbox}{%
+ \directlua{luatexja.direction.set_list_direction_hook()}%
+ \aftergroup\ltj@@reset@badness
+ }
+ \PushPreHook{vbox}{%
+ \directlua{luatexja.direction.set_list_direction_hook()}%
+ \aftergroup\ltj@@reset@badness
+ }
+\else
+ \let\ltj@@everyhbox=\everyhbox\let\ltj@@everyvbox=\everyvbox
+ \newtoks\ltj@@i@everyhbox\newtoks\ltj@@i@everyvbox
+ \let\everyhbox=\ltj@@i@everyhbox\let\everyvbox=\ltj@@i@everyvbox
+ \ltj@@everyhbox{%
+ \directlua{luatexja.direction.set_list_direction_hook()}%
+ \aftergroup\ltj@@reset@badness
+ \the\ltj@@i@everyhbox}
+ \ltj@@everyvbox{%
+ \directlua{luatexja.direction.set_list_direction_hook()}%
+ \aftergroup\ltj@@reset@badness
+ \the\ltj@@i@everyvbox}
+\fi
+
+\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
+ }%
+}
+\AtBeginShipout{\directlua{luatexja.direction.finalize()}}
+
+%%%% \raise, \lower, \moveleft, \moveright
+\let\ltj@@orig@raise=\raise
+\let\ltj@@orig@lower=\lower
+\protected\def\raise{\ltj@reset@globaldefs\afterassignment\ltj@@raise\ltj@tempdima}
+\protected\def\lower{\ltj@reset@globaldefs\afterassignment\ltj@@raise\ltj@tempdima-}
+\protected\def\ltj@@raise{%
+ \ltj@restore@globaldefs
+ \edef\ltj@@raise@a{%
+ \noexpand\directlua{luatexja.direction.raise_box()}%
+ \ltj@@orig@raise\the\ltj@tempdima\noexpand\box\ltj@afbox
+ }\ltj@afterbox\ltj@@raise@a}
+\let\ltj@@orig@moveleft=\moveleft
+\let\ltj@@orig@moveright=\moveright
+\protected\def\moveleft{\ltj@reset@globaldefs\afterassignment\ltj@@moveleft\ltj@tempdima}
+\protected\def\moveright{\ltj@reset@globaldefs\afterassignment\ltj@@moveleft\ltj@tempdima-}
+\protected\def\ltj@@moveleft{%
+ \ltj@restore@globaldefs
+ \edef\ltj@@moveleft@a{%
+ \noexpand\directlua{luatexja.direction.raise_box()}%
+ \ltj@@orig@moveleft\the\ltj@tempdima\noexpand\box\ltj@afbox
+ }\ltj@afterbox\ltj@@moveleft@a}
+
+%%%% \vcenter
+\let\ltj@@orig@vcenter=\vcenter
+\protected\def\vcenter{\ltj@afterbox\ltj@@vcenter\vbox}
+\protected\def\ltj@@vcenter{%
+ \directlua{luatexja.direction.raise_box()}%
+ \ltj@@orig@vcenter{\box\ltj@afbox}%
+}
+
+%%%% \unhbox and \unvbox
+\long\def \@gobbletwo #1#2{}
+\let\ltj@@orig@unhbox=\unhbox
+\let\ltj@@orig@unvbox=\unvbox
+\protected\def\unhbox{\ltj@reset@globaldefs\afterassignment\ltj@@unhbox\ltj@tempcnta}
+\protected\def\unvbox{\ltj@reset@globaldefs\afterassignment\ltj@@unvbox\ltj@tempcnta}
+\protected\def\ltj@@unhbox{%
+ \directlua{luatexja.direction.unbox_check_dir()}%
+ \ltj@@orig@unhbox\ltj@tempcnta}
+\protected\def\ltj@@unvbox{%
+ \directlua{luatexja.direction.unbox_check_dir()}%
+ \ltj@@orig@unvbox\ltj@tempcnta}
+\let\ltj@@orig@unhcopy=\unhcopy
+\let\ltj@@orig@unvcopy=\unvcopy
+\protected\def\unhcopy{\ltj@reset@globaldefs\afterassignment\ltj@@unhcopy\ltj@tempcnta}
+\protected\def\unvcopy{\ltj@reset@globaldefs\afterassignment\ltj@@unvcopy\ltj@tempcnta}
+\protected\def\ltj@@unhcopy{%
+ \directlua{luatexja.direction.unbox_check_dir(true)}%
+ \ltj@@orig@unhcopy\ltj@tempcnta
+ \directlua{luatexja.direction.uncopy_restore_whatsit()}}
+\protected\def\ltj@@unvcopy{%
+ \directlua{luatexja.direction.unbox_check_dir(true)}%
+ \ltj@@orig@unvcopy\ltj@tempcnta
+ \directlua{luatexja.direction.uncopy_restore_whatsit()}}
+
+%%%% 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%
\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.dir_conditional(\the\numexpr #1\relax, 4)}%
- \ltj@@box@cond{true}\else\ltj@@box@cond{false}\fi}
-\def\iftbox#1{\directlua{luatexja.direction.dir_conditional(\the\numexpr #1\relax, 3)}%
- \ltj@@box@cond{true}\else\ltj@@box@cond{false}\fi}
-\def\ifdbox#1{\directlua{luatexja.direction.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>