X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja-core.sty;h=3ea21ca76e45cadcf97ef9123e82f33e92f8ffa5;hb=0f0921ced2b53537326ad20ce546020b3cae2670;hp=317820ef2156b6b242a2cfc1104253a21a3435e3;hpb=cfd8a61b689e276b7eb8b7215e2d69d6f3602772;p=luatex-ja%2Fluatexja.git diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty index 317820e..3ea21ca 100644 --- a/src/luatexja-core.sty +++ b/src/luatexja-core.sty @@ -65,7 +65,7 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja-core}[2016/05/15 Core of LuaTeX-ja] + \ProvidesPackage{luatexja-core}[2017/05/05 Core of LuaTeX-ja] \fi % %% Load prerequisite packages. @@ -79,6 +79,8 @@ \RequirePackage{pdftexcmds} [2011/11/29] % v0.20 \RequirePackage{xkeyval} [2012/10/14] % v2.6b \RequirePackage{atbegshi} + \RequirePackage{etoolbox} + \AtBeginShipoutInit \IfFileExists{everyhook.sty}{\RequirePackage{everyhook}\ltj@everyhook@availtrue}{} \else %<*!LaTeX> \input luatexbase.sty @@ -189,7 +191,7 @@ %%%%%%%% Load all sub-packages. \ifltj@in@latex %<*LaTeX> - \RequirePackage{ltj-base} [2016/05/15] + \RequirePackage{ltj-base} \else %<*!LaTeX> \input ltj-base.sty % \fi % @@ -239,6 +241,7 @@ \newluafunction\ltj@restore@globaldefs@inner \newluafunction\ltj@@ihb@inner \newluafunction\ltj@@fakeparbegin@inner +\newluafunction\ltj@@fakeboxbdd@inner \directlua{ local t = lua.get_functions_table() t[\the\ltj@reset@globaldefs@inner] @@ -247,11 +250,13 @@ = function() tex.globaldefs = luatexja.global_temp end t[\the\ltj@@ihb@inner] = luatexja.jfmglue.create_inhibitglue_node t[\the\ltj@@fakeparbegin@inner] = luatexja.jfmglue.create_beginpar_node + t[\the\ltj@@fakeboxbdd@inner] = luatexja.jfmglue.create_boxbdd_node } \protected\def\ltj@reset@globaldefs{\luafunction\ltj@reset@globaldefs@inner} \protected\def\ltj@restore@globaldefs{\luafunction\ltj@restore@globaldefs@inner} \protected\def\inhibitglue{\ifhmode\relax\luafunction\ltj@@ihb@inner\fi} \protected\def\ltjfakeparbegin{\ifhmode\relax\luafunction\ltj@@fakeparbegin@inner\fi} +\protected\def\ltjfakeboxbdd{\ifhmode\relax\luafunction\ltj@@fakeboxbdd@inner\fi} %%%%%%%% \ltjdefcharrange{100-200,3000-,5000,...} @@ -711,7 +716,7 @@ %%------------------ Load module for the format \ifltj@in@latex %<*LaTeX> - \RequirePackage{ltj-latex}[2016/05/15] + \RequirePackage{ltj-latex} \else\ifltj@in@plain %<*plain> \input ltj-plain.sty % \fi\fi %