\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-core}[2015/02/22 Core of LuaTeX-ja]
+ \ProvidesPackage{luatexja-core}[2015/05/03 Core of LuaTeX-ja]
\fi %</LaTeX>
%% Load prerequisite packages.
\newluatexattribute\ltj@dir
\newlanguage\ltj@@japanese
-\ltj@dir=0
-\ltj@icflag=0
-\ltj@origchar=0
-\ltj@charclass=0
-\ltj@curjfnt=-1
-\ltj@curtfnt=-1
+\ltj@dir\z@
+\ltj@icflag\z@
+\ltj@origchar\z@
+\ltj@charclass\z@
+\ltj@curjfnt\m@ne
+\ltj@curtfnt\m@ne
%%%%%%%% Attributes for character ranges
\newcount\ltj@tempcnta
-\ltj@tempcnta=0
+\ltj@tempcnta\z@
\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
+ \advance\ltj@tempcnta\@ne
\repeat
\protected\def\ltj@@q@escapenum{\ltj@@q@escapenum@}
\directlua{%
- luatexja = {}
+ luatexja = {};
+ luatexja.lang_ja = \the\ltj@@japanese;
dofile(assert(kpse.find_file('luatexja.lua', 'tex'),
"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.
\fi %</LaTeX>
%%%%%%%% \asluastring
-\def\asluastring#1{'\luaescapestring{\detokenize{#1}}'}
+\def\asluastring#1{'\luatexluaescapestring{\detokenize{#1}}'}
%%%%%%%% Redefine \/
\protected\def\/{\relax\directlua{luatexja.jfont.append_italic()}}
%%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont
-\protected\def\jfont{%
- \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false, 'yoko')}}
-\protected\def\globaljfont{%
- \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true, 'yoko')}}
+\protected\def\jfont#1{%
+ \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false, 'yoko','\luatexluaescapestring{\noexpand#1}')}}
+\protected\def\globaljfont#1{%
+ \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true, 'yoko','\luatexluaescapestring{\noexpand#1}')}}
\def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY()}}
%%%%%%%% \tfont\CS={...:...;jfm=metric;...}, \globaltfont
-\protected\def\tfont{%
- \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(false, 'tate')}}
-\protected\def\globaltfont{%
- \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(true, 'tate')}}
+\protected\def\tfont#1{%
+ \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(false, 'tate','\luatexluaescapestring{\noexpand#1}')}}
+\protected\def\globaltfont#1{%
+ \afterassignment\ltj@@tfont\directlua{luatexja.jfont.jfontdefX(true, 'tate','\luatexluaescapestring{\noexpand#1}')}}
\def\ltj@@tfont{\directlua{luatexja.jfont.jfontdefY()}}
%%%%%%%% \zw, \zh
\expandafter\ltj@@set@stackfont#1:{MJSS}}
\protected\def\ltj@@set@stackfont#1,#2:#3{%
\ltj@reset@globaldefs
- \ltj@tempcnta=\ltj@curjfnt\ltj@curjfnt=-1 #2%
- \ifnum\ltj@curjfnt=-1
+ \ltj@tempcnta=\ltj@curjfnt\ltj@curjfnt\m@ne#2%
+ \ifnum\ltj@curjfnt=\m@ne
\@PackageError{luatexja-core}%
{\string#2 is not a control sequence that represents \MessageBreak
a Japanese font}{}%
\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@yablshift'],
- \ltj@safe@dimen@or\ltj@defdimen{#1})}}
+ luatexbase.attributes['ltj@yablshift'], luatexja.token.scan_dimen())}#1}
\define@key[ltj]{japaram}{yjabaselineshift}{%
\directlua{tex.setattribute(luatexja.isglobal,
- luatexbase.attributes['ltj@ykblshift'],
- \ltj@safe@dimen@or\ltj@defdimen{#1})}}
-% talbaselineshift = <dimen>
-% tjabaselineshift = <dimen>
+ luatexbase.attributes['ltj@ykblshift'], luatexja.token.scan_dimen())}#1}
\define@key[ltj]{japaram}{talbaselineshift}{%
\directlua{tex.setattribute(luatexja.isglobal,
- luatexbase.attributes['ltj@tablshift'],
- \ltj@safe@dimen@or\ltj@defdimen{#1})}}
+ luatexbase.attributes['ltj@tablshift'], luatexja.token.scan_dimen())}#1}
\define@key[ltj]{japaram}{tjabaselineshift}{%
\directlua{tex.setattribute(luatexja.isglobal,
- luatexbase.attributes['ltj@tkblshift'],
- \ltj@safe@dimen@or\ltj@defdimen{#1})}}
-\fi %%%%%%%%%%%%%%%%%%%%%%%%
+ luatexbase.attributes['ltj@tkblshift'], luatexja.token.scan_dimen())}#1}
% jaxspmode = {<char_code>, <mode>}
% mode: inhibit, preonly, postonly, allow
\ltj@safe@num@or{nil}{#1},
\ltj@safe@num@or{nil}{\ltj@temp},0,3)}}
+
% alxspmode = {<char_code>, <mode>}
% mode: inhibit, preonly, postonly, allow
% or 0 1 2 3
% autospacing = <bool> (default: true)
\define@boolkey[ltj]{japaram}{autospacing}[true]{%
\ifltj@japaram@autospacing
- \directlua{luatexja.ext_print_global()}\ltj@autospc=1
+ \directlua{luatexja.ext_print_global()}\ltj@autospc\@ne
\else
- \directlua{luatexja.ext_print_global()}\ltj@autospc=0
+ \directlua{luatexja.ext_print_global()}\ltj@autospc\z@
\fi}
% autoxspacing = <bool> (default: true)
\define@boolkey[ltj]{japaram}{autoxspacing}[true]{%
\ifltj@japaram@autoxspacing
- \directlua{luatexja.ext_print_global()}\ltj@autoxspc=1
+ \directlua{luatexja.ext_print_global()}\ltj@autoxspc\@ne
\else
- \directlua{luatexja.ext_print_global()}\ltj@autoxspc=0
+ \directlua{luatexja.ext_print_global()}\ltj@autoxspc\z@
\fi}
% [x]]kanjiskip = <skip>
-\ifltj@token@avail@scan %%%%%%%%%%%%%%%%%%%%%%%% new tokenlib
- \define@key[ltj]{japaram}{kanjiskip}{\message{<#1>}\ltjsetkanjiskip #1}
+ \define@key[ltj]{japaram}{kanjiskip}{\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.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>
\define@key[ltj]{japaram}{jcharwidowpenalty}{% %COUNT
%%%%%%%% \ltjalchar<number>, \ltjjachar<number>
\let\ltj@@origchar=\char
\protected\def\ltj@alljachar{\relax
- \csname ltj@kcat0\endcsname=0
- \csname ltj@kcat1\endcsname=0
- \csname ltj@kcat2\endcsname=0
- \csname ltj@kcat3\endcsname=0
- \csname ltj@kcat4\endcsname=0
- \csname ltj@kcat5\endcsname=0
- \csname ltj@kcat6\endcsname=0 }
+ \csname ltj@kcat0\endcsname\z@
+ \csname ltj@kcat1\endcsname\z@
+ \csname ltj@kcat2\endcsname\z@
+ \csname ltj@kcat3\endcsname\z@
+ \csname ltj@kcat4\endcsname\z@
+ \csname ltj@kcat5\endcsname\z@
+ \csname ltj@kcat6\endcsname\z@}
\protected\def\ltj@allalchar{\relax
\csname ltj@kcat0\endcsname="7FFFFFFF %"
\csname ltj@kcat1\endcsname="7FFFFFFF %"
% いつも global
\def\ltj@@getjfontnumber#1{% result in \ltj@tempcntc
\ltj@reset@globaldefs
- \begingroup\ltj@curjfnt=-1 \ltj@curtfnt=-1\relax
+ \begingroup\ltj@curjfnt\m@ne\ltj@curtfnt\m@ne\relax
#1\directlua{luatexja.__temp = -(\the\ltj@curjfnt)*(\the\ltj@curtfnt)}\endgroup
\ltj@tempcntc=\directlua{tex.sprint(luatexja.__temp)}\relax
- \ifnum\ltj@tempcntc=-1
+ \ifnum\ltj@tempcntc=\m@ne
\@PackageError{luatexja-core}%
{\string#1 is not a control sequence that represents \MessageBreak
a Japanese font}{I'll use the current horizontal Japanese font instead.^^J}%
}
%%%%%%%% \ltjgetwd<box_num> etc.
-\ifltj@token@avail@scan %%%%%%%%%%%%%%%%%%%%%%%% new tokenlib
\def\ltj@@getwd{%
- \directlua{luatexja.direction.get_box_dim('width', luatexja.token.scan_int())}%
- \ltj@tempdima}
+ \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()}%
- \ltj@tempdima}
+ \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())}%
- \ltj@tempdima}
-\else %%%%%%%%%%%%%%%%%%%%%%%% old tokenlib
-\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}
-\fi %%%%%%%%%%%%%%%%%%%%%%%%
+ \directlua{luatexja.direction.get_box_dim('depth', luatexja.token.scan_int())}}
\let\ltjgetwd=\ltj@@getwd\let\ltjgetht=\ltj@@getht\let\ltjgetdp=\ltj@@getdp
%%%%%%%% \ltjsetwd<box_num>=<dimen> etc.
OSDN Git Service
