X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=src%2Fluatexja-core.sty;h=d4487af2d7fa72b4b14bce6836fa2b5d9322d279;hb=1051d04eb2b5f8f657ee3bb1bfb5b97ba4201707;hp=617c7dc4705131c9a978aad98ebfecf1a87af1e9;hpb=5bb70ef57e9fd117aea6bd8f76e800fce285d1c7;p=luatex-ja%2Fluatexja.git diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty index 617c7dc..d4487af 100644 --- a/src/luatexja-core.sty +++ b/src/luatexja-core.sty @@ -131,8 +131,8 @@ %%%%%%%% Attributes for Japanese typesetting. \newluatexattribute\ltj@icflag % attribute for italic correction \newluatexattribute\ltj@curjfnt % index for ``current Japanese font'' -\newluatexattribute\ltj@origchar % -\newluatexattribute\ltj@charclass % +\newluatexattribute\ltj@origchar % +\newluatexattribute\ltj@charclass % \newluatexattribute\ltj@autospc % attribute for autospacing \newluatexattribute\ltj@autoxspc % attribute for autoxspacing \newluatexattribute\ltj@yablshift % attribute for \yabaselineshift @@ -174,10 +174,8 @@ %%%%%%%% Load all sub-packages. \ifltj@in@latex %<*LaTeX> - \RequirePackage{ltj-cctbreg}[2013/05/14] \RequirePackage{ltj-base} [2013/05/14] \else %<*!LaTeX> - \input ltj-cctbreg.sty % \input ltj-base.sty % \fi % @@ -206,7 +204,7 @@ \def\ltj@@ihb{\relax\directlua{luatexja.jfmglue.create_inhibitglue_node()}} %%%%%%%% \yoko, \tate, \ifydir, \iftdir -%% At this moment, tategaki mode is not implemented; +%% At this moment, tategaki mode is not implemented; %% there is only yokogaki mode now. \let\yoko\relax \let\tate\relax @@ -269,7 +267,7 @@ {\string#2 is not a control sequence that represents \MessageBreak a Japanese font}{}% \else - \directlua{luatexja.stack.set_stack_font(luatexja.isglobal, + \directlua{luatexja.stack.set_stack_font(luatexja.isglobal, luatexja.stack_table_index.#3, \ltj@safe@num@or{nil}{#1}, \the\ltj@curjfnt)}% \fi @@ -280,11 +278,11 @@ % yalbaselineshift = % yjabaselineshift = \define@key[ltj]{japaram}{yalbaselineshift}{% - \directlua{tex.setattribute(luatexja.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(luatexja.isglobal, + \directlua{tex.setattribute(luatexja.isglobal, luatexbase.attributes['ltj@ykblshift'], \ltj@safe@dimen@or\ltj@defdimen{#1})}}