\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-core}[2011/04/01 v0.1]
+ \ProvidesPackage{luatexja-core}[2012/04/20 v0.2]
\fi %</LaTeX>
%% Load prerequisite packages.
\let\LuaTeXjaAvailable=t %
%%------------------
-
-%% Load all sub-packages.
-\ifltj@in@latex %<*LaTeX>
- \RequirePackage{luatexja-cctbreg}[2011/04/01]
- \RequirePackage{luatexja-base}[2011/04/01]
-\else %<*!LaTeX>
- \input luatexja-cctbreg.sty %
- \input luatexja-base.sty %
-\fi %</LaTeX>
-
-%%------------------
\endlinechar=13
%! この中に master の luatexja-core.sty の内容を挿入する
%! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
\def\ltj@loaded{hoge}
-\newcount\ltj@tempcnta
-\newcount\ltj@tempcntb
-\newcount\ltj@tempcntc
-\newdimen\ltj@tempdima
-\newskip\ltj@tempskipa
-\newtoks\ltj@temptoks
-
\newdimen\ltj@zw
\newdimen\ltj@zh
\newdimen\jQ \jQ=0.25mm
\def\ltj@defnum{0}
\def\ltj@defdimen{0}
-
%%%%%%%% Attributes for Japanese typesetting.
+\newluatexattribute\ltj@icflag % attribute for italic correction
\newluatexattribute\ltj@curjfnt % index for ``current Japanese font''
-\newluatexattribute\jfam % index for current jfam
+\newluatexattribute\ltj@origchar %
\newluatexattribute\ltj@charclass %
-\newluatexattribute\ltj@yablshift % attribute for \yabaselineshift
-\newluatexattribute\ltj@ykblshift % attribute for \ykbaselineshift
\newluatexattribute\ltj@autospc % attribute for autospacing
\newluatexattribute\ltj@autoxspc % attribute for autoxspacing
-\newluatexattribute\ltj@icflag % attribute for italic correction
-\newlanguage\ltj@japanese
-
-%%%%%%%% Loading lua files
-\directlua{%
- utf = unicode.utf8
- ltj = {}
- function ltj.loadlua(file)
- local path = assert(kpse.find_file(file, 'tex'),
- "File '"..file.."' not found")
- texio.write_nl("("..path..")")
- dofile(path)
- end
- ltj.loadlua('luatexja-core.lua')
-}
-
+\newluatexattribute\ltj@yablshift % attribute for \yabaselineshift
+\newluatexattribute\ltj@ykblshift % attribute for \ykbaselineshift
+\newluatexattribute\jfam % index for current jfam
+\ltj@icflag=0\ltj@origchar=0
%%%%%%%% Attributes for character ranges
+\newcount\ltj@tempcnta
\ltj@tempcnta=0
\loop\ifnum\ltj@tempcnta<7
\expandafter\newluatexattribute%
\advance\ltj@tempcnta by1
\repeat
+
+%%%%%%%% Loading luatexja.lua
+%% Quark tokens needed in ltj-base
+\protected\def\ltj@@q@escape{\ltj@@q@escape@}
+\protected\def\ltj@@q@escapenum{\ltj@@q@escapenum@}
+
+\directlua{%
+ luatexja = {}
+ dofile(assert(kpse.find_file('luatexja.lua', 'tex'),
+ "File `luatexja.lua' not found"))
+}
+
+%% \RequireLuaTeXjaSubmodule{name}[date]
+% A TeX version of luatexja.load_module(name)
+% The second optional argument [date] is simply ignored.
+\def\RequireLuaTeXjaSubmodule#1{%
+ \@ifnextchar[{\ltj@requirelua@submod{#1}}{\ltj@requirelua@submod{#1}[]}}
+\def\ltj@requirelua@submod#1[#2]{%
+ \directlua{luatexja.load_module(
+ "\luatexluaescapestring{#1}")}}
+
+
+%%%%%%%% Load all sub-packages.
+\ifltj@in@latex %<*LaTeX>
+ \RequirePackage{ltj-cctbreg}[2012/04/21]
+ \RequirePackage{ltj-base}[2012/04/21]
+\else %<*!LaTeX>
+ \input ltj-cctbreg.sty %
+ \input ltj-base.sty %
+\fi %</LaTeX>
+
%%%%%%%% \asluastring
\def\asluastring#1{'\luaescapestring{\detokenize{#1}}'}
%%%%%%%% Redefine \/
-%\let\ltj@ic=\/ \protected\def\/{{\ltj@icflag=1\ltj@ic}}
-\protected\def\/{\directlua{luatexja.jfont.append_italic()}}
+\protected\def\/{\relax\directlua{luatexja.jfont.append_italic()}}
%%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont
\protected\def\jfont{\afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false)}}
\afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true)}}
\def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY()}}
-\def\zw{\directlua{luatexja.jfont.load_zw()}\ltj@zw}
-\def\zh{\directlua{luatexja.jfont.load_zh()}\ltj@zh}
+%%%%%%%% \zw, \zh
+\protected\def\zw{\directlua{luatexja.jfont.load_zw()}\ltj@zw}
+\protected\def\zh{\directlua{luatexja.jfont.load_zh()}\ltj@zh}
+
%%%%%%%% \inhibitglue
-\let\new@everypar=\everypar
-\protected\def\inhibitglue{%
- \ifvmode
- \directlua{ltj.global_temp = tex.globaldefs; tex.globaldefs = 0}% trick
- \xdef\@@tempa{\the\everypar}%
- \xdef\@@tempb{\everypar={\@@tempa}\@@tempa\noexpand\ltj@@ihb}%
- \everypar\expandafter{\@@tempb}%
- \directlua{tex.globaldefs = ltj.global_temp}% trick
- \else\ifhmode\ltj@@ihb\fi\fi}
-\def\ltj@@ihb{\directlua{luatexja.jfmglue.create_inhibitglue_node()}}
+\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\inhibitglue{\ifhmode\ltj@@ihb\fi}
+\def\ltj@@ihb{\relax\directlua{luatexja.jfmglue.create_inhibitglue_node()}}
%%%%%%%% \yoko, \tate, \ifydir, \iftdir
%% At this moment, tategaki mode is not implemented;
\newcount\ltj@@stack \newcount\ltj@@group@level
\ltj@@group@level=0 \ltj@@stack=0
+\setbox0\hbox{%
+ \directlua{% This value depends on the version of LuaTeX.
+ luatexja.stack.hmode = -tex.nest[tex.nest.ptr].mode
+ }
+}
+
% prebreakpenalty = {<char_code>, <penalty>}
\define@key[ltj]{japaram}{kcatcode}{%
- \expandafter\ltj@@set@stack#1:{kcat}{0}{0x7FFFFFFF}}
+ \expandafter\ltj@@set@stack#1:{KCAT}{0}{0x7FFFFFFF}}
\define@key[ltj]{japaram}{prebreakpenalty}{%
- \expandafter\ltj@@set@stack#1:{pre}{-10000}{10000}}
+ \expandafter\ltj@@set@stack#1:{PRE}{-10000}{10000}}
\define@key[ltj]{japaram}{postbreakpenalty}{%
- \expandafter\ltj@@set@stack#1:{post}{-10000}{10000}}
+ \expandafter\ltj@@set@stack#1:{POST}{-10000}{10000}}
\def\ltj@@set@stack#1,#2:#3#4#5{%
- \directlua{luatexja.stack.set_stack_table(ltj.isglobal, \asluastring{#3},
- \ltj@safe@num@or\ltj@defnum{#1},\ltj@safe@num@or\ltj@defnum{#2},#4,#5)}}
+ \directlua{luatexja.stack.set_stack_table(luatexja.isglobal, luatexja.stack_table_index.#3,
+ \ltj@safe@num@or{nil}{#1},\ltj@safe@num@or{nil}{#2},#4,#5)}}
% jatextfont = {<char_code>, <font_cs>}
\define@key[ltj]{japaram}{jatextfont}{%
- \expandafter\ltj@@set@stackfont#1:{mjtext}}
+ \expandafter\ltj@@set@stackfont#1:{MJT}}
\define@key[ltj]{japaram}{jascriptfont}{%
- \expandafter\ltj@@set@stackfont#1:{mjscr}}
+ \expandafter\ltj@@set@stackfont#1:{MJS}}
\define@key[ltj]{japaram}{jascriptscriptfont}{%
- \expandafter\ltj@@set@stackfont#1:{mjss}}
-\def\ltj@@set@stackfont#1,#2:#3{%
- \directlua{%
- ltj.global_temp = tex.globaldefs;
- tex.globaldefs = 0}%
+ \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
\@PackageError{luatexja-core}%
{\string#2 is not a control sequence that represents \MessageBreak
a Japanese font}{}%
\else
- \directlua{luatexja.stack.set_stack_font(ltj.isglobal, \asluastring{#3},
- \ltj@safe@num@or\ltj@defnum{#1}, \the\ltj@curjfnt)}%
+ \directlua{luatexja.stack.set_stack_font(luatexja.isglobal, luatexja.stack_table_index.#3,
+ \ltj@safe@num@or{nil}{#1}, \the\ltj@curjfnt)}%
\fi
\ltj@curjfnt=\ltj@tempcnta
- \directlua{tex.globaldefs = ltj.global_temp}%
+ \ltj@restore@globaldefs
}
% yalbaselineshift = <dimen>
% yjabaselineshift = <dimen>
\define@key[ltj]{japaram}{yalbaselineshift}{%
- \directlua{tex.setattribute(ltj.isglobal,
+ \directlua{tex.setattribute(luatexja.isglobal,
luatexbase.attributes['ltj@yablshift'],
\ltj@safe@dimen@or\ltj@defdimen{#1})}}
\define@key[ltj]{japaram}{yjabaselineshift}{%
- \directlua{tex.setattribute(ltj.isglobal,
+ \directlua{tex.setattribute(luatexja.isglobal,
luatexbase.attributes['ltj@ykblshift'],
\ltj@safe@dimen@or\ltj@defdimen{#1})}}
% jaxspmode = {<char_code>, <mode>}
% mode: inhibit, preonly, postonly, allow
-% or 0 2 1 3
+% or 0 1 2 3
\define@key[ltj]{japaram}{jaxspmode}{% \inhibitxspcode
\expandafter\ltj@set@jaxspmode#1:\relax}
\def\ltj@set@jaxspmode#1,#2:{%
\lowercase{\edef\ltj@temp{#2}}%
\def\ltj@tempa{inhibit}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{0}\fi
- \def\ltj@tempa{preonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi
- \def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{1}\fi
+ \def\ltj@tempa{preonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{1}\fi
+ \def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi
\def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi
- \directlua{luatexja.stack.set_stack_table(ltj.isglobal, 'xsp',
- \ltj@safe@num@or\ltj@defnum{#1},
- \ltj@safe@num@or\ltj@defnum{\ltj@temp},0,3)}}
+ \directlua{luatexja.stack.set_stack_table(luatexja.isglobal,
+ luatexja.stack_table_index.XSP,
+ \ltj@safe@num@or{nil}{#1},
+ \ltj@safe@num@or{nil}{\ltj@temp},0,3)}}
% alxspmode = {<char_code>, <mode>}
% mode: inhibit, preonly, postonly, allow
\def\ltj@tempa{preonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{1}\fi
\def\ltj@tempa{postonly}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{2}\fi
\def\ltj@tempa{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi
- \directlua{luatexja.stack.set_stack_table(ltj.isglobal, 'xsp',
- \ltj@safe@num@or\ltj@defnum{#1},
- \ltj@safe@num@or\ltj@defnum{\ltj@temp},0,3)}}
+ \directlua{luatexja.stack.set_stack_table(luatexja.isglobal,
+ luatexja.stack_table_index.XSP,
+ \ltj@safe@num@or{nil}{#1},
+ \ltj@safe@num@or{nil}{\ltj@temp},0,3)}}
% autospacing = <bool> (default: true)
\define@boolkey[ltj]{japaram}{autospacing}[true]{%
\ifltj@japaram@autospacing
- \directlua{ltj.ext_print_global()}\ltj@autospc=1
+ \directlua{luatexja.ext_print_global()}\ltj@autospc=1
\else
- \directlua{ltj.ext_print_global()}\ltj@autospc=0
+ \directlua{luatexja.ext_print_global()}\ltj@autospc=0
\fi}
% autoxspacing = <bool> (default: true)
\define@boolkey[ltj]{japaram}{autoxspacing}[true]{%
\ifltj@japaram@autoxspacing
- \directlua{ltj.ext_print_global()}\ltj@autoxspc=1
+ \directlua{luatexja.ext_print_global()}\ltj@autoxspc=1
\else
- \directlua{ltj.ext_print_global()}\ltj@autoxspc=0
+ \directlua{luatexja.ext_print_global()}\ltj@autoxspc=0
\fi}
% [x]]kanjiskip = <dimen>
\define@key[ltj]{japaram}{kanjiskip}{% % SKIP
- \directlua{luatexja.stack.set_stack_skip(ltj.isglobal, 'kanjiskip', \ltj@safe@glue{#1})}}
+ \directlua{luatexja.stack.set_stack_skip(luatexja.isglobal, 'kanjiskip', \ltj@safe@glue{#1})}}
\define@key[ltj]{japaram}{xkanjiskip}{% % SKIP
- \directlua{luatexja.stack.set_stack_skip(ltj.isglobal, 'xkanjiskip', \ltj@safe@glue{#1})}}
+ \directlua{luatexja.stack.set_stack_skip(luatexja.isglobal, 'xkanjiskip', \ltj@safe@glue{#1})}}
% jcharwidowpenalty = <count>
\define@key[ltj]{japaram}{jcharwidowpenalty}{% %COUNT
- \ltj@@set@stack0,#1:{jwp}{-10000}{10000}}
+ \ltj@@set@stack0,#1:{JWP}{-10000}{10000}}
-% differentjfm = { large | small | average | both }
+% differentjfm = { large | small | average | pleft | pright | paverage | both}
\define@choicekey*+[ltj]{japaram}{differentjfm}[\ltj@temp\ltj@tempr]%
- {large,small,average,both}{%
+ {large,small,average,pleft,pright,paverage,both}{%
\ifcase\ltj@tempr
\directlua{luatexja.jfmglue.diffmet_rule = math.max}\or
\directlua{luatexja.jfmglue.diffmet_rule = math.min}\or
\directlua{luatexja.jfmglue.diffmet_rule = math.two_average}\or
+ \directlua{luatexja.jfmglue.diffmet_rule = math.two_pleft}\or
+ \directlua{luatexja.jfmglue.diffmet_rule = math.two_pright}\or
+ \directlua{luatexja.jfmglue.diffmet_rule = math.two_paverage}\or
\directlua{luatexja.jfmglue.diffmet_rule = math.two_add}
\fi
}{\ltj@PackageError{luatexja}{invalid argument `#1' for `differentjfm'}{%
Argument for `differentjfm' must be one of `large', `small', `average',^^J%
- and `both'. }}
- % large, small, average, both
+ `pleft', `pright', 'paverage' or `both'. }}
+ % large, small, average, pleft, pright, paverage, both
% jacharrange = { +-<range_number> }
\edef\ltj@temp{#1}%
\ifx\ltj@temp\empty\let\next=\relax\else\let\next=\ltj@@scrange
\directlua{luatexja.charrange.toggle_char_range(%
- ltj.is_global,\ltj@safe@num@or\ltj@defnum{#1})}%
+ luatexja.is_global,\ltj@safe@num@or{nil}{#1})}%
\fi\next
}
+\protected\def\ltj@setpar@global{%
+ \ifnum\globaldefs>0\directlua{luatexja.isglobal='global'}\else\directlua{luatexja.isglobal=''}\fi
+}
\protected\def\ltjsetparameter#1{%
- \ifnum\globaldefs>0\directlua{ltj.isglobal='global'}\else\directlua{ltj.isglobal=''}\fi
- \setkeys[ltj]{japaram}{#1}\ignorespaces}
+ \ltj@setpar@global\setkeys[ltj]{japaram}{#1}\ignorespaces}
\protected\def\ltjglobalsetparameter#1{%
- \ifnum\globaldefs<0\directlua{ltj.isglobal=''}\else\directlua{ltj.isglobal='global'}\fi
+ \ifnum\globaldefs<0\directlua{luatexja.isglobal=''}\else\directlua{luatexja.isglobal='global'}\fi
\setkeys[ltj]{japaram}{#1}\ignorespaces}
-%%%%%%%%
+%%%%%%%% \ltjgetparameter
\def\ltj@@decl@array@param#1{%
\expandafter\let\csname ltj@@array@param/#1\endcsname=t%
}
{\ltj@@getparam@one{#1}}%
}
\def\ltj@@getparam@one#1{%
- \directlua{ltj.ext_get_parameter_unary('#1')}}%
+ \directlua{luatexja.ext_get_parameter_unary('#1')}}%
\def\ltj@@getparam@two#1#2{%
- \directlua{ltj.ext_get_parameter_binary('#1', \ltj@safe@num{#2})}%
+ \directlua{luatexja.ext_get_parameter_binary('#1', \ltj@safe@num@or{nil}{#2})}%
}
-
-
-%\def\ltj@temp{plain}
-%\ifx\fmtname\ltj@temp
-% \message{plain format: loading luatexja-plain.tex}
-%\fi
-%\input luatexja-plain.tex
-%\catcode`\@=12
-%\endinput
-%! ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑
+%%%%%%%% \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 }
+\protected\def\ltj@allalchar{\relax
+ \csname ltj@kcat0\endcsname="7FFFFFFF %"
+ \csname ltj@kcat1\endcsname="7FFFFFFF %"
+ \csname ltj@kcat2\endcsname="7FFFFFFF %"
+ \csname ltj@kcat3\endcsname="7FFFFFFF %"
+ \csname ltj@kcat4\endcsname="7FFFFFFF %"
+ \csname ltj@kcat5\endcsname="7FFFFFFF %"
+ \csname ltj@kcat6\endcsname="7FFFFFFF }%"
+
+\protected\def\ltjjachar{\afterassignment\ltj@@jachar\ltj@tempcnta}
+\def\ltj@@jachar{{\directlua{tex.globaldefs = 0}\ltj@alljachar\ltj@@origchar\ltj@tempcnta}}
+\protected\def\ltjalchar{\afterassignment\ltj@@alchar\ltj@tempcnta}
+\def\ltj@@alchar{{\directlua{tex.globaldefs = 0}\ltj@allalchar\ltj@@origchar\ltj@tempcnta}}
+
+%%%%%%%% \ltjsetmathletter<number>, \ltjunsetmathletter<number>
+\protected\def\ltjsetmathletter#1{\directlua{luatexja.math.is_math_letters[#1]=true}}
+\protected\def\ltjunsetmathletter#1{\directlua{luatexja.math.is_math_letters[#1]=false}}
%%------------------ Load module for the format
\ifltj@in@latex %<*LaTeX>
- \RequirePackage{luatexja-latex}[2011/04/01]
+ \RequirePackage{ltj-latex}[2012/04/21]
\else\ifltj@in@plain %<*plain>
- \input luatexja-plain.sty %
+ \input ltj-plain.sty %
\fi\fi %</LaTeX|plain>
+\newluatexcatcodetable\ltj@temp@cctb
+\def\ltj@overwrite@catcodetable#1{%
+ \setluatexcatcodetable\ltj@temp@cctb{\luatexcatcodetable#1}%
+ \setluatexcatcodetable#1{\luatexcatcodetable\ltj@temp@cctb\catcode"FFFFF=14}%
+}
+\ltj@overwrite@catcodetable\CatcodeTableLaTeX
+\ltj@overwrite@catcodetable\CatcodeTableLaTeXAtLetter
+\ltj@overwrite@catcodetable\CatcodeTableExpl
+
%%------------------ all done
\ltj@core@AtEnd
\endinput
OSDN Git Service
