%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2019/03/20 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[2019/09/26 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e,luatexja}
\ExplSyntaxOn
\ifx\csname \f@encoding+\f@family\endcsname\relax
\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
\ifin@\else % Alphabetic font
- \@font@info{Try loading font information for \f@encoding+\f@family}%
+ \@font@info{Trying loading font information for \f@encoding+\f@family}%
\global\expandafter\let
\csname\f@encoding+\f@family\endcsname\@empty
\nfss@catcodes
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-otf}[2017/05/20]
+ \ProvidesPackage{luatexja-otf}[2019/09/26]
\fi %</LaTeX>
% Load core module if not yet.
\fi
\let\ltj@@next=\@bou
\fi\ltj@@next}
- \long\def\mbox#1{\leavevmode\hbox{#1}}
+ \protected\long\def\mbox#1{\leavevmode\hbox{#1}}
\fi %</LaTeX>
% macros from otf.sty
% LaTeX only!
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-ruby}[2017/05/05 v0.23]
+\ProvidesPackage{luatexja-ruby}[2017/09/26 v0.23a]
\RequirePackage{luatexja}
%%------------------
--
--- luatexja/ltj-base.lua
+-- ltj-base.lua
--
local ltb = luatexbase
local tostring = tostring
--
--- luatexja/charrange.lua
+-- ltj-charrange.lua
--
luatexbase.provides_module({
name = 'luatexja.charrange',
- date = '2019/08/28',
+ date = '2019/09/26',
description = 'Handling the range of Japanese characters',
})
luatexja.charrange = {}
--
--- luatexja/ltj-compat.lua
+-- ltj-compat.lua
--
luatexja.load_module('base'); local ltjb = luatexja.base
--
--- luatexja/debug.lua
+-- ltj-debug.lua
--
local ltjdbg = {}
luatexja.debug = ltjdbg
--
--- luatexja/ltj-inputbuf.lua
+-- ltj-inputbuf.lua
--
luatexja.load_module('base'); local ltjb = luatexja.base
--
--- luatexja/ltj-jfmglue.lua
+-- ltj-jfmglue.lua
--
luatexbase.provides_module({
name = 'luatexja.jfmglue',
- date = '2019/07/26',
+ date = '2019/09/26',
description = 'Insertion process of JFM glues, [x]kanjiskip and others',
})
luatexja.jfmglue = luatexja.jfmglue or {}
--
--- luatexja/jfont.lua
+-- ltj-jfont.lua
--
luatexbase.provides_module({
name = 'luatexja.jfont',
- date = '2019/08/27',
+ date = '2019/09/26',
description = 'Loader for Japanese fonts',
})
\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2018/08/24 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2019/09/26 LaTeX support of LuaTeX-ja]
% cleanup at end of the document
%\let\ltj@@orig@end=\@@end
--
--- luatexja/ltj-math.lua
+-- ltj-math.lua
--
luatexja.load_module('base'); local ltjb = luatexja.base
--
--- luatexja/ltj-otf.lua
+-- ltj-otf.lua
--
require('unicode')
require('lualibs')
\ifltj@in@latex %<*LaTeX>
\NeedsTeXFormat{LaTeX2e}
\PackageWarning{ltj-plain}{Don't load this package directly; load luatexja.sty instead.}
- \ProvidesPackage{ltj-plain}[2019/08/27]
+ \ProvidesPackage{ltj-plain}[]
\fi %</LaTeX>
%%------------------
--
--- luatexja/ltj-pretreat.lua
+-- ltj-pretreat.lua
--
luatexja.load_module('base'); local ltjb = luatexja.base
--
--- luatexja/ltj-rmlgbm.lua
+-- ltj-rmlgbm.lua
--
luatexja.load_module('base'); local ltjb = luatexja.base
--
--- src/ltj-setwidth.lua
+-- ltj-setwidth.lua
--
luatexja.load_module('base'); local ltjb = luatexja.base
--
--- luatexja/stack.lua
+-- ltj-stack.lua
--
luatexbase.provides_module({
name = 'luatexja.stack',
- date = '2018/02/18',
+ date = '2019/09/26',
description = 'LuaTeX-ja stack system',
})
luatexja.stack = {}
local sid_user = node.subtype('user_defined')
local STCK = luatexja.userid_table.STCK
local fastcopy = table.fastcopy
-local setcount = tex.setcount
+local setcount, getcount = tex.setcount, tex.getcount
local scan_int, scan_keyword = token.scan_int, token.scan_keyword
ltjs.hmode = 0 -- dummy
ltjs.charprop_stack_table = charprop_stack_table
charprop_stack_table[0]={}
-
local function get_stack_level()
- local i = tex.getcount('ltj@@stack')
+ local i = getcount('ltj@@stack')
local j = tex.currentgrouplevel
- if j > tex.getcount('ltj@@group@level') then
+ if j > getcount('ltj@@group@level') then
i = i+1 -- new stack level
local gd = tex.globaldefs
if gd~=0 then tex.globaldefs = 0 end
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja}[2019/04/08 Japanese Typesetting with Lua(La)TeX]
+ \ProvidesPackage{luatexja}[2019/09/26 Japanese Typesetting with Lua(La)TeX]
\DeclareOption{disablejfam}{\ltj@disablejfamtrue}
\DeclareOption*{}
\ProcessOptions\relax
\fi %</LaTeX>
%%%% VERSION
-\def\LuaTeXjaversion{20190827.0}
+\def\LuaTeXjaversion{20190926.0}
\directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2018/06/15 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2019/09/26 Patch to LaTeX2e Kernel for LuaTeX-ja]
\RequirePackage{etoolbox}
\def\cleardoublepage{\clearpage\if@twoside
\csname bm@#3\endcsname}%
\if@pboxsw \m@th$\null\fi% !!!
\@end@tempboxa}
-\def\underline#1{%
+\DeclareRobustCommand\underline[1]{%
\relax
\ifmmode\@@underline{#1}%
\else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi}
%%% AtBeginDvi
-\def \AtBeginDvi #1{%
+\DeclareRobustCommand \AtBeginDvi [1]{%
\global \setbox \@begindvibox
\vbox{\yoko\unvbox \@begindvibox #1}%
}
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2019/08/27 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2019/09/26 Default font settings of LuaTeX-ja]
\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi
\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi
\else\tstrutbox % tate and utod
\fi\fi
}
-\def\strut{\relax
+\DeclareRobustCommand\strut{\relax
\ifnum\ltjgetparameter{direction}=1 % dtou
\ifmmode\copy\dstrutbox\else\unhcopy\dstrutbox\fi
\else\ifnum\ltjgetparameter{direction}=4 % yoko
\fi\fi
}
-\def\ystrut{\relax\hbox{\ltj@@orig@yoko
+\DeclareRobustCommand\ystrut{\relax\hbox{\ltj@@orig@yoko
\ifmmode\copy\ystrutbox\else\unhcopy\ystrutbox\fi}}
-\def\tstrut{\relax\hbox{\ltj@@orig@tate
+\DeclareRobustCommand\tstrut{\relax\hbox{\ltj@@orig@tate
\ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi}}
-\def\dstrut{\relax\hbox{\ltj@@orig@dtou
+\DeclareRobustCommand\dstrut{\relax\hbox{\ltj@@orig@dtou
\ifmmode\copy\dstrutbox\else\unhcopy\dstrutbox\fi}}
-\def\zstrut{\relax\hbox{\ltj@@orig@utod
+\DeclareRobustCommand\zstrut{\relax\hbox{\ltj@@orig@utod
\ifmmode\copy\zstrutbox\else\unhcopy\zstrutbox\fi}}
{%
\DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}}
\DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}}
\DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}}
-\def\usekanji#1#2#3#4{%
+\DeclareRobustCommand\usekanji[4]{%
\kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}%
\selectfont\ignorespaces}
-\def\useroman#1#2#3#4{%
+\DeclareRobustCommand\useroman[4]{%
\romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}%
\selectfont\ignorespaces}
\protected\def\usefont#1#2#3#4{%
%%%%%% Alternate Japanese Fonts
%%%% \DeclareAlternateKanjiFont<Benc><Bfam><Bser><Bshape><Aenc><Afam><Aser><Ashape><range>
% いつも global
-\def\DeclareAlternateKanjiFont#1#2#3#4#5#6#7#8#9{%
+\DeclareRobustComman\DeclareAlternateKanjiFont[9]{%
\edef\@temp{#9}%
\ifx\@temp\@empty\else
{\def\ltj@temp@bfont{#1/#2/#3/#4}\def\ltj@temp@afont{#5/#6/#7/#8}%