OSDN Git Service

\mgfamily
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Fri, 7 Sep 2018 09:45:41 +0000 (18:45 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Fri, 7 Sep 2018 09:45:41 +0000 (18:45 +0900)
src/addons/luatexja-preset.sty
src/patches/lltjdefs.sty

index 5b85ad4..9c690c2 100644 (file)
@@ -1,5 +1,5 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2018/09/01 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2018/09/07 Japanese font presets]
 
 \RequirePackage{expl3,l3keys2e}
 \RequirePackage{luatexja}
 
   \bool_if:NT \g_ltjpreset_deluxe_bool {
     \DeclareKanjiFamily{JY3}{ltjpmg}{}\DeclareKanjiFamily{JT3}{ltjpmg}{}
+    \let\mgfamily\undefined
     \DeclareRobustCommand\mgfamily {
       \not@math@alphabet\mgfamily\relax\kanjifamily{ltjpmg}\selectfont
     }
     ] { \ltjpreset_font_gt_m: }
     \bool_if:NT \g_ltjpreset_deluxe_bool {
       %% mg
-      \newjfontfamily \mgfamily [
-        BoldFont = \ltjpreset_font_mg_m: \tl_use:N \l_ltjpreset_add_features_tl
-      ] { \ltjpreset_font_mg_m: }
+         \bool_if_exist:NTF \setfontfamily {
+        \setjfontfamily \mgfamily [
+          BoldFont = \ltjpreset_font_mg_m: \tl_use:N \l_ltjpreset_add_features_tl
+        ] { \ltjpreset_font_mg_m: }
+         } {
+        \newjfontfamily \mgfamily [
+          BoldFont = \ltjpreset_font_mg_m: \tl_use:N \l_ltjpreset_add_features_tl
+        ] { \ltjpreset_font_mg_m: }
+      }
       \DeclareTextFontCommand{\textmg}{\mgfamily}
     }
   }
index 0c4cfb5..09c54ea 100644 (file)
@@ -3,10 +3,10 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2018/06/15 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2018/09/05 Default font settings of LuaTeX-ja]
 
-\def\ltj@stdmcfont{IPAExMincho}
-\def\ltj@stdgtfont{IPAExGothic}
+\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi
+\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi
 \InputIfFileExists{luatexja.cfg}{%
   \typeout{*************************^^J%
            * Loading luatexja.cfg.^^J%