summaryrefslogtreecommitdiff
path: root/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty
diff options
context:
space:
mode:
Diffstat (limited to 'macros/luatex/generic/luatexja/src/patches/lltjdefs.sty')
-rw-r--r--macros/luatex/generic/luatexja/src/patches/lltjdefs.sty22
1 files changed, 16 insertions, 6 deletions
diff --git a/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty b/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty
index 76a3147036..03366c258f 100644
--- a/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty
+++ b/macros/luatex/generic/luatexja/src/patches/lltjdefs.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2020-08-08 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2020-09-30 Default font settings of LuaTeX-ja]
\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{file:HaranoAjiMincho-Regular.otf}\fi
\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{file:HaranoAjiGothic-Medium.otf}\fi
@@ -32,7 +32,8 @@
\newcommand\kanjiencodingdefault{JY3}
\newcommand\kanjifamilydefault{\mcdefault}
\newcommand\kanjiseriesdefault{\mddefault}
-\ifdefined\@rmfamilyhook%% LaTeX 2020-02-02
+\ifnum 0\ifltj@ltfilehook@avail1\fi\ifdefined\@rmfamilyhook1\fi>0
+ %% LaTeX 2020-02-02
\newcommand\kanjishapedefault{\shapedefault}
\else %% LaTeX 2019-10-01
\newcommand\kanjishapedefault{\updefault}
@@ -80,8 +81,8 @@
\DeclareMathAlphabet{\mathgt}{JY3}{gt}{m}{n}
\fi
-\ifdefined\@rmfamilyhook
-%%%% LaTeX 2020-02-02
+\ifnum 0\ifltj@ltfilehook@avail1\fi\ifdefined\@rmfamilyhook1\fi>0
+%%%% LaTeX >= 2020-02-02
\edef\bfseries@mc{\bfdefault}
\edef\bfseries@gt{\bfdefault}
\def\bfseries@jtt{\bfseries@mc}
@@ -95,7 +96,9 @@
\def\verbatim@font{\normalfont\ttfamily\kanjifamily\jttdefault\selectfont}
\def\@ltj@hook@family#1#2{ % #1: csname #2: contents
- \ifcsname @#1hook\endcsname % LaTeX 2020-02-02
+ \ifltj@ltfilehook@avail % LaTeX 2020-10-01
+ \AddToHook{#1}{#2}%
+ \else\ifcsname @#1hook\endcsname % LaTeX 2020-02-02
\csappto{@#1hook}{#2}%
\else % LaTeX 2019-10-01
\ifcsname #1 \endcsname
@@ -105,7 +108,7 @@
Patching to \expandafter\string\csname #1\endcsname\space failed%
}%
\fi
- \fi
+ \fi\fi
}
\@ltj@hook@family{rmfamily}{%
\if@ltj@match@family
@@ -122,6 +125,13 @@
\prepare@family@series@update@kanji{jtt}\jttdefault
\fi
}
+\let\@ltj@hook@family\@undefined
+
+\ifltj@ltfilehook@avail % 2020-10-01
+ \expandafter\def\expandafter\kanjiseriesdefault
+ \expandafter{\kanjiseriesdefault\@empty}
+ \let\kanjiseriesdefault@kernel\kanjiseriesdefault
+\fi
%%% \eminnershape
\expandafter\patchcmd\csname em \endcsname{\itshape}{\gtfamily\itshape}{}{}