\def\luatexjalatexLoaded{\endinput}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2019/09/26 LaTeX support of LuaTeX-ja]
-
-% cleanup at end of the document
-%\let\ltj@@orig@end=\@@end
-%\protected\def\@@end{%
-% \directlua{luatexja.ext_cleanup()}\ltj@@orig@end}
+\ProvidesPackage{ltj-latex}[2021-05-17 LaTeX support of LuaTeX-ja]
\endlinechar=13
+%%% LaTeX version detection
+\newif\ifltj@ltfilehook@avail
+\@ifl@t@r\fmtversion{2020-10-01}{%
+ \@ifl@t@r\fmtversion{2020-10-02}%
+ {\ltj@ltfilehook@availtrue}
+ {%
+ \ifnum\patch@level<0\relax \ifnum\patch@level<-6 \ltj@ltfilehook@availtrue\fi
+ \else\ltj@ltfilehook@availtrue\fi
+ }%
+}{}
+\@ifl@t@r\fmtversion{2021-05-01}{\count@=1 }{\count@=0 }
+\ifnum \count@<1
+%%%% \shipout
+ \newluafunction\ltj@@lua@shipout@inner
+ \directlua{
+ local t = lua.get_functions_table()
+ local getbox, setbox = tex.getbox, tex.setbox
+ local shipout_lthook = luatexja.direction.shipout_lthook
+ t[\the\ltj@@lua@shipout@inner]=function ()
+ local a = shipout_lthook(getbox(\the\ltj@afbox))
+ if a then setbox(\the\ltj@afbox, a) end
+ end
+ }
+ \protected\luadef\ltj@@lua@shipout\ltj@@lua@shipout@inner
+ \def\ltj@shipout@{\ltj@@lua@shipout\primitive\shipout\box\ltj@afbox}%
+ \protected\def\ltj@shipout{\ltj@afterbox\ltj@shipout@}
+ \ifprimitive\shipout\let\shipout\ltj@shipout\fi
+ \ifcsname tex_shipout:D\endcsname
+ \expandafter\let\csname tex_shipout:D\endcsname\ltj@shipout
+ \fi
+\else
+ \directlua{%
+ luatexbase.add_to_callback('pre_shipout_filter',luatexja.direction.shipout_lthook, 'ltj.direction', 1)
+ }
+\fi
+
%%% patch for LaTeX
\usepackage{lltjfont}
\usepackage{lltjdefs}
\usepackage{lltjcore}
+\RequirePackage{lltjp-atbegshi}
%%% 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
- }%
+\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{begindocument/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
\ltj@pkgpatch{tascmac}
\ltj@pkgpatch{ascmac}[lltjp-tascmac]
\ltj@pkgpatch@im{stfloats}
-\ltj@pkgpatch{preview} %% at \begin{document}
+\ifltj@ltfilehook@avail\else
+ \ltj@pkgpatch{preview} %% at \begin{document}
% (preview package has delayed option)
+\fi
\ltj@pkgpatch{array} %% at \begin{document}
+\ltj@pkgpatch{collcell} %% at \begin{document}
\ltj@pkgpatch@im{unicode-math}
\ltj@pkgpatch@im{siunitx}
\ltj@pkgpatch@im{microtype}
+\ifltj@ltfilehook@avail\else\ltj@pkgpatch@im{everyshi}\fi
+
\RequirePackage{lltjp-geometry}
+\def\ltj@@q@stop{\ltj@@q@stop}
+\ifdefined\ltj@stop@overwrite@primitive
+ \begingroup
+ \def\ltj@loop#1{%
+ \unless\ifx#1\ltj@@q@stop
+ \escapechar-1
+ \ifcsname ltj@@orig@\string#1\endcsname
+ \ifcsname ltj@@\string#1\endcsname
+ \edef\ltj@@next{\unexpanded{\global\let#1}\csname ltj@@orig@\string#1\endcsname}%
+ \edef\ltj@@temp{ltj@@orig@\string#1}%
+ \escapechar92
+ \PackageInfo{luatexja}{%
+ Restoring \string#1\space into its orignal meaning\MessageBreak
+ (\expandafter\meaning\csname\ltj@@temp\endcsname)}%
+ \ltj@@next%
+ \fi
+ \fi
+ \let\ltj@@next\ltj@loop
+ \else\let\ltj@@next\relax\fi\ltj@@next
+ }%
+ \expandafter\ltj@loop\ltj@stop@overwrite@primitive\ltj@@q@stop
+ \endgroup
+\fi
+\def\ltj@overwrite@primitive#1{%
+ \begingroup
+ \def\ltj@loop##1{%
+ \unless\ifx##1\ltj@@q@stop
+ \escapechar-1
+ \edef\ltj@@next{\unexpanded{\let\ltj@@temp}\csname ltj@@\string##1\endcsname}\ltj@@next
+ \ifx\ltj@@temp\relax
+ \else\ifx\ltj@@temp##1
+ \escapechar92
+ \PackageInfo{luatexja}{No need to redefine \string##1}%
+ \else
+ \edef\ltj@@next{\unexpanded{\global\let##1}\csname ltj@@\string##1\endcsname}%
+ \escapechar92\PackageInfo{luatexja}{Redefining \string##1}\ltj@@next%
+ \fi\fi
+ \let\ltj@@next\ltj@loop
+ \else\let\ltj@@next\relax\fi\ltj@@next
+ }%
+ \ltj@loop#1\ltj@@q@stop
+ \endgroup
+}
+
%%------------------ all done
\ltj@latex@AtEnd
\endinput
OSDN Git Service
