date

[luatex-ja/luatexja.git] / src / patches / lltjdefs.sty

diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty
index 3efb011..03366c2 100644 (file)
--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -3,10 +3,10 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2020/02/27 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2020-09-30 Default font settings of LuaTeX-ja]
 
-\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi
-\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi
+\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{file:HaranoAjiMincho-Regular.otf}\fi
+\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{file:HaranoAjiGothic-Medium.otf}\fi
 \ifdefined\ltj@stdyokojfm\else\def\ltj@stdyokojfm{ujis}\fi
 \ifdefined\ltj@stdtatejfm\else\def\ltj@stdtatejfm{ujisv}\fi
 \InputIfFileExists{luatexja.cfg}{%
@@ -32,11 +32,10 @@
 \newcommand\kanjiencodingdefault{JY3}
 \newcommand\kanjifamilydefault{\mcdefault}
 \newcommand\kanjiseriesdefault{\mddefault}
-\ifdefined\@rmfamilyhook
+\ifnum 0\ifltj@ltfilehook@avail1\fi\ifdefined\@rmfamilyhook1\fi>0
   %% LaTeX 2020-02-02
   \newcommand\kanjishapedefault{\shapedefault}
-\else
-  %% LaTeX 2019-10-01
+\else                   %% LaTeX 2019-10-01
   \newcommand\kanjishapedefault{\updefault}
 \fi
 
@@ -76,15 +75,14 @@
 \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{}
 
 \unless\ifltj@disablejfam
-  \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n}
-  \jfam\symmincho
+  \DeclareSymbolFont{mincho}{JY3}{mc}{m}{n}\jfam\symmincho
   \SetSymbolFont{mincho}{bold}{JY3}{gt}{m}{n}
   \DeclareSymbolFontAlphabet{\mathmc}{mincho}
   \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}
@@ -98,17 +96,19 @@
 \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
-       \csappto{@#1hook}{#2}%
+  \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
-         \expandafter\patchcmd\csname #1 \endcsname{\selectfont}{#2\selectfont}{}{}%
-       \else
-         \PackageWarningNoLine{luatexja}{%
-               Patching to \expandafter\string\csname #1\endcsname\space failed%
-         }%
-       \fi
-  \fi
+    \ifcsname #1 \endcsname
+      \expandafter\patchcmd\csname #1 \endcsname{\selectfont}{#2\selectfont}{}{}%
+    \else
+      \PackageWarningNoLine{luatexja}{%
+        Patching to \expandafter\string\csname #1\endcsname\space failed%
+      }%
+    \fi
+  \fi\fi
 }
 \@ltj@hook@family{rmfamily}{%
   \if@ltj@match@family
@@ -125,11 +125,20 @@
     \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}{}{}
 \def\eminnershape{\mcfamily \upshape}
 
+\ltjsetparameter{autospacing, autoxspacing, differentjfm=paverage}
+
 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
 \ltjdefcharrange{3}{%