X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fpatches%2Flltjfont.sty;h=f2d78fb653a957cc78ec8fdc027822515b4dda17;hb=a978d06a452db8d773e039ed49dd2b57666e7f60;hp=8ad7e4586f34599b13bd0df451e3f40732c145ae;hpb=f1398298c252f6fed2b642c80ff726112d6c7785;p=luatex-ja%2Fluatexja.git

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 8ad7e45..f2d78fb 100644
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -3,8 +3,9 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2020/01/12 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2020/01/26 Patch to NFSS2 for LuaTeX-ja]
 
+%% patching \DeclareTextComposite
 \def\ltj@chardef@text@cmd#1{%
   \let\@ifdefinable\@@ifdefinable%
   \edef\ltj@chardef@text@cmd@name{\expandafter\@gobble\string#1}%
@@ -23,13 +24,11 @@
   \@dec@text@cmd\ltj@chardef@text@cmd#1{#2}#3\relax
 }
 
-\ifdefined\UnicodeEncodingName
-  \let\ltj@temp@DeclareTextComposite=\DeclareTextComposite
-  \def\DeclareTextComposite#1#2#3#4{}%
-  \input{tuenc.def}
-  \let\DeclareTextComposite=\ltj@temp@DeclareTextComposite
-  \expandafter\patchcmd\csname TU\string\textasteriskcentered\endcsname{\char}{\ltjalchar}{}{}
-\fi
+\let\ltj@temp@DeclareTextComposite=\DeclareTextComposite
+\def\DeclareTextComposite#1#2#3#4{}%
+\input{tuenc.def}
+\let\DeclareTextComposite=\ltj@temp@DeclareTextComposite
+\expandafter\patchcmd\csname TU\string\textasteriskcentered\endcsname{\char}{\ltjalchar}{}{}
 
 
 \let\k@encoding\@empty
@@ -569,7 +568,7 @@
   \fi\fi
 }
 
-\ifdefined\fontseriesforce
+\ifdefined\@rmfamilyhook
 %%%% LaTeX 2020-02-02
 \DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}}
 \DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}}
@@ -672,7 +671,7 @@
     \ignorespaces}
 \let\reset@font\normalfont
 
-\ifdefined\fontseriesforce
+\ifdefined\@rmfamilyhook
 %%%% LaTeX 2020-02-02
 \let\prepare@family@series@update@kanji=\prepare@family@series@update
 \patchcmd\prepare@family@series@update{\fontfamily}{\romanfamily}{}{}
@@ -683,7 +682,6 @@
     \maybe@load@fontshape\endgroup}{}{}
 \patchcmd\prepare@family@series@update@kanji{\@meta@family@list}{\@meta@family@kanji@list}{}{}
 \def\@meta@family@kanji@list{\@elt{mc}\@elt{gt}\@elt{jtt}}
-%%\appto\@meta@family@list{\@elt{mc}\@elt{gt}\@elt{jtt}}
 \DeclareRobustCommand\bfseries{%
   \not@math@alphabet\bfseries\mathbf
   \expand@font@defaults