\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-core}[2014/09/24 Core of LuaTeX-ja]
+ \ProvidesPackage{luatexja-core}[2015/02/22 Core of LuaTeX-ja]
\fi %</LaTeX>
%% Load prerequisite packages.
\newif\ifltj@everyhook@avail\ltj@everyhook@availfalse
%! 外部パッケージは普通の \endlinechar で読まないと危険.
\ifltj@in@latex %<*LaTeX>
- \RequirePackage{luaotfload} [2013/05/10] % v2.2
+ \RequirePackage{luaotfload} [2013/12/31] % v2.3
\RequirePackage{ltxcmds} [2011/11/09] % v1.22
\RequirePackage{pdftexcmds} [2011/11/29] % v0.20
\RequirePackage{xkeyval} [2012/10/14] % v2.6b
\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
"File `luatexja.lua' not found"))
}
+
+%%% true if we can use [new]token.scan_int and co.
+\newif\ifltj@token@avail@scan
+\directlua{%
+ local bs = string.char(92)
+ if luatexja.token then tex.sprint(bs .. 'ltj@token@avail@scantrue') end
+ print (luatexja.token)
+}
+
+
%% \RequireLuaTeXjaSubmodule{name}[date]
% A TeX version of luatexja.load_module(name)
% The second optional argument [date] is simply ignored.
\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}
\protected\def\zh{\directlua{tex.setdimen('ltj@zh', luatexja.jfont.get_zh())}\ltj@zh}
%%%%%%%% \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
}%
}
-\setbox0\vbox{%
+\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@restore@globaldefs
}
+\ifltj@token@avail@scan %%%%%%%%%%%%%%%%%%%%%%%% new tokenlib
+% {y,t}{ja,al}baselineshift = <dimen>
+% yjabaselineshift = <dimen>
+\define@key[ltj]{japaram}{yalbaselineshift}{
+ \directlua{tex.setattribute(luatexja.isglobal,
+ luatexbase.attributes['ltj@yablshift'], luatexja.token.scan_dimen())}#1}
+\define@key[ltj]{japaram}{yjabaselineshift}{
+ \directlua{tex.setattribute(luatexja.isglobal,
+ luatexbase.attributes['ltj@ykblshift'], luatexja.token.scan_dimen())}#1}
+\define@key[ltj]{japaram}{talbaselineshift}{
+ \directlua{tex.setattribute(luatexja.isglobal,
+ luatexbase.attributes['ltj@tablshift'], luatexja.token.scan_dimen())}#1}
+\define@key[ltj]{japaram}{tjabaselineshift}{
+ \directlua{tex.setattribute(luatexja.isglobal,
+ luatexbase.attributes['ltj@tkblshift'], luatexja.token.scan_dimen())}#1}
+\else %%%%%%%%%%%%%%%%%%%%%%%% old tokenlib
% yalbaselineshift = <dimen>
% yjabaselineshift = <dimen>
\define@key[ltj]{japaram}{yalbaselineshift}{%
\directlua{tex.setattribute(luatexja.isglobal,
luatexbase.attributes['ltj@tkblshift'],
\ltj@safe@dimen@or\ltj@defdimen{#1})}}
+\fi %%%%%%%%%%%%%%%%%%%%%%%%
% jaxspmode = {<char_code>, <mode>}
% mode: inhibit, preonly, postonly, allow
\directlua{luatexja.ext_print_global()}\ltj@autoxspc=0
\fi}
-% [x]]kanjiskip = <dimen>
-\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)
-}\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}
+% [x]]kanjiskip = <skip>
+\ifltj@token@avail@scan %%%%%%%%%%%%%%%%%%%%%%%% new tokenlib
+ \define@key[ltj]{japaram}{kanjiskip}{\message{<#1>}\ltjsetkanjiskip #1}
+ \define@key[ltj]{japaram}{xkanjiskip}{\ltjsetxkanjiskip #1}
+ \protected\def\ltjsetkanjiskip{% % SKIP
+ \directlua{%
+ local d = luatexja.token.scan_glue()
+ luatexja.stack.set_stack_skip(luatexja.stack_table_index.KSK, d); node.free(d)
+ }}
+ \protected\def\ltjsetxkanjiskip{% % SKIP
+ \directlua{%
+ local d = luatexja.token.scan_glue()
+ luatexja.stack.set_stack_skip(luatexja.stack_table_index.XSK, d); node.free(d)
+ }}
+\else %%%%%%%%%%%%%%%%%%%%%%%% old tokenlib
+ \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)
+ }\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}
+\else
+\fi %%%%%%%%%%%%%%%%%%%%%%%%
% jcharwidowpenalty = <count>
}
%%%% \hbox, \vbox, \vtop
-\setbox0\hbox{%
+\setbox\z@\hbox{%
$\directlua{% This value depends on the version of LuaTeX.
luatexja.stack.mmode = -tex.nest[tex.nest.ptr].mode
}$%
}
-\ifltj@everyhook@avail
+\setbox\z@\box\voidb@x
+\ifltj@everyhook@avail% using everyhook package
\PushPreHook{hbox}{%
\directlua{luatexja.direction.set_list_direction_hook()}%
\aftergroup\ltj@@reset@badness
\aftergroup\ltj@@reset@badness
}
\else
- {\catcode`\!=0\catcode`\\=12
- !@PackageWarningNoLine{luatexja-core}{%
- I will use \everyhbox and \everyvbox directly !MessageBreak
- for supporting multiple directions, !MessageBreak
- since everyhook.sty is not available}}
- \everyhbox{%
+ \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
- }
- \everyvbox{%
+ \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
\ltj@@orig@unvcopy\ltj@tempcnta
\directlua{luatexja.direction.uncopy_restore_whatsit()}}
-
%%%% lastbox
\let\ltj@@orig@lastbox=\lastbox
\protected\def\lastbox{%
}
%%%%%%%% \ltjgetwd<box_num> etc.
+\ifltj@token@avail@scan %%%%%%%%%%%%%%%%%%%%%%%% new tokenlib
+\def\ltj@@getwd{%
+ \directlua{luatexja.direction.get_box_dim('width', luatexja.token.scan_int())}}
+\def\ltj@@getht{%
+ \directlua{luatexja.direction.get_box_dim('height', luatexja.token.scan_int())}}
+\def\ltj@@getdp{%
+ \directlua{luatexja.direction.get_box_dim('depth', luatexja.token.scan_int())}}
+\else %%%%%%%%%%%%%%%%%%%%%%%% old tokenlib
\def\ltj@@getwd#1{%
- \directlua{luatexja.direction.get_box_dim('width', \the\numexpr#1\relax)}%
- \ltj@tempdima%
-}
+ \directlua{luatexja.direction.get_box_dim('width', \the\numexpr#1\relax)}}
\def\ltj@@getht#1{%
- \directlua{luatexja.direction.get_box_dim('height', \the\numexpr#1\relax)}%
- \ltj@tempdima%
-}
+ \directlua{luatexja.direction.get_box_dim('height', \the\numexpr#1\relax)}}
\def\ltj@@getdp#1{%
- \directlua{luatexja.direction.get_box_dim('depth', \the\numexpr#1\relax)}%
- \ltj@tempdima%
-}
+ \directlua{luatexja.direction.get_box_dim('depth', \the\numexpr#1\relax)}}
+\fi %%%%%%%%%%%%%%%%%%%%%%%%
\let\ltjgetwd=\ltj@@getwd\let\ltjgetht=\ltj@@getht\let\ltjgetdp=\ltj@@getdp
%%%%%%%% \ltjsetwd<box_num>=<dimen> etc.
\directlua{luatexja.direction.set_box_dim('depth')}%
\ltj@restore@globaldefs\endgroup}
-
%%------------------ Load module for the format
\ifltj@in@latex %<*LaTeX>