Mark variants with bold and italic values so that unknown characters …

…can have font-weight and font-style set properly (resolves issue #96).
mathjax · May 9, 2011 · 0dc8212 · 0dc8212
1 parent 6275aa4
commit 0dc8212
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 24 deletions.
diff --git a/config/Accessible-full.js b/config/Accessible-full.js
diff --git a/config/MML_HTMLorMML-full.js b/config/MML_HTMLorMML-full.js
diff --git a/config/TeX-AMS-MML_HTMLorMML-full.js b/config/TeX-AMS-MML_HTMLorMML-full.js
diff --git a/config/TeX-AMS_HTML-full.js b/config/TeX-AMS_HTML-full.js
diff --git a/jax/output/HTML-CSS/fonts/STIX/fontdata.js b/jax/output/HTML-CSS/fonts/STIX/fontdata.js
diff --git a/jax/output/HTML-CSS/fonts/TeX/fontdata.js b/jax/output/HTML-CSS/fonts/TeX/fontdata.js
diff --git a/jax/output/HTML-CSS/jax.js b/jax/output/HTML-CSS/jax.js
diff --git a/unpacked/jax/output/HTML-CSS/fonts/STIX/fontdata.js b/unpacked/jax/output/HTML-CSS/fonts/STIX/fontdata.js
@@ -66,24 +66,24 @@
 
       VARIANT: {
         "normal": {fonts: [GENERAL,NONUNI,SIZE1]},
-        "bold":   {fonts: [BOLD,"STIXNonUnicode-bold","STIXSizeOneSym-bold"]},
-        "italic": {fonts: [ITALIC,"STIXNonUnicode-italic",GENERAL,NONUNI,SIZE1]},
-        "bold-italic": {fonts: ["STIXGeneral-bold-italic","STIXNonUnicode-bold-italic"]},
+        "bold":   {fonts: [BOLD,"STIXNonUnicode-bold","STIXSizeOneSym-bold"], bold:true},
+        "italic": {fonts: [ITALIC,"STIXNonUnicode-italic",GENERAL,NONUNI,SIZE1], italic:true},
+        "bold-italic": {fonts: ["STIXGeneral-bold-italic","STIXNonUnicode-bold-italic"], bold:true, italic:true},
         "double-struck": {offsetA: 0x1D538, offsetN: 0x1D7D8,
                            remap: {0x1D53A: 0x2102, 0x1D53F: 0x210D, 0x1D545: 0x2115, 0x1D547: 0x2119,
                                    0x1D548: 0x211A, 0x1D549: 0x211D, 0x1D551: 0x2124}},
         "fraktur": {offsetA: 0x1D504,
                     remap: {0x1D506: 0x212D, 0x1D50B: 0x210C, 0x1D50C: 0x2111, 0x1D515: 0x211C, 0x1D51D: 0x2128}},
-        "bold-fraktur": {fonts: [BOLD], offsetA: 0x1D56C},
+        "bold-fraktur": {fonts: [BOLD], offsetA: 0x1D56C, bold:true},
         "script": {fonts: [ITALIC], offsetA: 0x1D49C,
                    remap: {0x1D49D: 0x212C, 0x1D4A0: 0x2130, 0x1D4A1: 0x2131, 0x1D4A3: 0x210B,
                            0x1D4A4: 0x2110, 0x1D4A7: 0x2112, 0x1D4A8: 0x2133, 0x1D4AD: 0x211B,
                            0x1D4BA: 0x212F, 0x1D4BC: 0x210A, 0x1D4C4: 0x2134}},
-        "bold-script": {fonts: [ITALIC], offsetA: 0x1D4D0},
+        "bold-script": {fonts: [ITALIC], offsetA: 0x1D4D0, bold:true},
         "sans-serif": {offsetA: 0x1D5A0, offsetN: 0x1D7E2, offsetG: 0xE17D},
-        "bold-sans-serif": {offsetA: 0x1D5D4, offsetG: 0x1D756, offsetN: 0x1D7EC},
-        "sans-serif-italic": {fonts: [ITALIC], offsetA: 0x1D608, offsetN: 0xE1B4, offsetG: 0xE1BF},
-        "sans-serif-bold-italic": {fonts: ["STIXGeneral-bold-italic"], offsetA: 0x1D63C, offsetN: 0xE1F6, offsetG: 0x1D790},
+        "bold-sans-serif": {offsetA: 0x1D5D4, offsetG: 0x1D756, offsetN: 0x1D7EC, bold:true},
+        "sans-serif-italic": {fonts: [ITALIC], offsetA: 0x1D608, offsetN: 0xE1B4, offsetG: 0xE1BF, italic:true},
+        "sans-serif-bold-italic": {fonts: ["STIXGeneral-bold-italic"], offsetA: 0x1D63C, offsetN: 0xE1F6, offsetG: 0x1D790, bold:true, italic:true},
         "monospace": {offsetA: 0x1D670, offsetN: 0x1D7F6},
         "-STIX-variant": {fonts:["STIXVariants",NONUNI,GENERAL]},
         "-tex-caligraphic": {fonts: [ITALIC,"STIXNonUnicode-italic",NONUNI,SIZE1], offsetA: 0xE22D, noLowerCase: 1},

diff --git a/unpacked/jax/output/HTML-CSS/fonts/TeX/fontdata.js b/unpacked/jax/output/HTML-CSS/fonts/TeX/fontdata.js
@@ -67,31 +67,33 @@
       },
 
       VARIANT: {
-        "normal": {fonts:[MAIN,SIZE1,AMS], offsetG: 0x03B1, variantG: "italic",
+        "normal": {fonts:[MAIN,SIZE1,AMS],
+                   offsetG: 0x03B1, variantG: "italic",
                    remap: {0x391:0x41, 0x392:0x42, 0x395:0x45, 0x396:0x5A, 0x397:0x48,
                            0x399:0x49, 0x39A:0x4B, 0x39C:0x4D, 0x39D:0x4E, 0x39F:0x4F,
                            0x3A1:0x50, 0x3A4:0x54, 0x3A7:0x58}},
-        "bold":   {fonts:[BOLD,SIZE1,AMS], offsetG: 0x03B1, variantG: "bold-italic",
+        "bold":   {fonts:[BOLD,SIZE1,AMS], bold:true,
+                   offsetG: 0x03B1, variantG: "bold-italic",
                    remap: {0x391:0x41, 0x392:0x42, 0x395:0x45, 0x396:0x5A, 0x397:0x48,
                            0x399:0x49, 0x39A:0x4B, 0x39C:0x4D, 0x39D:0x4E, 0x39F:0x4F,
                            0x3A1:0x50, 0x3A4:0x54, 0x3A7:0x58}},
-        "italic": {fonts:[ITALIC,"MathJax_Main-italic",MAIN,SIZE1,AMS],
+        "italic": {fonts:[ITALIC,"MathJax_Main-italic",MAIN,SIZE1,AMS], italic:true,
                    remap: {0x391:0x41, 0x392:0x42, 0x395:0x45, 0x396:0x5A, 0x397:0x48,
                            0x399:0x49, 0x39A:0x4B, 0x39C:0x4D, 0x39D:0x4E, 0x39F:0x4F,
                            0x3A1:0x50, 0x3A4:0x54, 0x3A7:0x58}},
-        "bold-italic": {fonts:["MathJax_Math-bold-italic",BOLD,SIZE1,AMS],
+        "bold-italic": {fonts:["MathJax_Math-bold-italic",BOLD,SIZE1,AMS], bold:true, italic:true,
                    remap: {0x391:0x41, 0x392:0x42, 0x395:0x45, 0x396:0x5A, 0x397:0x48,
                            0x399:0x49, 0x39A:0x4B, 0x39C:0x4D, 0x39D:0x4E, 0x39F:0x4F,
                            0x3A1:0x50, 0x3A4:0x54, 0x3A7:0x58}},
         "double-struck": {fonts:[AMS, MAIN]},
         "fraktur": {fonts:["MathJax_Fraktur",MAIN,SIZE1,AMS]},
-        "bold-fraktur": {fonts:["MathJax_Fraktur-bold",BOLD,SIZE1,AMS]},
+        "bold-fraktur": {fonts:["MathJax_Fraktur-bold",BOLD,SIZE1,AMS], bold:true},
         "script": {fonts:["MathJax_Script",MAIN,SIZE1,AMS]},
-        "bold-script": {fonts:["MathJax_Script",BOLD,SIZE1,AMS]},
+        "bold-script": {fonts:["MathJax_Script",BOLD,SIZE1,AMS], bold:true},
         "sans-serif": {fonts:["MathJax_SansSerif",MAIN,SIZE1,AMS]},
-        "bold-sans-serif": {fonts:["MathJax_SansSerif-bold",BOLD,SIZE1,AMS]},
-        "sans-serif-italic": {fonts:["MathJax_SansSerif-italic","MathJax_Main-italic",SIZE1,AMS]},
-        "sans-serif-bold-italic": {fonts:["MathJax_SansSerif-italic","MathJax_Main-italic",SIZE1,AMS]},
+        "bold-sans-serif": {fonts:["MathJax_SansSerif-bold",BOLD,SIZE1,AMS], bold:true},
+        "sans-serif-italic": {fonts:["MathJax_SansSerif-italic","MathJax_Main-italic",SIZE1,AMS], italic:true},
+        "sans-serif-bold-italic": {fonts:["MathJax_SansSerif-italic","MathJax_Main-italic",SIZE1,AMS], bold:true, italic:true},
         "monospace": {fonts:["MathJax_Typewriter",MAIN,SIZE1,AMS]},
         "-tex-caligraphic": {fonts:["MathJax_Caligraphic",MAIN], offsetA: 0x41, variantA: "italic"},
         "-tex-oldstyle": {fonts:["MathJax_Caligraphic",MAIN]},

diff --git a/unpacked/jax/output/HTML-CSS/jax.js b/unpacked/jax/output/HTML-CSS/jax.js
@@ -1038,6 +1038,7 @@
         } else {this.findBlock(font,n)}
       }
       var unknown = (variant.defaultFont || {family:HTMLCSS.config.undefinedFamily});
+      if (variant.bold) {unknown.weight = "bold"}; if (variant.italic) {unknown.style = "italic"}
       unknown[n] = [800,200,500,0,500,{isUnknown:true}]; // [h,d,w,lw,rw,{data}]
       return unknown;
     },