lltjfont.sty: more fix

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 33a9946..082d1e3 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -227,10 +227,18 @@
                            \def\default@k@series{#3}%
                            \def\default@k@shape{#4}}%
   \fi}
-\let\wrong@kfontshape\wrong@fontshape
-\patchcmd\wrong@kfontshape{\default@shape}{\default@k@shape}{}{}
-\patchcmd\wrong@kfontshape{\default@series}{\default@k@series}{}{}
-\patchcmd\wrong@kfontshape{\default@family}{\default@k@family}{}{}
+\let\wrong@ja@fontshape\wrong@fontshape
+\let\wrong@al@fontshape\wrong@fontshape
+\patchcmd\wrong@ja@fontshape{\default@shape}{\default@k@shape}{}{}
+\patchcmd\wrong@ja@fontshape{\default@series}{\default@k@series}{}{}
+\patchcmd\wrong@ja@fontshape{\default@family}{\default@k@family}{}{}
+\def\wrong@fontshape{%
+  \directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}\ifin@%
+    \wrong@ja@fontshape
+  \else
+    \wrong@al@fontshape
+  \fi
+}
 \@onlypreamble\DeclareKanjiSubstitution
 \def\DeclareErrorKanjiFont#1#2#3#4#5{%
    \xdef\error@kfontshape{%
@@ -353,8 +361,6 @@
   \directlua{luatexja.base.start_time_measure('selectfont')}%
   \let\tmp@error@fontshape\error@fontshape
   \let\error@fontshape\error@kfontshape
-  \let\tmp@wrong@fontshape\wrong@fontshape
-  \let\wrong@fontshape\wrong@kfontshape
   \directlua{luatexja.jfont.is_kyenc('\luatexluaescapestring{\k@encoding}')}\ifin@%
     \let\cy@encoding\k@encoding
     \ensure@KanjiEncodingPair{t}%
@@ -375,7 +381,6 @@
   \kenc@update
   \global\let\font@name=\ltj@afont@name
   \let\error@fontshape\tmp@error@fontshape
-  \let\wrong@fontshape\tmp@wrong@fontshape
   \if@knjcmd \@knjcmdfalse
     \expandafter\ifx
     \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax

diff --git a/test/test31b-nfss_subst.tex b/test/test31b-nfss_subst.tex
new file mode 100644 (file)
index 0000000..7dcee64
--- /dev/null
+++ b/test/test31b-nfss_subst.tex
@@ -0,0 +1,17 @@
+\documentclass{ltjarticle}
+\usepackage[OT1]{fontenc}
+\DeclareSymbolFont{hogemath}{OT1}{hoge}{m}{n}
+\SetSymbolFont{hogemath}{bold}{OT1}{hoge}{bx}{n}
+\DeclareSymbolFont{piyomath}{JY3}{piyo}{m}{n}
+\SetSymbolFont{piyomath}{bold}{JY3}{piyo}{bx}{n}
+%
+\DeclareFontFamily{OT1}{guha}{}
+\DeclareFontShape{OT1}{guha}{m}{n}{<-> cmfi10}{}
+\DeclareFontShape{JY3}{gt}{l}{it}{<-> file:HaranoAjiMincho-Heavy.otf:jfm=ujis}{}
+\DeclareFontSubstitution{OT1}{guha}{m}{n}
+\DeclareKanjiSubstitution{JY3}{gt}{l}{it}
+%
+\begin{document}
+\romanfamily{fuga}\kanjifamily{fuga}\selectfont abcあいうえお
+\setbox0=\hbox{$\empty$}%
+\end{document}