diff options
author | Norbert Preining <norbert@preining.info> | 2020-08-09 03:02:03 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-08-09 03:02:03 +0000 |
commit | 68df63effba2e77fb0218b91a6722821355885cd (patch) | |
tree | b83f3e8c1ebfbfd59df87a4a6e89abb5a0442008 /macros/luatex/generic/luatexja/src/ltj-latex.sty | |
parent | 1c9455caf30309c8b8ba69afdc5a16a83d9f9a58 (diff) |
CTAN sync 202008090302
Diffstat (limited to 'macros/luatex/generic/luatexja/src/ltj-latex.sty')
-rw-r--r-- | macros/luatex/generic/luatexja/src/ltj-latex.sty | 77 |
1 files changed, 41 insertions, 36 deletions
diff --git a/macros/luatex/generic/luatexja/src/ltj-latex.sty b/macros/luatex/generic/luatexja/src/ltj-latex.sty index ca774fe8cd..55fd5d4ebd 100644 --- a/macros/luatex/generic/luatexja/src/ltj-latex.sty +++ b/macros/luatex/generic/luatexja/src/ltj-latex.sty @@ -12,7 +12,7 @@ \def\luatexjalatexLoaded{\endinput} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ltj-latex}[2020-05-17 LaTeX support of LuaTeX-ja] +\ProvidesPackage{ltj-latex}[2020-08-08 LaTeX support of LuaTeX-ja] % cleanup at end of the document %\let\ltj@@orig@end=\@@end @@ -27,45 +27,49 @@ \usepackage{lltjcore} %%% patching commands -\RequirePackage{filehook} - -\def\ltj@pkgpatch@im#1{% - \@ifnextchar[{\ltj@pkgpatch@im@{#1}}{\ltj@pkgpatch@im@{#1}[lltjp-#1]}}%] -\def\ltj@pkgpatch@im@#1[#2]{% - \AtEndOfPackageFile*{#1}{% - \@ifpackageloaded{#2}{}{% - \@namedef{ver@#2.\@pkgextension}{0000/00/00}%dummy - \if\catcode`@=11\let\ltj@temp\relax\else - \edef\ltj@temp{\noexpand\catcode`@=\the\catcode`@\relax}\makeatletter - \fi - \@@input{#2.\@pkgextension}\ltj@temp - }% +\newif\ifltj@ltfilehook@avail +\@ifl@t@r\fmtversion{2020-10-01}{% + \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltfilehook@availtrue\fi + \else\ltj@ltfilehook@availtrue\fi +}{} +\ifltj@ltfilehook@avail + \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}} + \def\@@ltj@ExecuteBeforePackage#1{\AddToHook{package/before/#1}} + \def\ltj@ExecuteAfterPackage{\@ifstar\@@ltj@ExecuteAfterPackage@star\@@ltj@ExecuteAfterPackage} + \def\@@ltj@ExecuteAfterPackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteAfterPackage{#1}{#2}}% + } + \def\ltj@ExecuteBeforePackage{\@ifstar\@@ltj@ExecuteBeforePackage@star\@@ltj@ExecuteBeforePackage} + \def\@@ltj@ExecuteBeforePackage@star#1#2{% + \@ifpackageloaded{#1}{#2}{\@@ltj@ExecuteBeforePackage{#1}{#2}}% + } +\else + \RequirePackage{filehook} + \let\ltj@ExecuteAfterPackage=\AtEndOfPackageFile + \let\ltj@ExecuteBeforePackage=\AtBeginOfPackageFile +\fi +\def\ltj@pkgpatch@im#1{\@ifnextchar[{\ltj@pkgpatch@im@{#1}}{\ltj@pkgpatch@im@{#1}[lltjp-#1]}}%] +\def\ltj@pkgpatch@im@#1[#2]{\ltj@ExecuteAfterPackage*{#1}{\ltj@pkgpatch@im@@{#2}}} +\def\ltj@pkgpatch@im@@#1{% + \@ifpackageloaded{#1}{}{% + \if\catcode`@=11\let\ltj@temp\relax\else + \edef\ltj@temp{\noexpand\catcode`@=\the\catcode`@\relax}\makeatletter + \fi + \@@input{#1.\@pkgextension}\ltj@temp }% } -\def\ltj@pkgpatch#1{% - \@ifnextchar[{\ltj@pkgpatch@@{#1}}{\ltj@pkgpatch@@{#1}[lltjp-#1]}}%] -\def\ltj@pkgpatch@@#1[#2]{% - \gpreto\@begindocumenthook{% - \@ifpackageloaded{#1}{% - \@ifpackageloaded{#2}{}{\RequirePackage{#2}}% - }{}% +\def\ltj@pkgpatch#1{\@ifnextchar[{\ltj@pkgpatch@{#1}}{\ltj@pkgpatch@{#1}[lltjp-#1]}}%] +\ifltj@ltfilehook@avail + \def\ltj@pkgpatch@@{\AddToHook{env/document/before}[luatexja.autopatch]} +\else + \def\ltj@pkgpatch@@{\gpreto\@begindocumenthook} +\fi +\def\ltj@pkgpatch@#1[#2]{% + \ltj@pkgpatch@@{% + \@ifpackageloaded{#1}{\@ifpackageloaded{#2}{}{\RequirePackage{#2}}}{}% }% } - -%%% default parameters -\directlua{ - local s = kpse.find_file('ltj-kinsoku.lua', 'tex') - luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {} -} - -\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt, - xkanjiskip=.25\zw plus 1pt minus 1pt, - autospacing, autoxspacing, jacharrange={-1}, - yalbaselineshift=\z@, yjabaselineshift=\z@, - jcharwidowpenalty=500, differentjfm=paverage -} - \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax %%% patch for packages @@ -83,7 +87,8 @@ \ltj@pkgpatch@im{unicode-math} \ltj@pkgpatch@im{siunitx} \ltj@pkgpatch@im{microtype} -\ltj@pkgpatch@im{everyshi} + +\ifltj@ltshipout@avail\else\ltj@pkgpatch@im{everyshi}\fi \RequirePackage{lltjp-geometry} |