From 0fe320209795205ffb3b6f01e216820f854eef42 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 3 Nov 2018 21:08:36 +0000
Subject: luatexja (3nov18)

git-svn-id: svn://tug.org/texlive/trunk@49067 c570f23f-e606-0410-a88d-b1316a301751
---
 .../tex/luatex/luatexja/addons/luatexja-preset.sty       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty')

diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
index b4681e91997..69104467507 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2018/09/30 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2018/10/08 Japanese font presets]
 
 \RequirePackage{expl3,l3keys2e}
 \RequirePackage{luatexja}
@@ -465,7 +465,7 @@
   \cs_new:Nn \ltj_preset_declare_font_shape:nnnnnn {
     \DeclareFontShape{#1}{#2}{#3}{#4}{ <-> s*[\Cjascale]
       { \bool_if:NT \g_ltjpreset_noembed_bool {psft:} #5
-	;-kern \tl_use:N \l_ltjpreset_kanji_shape_tl; #6 } } {}
+    ;-kern \tl_use:N \l_ltjpreset_kanji_shape_tl; #6 } } {}
   }
   \cs_new:Nn \ltj_preset_define_family:nnn {
     \ltj_preset_declare_font_shape:nnnnnn { JY3 }
@@ -505,9 +505,11 @@
     \DeclareKanjiFamily{JT3}{\mcdefault}{}
     \DeclareKanjiFamily{JY3}{\gtdefault}{}
     \DeclareKanjiFamily{JT3}{\gtdefault}{}
-    \SetSymbolFont{mincho}{normal}{JY3}{\mcdefault}{m}{n}
-    \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{bx}{n}
-    \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{m}{n}
+    \unless\ifltj@disablejfam
+      \SetSymbolFont{mincho}{normal}{JY3}{\mcdefault}{m}{n}
+      \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{bx}{n}
+      \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{m}{n}
+    \fi
     \bool_if:NT \g_ltjpreset_deluxe_bool {
       \DeclareKanjiFamily{JY3}{ltjpmg \int_to_arabic:n { \g_ltjpreset_applycount_int }}{}
       \DeclareKanjiFamily{JT3}{ltjpmg \int_to_arabic:n { \g_ltjpreset_applycount_int }}{}
@@ -573,11 +575,11 @@
     ] { \ltjpreset_font_gt_m: }
     \bool_if:NT \g_ltjpreset_deluxe_bool {
       %% mg
-	  \bool_if_exist:NTF \setfontfamily {
+      \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: }
-- 
cgit v1.2.3

