diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
11 files changed, 34 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty index b0ce39bf5d8..3da21dd1556 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty @@ -110,7 +110,6 @@ gt-m .code:n = % gtfamily , medium series \prop_put:Nnn \g__ltjpreset_font_prop { gt-u } {#1} \prop_put:Nnn \g__ltjpreset_font_prop { gt-d } {#1}, - % gt-d, gt-u は隠し gt .groups:n = { preset }, gt .value_required:n = true, gt-m .groups:n = { preset }, gt-m .value_required:n = true, } diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua index a4073936f07..0e8e39f0717 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-setwidth.lua @@ -128,8 +128,7 @@ local function capsule_glyph_yoko(p, met, char_data, head, dir) end end - local q - head, q = node_remove(head, p) + local q; head, q = node_remove(head, p) if pwidth > fwidth then if char_data.round_threshold then local frac = pwidth / fwidth diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls index 1f19c60dd31..ea6dc8c455c 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls @@ -1401,7 +1401,7 @@ class has defined the old font commands like\MessageBreak \advance\leftskip 3\zw \parindent 1\zw \noindent - \llap{\@makefnmark\hskip0.3\zw}#1} + \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1} \let\@inhibitglue=\ltjfakeparbegin \def\@item[#1]{% \if@noparitem diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index bbe4025df3b..43bedbc8787 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls @@ -1494,7 +1494,7 @@ class has defined the old font commands like\MessageBreak \advance\leftskip 3\zw \parindent 1\zw \noindent - \llap{\@makefnmark\hskip0.3\zw}#1} + \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1} \let\@inhibitglue=\ltjfakeparbegin \def\@item[#1]{% \if@noparitem diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls index 09d94301be4..be94fcc2879 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls @@ -1365,7 +1365,7 @@ class has defined the old font commands like\MessageBreak \advance\leftskip 3\zw \parindent 1\zw \noindent - \llap{\@makefnmark\hskip0.3\zw}#1} + \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1} \let\@inhibitglue=\ltjfakeparbegin \def\@item[#1]{% \if@noparitem diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls index eb4b41e0a5a..f4f11d0de0e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls @@ -1259,7 +1259,7 @@ class has defined the old font commands like\MessageBreak \advance\leftskip 3\zw \parindent 1\zw \noindent - \llap{\@makefnmark\hskip0.3\zw}#1} + \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1} \let\@inhibitglue=\ltjfakeparbegin \def\@item[#1]{% \if@noparitem diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls index 47e65c6ec90..6f5a71a175a 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsreport.cls @@ -1487,7 +1487,7 @@ class has defined the old font commands like\MessageBreak \advance\leftskip 3\zw \parindent 1\zw \noindent - \llap{\@makefnmark\hskip0.3\zw}#1} + \hb@xt@\z@{\hss\@makefnmark\hskip0.3\zw}#1} \let\@inhibitglue=\ltjfakeparbegin \def\@item[#1]{% \if@noparitem diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua index f375d727dfb..f7957a116de 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua @@ -323,13 +323,14 @@ do local to_node = node.direct.tonode local to_direct = node.direct.todirect local ensure_tex_attr = ltjb.ensure_tex_attr - + local slide = node.slide -- mode = true iff main_process is called from pre_linebreak_filter local function main_process(head, mode, dir, gc) ensure_tex_attr(attr_icflag, 0) if gc == 'fin_row' then return head else start_time_measure('jfmglue') + slide(head); local p = ltjj.main(to_direct(head),mode, dir) stop_time_measure('jfmglue') return to_node(p) diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty index adc6f2276ed..eae7d5040b8 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty @@ -27,7 +27,7 @@ \newif\ifltj@disablejfam %%%% VERSION -\def\LuaTeXjaversion{20220411.0} +\def\LuaTeXjaversion{20220530.0} %% Check if LaTeX is used. \begingroup\expandafter\expandafter\expandafter\endgroup diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index 086771a200b..af49aef7faf 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjcore}[2022-01-17 Patch to LaTeX2e Kernel for LuaTeX-ja] +\ProvidesPackage{lltjcore}[2022-05-30 Patch to LaTeX2e Kernel for LuaTeX-ja] \RequirePackage{etoolbox} %%% expl3 @@ -235,11 +235,16 @@ \hskip\@tempskipa\color@endgroup\egroup} \pretocmd{\footnote}{\inhibitglue}{}{} \pretocmd{\footnotemark}{\inhibitglue}{}{} -\patchcmd{\@footnotemark}{\@makefnmark}{% - \unless\ifnum\ltjgetparameter{direction}=3 \@makefnmark% - \else\hbox to\z@{\hskip-.25\zw\raise.9\zh\@makefnmark\hss}\fi% -}{}{} -\let\@parboxto\@empty +\def\@ltj@process@makefnmark#1{% + \unless\ifnum\ltjgetparameter{direction}=3 #1% + \else\hbox to\z@{\hskip-.25\zw\raise.9\zh#1\hss}\fi% +}% +\ifdefined\@kernel@process@makefnmark %% 2022-06-01 latex-lab? + \let\ltj@orig@kernel@process@makefnmark=\@kernel@process@makefnmark + \def\@kernel@process@makefnmark#1{\ltj@orig@kernel@process@makefnmark{\@ltj@process@makefnmark#1}} +\else + \patchcmd{\@footnotemark}{\@makefnmark}{\@ltj@process@makefnmark\@makefnmark}{}{} +\fi \long\def\@iiiparbox#1#2[#3]#4#5{% \leavevmode \@pboxswfalse diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty index 173b1ed94bb..c0377159535 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-listings.sty @@ -1,10 +1,11 @@ % -% lltjp-listings.sty 2020-03-23 +% lltjp-listings.sty 2022-05-22 % \NeedsTeXFormat{LaTeX2e} \RequirePackage{etoolbox,listings,luatexbase-cctb} +\newcount\ltj@lst@japanese@min \ltj@lst@japanese@min=128 %%%%%%%%%%%%%%%% Japanese support %% whether letter-space in a fixed mode box is doubled or not \newif\if@ltj@lst@double @@ -197,9 +198,6 @@ \lsthk@PreSet\lstset{flexiblecolumns,#1}% \lsthk@TextStyle \@ifnextchar\bgroup \ltj@lst@InlineG \ltj@lstinline@} -\def\ltj@lstinline@#1{% - \edef\ltj@lst@temp{\the\catcode`#1}\lst@Init\relax\catcode`#1\ltj@lst@temp - \lst@InlineJ#1} \def\ltj@lst@InlineG{% \lst@Init\relax\edef\ltj@lst@temp{\the\catcode`\}}\catcode`\}=2 \catcode`\ =12\relax \let\lst@arg\@empty\afterassignment\ltj@lst@InlineG@@\@temptokena} @@ -207,9 +205,16 @@ \catcode`\}=\ltj@lst@temp% \expandafter\expandafter\expandafter\lst@InsideConvert% \expandafter{\the\@temptokena}\lst@arg\lst@DeInit\egroup} - -%%%%%%%%%%%%%%%% \lstMakeShortInline -\patchcmd\lstMakeShortInline@{\lst@shortinlinedef#1}{\lst@shortinlinedef~}{}{} +\def\ltj@lstinline@#1{% + \edef\ltj@lst@temp{\the\catcode`#1} + \lst@Init\relax\catcode`#1\ltj@lst@temp + \ifnum\ltj@lst@temp=\active + \begingroup\lccode`\~=`#1\relax + \lowercase{\xdef\lst@next{\noexpand\lst@InlineJ\noexpand~}}\endgroup% + \else + \edef\lst@next{\noexpand\lst@InlineJ\scantextokens{#1}}% + \fi\lst@next +} % We redefine \lst@BeginDropInput, since now we have % two additional `process macros'. @@ -239,7 +244,7 @@ for i = 1, utf.len(buf) do local c = utf.sub(buf, i, i) local cu = utf.byte(c) - if cu >= 0x80 and tex.getcatcode(cu) \string~= 13 then + if cu >= \the\ltj@lst@japanese@min\space and tex.getcatcode(cu) \string~= 13 then ret = ret .. utfchar(getcount('ltjlineendcomment')) end ret = ret .. c @@ -283,7 +288,7 @@ \gdef\ltj@lst@MakeActive@#1{\let\lst@next\relax% \ifx#1\relax \else\let\lst@next\ltj@lst@MakeActive@ - \ifnum`#1>127 + \ifnum`#1>\numexpr\ltj@lst@japanese@min-1 \lccode`\^^A=`#1 \lowercase{\lst@lAddTo\lst@temp{$^^A}}%$ \else |