[80_1] Font: choose the correct math font in math mode

XmacsLabs · Nov 1, 2024 · 2832457 · 2832457
1 parent 4c6d2c3
commit 2832457
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/TeXmacs/tests/tmu/80_1.tmu b/TeXmacs/tests/tmu/80_1.tmu
@@ -0,0 +1,14 @@
+<TMU|<tuple|1.0.5|1.2.9.5>>
+
+<style|<tuple|generic|chinese>>
+
+<\body>
+  <math|<around*|(|a+b|)>>
+</body>
+
+<\initial>
+  <\collection>
+    <associate|math-font|math-stix>
+    <associate|page-screen-margin|false>
+  </collection>
+</initial>
diff --git a/src/Graphics/Fonts/smart_font.cpp b/src/Graphics/Fonts/smart_font.cpp
@@ -1657,15 +1657,15 @@ smart_font_bis (string family, string variant, string series, string shape,
   if (starts (family, "sys-")) {
     if (family == "sys-chinese") {
       string name= default_chinese_font_name ();
-      family     = "math=roman,cjk=" * name * ",roman";
+      family     = "cjk=" * name * ",roman";
     }
     if (family == "sys-japanese") {
       string name= default_japanese_font_name ();
-      family     = "math=roman,cjk=" * name * ",roman";
+      family     = "cjk=" * name * ",roman";
     }
     if (family == "sys-korean") {
       string name= default_korean_font_name ();
-      family     = "math=roman,cjk=" * name * ",roman";
+      family     = "cjk=" * name * ",roman";
     }
   }
   family= tex_gyre_fix (family, series, shape);
@@ -1707,13 +1707,12 @@ font
 smart_font (string family, string variant, string series, string shape,
             string tfam, string tvar, string tser, string tsh, int sz,
             int dpi) {
-  if (tfam == "roman") tfam= family;
   if (variant != "mr") {
     if (variant == "ms") tvar= "ss";
     if (variant == "mt") tvar= "tt";
   }
   if (shape == "right") tsh= "mathupright";
-  return smart_font (tfam, tvar, tser, tsh, sz, dpi);
+  return smart_font (family, tvar, tser, tsh, sz, dpi);
 }
 
 static string