update LaTeX patch level detection and \usekanji, \useroman

diff --git a/src/ltj-latex.sty b/src/ltj-latex.sty
index 506adea..213f2f7 100644 (file)
--- a/src/ltj-latex.sty
+++ b/src/ltj-latex.sty
@@ -12,7 +12,7 @@
 \def\luatexjalatexLoaded{\endinput}
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ltj-latex}[2020-10-09 LaTeX support of LuaTeX-ja]
+\ProvidesPackage{ltj-latex}[2020-12-29 LaTeX support of LuaTeX-ja]
 
 % cleanup at end of the document
 %\let\ltj@@orig@end=\@@end
@@ -27,8 +27,12 @@
 \fi
 \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
+  \@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
+    }%
 }{}
 
 %%% patch for LaTeX

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index bad7e6c..287a396 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2020-10-05 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2020-12-29 Patch to NFSS2 for LuaTeX-ja]
 
 %% patching \DeclareTextComposite
 \def\ltj@chardef@text@cmd#1{%
@@ -634,7 +634,8 @@
 
 \newcount\ltj@@latex@plv \ltj@@latex@plv=-1
 \ifltj@ltfilehook@avail % 2020-10-01
-  \ltj@@latex@plv=1000
+  \@ifl@t@r\fmtversion{2020-10-02}{\ltj@@latex@plv=1300}%
+    {\ifnum\patch@level>2 \ltj@@latex@plv=1300\else \ltj@@latex@plv=1000\fi}
 \else\ifdefined\@rmfamilyhook % 2020-02-02
   \ifx\@forced@seriestrue\@undefined % 2020-02-02 pl0--2
     \@latex@error
@@ -768,12 +769,25 @@
 \DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}}
 \DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}}
 \DeclareRobustCommand\fontshapeforce[1]{\set@safe@kanji@shape{#1}{}\romanshapeforce{#1}}
+\ifnum\ltj@@latex@plv>1000
+%%%% LaTeX >= 2020-10-01 PL3
+\DeclareRobustCommand\usekanji[4]{%
+    \kanjiencoding{#1}\edef\k@family{#2}%
+    \set@target@series@kanji{#3}\edef\k@shape{#4}%
+    \selectfont\ignorespaces}
+\DeclareRobustCommand\useroman[4]{%
+    \romanencoding{#1}\edef\f@family{#2}%
+    \set@target@series{#3}\edef\f@shape{#4}%
+    \selectfont\ignorespaces}
+\else
+%%%% 2020-10-01 <= LaTeX < 2020-10-01 PL3
 \DeclareRobustCommand\usekanji[4]{%
     \kanjiencoding{#1}\edef\k@family{#2}\edef\k@series{#3}\edef\k@shape{#4}%
     \selectfont\ignorespaces}
 \DeclareRobustCommand\useroman[4]{%
     \romanencoding{#1}\edef\f@family{#2}\edef\f@series{#3}\edef\f@shape{#4}%
     \selectfont\ignorespaces}
+\fi
 %%%% LaTeX >= 2020-02-02 END
 \else
 %%%% LaTeX 2019-10-01

diff --git a/src/patches/lltjp-geometry.sty b/src/patches/lltjp-geometry.sty
index 161029b..0be092e 100644 (file)
--- a/src/patches/lltjp-geometry.sty
+++ b/src/patches/lltjp-geometry.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-geometry}[2020-09-18 Patch to geometry for LuaTeX-ja with vertical writing mode]
+\ProvidesPackage{lltjp-geometry}[2020-12-29 Patch to geometry for LuaTeX-ja with vertical writing mode]
 \RequirePackage{expl3}
 \ifdefined\if@ltj@@geometry@tate\expandafter\endinput\fi
 \newif\if@ltj@@geometry@tate
@@ -33,8 +33,11 @@
 \unless\ifdefined\ltj@ExecuteAfterPackage
 \expandafter\newif\csname ifltj@ltfilehook@avail\endcsname
 \@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
+  \@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
+    }%
 }{}
 \ifltj@ltfilehook@avail
   \def\@@ltj@ExecuteAfterPackage#1{\AddToHook{package/after/#1}}