bugfix

diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index c7a8530..313d56f 100644 (file)
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -1603,7 +1603,7 @@ One can use the \texttt{custom} option, such as
   % gt-m=SourceHanSans-Regular,   % gothic medium (with deluxe option)
   % gt-bx=HiraKakuProN-W6,ular,   % gothic bold
   % gt-eb=HiraKakuProN-W6,ular,   % gothic extra bold
-    mg-m=HG Maru Gothic PRO,      % rounded gothic
+    mg-m=HGMaruGothicMPRO,        % rounded gothic
   },
   deluxe,expert,jis2004,match,nfssonly
 ]{luatexja-preset}
@@ -7683,7 +7683,7 @@ only if \texttt{jis2004} or \texttt{nodeluxe} option is spefified.
 \textit{gothic}&bold&HG Gothic E&HG Gothic E&HG Gothic E\\\cmidrule{2-5}
 &extra bold&HG Soei Kaku Gothic UB&HG Soei Kaku Gothic UB&HG Soei Kaku Gothic UB\\\midrule
 \textit{rounded gothic}&&
-HG Maru Gothic PRO&HG Maru Gothic PRO&HG Maru Gothic PRO\\
+HG MaruGothic M PRO&HG MaruGothic M PRO&HG MaruGothic M PRO\\
 %</en>
 %<*ja>
 &medium&IPA明朝&IPAex明朝&MS明朝\\
@@ -7695,7 +7695,7 @@ HG Maru Gothic PRO&HG Maru Gothic PRO&HG Maru Gothic PRO\\
 \textgt{ゴシック体}&bold&HGゴシックE&HGゴシックE&HGゴシックE\\\cmidrule{2-5}
 &extra bold&HG創英角ゴシックUB&HG創英角ゴシックUB&HG創英角ゴシックUB\\\midrule
 \textgt{丸ゴシック体}&&
-HG丸ゴシック体PRO&HG丸ゴシック体PRO&HG丸ゴシック体PRO\\
+HG丸ゴシックM-PRO&HG丸ゴシックM-PRO&HG丸ゴシックM-PRO\\
 %</ja>
 \bottomrule
 \end{tabular}\par\medskip}

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index 0c67c9d..d5c3d1a 100644 (file)
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -441,7 +441,7 @@
 }
 
 \msg_new:nnn { luatexja-preset }{ no-font }{
-  Font~ for~ #1~ (#2)~ is~ not~found.~ Hence~ I~ substitute~ #3~ (#4)~ for~ it.
+  Font~ #1~ (#2)~ is~ not~found.~ Hence~ I~ substitute~ #3~ (#4)~ for~ it.
 }
 \bool_if:NT \l_ltjpreset_deluxe_bool {
   \ltjpreset_substitute:nnnn { gt } { eb } { gt } { bx }

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index ac75cc1..c7f8593 100644 (file)
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -903,8 +903,8 @@ do
       end
    end
    local function prepare_extra_data_font(id, res)
-      if type(res)=='table' and res.shared and res.filename then
-        font_extra_info[id] = font_extra_basename[file.nameonly(res.filename)]
+      if type(res)=='table' and res.shared and (res.psname or res.filename) then
+        font_extra_info[id] = font_extra_basename[res.psname or file.nameonly(res.filename)]
       end
    end
     luatexbase.add_to_callback(