X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-core.sty;h=b0233cc81c5f051866de06513a5d5172d2bfa05c;hb=23c26360244f7f15daca59158fcb2bd51d71ab7a;hp=6ad407c304412e0da2a0ef32d8180fcc67b5f88b;hpb=758f2ea699a9424c6d0e40f6209e408f290c9ff2;p=luatex-ja%2Fluatexja.git diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty index 6ad407c..b0233cc 100644 --- a/src/luatexja-core.sty +++ b/src/luatexja-core.sty @@ -1,31 +1,158 @@ +% +% luatexja-core.sty +% + +%! 外から読まれるので仰々しくなってます +%% Avoid multiple loading. +\csname\if11luatexjacoreLoaded\fi\endcsname +\edef\x{% +\catcode32=\the\catcode32% +\catcode33=\the\catcode33% +\catcode35=\the\catcode35% +\catcode40=\the\catcode40% +\catcode41=\the\catcode41% +\catcode42=\the\catcode42% +\catcode43=\the\catcode43% +\catcode44=\the\catcode44% +\catcode45=\the\catcode45% +\catcode46=\the\catcode46% +\catcode58=\the\catcode58% +\catcode59=\the\catcode59% +\catcode60=\the\catcode60% +\catcode61=\the\catcode61% +\catcode62=\the\catcode62% +\catcode64=\the\catcode64% +\catcode91=\the\catcode91% +\catcode93=\the\catcode93% +\catcode94=\the\catcode94% +\catcode95=\the\catcode95% +\catcode126=\the\catcode126% +\endlinechar=\the\endlinechar +\relax} +\catcode32=10 %< > +\catcode33=12 %<"> +\catcode35=6 %<#> +\catcode40=12 %<(> +\catcode41=12 %<)> +\catcode42=12 %<*> +\catcode43=12 %<+> +\catcode44=12 %<,> +\catcode45=12 %<-> +\catcode46=12 %<.> +\catcode58=12 %<:> +\catcode59=12 %<;> +\catcode60=12 %<<> +\catcode61=12 %<=> +\catcode62=12 %<>> +\catcode64=11 %<@> +\catcode91=12 %<[> +\catcode93=12 %<]> +\catcode94=7 %<^> +\catcode95=8 %<_> +\catcode126=13 %<~> +\endlinechar=-1 % +%! なお, 上のcatcode設定はcoreとcompatで同一にしておく. +\edef\ltj@core@AtEnd{\x + \noexpand\let\noexpand\ltj@core@AtEnd\relax} +\def\luatexjacoreLoaded{\endinput} + +%% Check if LaTeX is used. +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax %<*!LaTeX> + \expandafter\let\csname ifltj@in@latex\expandafter\endcsname + \csname iffalse\endcsname +\else %<*LaTeX> + \expandafter\let\csname ifltj@in@latex\expandafter\endcsname + \csname iftrue\endcsname + \NeedsTeXFormat{LaTeX2e} + \ProvidesPackage{luatexja-core}[2011/04/01 v0.1] +\fi % + +%% Load prerequisite packages. +%! 参考： W32TeX の LuaTeX +%! 2010/11/27 v0.65.0 r3988 (LuaTeX-ja の最低要件) +%! 2010/07/10 v0.60.2 r3735 (TL2010 とほぼ同じ) +\endlinechar=13 % +%! 外部パッケージは普通の \endlinechar で読まないと危険. +\ifltj@in@latex %<*LaTeX> + \RequirePackage{luaotfload} [2010/11/11] % v1.21 + \RequirePackage{infwarerr} [2010/04/08] % v1.3 + \RequirePackage{ltxcmds} [2010/04/26] % v1.7 + \RequirePackage{pdftexcmds} [2010/04/01] % v0.9 + \RequirePackage{xkeyval} [2008/08/13] % v2.6a +\else %<*!LaTeX> + \input luaotfload.sty + \input infwarerr.sty + \input ltxcmds.sty + \input pdftexcmds.sty + \input xkeyval +\fi % +\endlinechar=-1 % + +%% Check if LuaTeX is used +\ltx@LocalExpandAfter\ifx\csname directlua\endcsname\relax + % Loading is silently aborted, since the notice of the wrong + % engine is aldready shown in otfluaload. + \ltj@core@AtEnd +\expandafter\endinput\fi\relax + +%% Check LuaTeX version. +\ifnum\luatexversion<65 + \@PackageError{luatexja-core} + {This LuaTeX engine is too old for this package;\MessageBreak + at least v0.65 is needed} + {Package loading is aborted now.\MessageBreak} +\expandafter\endinput\fi\relax + +%! なお、luatexbase-compat の説明に従うと、LuaTeX 拡張プリミティブは +%! plain/LaTeX の両方で \luatex 付の名前（\directlua はそのまま) +%! で使えると考えてよい。 + +%% \LuaTeXjaAvailable +%! 環境検査にパスした時に定義される. +\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 % + +%%------------------ +\endlinechar=13 +%! この中に master の luatexja-core.sty の内容を挿入する +%! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ % LuaTeX-ja core TeX source -\catcode`\@=11 \catcode"FFFFF=14 %" -\input luaotfload.sty -\input ltxcmds.sty -\input xkeyval.tex -\input infwarerr.sty -\ifdefined\ltj@loaded\endinput\fi \def\ltj@loaded{hoge} \newcount\ltj@tempcnta \newcount\ltj@tempcntb \newcount\ltj@tempcntc \newdimen\ltj@tempdima +\newskip\ltj@tempskipa +\newtoks\ltj@temptoks - -\newcount\jcharwidowpenalty -\newskip\kanjiskip -\newskip\xkanjiskip -\newdimen\zw -\newdimen\zh +\newdimen\ltj@zw +\newdimen\ltj@zh \newdimen\jQ \jQ=0.25mm -\newdimen\jH \jH=0.25mm +\let\jH=\jQ + +%%%%%%%% error message +\def\ltj@defnum{0} +\def\ltj@defdimen{0} + %%%%%%%% Attributes for Japanese typesetting. \newluatexattribute\ltj@curjfnt % index for ``current Japanese font'' +\newluatexattribute\jfam % index for current jfam \newluatexattribute\ltj@charclass % \newluatexattribute\ltj@yablshift % attribute for \yabaselineshift \newluatexattribute\ltj@ykblshift % attribute for \ykbaselineshift @@ -44,13 +171,7 @@ texio.write_nl("("..path..")") dofile(path) end - require('lualibs') - ltj.loadlua('luatexja-rmlgbm.lua') - % For Ryumin-Light and GothicBBB-Medium. - ltj.loadlua('luatexja-jfont.lua') ltj.loadlua('luatexja-core.lua') - ltj.loadlua('luatexja-jfmglue.lua') - ltj.loadlua('luatexja-xkanji.lua') } @@ -63,25 +184,50 @@ \advance\ltj@tempcnta by1 \repeat + %%%%%%%% \asluastring \def\asluastring#1{'\luaescapestring{\detokenize{#1}}'} %%%%%%%% Redefine \/ -%\let\ltj@ic=\/ \protected\def\/{{\ltj@icflag=1\ltj@ic}} -\protected\def\/{\directlua{ltj.ext_append_italic()}} +\protected\def\/{\relax\directlua{luatexja.jfont.append_italic()}} %%%%%%%% \jfont\CS={...:...;jfm=metric;...}, \globaljfont -\protected\def\jfont{\afterassignment\ltj@@jfont\directlua{ltj.ext_jfontdefX(false)}} +\protected\def\jfont{\afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(false)}} \protected\def\globaljfont{% - \afterassignment\ltj@@jfont\directlua{ltj.ext_jfontdefX(true)}} -\def\ltj@@jfont{\directlua{ltj.ext_jfontdefY()}} + \afterassignment\ltj@@jfont\directlua{luatexja.jfont.jfontdefX(true)}} +\def\ltj@@jfont{\directlua{luatexja.jfont.jfontdefY()}} + +%%%%%%%% \zw, \zh +\def\zw{\directlua{luatexja.jfont.load_zw()}\ltj@zw} +\def\zh{\directlua{luatexja.jfont.load_zh()}\ltj@zh} + %%%%%%%% \inhibitglue -\protected\def\inhibitglue{\directlua{ltj.ext_create_inhibitglue_node()}} +\protected\def\ltj@reset@globaldefs{% + \directlua{ltj.global_temp = tex.globaldefs; tex.globaldefs = 0}} +\protected\def\ltj@restore@globaldefs{\directlua{tex.globaldefs = ltj.global_temp}} +\let\new@everypar=\everypar +\protected\def\inhibitglue{\relax% + \ifvmode + \ltj@reset@globaldefs + \xdef\@@tempa{\the\everypar}% + \xdef\@@tempb{\everypar={\@@tempa}\@@tempa\noexpand\ltj@@ihb}% + \everypar\expandafter{\@@tempb}% + \ltj@restore@globaldefs + \else\ifhmode\ltj@@ihb\fi\fi} +\def\ltj@@ihb{\directlua{luatexja.jfmglue.create_inhibitglue_node()}} + +%%%%%%%% \yoko, \tate, \ifydir, \iftdir +%% At this moment, tategaki mode is not implemented; +%% there is only yokogaki mode now. +\let\yoko\relax +\let\tate\relax +\newif\ifydir\ydirtrue +\newif\iftdir\tdirfalse %%%%%%%% \ltjdefcharrange{100-200,3000-,5000,...} \protected\def\ltjdefcharrange#1#2{% - \ltj@tempcntc=#1 \expandafter\ltj@@dcrange#2,,\ignorespaces} + {\ltj@tempcntc=#1 \expandafter\ltj@@dcrange#2,,}\ignorespaces} \def\ltj@@dcrange#1,{\def\ltj@temp{#1}% \ifx\ltj@temp\empty\let\@next=\relax\else \ltj@@dcrangeA{#1}\let\@next=\ltj@@dcrange\fi\@next} @@ -91,11 +237,11 @@ \ltj@tempcnta=#1 \ltj@tempcntb=\ltj@tempcnta \else \def\ltj@temp{#1}% - \ifx\ltj@temp\empty\ltj@tempcnta='200 \else\ltj@tempcnta=#1 \fi + \ifx\ltj@temp\empty\ltj@tempcnta='200\else\ltj@tempcnta=#1\fi\relax \def\ltj@temp{#2}% - \ifx\ltj@temp\empty\ltj@tempcntb="10FFFF \else\ltj@tempcntb=#2 \fi%" + \ifx\ltj@temp\empty\ltj@tempcntb="10FFFF\else\ltj@tempcntb=#2\fi\relax%" \fi - \directlua{ltj.ext_add_char_range(\the\ltj@tempcnta,\the\ltj@tempcntb, + \directlua{luatexja.charrange.add_char_range(\the\ltj@tempcnta,\the\ltj@tempcntb, \the\ltj@tempcntc)}% } @@ -111,22 +257,41 @@ \define@key[ltj]{japaram}{postbreakpenalty}{% \expandafter\ltj@@set@stack#1:{post}{-10000}{10000}} \def\ltj@@set@stack#1,#2:#3#4#5{% - \ltj@tempcnta=#1\relax \ltj@tempcntb=#2\relax - \directlua{ltj.ext_set_stack_table(ltj.isglobal, \asluastring{#3}, - \the\ltj@tempcnta,tex.getcount('ltj@tempcntb'),#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)}} + +% jatextfont = {, } +\define@key[ltj]{japaram}{jatextfont}{% + \expandafter\ltj@@set@stackfont#1:{mjtext}} +\define@key[ltj]{japaram}{jascriptfont}{% + \expandafter\ltj@@set@stackfont#1:{mjscr}} +\define@key[ltj]{japaram}{jascriptscriptfont}{% + \expandafter\ltj@@set@stackfont#1:{mjss}} +\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)}% + \fi + \ltj@curjfnt=\ltj@tempcnta + \ltj@restore@globaldefs + } % yalbaselineshift = % yjabaselineshift = \define@key[ltj]{japaram}{yalbaselineshift}{% - \ltj@tempdima=#1\relax% \directlua{tex.setattribute(ltj.isglobal, luatexbase.attributes['ltj@yablshift'], - tex.getdimen('ltj@tempdima'))}} + \ltj@safe@dimen@or\ltj@defdimen{#1})}} \define@key[ltj]{japaram}{yjabaselineshift}{% - \ltj@tempdima=#1\relax% \directlua{tex.setattribute(ltj.isglobal, luatexbase.attributes['ltj@ykblshift'], - tex.getdimen('ltj@tempdima'))}} + \ltj@safe@dimen@or\ltj@defdimen{#1})}} % jaxspmode = {, } % mode: inhibit, preonly, postonly, allow @@ -139,9 +304,9 @@ \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{allow}\ifx\ltj@temp\ltj@tempa\def\ltj@temp{3}\fi - \ltj@tempcnta=#1\relax\ltj@tempcntb=\ltj@temp\relax - \directlua{ltj.ext_set_stack_table(ltj.isglobal, 'xsp', \the\ltj@tempcnta, - \the\ltj@tempcntb,0,3)}} + \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)}} % alxspmode = {, } % mode: inhibit, preonly, postonly, allow @@ -154,9 +319,9 @@ \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 - \ltj@tempcnta=#1\relax\ltj@tempcntb=\ltj@temp\relax - \directlua{ltj.ext_set_stack_table(ltj.isglobal, 'xsp', \the\ltj@tempcnta, - \the\ltj@tempcntb,0,3)}} + \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)}} % autospacing = (default: true) \define@boolkey[ltj]{japaram}{autospacing}[true]{% @@ -174,23 +339,28 @@ \directlua{ltj.ext_print_global()}\ltj@autoxspc=0 \fi} +% [x]]kanjiskip = \define@key[ltj]{japaram}{kanjiskip}{% % SKIP - \directlua{ltj.ext_print_global()}\kanjiskip=#1 } + \directlua{luatexja.stack.set_stack_skip(ltj.isglobal, 'kanjiskip', \ltj@safe@glue{#1})}} \define@key[ltj]{japaram}{xkanjiskip}{% % SKIP - \directlua{ltj.ext_print_global()}\xkanjiskip=#1 } + \directlua{luatexja.stack.set_stack_skip(ltj.isglobal, 'xkanjiskip', \ltj@safe@glue{#1})}} + +% jcharwidowpenalty = \define@key[ltj]{japaram}{jcharwidowpenalty}{% %COUNT - \directlua{ltj.ext_print_global()}\jcharwidowpenalty=#1 } + \ltj@@set@stack0,#1:{jwp}{-10000}{10000}} % differentjfm = { large | small | average | both } \define@choicekey*+[ltj]{japaram}{differentjfm}[\ltj@temp\ltj@tempr]% {large,small,average,both}{% \ifcase\ltj@tempr - \directlua{ltj.ja_diffmet_rule = math.max}\or - \directlua{ltj.ja_diffmet_rule = math.min}\or - \directlua{ltj.ja_diffmet_rule = math.two_average}\or - \directlua{ltj.ja_diffmet_rule = math.two_add} + \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_add} \fi -}{\@PackageWarning{luatexja}{ignored invalid argument '#1' for 'differentjfm'}} +}{\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 @@ -199,17 +369,19 @@ \def\ltj@@scrange#1,{% \edef\ltj@temp{#1}% \ifx\ltj@temp\empty\let\next=\relax\else\let\next=\ltj@@scrange - \ltj@tempcnta=#1 \directlua{ltj.ext_toggle_char_range(% - ltj.is_global,\the\ltj@tempcnta)}% + \directlua{luatexja.charrange.toggle_char_range(% + ltj.is_global,\ltj@safe@num@or\ltj@defnum{#1})}% \fi\next } -\protected\def\ltjsetparameter#1{\directlua{ltj.isglobal=''}% +\protected\def\ltjsetparameter#1{% + \ifnum\globaldefs>0\directlua{ltj.isglobal='global'}\else\directlua{ltj.isglobal=''}\fi \setkeys[ltj]{japaram}{#1}\ignorespaces} -\protected\def\ltjglobalsetparameter#1{\directlua{ltj.isglobal='global'}% +\protected\def\ltjglobalsetparameter#1{% + \ifnum\globaldefs<0\directlua{ltj.isglobal=''}\else\directlua{ltj.isglobal='global'}\fi \setkeys[ltj]{japaram}{#1}\ignorespaces} -%%%%%%%% +%%%%%%%% \ltjgetparameter \def\ltj@@decl@array@param#1{% \expandafter\let\csname ltj@@array@param/#1\endcsname=t% } @@ -231,16 +403,45 @@ } \def\ltj@@getparam@one#1{% \directlua{ltj.ext_get_parameter_unary('#1')}}% -\def\ltj@@getparam@two#1#2{\ltj@tempcnta=#2 - \directlua{ltj.ext_get_parameter_binary('#1', \the\ltj@tempcnta)}% +\def\ltj@@getparam@two#1#2{% + \directlua{ltj.ext_get_parameter_binary('#1', \ltj@safe@num{#2})}% } +%%%%%%%% \ltjalchar, \ltjjachar +\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@@kchar\ltj@tempcnta} +\def\ltj@@kchar{{\directlua{tex.globaldefs = 0}\ltj@alljachar\ltj@@origchar\ltj@tempcnta}} +\protected\def\ltjalchar{\afterassignment\ltj@@achar\ltj@tempcnta} +\def\ltj@@achar{{\directlua{tex.globaldefs = 0}\ltj@allalchar\ltj@@origchar\ltj@tempcnta}} + + + +%%------------------ Load module for the format +\ifltj@in@latex %<*LaTeX> + \RequirePackage{luatexja-latex}[2011/04/01] +\else\ifltj@in@plain %<*plain> + \input luatexja-plain.sty % +\fi\fi % -\def\ltj@temp{plain} -\ifx\fmtname\ltj@temp - \message{plain format: loading luatexja-plain.tex} -\fi -\input luatexja-plain.tex -\catcode`\@=12 +%%------------------ all done +\ltj@core@AtEnd \endinput +%% EOF