diff options
author | Karl Berry <karl@freefriends.org> | 2023-04-09 19:45:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-04-09 19:45:14 +0000 |
commit | ff3b2a89ec36aa462e38987d09d6ef8ba25c0bbd (patch) | |
tree | b15c55e1530ac3b24a33092a04af88a5fc3095a2 /Master/texmf-dist/tex/luatex/luatexja/patches | |
parent | 556a719cebe24900f0c2bcec3c554e7c7a8ad3f9 (diff) |
luatexja (9apr23)
git-svn-id: svn://tug.org/texlive/trunk@66814 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/patches')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty | 16 |
2 files changed, 30 insertions, 2 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjcore.sty index af49aef7faf..fff34327c77 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-05-30 Patch to LaTeX2e Kernel for LuaTeX-ja] +\ProvidesPackage{lltjcore}[2023-02-26 Patch to LaTeX2e Kernel for LuaTeX-ja] \RequirePackage{etoolbox} %%% expl3 @@ -201,6 +201,20 @@ \patchcmd\@outputpage{\reset@font}{\@tombowreset@@paper\reset@font}{}{} \patchcmd\@outputpage{\@begindvi}{\@begindvi\@outputtombow}{}{} +% +\pretocmd\@floatboxreset{\pltx@save@float@dir}{}{} +\patchcmd\@endfloatbox{\outer@nobreak}{\outer@nobreak\pltx@check@float@dir}{}{} +\def\pltx@save@float@dir{% + \edef\pltx@float@dir@first{\ltjgetparameter{direction}}} +\def\pltx@check@float@dir{% + \ifx\pltx@float@dir@first\@undefined\else + \ifnum\ltjgetparameter{direction}=\pltx@float@dir@first\else + \pltx@err@float@dir + \fi + \fi} +\def\pltx@err@float@dir{% + \@latex@error{Direction change inside float!?\MessageBreak + Use \noexpand\layoutcaption provided in \string\usepackage{lltjext}}\@ehc} %%% Remove extra xkanjiskip \renewcommand\@makefnmark{% \unless\ifnum\ltjgetparameter{direction}=3 diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty index f1435f71525..f86dec1de6e 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{lltjfont}[2021-05-26 Patch to NFSS2 for LuaTeX-ja] +\ProvidesPackage{lltjfont}[2023-04-06 Patch to NFSS2 for LuaTeX-ja] %%%%%%%% LaTeX2e version detection \newcount\ltj@@latex@plv \ltj@@latex@plv=-1 @@ -1433,4 +1433,18 @@ \ltj@@getjfontnumber#1% \directlua{luatexja.jfont.pickup_alt_font_b(\the\ltj@tempcntc,'\luatexluaescapestring{#2}')}% } + +%%%% send \input@path data to lua +\def\ltj@@convert@input@path@to@lua{% + \ltj@@cipath@clear + \ifdefined\input@path + \expandafter\@tfor\expandafter\ltj@temp\expandafter:\expandafter=\input@path\do{\ltj@@cipath@add{\ltj@temp}}% + \fi +} +\newluafunction\ltj@@cipath@clear@inner +\directlua{ + (lua.get_functions_table())[\the\ltj@@cipath@clear@inner] = luatexja.input_path_clear +} +\protected\luadef\ltj@@cipath@clear\ltj@@cipath@clear@inner +\def\ltj@@cipath@add#1{\directlua{luatexja.input_path_add('\luatexluaescapestring{#1}')}} \endinput |