luatexja-fontspec-26h

diff --git a/src/addons/luatexja-fontspec-26h.sty b/src/addons/luatexja-fontspec-26h.sty
index 6c1ffdd..01a1a58 100644 (file)
--- a/src/addons/luatexja-fontspec-26h.sty
+++ b/src/addons/luatexja-fontspec-26h.sty
@@ -315,14 +315,18 @@
 
 \DeclareDocumentCommand \setmainjfont { O{} m O{} } {
   \ltj_fontspec_set_family:Nnn \mcdefault {#1,#3}{#2}
-  \DeclareSymbolFont{mincho}{JY3}{\mcdefault}{\mddefault}{n}
-  \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{\bfdefault}{n}
+  \unless\ifltj@disablejfam
+    \DeclareSymbolFont{mincho}{JY3}{\mcdefault}{\mddefault}{n}
+    \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{\bfdefault}{n}
+  \fi
   \normalfont
 }
 
 \DeclareDocumentCommand \setsansjfont { O{} m O{} } {
   \ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2}
-  \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{\mddefault}{n}
+  \unless\ifltj@disablejfam
+    \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{\mddefault}{n}
+  \fi
   \normalfont
 }
 

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index ad29ad4..5f1ddf6 100644 (file)
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -344,6 +344,9 @@ do
          t.shared.features[vrt2_exist and 'vrt2' or 'vert'] = true
       end
 
+      texio.write_nl('term and log', 
+        'JFNT\t' .. identifiers[fn].name .. '\t' .. identifiers[fn].size .. '\t' .. fn, '')
+
       fmtable = luatexbase.call_callback("luatexja.define_jfont", fmtable, fn)
       font_metric_table[fn]=fmtable
       tex.sprint(cat_lp, global_flag, '\\protected\\expandafter\\def\\csname ',
@@ -419,7 +422,7 @@ do
            .. ((l==':' or l==';') and '' or ';')
            .. 'jfm=' .. jfm_file_name
         if jfm_var~='' then
-           name = name .. 'jfmvar=' .. jfm_var
+           name = name .. ';jfmvar=' .. jfm_var
         end
       end
       for x in gmatch (name, "[:;]([+%%-]?)ltjks") do