X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-core.sty;h=d4487af2d7fa72b4b14bce6836fa2b5d9322d279;hb=0da2f34c349a80531610dff56a0e16b121d66b70;hp=853872ee939f4735c421c617fea21f71b0ca177a;hpb=60c3a83c4cedcb7ff90f956165c843a1474d6fd6;p=luatex-ja%2Fluatexja.git diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty index 853872e..d4487af 100644 --- a/src/luatexja-core.sty +++ b/src/luatexja-core.sty @@ -65,21 +65,18 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-core}[2012/04/20 v0.2] + \ProvidesPackage{luatexja-core}[2013/05/14 Core of LuaTeX-ja] \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{luaotfload} [2013/05/10] % v2.2 \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 + \RequirePackage{ltxcmds} [2011/11/09] % v1.22 + \RequirePackage{pdftexcmds} [2011/11/29] % v0.20 + \RequirePackage{xkeyval} [2012/10/14] % v2.6b \else %<*!LaTeX> \input luaotfload.sty \input infwarerr.sty @@ -97,10 +94,10 @@ \expandafter\endinput\fi\relax %% Check LuaTeX version. -\ifnum\luatexversion<65 +\ifnum\luatexversion<74 \@PackageError{luatexja-core} {This LuaTeX engine is too old for this package;\MessageBreak - at least v0.65 is needed} + at least beta-0.74.0 is needed} {Package loading is aborted now.\MessageBreak} \expandafter\endinput\fi\relax @@ -134,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 @@ -177,10 +174,8 @@ %%%%%%%% Load all sub-packages. \ifltj@in@latex %<*LaTeX> - \RequirePackage{ltj-cctbreg}[2012/04/21] - \RequirePackage{ltj-base}[2012/04/21] + \RequirePackage{ltj-base} [2013/05/14] \else %<*!LaTeX> - \input ltj-cctbreg.sty % \input ltj-base.sty % \fi % @@ -209,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 @@ -272,7 +267,8 @@ {\string#2 is not a control sequence that represents \MessageBreak a Japanese font}{}% \else - \directlua{luatexja.stack.set_stack_font(luatexja.isglobal, luatexja.stack_table_index.#3, + \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 @@ -282,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})}} @@ -442,7 +438,7 @@ %%------------------ Load module for the format \ifltj@in@latex %<*LaTeX> - \RequirePackage{ltj-latex}[2012/04/21] + \RequirePackage{ltj-latex}[2013/05/14] \else\ifltj@in@plain %<*plain> \input ltj-plain.sty % \fi\fi %