Fix the message in searching .fd

diff --git a/src/addons/luatexja-fontspec.sty b/src/addons/luatexja-fontspec.sty
index 39f4eba..9fa1ec4 100644 (file)
--- a/src/addons/luatexja-fontspec.sty
+++ b/src/addons/luatexja-fontspec.sty
@@ -187,9 +187,10 @@
     \ifin@\edef\k@family{#1}\else%
       \directlua{luatexja.jfont.is_Nffam(\tmp@enc, \tmp@item)}%
       \ifin@\@notffamtrue\else%
-        \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\f@encoding+%
-        \message{(I search kanjifont definition file: \@@temp)}%
-        \IfFileExists{\@@temp}{\@tempswztrue}{\@tempswzfalse}%
+        % filename of font definition file is always lowercase
+        \edef\@temp{\lowercase{\noexpand\IfFileExists{\f@encoding#1.fd}}}%
+        \message{(I search font definition file)}%
+        \@temp{\@tempswztrue}{\@tempswzfalse}%
         \if@tempswz
           \directlua{luatexja.jfont.add_ffam_list(\tmp@enc, \tmp@item)}%
          \edef\f@family{#1}%

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index a6e6625..5157a1e 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -429,9 +429,10 @@
      \ifin@\edef\k@family{#1}\else%
        \directlua{luatexja.jfont.is_Nkfam(\tmp@enc, \tmp@item)}%
        \ifin@\@notkfamtrue\else%
-         \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\k@encoding+%
-         \message{(I search kanjifont definition file: \@@temp)}%
-         \IfFileExists{\@@temp}{\@tempswztrue}{\@tempswzfalse}%
+         % filename of font definition file is always lowercase
+         \edef\@temp{\lowercase{\noexpand\IfFileExists{\k@encoding#1.fd}}}%
+         \message{(I search kanjifont definition file)}%
+         \@temp{\@tempswztrue}{\@tempswzfalse}%
          \if@tempswz
            \directlua{luatexja.jfont.add_kfam_list(\tmp@enc, \tmp@item)}%
           \edef\k@family{#1}%
@@ -450,9 +451,10 @@
      \ifin@\edef\f@family{#1}\else
        \directlua{luatexja.jfont.is_Nffam(\tmp@enc, \tmp@item)}%
        \ifin@\@notffamtrue\else
-         \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\f@encoding+%
-         \message{(I search font definition file: \@@temp)}%
-         \IfFileExists{\@@temp}{\@tempswztrue}{\@tempswzfalse}%
+         % filename of font definition file is always lowercase
+         \edef\@temp{\lowercase{\noexpand\IfFileExists{\f@encoding#1.fd}}}%
+         \message{(I search font definition file)}%
+         \@temp{\@tempswztrue}{\@tempswzfalse}%
          \if@tempswz
            \directlua{luatexja.jfont.add_ffam_list(\tmp@enc, \tmp@item)}%
           \edef\f@family{#1}%