diff options
Diffstat (limited to 'macros/luatex/generic/luatexja/src')
4 files changed, 21 insertions, 11 deletions
diff --git a/macros/luatex/generic/luatexja/src/ltj-lotf_aux.lua b/macros/luatex/generic/luatexja/src/ltj-lotf_aux.lua index 04cae9d2f1..2efafc06ed 100644 --- a/macros/luatex/generic/luatexja/src/ltj-lotf_aux.lua +++ b/macros/luatex/generic/luatexja/src/ltj-lotf_aux.lua @@ -40,8 +40,7 @@ do local nulltable = {} local function get_cidinfo(id) -- table local t = getfont(id) - local a = t and (t.cidinfo or (t.resources and t.resources and t.resources.cidinfo)) or nulltable - return a + return (t and (t.resources and t.resources.cidinfo or t.cidinfo)) or nulltable end aux.get_cidinfo = get_cidinfo end diff --git a/macros/luatex/generic/luatexja/src/ltj-otf.lua b/macros/luatex/generic/luatexja/src/ltj-otf.lua index 48fe4bde2e..f0088944c2 100644 --- a/macros/luatex/generic/luatexja/src/ltj-otf.lua +++ b/macros/luatex/generic/luatexja/src/ltj-otf.lua @@ -78,7 +78,7 @@ local function get_ucs_from_rmlgbm(c) local tfmdata = font_getfont(curjfnt) if tfmdata and tfmdata.resources then local base, ivs = v % 0x200000, 0xE00FF + math.floor(v/0x200000) - curjfnt = tfmdata and tfmdata.variants + curjfnt = tfmdata.resources.variants curjfnt = curjfnt and curjfnt[ivs] return curjfnt and curjfnt[base] or base else return base @@ -144,7 +144,7 @@ do if key==0 then return append_jglyph(0) end local curjfnt = tex_get_attr((ltjd_get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt) - local cidinfo = ltju.get_cidinfo(cudjfnt) + local cidinfo = ltju.get_cidinfo(curjfnt) if type(cidinfo)~="table" or cidinfo.ordering ~= "Japan1" and cidinfo.ordering ~= "GB1" and @@ -205,7 +205,7 @@ ltjb.add_to_callback('pre_linebreak_filter', extract,'ltj.otf', local function ind_to_uni(fmtable, fn) if fn<0 then return end local cid = ltju.get_cidinfo(fn); - local t = ltjf_font_extra_info[fn].ind_to_uni + local t = ltjf_font_extra_info[fn]; t = t and t.ind_to_uni if t and cid.ordering == "Japan1" then for i, v in pairs(fmtable.chars) do local j = string.match(i, "^AJ1%-([0-9]*)") diff --git a/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty index 0af38a01af..0fbb7d1f39 100644 --- a/macros/luatex/generic/luatexja/src/luatexja.sty +++ b/macros/luatex/generic/luatexja/src/luatexja.sty @@ -41,7 +41,7 @@ \ProcessOptions\relax \fi %</LaTeX> %%%% VERSION -\def\LuaTeXjaversion{20200323.0} +\def\LuaTeXjaversion{20200326.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs diff --git a/macros/luatex/generic/luatexja/src/patches/lltjp-listings.sty b/macros/luatex/generic/luatexja/src/patches/lltjp-listings.sty index 13f75e302e..ee3c3aa14b 100644 --- a/macros/luatex/generic/luatexja/src/patches/lltjp-listings.sty +++ b/macros/luatex/generic/luatexja/src/patches/lltjp-listings.sty @@ -1,9 +1,9 @@ % -% lltjp-listings.sty 2018-09-17 +% lltjp-listings.sty 2020-03-23 % \NeedsTeXFormat{LaTeX2e} -\RequirePackage{listings,luatexbase-cctb} +\RequirePackage{etoolbox,listings,luatexbase-cctb} %%%%%%%%%%%%%%%% Japanese support %% whether letter-space in a fixed mode box is doubled or not @@ -26,8 +26,19 @@ % override \lst@FillFixed@ % \ltj@hst@hss is \ltj@lst@hss@ivs or \ltj@lst@hss@normal, % according to vsraw = true or not. +\def\lst@FillFixed#1{{\null#1\null}\lst@FillFixed@} \def\lst@FillFixed@#1{% - \ifx\@empty#1\else\ltj@lst@hss#1\expandafter\lst@FillFixed@\fi} + \ifx\@empty#1\else\ltj@lst@hss{\null#1\null}\expandafter\lst@FillFixed@\fi} +\let\lst@FillOutputBox\lst@FillFixed +% [space/full]flexiblemode (not much useful...) +\def\ltj@lst@FillFlex#1\@empty{\null#1\null} +\patchcmd\lst@column@flexible + {\let\lst@FillOutputBox\@empty}{\let\lst@FillOutputBox\ltj@lst@FillFlex}{}{} +\patchcmd\lst@column@fullflexible + {\let\lst@FillOutputBox\@empty}{\let\lst@FillOutputBox\ltj@lst@FillFlex}{}{} +\patchcmd\lst@column@spaceflexible + {\let\lst@FillOutputBox\@empty}{\let\lst@FillOutputBox\ltj@lst@FillFlex}{}{} + \directlua{ local cat_str = luatexbase.catcodetables['string'] @@ -97,7 +108,8 @@ \else \ltj@lst@setletterflag \fi - \lst@Append#1} + \lst@Append#1% +} % 半角カナ処理命令 \def\ltj@lst@ProcessJALetterHalf#1{% @@ -423,7 +435,6 @@ \fi} \endgroup - % \begin{修正事項}{1.3} from jlisting.sty % ちょっとした修正 \gdef\lst@breakProcessOther#1{\lst@ProcessOther#1} |