From 8f628e0590f87f073185c1e7938964dbb1c41002 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Thu, 16 Jun 2016 22:20:56 -0400 Subject: [PATCH] Adjust height and depth of minus to match plus, and fix arrow rep to remove the extra when it is used as an arrow extender. Fix up some spacing and use shorthands for some font names. Resolves issue #1187. --- .../CommonHTML/fonts/TeX/fontdata-extra.js | 36 ++++++++-------- .../output/CommonHTML/fonts/TeX/fontdata.js | 6 ++- .../HTML-CSS/fonts/Asana-Math/fontdata.js | 29 ++++++++----- .../HTML-CSS/fonts/Gyre-Pagella/fontdata.js | 28 +++++++------ .../HTML-CSS/fonts/Gyre-Termes/fontdata.js | 28 +++++++------ .../HTML-CSS/fonts/Latin-Modern/fontdata.js | 28 +++++++------ .../HTML-CSS/fonts/Neo-Euler/fontdata.js | 16 ++++++-- .../HTML-CSS/fonts/STIX-Web/fontdata-extra.js | 41 ++++++++++--------- .../HTML-CSS/fonts/STIX-Web/fontdata.js | 10 +++-- .../output/HTML-CSS/fonts/STIX/fontdata.js | 10 +++-- .../HTML-CSS/fonts/TeX/fontdata-extra.js | 34 +++++++-------- .../jax/output/HTML-CSS/fonts/TeX/fontdata.js | 35 +++++++++------- unpacked/jax/output/HTML-CSS/jax.js | 2 +- .../output/SVG/fonts/Asana-Math/fontdata.js | 29 ++++++++----- .../output/SVG/fonts/Gyre-Pagella/fontdata.js | 29 +++++++------ .../output/SVG/fonts/Gyre-Termes/fontdata.js | 29 +++++++------ .../output/SVG/fonts/Latin-Modern/fontdata.js | 31 +++++++------- .../output/SVG/fonts/Neo-Euler/fontdata.js | 14 +++++-- .../SVG/fonts/STIX-Web/fontdata-extra.js | 41 ++++++++++--------- .../jax/output/SVG/fonts/STIX-Web/fontdata.js | 12 +++--- .../output/SVG/fonts/TeX/fontdata-extra.js | 34 +++++++-------- unpacked/jax/output/SVG/fonts/TeX/fontdata.js | 33 +++++++++------ 22 files changed, 319 insertions(+), 236 deletions(-) diff --git a/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata-extra.js b/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata-extra.js index 166da0eee..709a5f784 100644 --- a/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata-extra.js +++ b/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata-extra.js @@ -35,7 +35,9 @@ SIZE1 = "MathJax_Size1", SIZE4 = "MathJax_Size4"; var H = "H", V = "V"; - + var ARROWREP = [0x2212,MAIN,0,0,0,-.31,-.31]; // remove extra height/depth added below + var DARROWREP = [0x3D,MAIN,0,0,0,0,.1]; // add depth for arrow extender + var delim = { 0x003D: // equal sign { @@ -43,16 +45,16 @@ }, 0x219E: // left two-headed arrow { - dir: H, HW: [[1,AMS]], stretch: {left:[0x219E,AMS], rep:[0x2212,MAIN]} + dir: H, HW: [[1,AMS]], stretch: {left:[0x219E,AMS], rep:ARROWREP} }, 0x21A0: // right two-headed arrow { - dir: H, HW: [[1,AMS]], stretch: {right:[0x21A0,AMS], rep:[0x2212,MAIN]} + dir: H, HW: [[1,AMS]], stretch: {right:[0x21A0,AMS], rep:ARROWREP} }, 0x21A4: // left arrow from bar { dir: H, HW: [], - stretch: {min:1, left:[0x2190,MAIN], rep:[0x2212,MAIN], right:[0x2223,SIZE1,0,-.05,.9]} + stretch: {min:1, left:[0x2190,MAIN], rep:ARROWREP, right:[0x2223,SIZE1,0,-.05,.9]} }, 0x21A5: // up arrow from bar { @@ -62,7 +64,7 @@ 0x21A6: // right arrow from bar { dir: H, HW: [[1,MAIN]], - stretch: {left:[0x2223,SIZE1,-.09,-.05,.9], rep:[0x2212,MAIN], right:[0x2192,MAIN]} + stretch: {left:[0x2223,SIZE1,-.09,-.05,.9], rep:ARROWREP, right:[0x2192,MAIN]} }, 0x21A7: // down arrow from bar { @@ -82,12 +84,12 @@ 0x21BC: // left harpoon with barb up { dir: H, HW: [[1,MAIN]], - stretch: {left:[0x21BC,MAIN], rep:[0x2212,MAIN]} + stretch: {left:[0x21BC,MAIN], rep:ARROWREP} }, 0x21BD: // left harpoon with barb down { dir: H, HW: [[1,MAIN]], - stretch: {left:[0x21BD,MAIN], rep:[0x2212,MAIN]} + stretch: {left:[0x21BD,MAIN], rep:ARROWREP} }, 0x21BE: // up harpoon with barb right { @@ -102,12 +104,12 @@ 0x21C0: // right harpoon with barb up { dir: H, HW: [[1,MAIN]], - stretch: {right:[0x21C0,MAIN], rep:[0x2212,MAIN]} + stretch: {right:[0x21C0,MAIN], rep:ARROWREP} }, 0x21C1: // right harpoon with barb down { dir: H, HW: [[1,MAIN]], - stretch: {right:[0x21C1,MAIN], rep:[0x2212,MAIN]} + stretch: {right:[0x21C1,MAIN], rep:ARROWREP} }, 0x21C2: // down harpoon with barb right { @@ -162,17 +164,17 @@ 0x2906: // leftwards double arrow from bar { dir: H, HW: [], - stretch: {min:1, left:[0x21D0,MAIN], rep:[0x3D,MAIN], right:[0x2223,SIZE1,0,-.1]} + stretch: {min:1, left:[0x21D0,MAIN], rep:DARROWREP, right:[0x2223,SIZE1,0,-.1]} }, 0x2907: // rightwards double arrow from bar { dir: H, HW: [], - stretch: {min:.7, left:[0x22A8,AMS,0,-.12], rep:[0x3D,MAIN], right:[0x21D2,MAIN]} + stretch: {min:.7, left:[0x22A8,AMS,0,-.12], rep:DARROWREP, right:[0x21D2,MAIN]} }, 0x294E: // left barb up right barb up harpoon { dir: H, HW: [], - stretch: {min:.5, left:[0x21BC,MAIN], rep:[0x2212,MAIN], right:[0x21C0,MAIN]} + stretch: {min:.5, left:[0x21BC,MAIN], rep:ARROWREP, right:[0x21C0,MAIN]} }, 0x294F: // up barb right down barb right harpoon { @@ -182,7 +184,7 @@ 0x2950: // left barb dow right barb down harpoon { dir: H, HW: [], - stretch: {min:.5, left:[0x21BD,MAIN], rep:[0x2212,MAIN], right:[0x21C1,MAIN]} + stretch: {min:.5, left:[0x21BD,MAIN], rep:ARROWREP, right:[0x21C1,MAIN]} }, 0x2951: // up barb left down barb left harpoon { @@ -192,12 +194,12 @@ 0x295A: // leftwards harpoon with barb up from bar { dir: H, HW: [], - stretch: {min:1, left:[0x21BC,MAIN], rep:[0x2212,MAIN], right:[0x2223,SIZE1,0,-.05,.9]} + stretch: {min:1, left:[0x21BC,MAIN], rep:ARROWREP, right:[0x2223,SIZE1,0,-.05,.9]} }, 0x295B: // rightwards harpoon with barb up from bar { dir: H, HW: [], - stretch: {min:1, left:[0x2223,SIZE1,-.05,-.05,.9], rep:[0x2212,MAIN], right:[0x21C0,MAIN]} + stretch: {min:1, left:[0x2223,SIZE1,-.05,-.05,.9], rep:ARROWREP, right:[0x21C0,MAIN]} }, 0x295C: // up harpoon with barb right from bar { @@ -212,12 +214,12 @@ 0x295E: // leftwards harpoon with barb down from bar { dir: H, HW: [], - stretch: {min:1, left:[0x21BD,MAIN], rep:[0x2212,MAIN], right:[0x2223,SIZE1,0,-.05,.9]} + stretch: {min:1, left:[0x21BD,MAIN], rep:ARROWREP, right:[0x2223,SIZE1,0,-.05,.9]} }, 0x295F: // rightwards harpoon with barb down from bar { dir: H, HW: [], - stretch: {min:1, left:[0x2223,SIZE1,-.05,-.05,.9], rep:[0x2212,MAIN], right:[0x21C1,MAIN]} + stretch: {min:1, left:[0x2223,SIZE1,-.05,-.05,.9], rep:ARROWREP, right:[0x21C1,MAIN]} }, 0x2960: // up harpoon with barb left from bar { diff --git a/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata.js b/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata.js index f94b6bef6..0dbb1e617 100644 --- a/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata.js +++ b/unpacked/jax/output/CommonHTML/fonts/TeX/fontdata.js @@ -37,8 +37,8 @@ SIZE3 = "MathJax_Size3", SIZE4 = "MathJax_Size4"; var H = "H", V = "V", EXTRAH = {load:"extra", dir:H}, EXTRAV = {load:"extra", dir:V}; - var ARROWREP = [0x2212,MAIN,0,0,0,0,.1]; // add depth for arrow extender - var DARROWREP = [0x3D,MAIN,0,0,0,0,.1]; // add depth for arrow extender + var ARROWREP = [0x2212,MAIN,0,0,0,-.31,-.31]; // remove extra height/depth added below + var DARROWREP = [0x3D,MAIN,0,0,0,0,.1]; // add depth for arrow extender var UNDEFINEDFAMILY = CHTML.config.undefinedFamily; @@ -1588,6 +1588,8 @@ 0xE154: [120,0,400,-10,410] // stix-oblique open face capital letter A }; + CHTML.FONTDATA.FONTS[MAIN][0x2212][0] = CHTML.FONTDATA.FONTS[MAIN][0x002B][0]; // minus is sized as plus + CHTML.FONTDATA.FONTS[MAIN][0x2212][1] = CHTML.FONTDATA.FONTS[MAIN][0x002B][1]; // minus is sized as plus CHTML.FONTDATA.FONTS[MAIN][0x22EE][0] += 400; // adjust height for \vdots CHTML.FONTDATA.FONTS[MAIN][0x22F1][0] += 700; // adjust height for \ddots CHTML.FONTDATA.FONTS[SIZE4][0x23AA][0] -= 20; diff --git a/unpacked/jax/output/HTML-CSS/fonts/Asana-Math/fontdata.js b/unpacked/jax/output/HTML-CSS/fonts/Asana-Math/fontdata.js index 4db13cd4a..ec87a5797 100644 --- a/unpacked/jax/output/HTML-CSS/fonts/Asana-Math/fontdata.js +++ b/unpacked/jax/output/HTML-CSS/fonts/Asana-Math/fontdata.js @@ -21,7 +21,7 @@ (function (HTMLCSS,MML,AJAX) { - var VERSION = "2.6.0"; + var VERSION = "2.6.0"; var ALPHABETS = "AsanaMathJax_Alphabets", ARROWS = "AsanaMathJax_Arrows", @@ -141,7 +141,7 @@ offsetA: 0x1D670, offsetN: 0x1D7F6 }, - "-Asana-Math-variant": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1]}, + "-Asana-Math-variant": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1]}, "-tex-caligraphic": {offsetA: 0xE20A, noLowerCase: 1, fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1], italic: true}, "-tex-oldstyle": {offsetN: 0xE200, fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, "-tex-caligraphic-bold": {offsetA: 0xE224, noLowerCase: 1, fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1], italic: true, bold: true}, @@ -160,7 +160,7 @@ remap: {0x03F5: 52, 0x03D1: 53, 0x03F0: 54, 0x03D5: 55, 0x03F1: 56, 0x03D6: 57, 0x03F4: 17}} ], - RULECHAR: 0x0305, + RULECHAR: 0x2212, REMAP: { 0x25C2: 0x25C0, @@ -208,7 +208,7 @@ HW: [[0.941,MAIN], [1.471,SIZE1], [2.041,SIZE2], [2.552,SIZE3], [2.615,SIZE3,1.025]], stretch: {bot:[0x23A0,SYMBOLS], ext:[0x239F,SYMBOLS], top:[0x239E,SYMBOLS]} }, - 0x2D: {alias: 0x305, dir: H}, + 0x2D: {alias: 0x2212, dir: H}, 0x2F: {alias: 0x2044, dir: H}, 0x3D: { @@ -254,9 +254,9 @@ stretch: {bot:[0x23AD,SYMBOLS], ext:[0x23AA,SYMBOLS], mid:[0x23AC,SYMBOLS], top:[0x23AB,SYMBOLS]} }, 0x7E: {alias: 0x303, dir: H}, - 0xAF: {alias: 0x305, dir: H}, + 0xAF: {alias: 0x2212, dir: H}, 0x2C6: {alias: 0x302, dir: H}, - 0x2C9: {alias: 0x305, dir: H}, + 0x2C9: {alias: 0x2212, dir: H}, 0x2DC: {alias: 0x303, dir: H}, 0x302: { @@ -288,15 +288,15 @@ }, 0x333: EXTRAH, 0x33F: EXTRAH, - 0x2015: {alias: 0x305, dir: H}, + 0x2015: {alias: 0x2212, dir: H}, 0x2016: { dir: V, HW: [[0.885,MAIN], [1.275,SIZE1], [1.555,SIZE2], [1.897,SIZE3], [2.315,SIZE4]], stretch: {ext:[0xE005,SIZE6], top:[0xE005,SIZE6]} }, - 0x2017: {alias: 0x305, dir: H}, - 0x203E: {alias: 0x305, dir: H}, + 0x2017: {alias: 0x2212, dir: H}, + 0x203E: {alias: 0x2212, dir: H}, 0x2044: { dir: V, @@ -405,7 +405,10 @@ }, 0x2210: EXTRAV, 0x2211: EXTRAV, - 0x2212: {alias: 0x305, dir: H}, + 0x2212: { + dir: H, HW: [], + stretch: {rep:[0x2212,MAIN,0,0,0,-.23,-.23]} + }, 0x2215: {alias: 0x2044, dir: V}, 0x221A: { @@ -506,7 +509,7 @@ }, 0x23E0: EXTRAH, 0x23E1: EXTRAH, - 0x2500: {alias: 0x305, dir: H}, + 0x2500: {alias: 0x2212, dir: H}, 0x2758: {alias: 0x2223, dir: V}, 0x27C5: { @@ -593,6 +596,10 @@ } }); + MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Main/Regular/Main.js",function () { + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][0] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][0]; // - needs height and depth of + + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][1] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][1]; // - needs height and depth of + + }); MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Size6/Regular/Main.js",function () { var u; u = HTMLCSS.FONTDATA.DELIMITERS[0x23DE].stretch.rep[0]; diff --git a/unpacked/jax/output/HTML-CSS/fonts/Gyre-Pagella/fontdata.js b/unpacked/jax/output/HTML-CSS/fonts/Gyre-Pagella/fontdata.js index 42041e1c6..4565a7e9b 100644 --- a/unpacked/jax/output/HTML-CSS/fonts/Gyre-Pagella/fontdata.js +++ b/unpacked/jax/output/HTML-CSS/fonts/Gyre-Pagella/fontdata.js @@ -21,7 +21,7 @@ (function (HTMLCSS,MML,AJAX) { - var VERSION = "2.6.0"; + var VERSION = "2.6.0"; var ALPHABETS = "GyrePagellaMathJax_Alphabets", ARROWS = "GyrePagellaMathJax_Arrows", @@ -141,7 +141,7 @@ offsetA: 0x1D670, offsetN: 0x1D7F6 }, - "-Gyre-Pagella-variant": {fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, + "-Gyre-Pagella-variant": {fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, "-tex-caligraphic": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1], italic: true}, "-tex-oldstyle": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1]}, "-tex-caligraphic-bold": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1], italic: true, bold: true}, @@ -160,7 +160,7 @@ remap: {0x03F5: 52, 0x03D1: 53, 0x03F0: 54, 0x03D5: 55, 0x03F1: 56, 0x03D6: 57, 0x03F4: 17}} ], - RULECHAR: 0x0305, + RULECHAR: 0x2212, REMAP: { 0x25C2: 0x25C0, @@ -207,7 +207,7 @@ HW: [[0.828,MAIN], [0.988,SIZE1], [1.180,SIZE2], [1.410,SIZE3], [1.686,SIZE4], [2.018,SIZE5], [2.416,SIZE6], [2.612,SIZE6,1.081]], stretch: {bot:[0x23A0,SYMBOLS], ext:[0x239F,SYMBOLS], top:[0x239E,SYMBOLS]} }, - 0x2D: {alias: 0x305, dir: H}, + 0x2D: {alias: 0x2212, dir: H}, 0x2F: { dir: V, @@ -259,7 +259,7 @@ 0x7E: {alias: 0x303, dir: H}, 0xAF: {alias: 0x332, dir: H}, 0x2C6: {alias: 0x302, dir: H}, - 0x2C9: {alias: 0x305, dir: H}, + 0x2C9: {alias: 0x2212, dir: H}, 0x2DC: {alias: 0x303, dir: H}, 0x302: { @@ -297,15 +297,15 @@ }, 0x333: EXTRAH, 0x33F: EXTRAH, - 0x2015: {alias: 0x305, dir: H}, + 0x2015: {alias: 0x2212, dir: H}, 0x2016: { dir: V, HW: [[0.800,MAIN], [0.960,SIZE1], [1.152,SIZE2], [1.382,SIZE3], [1.658,SIZE4], [1.990,SIZE5], [2.388,SIZE6]], stretch: {bot:[0xE12A,SIZE6], ext:[0xE12B,SIZE6], top:[0xE12C,SIZE6]} }, - 0x2017: {alias: 0x305, dir: H}, - 0x203E: {alias: 0x305, dir: H}, + 0x2017: {alias: 0x2212, dir: H}, + 0x203E: {alias: 0x2212, dir: H}, 0x2044: { dir: V, @@ -477,8 +477,8 @@ 0x2212: { dir: H, - HW: [[0.600,MAIN]], - stretch: {left:[0xE127,SIZE6], rep:[0xE128,SIZE6], right:[0xE129,SIZE6]} + HW: [], + stretch: {rep:[0x2212,MAIN,0,0,0,-.27,-.28]} }, 0x2215: {alias: 0x2044, dir: V}, 0x221A: @@ -561,7 +561,7 @@ HW: [[0.596,SYMBOLS]], stretch: {ext:[0x23AA,SYMBOLS]} }, - 0x23AF: {alias: 0x305, dir: H}, + 0x23AF: {alias: 0x2212, dir: H}, 0x23B0: { dir: V, @@ -598,7 +598,7 @@ }, 0x23E0: EXTRAH, 0x23E1: EXTRAH, - 0x2500: {alias: 0x305, dir: H}, + 0x2500: {alias: 0x2212, dir: H}, 0x27A1: EXTRAH, 0x27E6: EXTRAV, 0x27E7: EXTRAV, @@ -673,6 +673,10 @@ } }); + MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Main/Regular/Main.js",function () { + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][0] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][0]; // - needs height and depth of + + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][1] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][1]; // - needs height and depth of + + }); MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Size1/Regular/Main.js",function () { var i; for (i = 0x222B; i <= 0x222D; i++) { diff --git a/unpacked/jax/output/HTML-CSS/fonts/Gyre-Termes/fontdata.js b/unpacked/jax/output/HTML-CSS/fonts/Gyre-Termes/fontdata.js index 9053e7611..b4eac2f17 100644 --- a/unpacked/jax/output/HTML-CSS/fonts/Gyre-Termes/fontdata.js +++ b/unpacked/jax/output/HTML-CSS/fonts/Gyre-Termes/fontdata.js @@ -21,7 +21,7 @@ (function (HTMLCSS,MML,AJAX) { - var VERSION = "2.6.0"; + var VERSION = "2.6.0"; var ALPHABETS = "GyreTermesMathJax_Alphabets", ARROWS = "GyreTermesMathJax_Arrows", @@ -141,7 +141,7 @@ offsetA: 0x1D670, offsetN: 0x1D7F6 }, - "-Gyre-Termes-variant": {fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, + "-Gyre-Termes-variant": {fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, "-tex-caligraphic": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1], italic: true}, "-tex-oldstyle": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1]}, "-tex-caligraphic-bold": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1], italic: true, bold: true}, @@ -160,7 +160,7 @@ remap: {0x03F5: 52, 0x03D1: 53, 0x03F0: 54, 0x03D5: 55, 0x03F1: 56, 0x03D6: 57, 0x03F4: 17}} ], - RULECHAR: 0x0305, + RULECHAR: 0x2212, REMAP: { 0x25C2: 0x25C0, @@ -207,7 +207,7 @@ HW: [[0.816,MAIN], [0.976,SIZE1], [1.168,SIZE2], [1.398,SIZE3], [1.674,SIZE4], [2.006,SIZE5], [2.404,SIZE6], [2.780,SIZE6,1.157]], stretch: {bot:[0x23A0,SYMBOLS], ext:[0x239F,SYMBOLS], top:[0x239E,SYMBOLS]} }, - 0x2D: {alias: 0x305, dir: H}, + 0x2D: {alias: 0x2212, dir: H}, 0x2F: { dir: V, @@ -259,7 +259,7 @@ 0x7E: {alias: 0x303, dir: H}, 0xAF: {alias: 0x332, dir: H}, 0x2C6: {alias: 0x302, dir: H}, - 0x2C9: {alias: 0x305, dir: H}, + 0x2C9: {alias: 0x2212, dir: H}, 0x2DC: {alias: 0x303, dir: H}, 0x302: { @@ -297,15 +297,15 @@ }, 0x333: EXTRAH, 0x33F: EXTRAH, - 0x2015: {alias: 0x305, dir: H}, + 0x2015: {alias: 0x2212, dir: H}, 0x2016: { dir: V, HW: [[0.800,MAIN], [0.960,SIZE1], [1.152,SIZE2], [1.382,SIZE3], [1.658,SIZE4], [1.990,SIZE5], [2.388,SIZE6]], stretch: {bot:[0xE12A,SIZE6], ext:[0xE12B,SIZE6], top:[0xE12C,SIZE6]} }, - 0x2017: {alias: 0x305, dir: H}, - 0x203E: {alias: 0x305, dir: H}, + 0x2017: {alias: 0x2212, dir: H}, + 0x203E: {alias: 0x2212, dir: H}, 0x2044: { dir: V, @@ -477,8 +477,8 @@ 0x2212: { dir: H, - HW: [[0.500,MAIN]], - stretch: {left:[0xE127,SIZE6], rep:[0xE128,SIZE6], right:[0xE129,SIZE6]} + HW: [], + stretch: {rep:[0x2212,MAIN,0,0,0,-.224,-.224]} }, 0x2215: {alias: 0x2044, dir: V}, 0x221A: @@ -561,7 +561,7 @@ HW: [[0.596,SYMBOLS]], stretch: {ext:[0x23AA,SYMBOLS]} }, - 0x23AF: {alias: 0x305, dir: H}, + 0x23AF: {alias: 0x2212, dir: H}, 0x23B0: { dir: V, @@ -598,7 +598,7 @@ }, 0x23E0: EXTRAH, 0x23E1: EXTRAH, - 0x2500: {alias: 0x305, dir: H}, + 0x2500: {alias: 0x2212, dir: H}, 0x27A1: EXTRAH, 0x27E6: EXTRAV, 0x27E7: EXTRAV, @@ -673,6 +673,10 @@ } }); + MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Main/Regular/Main.js",function () { + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][0] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][0]; // - needs height and depth of + + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][1] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][1]; // - needs height and depth of + + }); MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Size1/Regular/Main.js",function () { var i; for (i = 0x222B; i <= 0x222D; i++) { diff --git a/unpacked/jax/output/HTML-CSS/fonts/Latin-Modern/fontdata.js b/unpacked/jax/output/HTML-CSS/fonts/Latin-Modern/fontdata.js index 950b86830..e4426eaeb 100644 --- a/unpacked/jax/output/HTML-CSS/fonts/Latin-Modern/fontdata.js +++ b/unpacked/jax/output/HTML-CSS/fonts/Latin-Modern/fontdata.js @@ -21,7 +21,7 @@ (function (HTMLCSS,MML,AJAX) { - var VERSION = "2.6.0"; + var VERSION = "2.6.0"; var ALPHABETS = "LatinModernMathJax_Alphabets", ARROWS = "LatinModernMathJax_Arrows", @@ -143,7 +143,7 @@ offsetA: 0x1D670, offsetN: 0x1D7F6 }, - "-Latin-Modern-variant": {fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, + "-Latin-Modern-variant": {fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, "-tex-caligraphic": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1], italic: true}, "-tex-oldstyle": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1]}, "-tex-caligraphic-bold": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1], italic: true, bold: true}, @@ -162,7 +162,7 @@ remap: {0x03F5: 52, 0x03D1: 53, 0x03F0: 54, 0x03D5: 55, 0x03F1: 56, 0x03D6: 57, 0x03F4: 17}} ], - RULECHAR: 0x0305, + RULECHAR: 0x2212, REMAP: { 0x25C2: 0x25C0, @@ -209,7 +209,7 @@ HW: [[0.996,MAIN], [1.094,SIZE1], [1.194,SIZE2], [1.444,SIZE3], [1.792,SIZE4], [2.092,SIZE5], [2.392,SIZE6], [2.990,SIZE7]], stretch: {bot:[0x23A0,SYMBOLS], ext:[0x239F,SYMBOLS], top:[0x239E,SYMBOLS]} }, - 0x2D: {alias: 0x305, dir: H}, + 0x2D: {alias: 0x2212, dir: H}, 0x2F: { dir: V, @@ -261,7 +261,7 @@ 0x7E: {alias: 0x303, dir: H}, 0xAF: {alias: 0x332, dir: H}, 0x2C6: {alias: 0x302, dir: H}, - 0x2C9: {alias: 0x305, dir: H}, + 0x2C9: {alias: 0x2212, dir: H}, 0x2DC: {alias: 0x303, dir: H}, 0x302: { @@ -299,15 +299,15 @@ }, 0x333: EXTRAH, 0x33F: EXTRAH, - 0x2015: {alias: 0x305, dir: H}, + 0x2015: {alias: 0x2212, dir: H}, 0x2016: { dir: V, HW: [[1.000,MAIN], [1.202,SIZE1], [1.444,SIZE2], [1.734,SIZE3], [2.084,SIZE4], [2.502,SIZE5], [3.004,SIZE6], [3.606,SIZE7]], stretch: {bot:[0xE12A,SIZE7], ext:[0xE12B,SIZE7], top:[0xE12C,SIZE7]} }, - 0x2017: {alias: 0x305, dir: H}, - 0x203E: {alias: 0x305, dir: H}, + 0x2017: {alias: 0x2212, dir: H}, + 0x203E: {alias: 0x2212, dir: H}, 0x2044: { dir: V, @@ -474,8 +474,8 @@ 0x2212: { dir: H, - HW: [[0.666,MAIN]], - stretch: {left:[0xE127,SIZE7], rep:[0xE128,SIZE7], right:[0xE129,SIZE7]} + HW: [], + stretch: {rep:[0x2212,MAIN,0,0,0,-.31,-.31]} }, 0x2215: {alias: 0x2044, dir: V}, 0x221A: @@ -558,7 +558,7 @@ HW: [[0.748,SYMBOLS]], stretch: {ext:[0x23AA,SYMBOLS]} }, - 0x23AF: {alias: 0x305, dir: H}, + 0x23AF: {alias: 0x2212, dir: H}, 0x23B0: { dir: V, @@ -595,7 +595,7 @@ }, 0x23E0: EXTRAH, 0x23E1: EXTRAH, - 0x2500: {alias: 0x305, dir: H}, + 0x2500: {alias: 0x2212, dir: H}, 0x27A1: EXTRAH, 0x27E6: EXTRAV, 0x27E7: EXTRAV, @@ -670,6 +670,10 @@ } }); + MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Main/Regular/Main.js",function () { + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][0] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][0]; // - needs height and depth of + + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][1] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][1]; // - needs height and depth of + + }); MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Size7/Regular/Main.js",function () { var u; u = HTMLCSS.FONTDATA.DELIMITERS[0x23DE].stretch.rep[0]; diff --git a/unpacked/jax/output/HTML-CSS/fonts/Neo-Euler/fontdata.js b/unpacked/jax/output/HTML-CSS/fonts/Neo-Euler/fontdata.js index 4a3d5a91a..5294e7c5a 100644 --- a/unpacked/jax/output/HTML-CSS/fonts/Neo-Euler/fontdata.js +++ b/unpacked/jax/output/HTML-CSS/fonts/Neo-Euler/fontdata.js @@ -21,7 +21,7 @@ (function (HTMLCSS,MML,AJAX) { - var VERSION = "2.6.0"; + var VERSION = "2.6.0"; var ALPHABETS = "NeoEulerMathJax_Alphabets", ARROWS = "NeoEulerMathJax_Arrows", @@ -132,7 +132,7 @@ offsetA: 0x1D670, offsetN: 0x1D7F6 }, - "-Neo-Euler-variant": {fonts: [VARIANTS,MAIN,NORMAL,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,NONUNICODE,SIZE1]}, + "-Neo-Euler-variant": {fonts: [VARIANTS,MAIN,NORMAL,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,NONUNICODE,SIZE1]}, "-tex-caligraphic": {fonts: [MAIN,NORMAL,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,VARIANTS,NONUNICODE,SIZE1], italic: true}, "-tex-oldstyle": {offsetN: 0xE200, fonts: [VARIANTS,MAIN,NORMAL,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,NONUNICODE,SIZE1]}, "-tex-caligraphic-bold": {fonts: [MAIN,NORMAL,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,VARIANTS,NONUNICODE,SIZE1], italic: true, bold: true}, @@ -151,7 +151,7 @@ remap: {0x03F5: 52, 0x03D1: 53, 0x03F0: 54, 0x03D5: 55, 0x03F1: 56, 0x03D6: 57, 0x03F4: 17}} ], - RULECHAR: 0x00AF, + RULECHAR: 0x2212, REMAP: { 0x20F0: 0x002A, @@ -341,7 +341,11 @@ 0x220F: EXTRAV, 0x2210: EXTRAV, 0x2211: EXTRAV, - 0x2212: {alias: 0xAF, dir: H}, + 0x2212: { + dir: H, + HW: [], + stretch: {rep:[0x2212,MAIN,0,0,0,-.31,-.31]} + }, 0x2215: { dir: V, @@ -486,6 +490,10 @@ } }); + MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Main/Regular/Main.js",function () { + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][0] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][0]; // - needs height and depth of + + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][1] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][1]; // - needs height and depth of + + }); MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Size5/Regular/Main.js",function () { var u; u = HTMLCSS.FONTDATA.DELIMITERS[0x23DE].stretch.rep[0]; diff --git a/unpacked/jax/output/HTML-CSS/fonts/STIX-Web/fontdata-extra.js b/unpacked/jax/output/HTML-CSS/fonts/STIX-Web/fontdata-extra.js index e7f77b4f4..10718f420 100644 --- a/unpacked/jax/output/HTML-CSS/fonts/STIX-Web/fontdata-extra.js +++ b/unpacked/jax/output/HTML-CSS/fonts/STIX-Web/fontdata-extra.js @@ -25,6 +25,7 @@ var DELIMITERS = HTMLCSS.FONTDATA.DELIMITERS; var H = "H", V = "V"; + var ARROWREP = [0x2212,MAIN,0,0,0,-.26,-.26]; var ALPHABETSBOLDITALIC = "STIXMathJax_Alphabets-bold-italic", ALPHABETSBOLD = "STIXMathJax_Alphabets-bold", @@ -162,7 +163,7 @@ { dir: H, HW: [[0.786,MAIN]], - stretch: {left:[0x219E,MAIN], rep:[0x2212,MAIN]} + stretch: {left:[0x219E,MAIN], rep:ARROWREP} }, 0x219F: { @@ -174,7 +175,7 @@ { dir: H, HW: [[0.786,MAIN]], - stretch: {right:[0x21A0,MAIN], rep:[0x2212,MAIN]} + stretch: {right:[0x21A0,MAIN], rep:ARROWREP} }, 0x21A1: { @@ -216,13 +217,13 @@ { dir: H, HW: [[0.786,MAIN]], - stretch: {left:[0x2190,MAIN], rep:[0x2212,MAIN], right:[0xE0B5,ARROWS]} + stretch: {left:[0x2190,MAIN], rep:ARROWREP, right:[0xE0B5,ARROWS]} }, 0x21AA: { dir: H, HW: [[0.786,MAIN]], - stretch: {left:[0xE0B4,ARROWS], rep:[0x2212,MAIN], right:[0x2192,MAIN]} + stretch: {left:[0xE0B4,ARROWS], rep:ARROWREP, right:[0x2192,MAIN]} }, 0x21B0: { @@ -294,7 +295,7 @@ { dir: H, HW: [[0.847,MAIN]], - stretch: {right:[0x21C1,MAIN], rep:[0x2212,MAIN]} + stretch: {right:[0x21C1,MAIN], rep:ARROWREP} }, 0x21C2: { @@ -360,31 +361,31 @@ { dir: H, HW: [[0.806,ARROWS]], - stretch: {left:[0x21E4,ARROWS], rep:[0x2212,MAIN]} + stretch: {left:[0x21E4,ARROWS], rep:ARROWREP} }, 0x21E5: { dir: H, HW: [[0.806,ARROWS]], - stretch: {right:[0x21E5,ARROWS], rep:[0x2212,MAIN]} + stretch: {right:[0x21E5,ARROWS], rep:ARROWREP} }, 0x21FD: { dir: H, HW: [[0.806,ARROWS]], - stretch: {left:[0x21FD,ARROWS], rep:[0x2212,MAIN]} + stretch: {left:[0x21FD,ARROWS], rep:ARROWREP} }, 0x21FE: { dir: H, HW: [[0.806,ARROWS]], - stretch: {right:[0x21FE,ARROWS], rep:[0x2212,MAIN]} + stretch: {right:[0x21FE,ARROWS], rep:ARROWREP} }, 0x21FF: { dir: H, HW: [[0.886,ARROWS]], - stretch: {left:[0x21FD,ARROWS], rep:[0x2212,MAIN], right:[0x21FE,ARROWS]} + stretch: {left:[0x21FD,ARROWS], rep:ARROWREP, right:[0x21FE,ARROWS]} }, 0x220F: { @@ -609,7 +610,7 @@ { dir: H, HW: [[0.850,ARROWS]], - stretch: {left:[0x21BC,MAIN], rep:[0x2212,MAIN], right:[0x21C0,MAIN]} + stretch: {left:[0x21BC,MAIN], rep:ARROWREP, right:[0x21C0,MAIN]} }, 0x294F: { @@ -621,7 +622,7 @@ { dir: H, HW: [[0.850,ARROWS]], - stretch: {left:[0x21BD,MAIN], rep:[0x2212,MAIN], right:[0x21C1,MAIN]} + stretch: {left:[0x21BD,MAIN], rep:ARROWREP, right:[0x21C1,MAIN]} }, 0x2951: { @@ -633,13 +634,13 @@ { dir: H, HW: [[0.816,ARROWS]], - stretch: {left:[0x2952,ARROWS], rep:[0x2212,MAIN]} + stretch: {left:[0x2952,ARROWS], rep:ARROWREP} }, 0x2953: { dir: H, HW: [[0.816,ARROWS]], - stretch: {right:[0x2953,ARROWS], rep:[0x2212,MAIN]} + stretch: {right:[0x2953,ARROWS], rep:ARROWREP} }, 0x2954: { @@ -657,13 +658,13 @@ { dir: H, HW: [[0.816,ARROWS]], - stretch: {left:[0x2956,ARROWS], rep:[0x2212,MAIN]} + stretch: {left:[0x2956,ARROWS], rep:ARROWREP} }, 0x2957: { dir: H, HW: [[0.816,ARROWS]], - stretch: {right:[0x2957,ARROWS], rep:[0x2212,MAIN]} + stretch: {right:[0x2957,ARROWS], rep:ARROWREP} }, 0x2958: { @@ -681,13 +682,13 @@ { dir: H, HW: [[0.816,ARROWS]], - stretch: {left:[0x21BC,MAIN], rep:[0x2212,MAIN], right:[0x22A3,MAINBOLD,0.000,0.100,0.600]} + stretch: {left:[0x21BC,MAIN], rep:ARROWREP, right:[0x22A3,MAINBOLD,0.000,0.100,0.600]} }, 0x295B: { dir: H, HW: [[0.816,ARROWS]], - stretch: {left:[0xE0B6,ARROWS], rep:[0x2212,MAIN], right:[0x21C0,MAIN]} + stretch: {left:[0xE0B6,ARROWS], rep:ARROWREP, right:[0x21C0,MAIN]} }, 0x295C: { @@ -705,13 +706,13 @@ { dir: H, HW: [[0.816,ARROWS]], - stretch: {left:[0x21BD,MAIN], rep:[0x2212,MAIN], right:[0x22A3,MAINBOLD,0.000,0.100,0.600]} + stretch: {left:[0x21BD,MAIN], rep:ARROWREP, right:[0x22A3,MAINBOLD,0.000,0.100,0.600]} }, 0x295F: { dir: H, HW: [[0.816,ARROWS]], - stretch: {left:[0xE0B6,ARROWS], rep:[0x2212,MAIN], right:[0x21C1,MAIN]} + stretch: {left:[0xE0B6,ARROWS], rep:ARROWREP, right:[0x21C1,MAIN]} }, 0x2960: { diff --git a/unpacked/jax/output/HTML-CSS/fonts/STIX-Web/fontdata.js b/unpacked/jax/output/HTML-CSS/fonts/STIX-Web/fontdata.js index 9eecc41a2..f6bee1576 100644 --- a/unpacked/jax/output/HTML-CSS/fonts/STIX-Web/fontdata.js +++ b/unpacked/jax/output/HTML-CSS/fonts/STIX-Web/fontdata.js @@ -80,6 +80,7 @@ VARIANTS = "STIXMathJax_Variants"; var H = "H", V = "V", EXTRAH = {load:"extra", dir:H}, EXTRAV = {load:"extra", dir:V}; + var ARROWREP = [0x2212,MAIN,0,0,0,-.26,-.26]; HTMLCSS.Augment({ FONTDATA: { @@ -399,7 +400,7 @@ { dir: H, HW: [[0.786,MAIN]], - stretch: {left:[0x2190,MAIN], rep:[0x23AF,SYMBOLS]} + stretch: {left:[0x2190,MAIN], rep:ARROWREP} }, 0x2191: { @@ -411,7 +412,7 @@ { dir: H, HW: [[0.786,MAIN]], - stretch: {rep:[0x23AF,SYMBOLS], right:[0x2192,MAIN]} + stretch: {rep:ARROWREP, right:[0x2192,MAIN]} }, 0x2193: { @@ -423,7 +424,7 @@ { dir: H, HW: [[0.850,MAIN]], - stretch: {left:[0x2190,MAIN], rep:[0x23AF,SYMBOLS], right:[0x2192,MAIN]} + stretch: {left:[0x2190,MAIN], rep:ARROWREP, right:[0x2192,MAIN]} }, 0x2195: { @@ -744,7 +745,8 @@ MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Main/Regular/Main.js",function () { HTMLCSS.FONTDATA.FONTS[MAIN][0x22EE][0] += 400; // adjust height for \vdots HTMLCSS.FONTDATA.FONTS[MAIN][0x22F1][0] += 500; // adjust height for \ddots - HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][1] += 100; // adjust depth for minus (arrow extender) + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][0] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][0]; // - needs height and depth of + + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][1] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][1]; // - needs height and depth of + HTMLCSS.FONTDATA.FONTS[MAIN][0x003D][1] += 100; // adjust depth for = (double arrow extender) }); MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Size5/Regular/Main.js",function () { diff --git a/unpacked/jax/output/HTML-CSS/fonts/STIX/fontdata.js b/unpacked/jax/output/HTML-CSS/fonts/STIX/fontdata.js index 773e2f93d..34f601574 100644 --- a/unpacked/jax/output/HTML-CSS/fonts/STIX/fontdata.js +++ b/unpacked/jax/output/HTML-CSS/fonts/STIX/fontdata.js @@ -42,6 +42,7 @@ SIZE4 = "STIXSizeFourSym", SIZE5 = "STIXSizeFiveSym"; var H = "H", V = "V", EXTRAH = {load:"extra", dir:H}, EXTRAV = {load:"extra", dir:V}; + var ARROWREP = [0x2212,GENERAL,0,0,0,-.26,-.26]; // remove extra height/depth added below HTMLCSS.Augment({ FONTDATA: { @@ -225,7 +226,7 @@ }, 0x2190: // left arrow { - dir: H, HW: [[.926,GENERAL]], stretch: {left:[0x2190,GENERAL], rep:[0x2212,GENERAL]} + dir: H, HW: [[.926,GENERAL]], stretch: {left:[0x2190,GENERAL], rep:ARROWREP} }, 0x2191: // \uparrow { @@ -233,7 +234,7 @@ }, 0x2192: // right arrow { - dir: H, HW: [[.926,GENERAL]], stretch: {rep:[0x2212,GENERAL], right:[0x2192,GENERAL]} + dir: H, HW: [[.926,GENERAL]], stretch: {rep:ARROWREP, right:[0x2192,GENERAL]} }, 0x2193: // \downarrow { @@ -242,7 +243,7 @@ 0x2194: // left-right arrow { dir: H, HW: [[.926,GENERAL]], - stretch: {left:[0x2190,GENERAL], rep:[0x2212,GENERAL], right:[0x2192,GENERAL]} + stretch: {left:[0x2190,GENERAL], rep:ARROWREP, right:[0x2192,GENERAL]} }, 0x2195: // \updownarrow { @@ -1508,6 +1509,9 @@ 0x221A: [943,11,737,67,767] // SQUARE ROOT }; + + HTMLCSS.FONTDATA.FONTS['STIXGeneral'][0x2212][0] = HTMLCSS.FONTDATA.FONTS['STIXGeneral'][0x002B][0]; // minus is sized as plus + HTMLCSS.FONTDATA.FONTS['STIXGeneral'][0x2212][1] = HTMLCSS.FONTDATA.FONTS['STIXGeneral'][0x002B][1]; // minus is sized as plus HTMLCSS.FONTDATA.FONTS['STIXGeneral'][0x22EE][0] += 400; // adjust height for \vdots HTMLCSS.FONTDATA.FONTS['STIXGeneral'][0x22F1][0] += 500; // adjust height for \ddots HTMLCSS.FONTDATA.FONTS['STIXGeneral'][0x2212][1] += 100; // adjust depth for minus (arrow extender) diff --git a/unpacked/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js b/unpacked/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js index 8cb6497fd..2b6c5de95 100644 --- a/unpacked/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js +++ b/unpacked/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js @@ -35,6 +35,8 @@ SIZE1 = "MathJax_Size1", SIZE4 = "MathJax_Size4"; var H = "H", V = "V"; + var ARROWREP = [0x2212,MAIN,0,0,0,-.3,-.3]; // remove extra height/depth added below + var DARROWREP = [0x3D,MAIN,0,0,0,0,.1]; // add depth for arrow extender var delim = { 0x003D: // equal sign @@ -43,16 +45,16 @@ }, 0x219E: // left two-headed arrow { - dir: H, HW: [[1,AMS]], stretch: {left:[0x219E,AMS], rep:[0x2212,MAIN]} + dir: H, HW: [[1,AMS]], stretch: {left:[0x219E,AMS], rep:ARROWREP} }, 0x21A0: // right two-headed arrow { - dir: H, HW: [[1,AMS]], stretch: {right:[0x21A0,AMS], rep:[0x2212,MAIN]} + dir: H, HW: [[1,AMS]], stretch: {right:[0x21A0,AMS], rep:ARROWREP} }, 0x21A4: // left arrow from bar { dir: H, HW: [], - stretch: {min:1, left:[0x2190,MAIN], rep:[0x2212,MAIN], right:[0x2223,SIZE1,0,-.05,.9]} + stretch: {min:1, left:[0x2190,MAIN], rep:ARROWREP, right:[0x2223,SIZE1,0,-.05,.9]} }, 0x21A5: // up arrow from bar { @@ -62,7 +64,7 @@ 0x21A6: // right arrow from bar { dir: H, HW: [[1,MAIN]], - stretch: {left:[0x2223,SIZE1,-.09,-.05,.9], rep:[0x2212,MAIN], right:[0x2192,MAIN]} + stretch: {left:[0x2223,SIZE1,-.09,-.05,.9], rep:ARROWREP, right:[0x2192,MAIN]} }, 0x21A7: // down arrow from bar { @@ -82,12 +84,12 @@ 0x21BC: // left harpoon with barb up { dir: H, HW: [[1,MAIN]], - stretch: {left:[0x21BC,MAIN], rep:[0x2212,MAIN]} + stretch: {left:[0x21BC,MAIN], rep:ARROWREP} }, 0x21BD: // left harpoon with barb down { dir: H, HW: [[1,MAIN]], - stretch: {left:[0x21BD,MAIN], rep:[0x2212,MAIN]} + stretch: {left:[0x21BD,MAIN], rep:ARROWREP} }, 0x21BE: // up harpoon with barb right { @@ -102,12 +104,12 @@ 0x21C0: // right harpoon with barb up { dir: H, HW: [[1,MAIN]], - stretch: {right:[0x21C0,MAIN], rep:[0x2212,MAIN]} + stretch: {right:[0x21C0,MAIN], rep:ARROWREP} }, 0x21C1: // right harpoon with barb down { dir: H, HW: [[1,MAIN]], - stretch: {right:[0x21C1,MAIN], rep:[0x2212,MAIN]} + stretch: {right:[0x21C1,MAIN], rep:ARROWREP} }, 0x21C2: // down harpoon with barb right { @@ -162,17 +164,17 @@ 0x2906: // leftwards double arrow from bar { dir: H, HW: [], - stretch: {min:1, left:[0x21D0,MAIN], rep:[0x3D,MAIN], right:[0x2223,SIZE1,0,-.1]} + stretch: {min:1, left:[0x21D0,MAIN], rep:DARROWREP, right:[0x2223,SIZE1,0,-.1]} }, 0x2907: // rightwards double arrow from bar { dir: H, HW: [], - stretch: {min:.7, left:[0x22A8,AMS,0,-.12], rep:[0x3D,MAIN], right:[0x21D2,MAIN]} + stretch: {min:.7, left:[0x22A8,AMS,0,-.12], rep:DARROWREP, right:[0x21D2,MAIN]} }, 0x294E: // left barb up right barb up harpoon { dir: H, HW: [], - stretch: {min:.5, left:[0x21BC,MAIN], rep:[0x2212,MAIN], right:[0x21C0,MAIN]} + stretch: {min:.5, left:[0x21BC,MAIN], rep:ARROWREP, right:[0x21C0,MAIN]} }, 0x294F: // up barb right down barb right harpoon { @@ -182,7 +184,7 @@ 0x2950: // left barb dow right barb down harpoon { dir: H, HW: [], - stretch: {min:.5, left:[0x21BD,MAIN], rep:[0x2212,MAIN], right:[0x21C1,MAIN]} + stretch: {min:.5, left:[0x21BD,MAIN], rep:ARROWREP, right:[0x21C1,MAIN]} }, 0x2951: // up barb left down barb left harpoon { @@ -192,12 +194,12 @@ 0x295A: // leftwards harpoon with barb up from bar { dir: H, HW: [], - stretch: {min:1, left:[0x21BC,MAIN], rep:[0x2212,MAIN], right:[0x2223,SIZE1,0,-.05,.9]} + stretch: {min:1, left:[0x21BC,MAIN], rep:ARROWREP, right:[0x2223,SIZE1,0,-.05,.9]} }, 0x295B: // rightwards harpoon with barb up from bar { dir: H, HW: [], - stretch: {min:1, left:[0x2223,SIZE1,-.05,-.05,.9], rep:[0x2212,MAIN], right:[0x21C0,MAIN]} + stretch: {min:1, left:[0x2223,SIZE1,-.05,-.05,.9], rep:ARROWREP, right:[0x21C0,MAIN]} }, 0x295C: // up harpoon with barb right from bar { @@ -212,12 +214,12 @@ 0x295E: // leftwards harpoon with barb down from bar { dir: H, HW: [], - stretch: {min:1, left:[0x21BD,MAIN], rep:[0x2212,MAIN], right:[0x2223,SIZE1,0,-.05,.9]} + stretch: {min:1, left:[0x21BD,MAIN], rep:ARROWREP, right:[0x2223,SIZE1,0,-.05,.9]} }, 0x295F: // rightwards harpoon with barb down from bar { dir: H, HW: [], - stretch: {min:1, left:[0x2223,SIZE1,-.05,-.05,.9], rep:[0x2212,MAIN], right:[0x21C1,MAIN]} + stretch: {min:1, left:[0x2223,SIZE1,-.05,-.05,.9], rep:ARROWREP, right:[0x21C1,MAIN]} }, 0x2960: // up harpoon with barb left from bar { diff --git a/unpacked/jax/output/HTML-CSS/fonts/TeX/fontdata.js b/unpacked/jax/output/HTML-CSS/fonts/TeX/fontdata.js index 324785b9e..385bd645a 100644 --- a/unpacked/jax/output/HTML-CSS/fonts/TeX/fontdata.js +++ b/unpacked/jax/output/HTML-CSS/fonts/TeX/fontdata.js @@ -37,8 +37,8 @@ SIZE3 = "MathJax_Size3", SIZE4 = "MathJax_Size4"; var H = "H", V = "V", EXTRAH = {load:"extra", dir:H}, EXTRAV = {load:"extra", dir:V}; - var ARROWREP = [0x2212,MAIN,0,0,0,0,.1]; // add depth for arrow extender - var DARROWREP = [0x3D,MAIN,0,0,0,0,.1]; // add depth for arrow extender + var ARROWREP = [0x2212,MAIN,0,0,0,-.31,-.31]; // remove extra height/depth added below + var DARROWREP = [0x3D,MAIN,0,0,0,0,.1]; // add depth for arrow extender HTMLCSS.Augment({ FONTDATA: { @@ -369,6 +369,10 @@ { dir: H, HW: [[.333+.25,MAIN],[.555+.25,SIZE1],[1+.33,SIZE2],[1.443+.33,SIZE3],[1.887,SIZE4]] }, + 0x2013: // en-dash + { + dir: H, HW: [[.5,MAIN]], stretch: {rep:[0x2013,MAIN]} + }, 0x2016: // vertical arrow extension { dir: V, HW: [[.602,SIZE1],[1,MAIN,null,0x2225]], stretch: {ext:[0x2225,MAIN]} @@ -427,7 +431,7 @@ }, 0x2212: // horizontal line { - dir: H, HW: [[.778,MAIN]], stretch: {rep:[0x2212,MAIN]} + dir: H, HW: [[.5,MAIN,0,0x2013]], stretch: {rep:ARROWREP} }, 0x221A: // \surd { @@ -518,8 +522,9 @@ 0x0303: {alias: 0x02DC, dir:H}, // wide tilde 0x030C: {alias: 0x02C7, dir:H}, // wide caron 0x0332: {alias: 0x2212, dir:H}, // combining low line - 0x2015: {alias: 0x2212, dir:H}, // horizontal line - 0x2017: {alias: 0x2212, dir:H}, // horizontal line + 0x2014: {alias: 0x2013, dir:H}, // em-dash + 0x2015: {alias: 0x2013, dir:H}, // horizontal line + 0x2017: {alias: 0x2013, dir:H}, // horizontal line 0x203E: {alias: 0x00AF, dir:H}, // overline 0x2215: {alias: 0x002F, dir:V}, // division slash 0x2329: {alias: 0x27E8, dir:V}, // langle @@ -1563,15 +1568,17 @@ 0xE154: [120,0,400,-10,410] // stix-oblique open face capital letter A }; - HTMLCSS.FONTDATA.FONTS['MathJax_Main'][0x22EE][0] += 400; // adjust height for \vdots - HTMLCSS.FONTDATA.FONTS['MathJax_Main'][0x22F1][0] += 700; // adjust height for \ddots - HTMLCSS.FONTDATA.FONTS['MathJax_Size4'][0xE154][0] += 200; // adjust height for brace extender - HTMLCSS.FONTDATA.FONTS['MathJax_Size4'][0xE154][1] += 200; // adjust depth for brace extender - HTMLCSS.FONTDATA.FONTS['MathJax_Main'][0x2245][2] -= 222; // fix error in character's right bearing - HTMLCSS.FONTDATA.FONTS['MathJax_Main'][0x2245][5] = {rfix:-222}; // fix error in character's right bearing + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][0] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][0]; // minus is sized as plus + HTMLCSS.FONTDATA.FONTS[MAIN][0x2212][1] = HTMLCSS.FONTDATA.FONTS[MAIN][0x002B][1]; // minus is sized as plus + HTMLCSS.FONTDATA.FONTS[MAIN][0x22EE][0] += 400; // adjust height for \vdots + HTMLCSS.FONTDATA.FONTS[MAIN][0x22F1][0] += 700; // adjust height for \ddots + HTMLCSS.FONTDATA.FONTS[SIZE4][0xE154][0] += 200; // adjust height for brace extender + HTMLCSS.FONTDATA.FONTS[SIZE4][0xE154][1] += 200; // adjust depth for brace extender + HTMLCSS.FONTDATA.FONTS[MAIN][0x2245][2] -= 222; // fix error in character's right bearing + HTMLCSS.FONTDATA.FONTS[MAIN][0x2245][5] = {rfix:-222}; // fix error in character's right bearing MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Main/Bold/MathOperators.js",function () { - HTMLCSS.FONTDATA.FONTS['MathJax_Main-bold'][0x2245][2] -= 106; // fix error in character's right bearing - HTMLCSS.FONTDATA.FONTS['MathJax_Main-bold'][0x2245][5] = {rfix:-106}; // fix error in character's right bearing + HTMLCSS.FONTDATA.FONTS[BOLD][0x2245][2] -= 106; // fix error in character's right bearing + HTMLCSS.FONTDATA.FONTS[BOLD][0x2245][5] = {rfix:-106}; // fix error in character's right bearing }); MathJax.Hub.Register.LoadHook(HTMLCSS.fontDir+"/Typewriter/Regular/BasicLatin.js",function () { HTMLCSS.FONTDATA.FONTS['MathJax_Typewriter'][0x20][2] += 275; // fix error in character width @@ -1581,7 +1588,7 @@ // // Add some spacing characters (more will come later) // - MathJax.Hub.Insert(HTMLCSS.FONTDATA.FONTS['MathJax_Main'],{ + MathJax.Hub.Insert(HTMLCSS.FONTDATA.FONTS[MAIN],{ 0xEEE0: [0,0,-575,0,0,{space:1}], 0xEEE1: [0,0,-300,0,0,{space:1}], 0xEEE8: [0,0,25,0,0,{space:1}] diff --git a/unpacked/jax/output/HTML-CSS/jax.js b/unpacked/jax/output/HTML-CSS/jax.js index 8dad7d6aa..5ac40ac6a 100644 --- a/unpacked/jax/output/HTML-CSS/jax.js +++ b/unpacked/jax/output/HTML-CSS/jax.js @@ -2624,7 +2624,7 @@ if (surd.isMultiChar || (HTMLCSS.AdjustSurd && HTMLCSS.imgFonts)) {surd.bbox.w *= .95} if (surd.bbox.h + surd.bbox.d > H) {q = ((surd.bbox.h+surd.bbox.d) - (H-t))/2} var ruleC = HTMLCSS.FONTDATA.DELIMITERS[HTMLCSS.FONTDATA.RULECHAR]; - if (!ruleC || W < ruleC.HW[0][0]*scale || scale < .75) { + if (!ruleC || W < (ruleC.HW[0]||[0])[0]*scale || scale < .75) { HTMLCSS.createRule(rule,0,t,W); rule.bbox.h = -t; } else { HTMLCSS.createDelimiter(rule,HTMLCSS.FONTDATA.RULECHAR,W,scale); diff --git a/unpacked/jax/output/SVG/fonts/Asana-Math/fontdata.js b/unpacked/jax/output/SVG/fonts/Asana-Math/fontdata.js index 63c173182..a3b2b163d 100644 --- a/unpacked/jax/output/SVG/fonts/Asana-Math/fontdata.js +++ b/unpacked/jax/output/SVG/fonts/Asana-Math/fontdata.js @@ -21,7 +21,7 @@ (function (SVG,MML,AJAX,HUB) { - var VERSION = "2.6.0"; + var VERSION = "2.6.0"; var ALPHABETS = "AsanaMathJax_Alphabets", ARROWS = "AsanaMathJax_Arrows", @@ -138,7 +138,7 @@ offsetA: 0x1D670, offsetN: 0x1D7F6 }, - "-Asana-Math-variant": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1]}, + "-Asana-Math-variant": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1]}, "-tex-caligraphic": {offsetA: 0xE20A, noLowerCase: 1, fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1], italic: true}, "-tex-oldstyle": {offsetN: 0xE200, fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, "-tex-caligraphic-bold": {offsetA: 0xE224, noLowerCase: 1, fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1], italic: true, bold: true}, @@ -157,7 +157,7 @@ remap: {0x03F5: 52, 0x03D1: 53, 0x03F0: 54, 0x03D5: 55, 0x03F1: 56, 0x03D6: 57, 0x03F4: 17}} ], - RULECHAR: 0x0305, + RULECHAR: 0x2212, REMAP: { 0x25C2: 0x25C0, @@ -205,7 +205,7 @@ HW: [[941,MAIN], [1471,SIZE1], [2041,SIZE2], [2552,SIZE3], [2615,SIZE3,1.025]], stretch: {bot:[0x23A0,SYMBOLS], ext:[0x239F,SYMBOLS], top:[0x239E,SYMBOLS]} }, - 0x2D: {alias: 0x305, dir: H}, + 0x2D: {alias: 0x2212, dir: H}, 0x2F: {alias: 0x2044, dir: H}, 0x3D: { @@ -251,9 +251,9 @@ stretch: {bot:[0x23AD,SYMBOLS], ext:[0x23AA,SYMBOLS], mid:[0x23AC,SYMBOLS], top:[0x23AB,SYMBOLS]} }, 0x7E: {alias: 0x303, dir: H}, - 0xAF: {alias: 0x305, dir: H}, + 0xAF: {alias: 0x2212, dir: H}, 0x2C6: {alias: 0x302, dir: H}, - 0x2C9: {alias: 0x305, dir: H}, + 0x2C9: {alias: 0x2212, dir: H}, 0x2DC: {alias: 0x303, dir: H}, 0x302: { @@ -285,15 +285,15 @@ }, 0x333: EXTRAH, 0x33F: EXTRAH, - 0x2015: {alias: 0x305, dir: H}, + 0x2015: {alias: 0x2212, dir: H}, 0x2016: { dir: V, HW: [[885,MAIN], [1275,SIZE1], [1555,SIZE2], [1897,SIZE3], [2315,SIZE4]], stretch: {ext:[0xE005,SIZE6], top:[0xE005,SIZE6]} }, - 0x2017: {alias: 0x305, dir: H}, - 0x203E: {alias: 0x305, dir: H}, + 0x2017: {alias: 0x2212, dir: H}, + 0x203E: {alias: 0x2212, dir: H}, 0x2044: { dir: V, @@ -402,7 +402,10 @@ }, 0x2210: EXTRAV, 0x2211: EXTRAV, - 0x2212: {alias: 0x305, dir: H}, + 0x2212: { + dir: H, HW: [], + stretch: {rep:[0x2212,MAIN,0,0,0,-.23,-.23]} + }, 0x2215: {alias: 0x2044, dir: V}, 0x221A: { @@ -503,7 +506,7 @@ }, 0x23E0: EXTRAH, 0x23E1: EXTRAH, - 0x2500: {alias: 0x305, dir: H}, + 0x2500: {alias: 0x2212, dir: H}, 0x2758: {alias: 0x2223, dir: V}, 0x27C5: { @@ -590,6 +593,10 @@ } }); + MathJax.Hub.Register.LoadHook(SVG.fontDir+"/Main/Regular/Main.js",function () { + SVG.FONTDATA.FONTS[MAIN][0x2212][0] = SVG.FONTDATA.FONTS[MAIN][0x002B][0]; // - needs height and depth of + + SVG.FONTDATA.FONTS[MAIN][0x2212][1] = SVG.FONTDATA.FONTS[MAIN][0x002B][1]; // - needs height and depth of + + }); MathJax.Hub.Register.LoadHook(SVG.fontDir+"/Size6/Regular/Main.js",function () { var u; u = SVG.FONTDATA.DELIMITERS[0x23DE].stretch.rep[0]; diff --git a/unpacked/jax/output/SVG/fonts/Gyre-Pagella/fontdata.js b/unpacked/jax/output/SVG/fonts/Gyre-Pagella/fontdata.js index 2c294921f..7d1aa7852 100644 --- a/unpacked/jax/output/SVG/fonts/Gyre-Pagella/fontdata.js +++ b/unpacked/jax/output/SVG/fonts/Gyre-Pagella/fontdata.js @@ -21,7 +21,7 @@ (function (SVG,MML,AJAX,HUB) { - var VERSION = "2.6.0"; + var VERSION = "2.6.0"; var ALPHABETS = "GyrePagellaMathJax_Alphabets", ARROWS = "GyrePagellaMathJax_Arrows", @@ -138,7 +138,7 @@ offsetA: 0x1D670, offsetN: 0x1D7F6 }, - "-Gyre-Pagella-variant": {fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, + "-Gyre-Pagella-variant": {fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, "-tex-caligraphic": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1], italic: true}, "-tex-oldstyle": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1]}, "-tex-caligraphic-bold": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1], italic: true, bold: true}, @@ -157,7 +157,7 @@ remap: {0x03F5: 52, 0x03D1: 53, 0x03F0: 54, 0x03D5: 55, 0x03F1: 56, 0x03D6: 57, 0x03F4: 17}} ], - RULECHAR: 0x0305, + RULECHAR: 0x2212, REMAP: { 0x25C2: 0x25C0, @@ -204,7 +204,7 @@ HW: [[828,MAIN], [988,SIZE1], [1180,SIZE2], [1410,SIZE3], [1686,SIZE4], [2017,SIZE5], [2416,SIZE6], [2612,SIZE6,1.081]], stretch: {bot:[0x23A0,SYMBOLS], ext:[0x239F,SYMBOLS], top:[0x239E,SYMBOLS]} }, - 0x2D: {alias: 0x305, dir: H}, + 0x2D: {alias: 0x2212, dir: H}, 0x2F: { dir: V, @@ -256,7 +256,7 @@ 0x7E: {alias: 0x303, dir: H}, 0xAF: {alias: 0x332, dir: H}, 0x2C6: {alias: 0x302, dir: H}, - 0x2C9: {alias: 0x305, dir: H}, + 0x2C9: {alias: 0x2212, dir: H}, 0x2DC: {alias: 0x303, dir: H}, 0x302: { @@ -294,15 +294,15 @@ }, 0x333: EXTRAH, 0x33F: EXTRAH, - 0x2015: {alias: 0x305, dir: H}, + 0x2015: {alias: 0x2212, dir: H}, 0x2016: { dir: V, HW: [[800,MAIN], [960,SIZE1], [1152,SIZE2], [1382,SIZE3], [1658,SIZE4], [1990,SIZE5], [2388,SIZE6]], stretch: {bot:[0xE12A,SIZE6], ext:[0xE12B,SIZE6], top:[0xE12C,SIZE6]} }, - 0x2017: {alias: 0x305, dir: H}, - 0x203E: {alias: 0x305, dir: H}, + 0x2017: {alias: 0x2212, dir: H}, + 0x203E: {alias: 0x2212, dir: H}, 0x2044: { dir: V, @@ -473,9 +473,8 @@ 0x2211: EXTRAV, 0x2212: { - dir: H, - HW: [[600,MAIN]], - stretch: {left:[0xE127,SIZE6], rep:[0xE128,SIZE6], right:[0xE129,SIZE6]} + HW: [], + stretch: {rep:[0x2212,MAIN,0,0,0,-.27,-.28]} }, 0x2215: {alias: 0x2044, dir: V}, 0x221A: @@ -558,7 +557,7 @@ HW: [[596,SYMBOLS]], stretch: {ext:[0x23AA,SYMBOLS]} }, - 0x23AF: {alias: 0x305, dir: H}, + 0x23AF: {alias: 0x2212, dir: H}, 0x23B0: { dir: V, @@ -595,7 +594,7 @@ }, 0x23E0: EXTRAH, 0x23E1: EXTRAH, - 0x2500: {alias: 0x305, dir: H}, + 0x2500: {alias: 0x2212, dir: H}, 0x27A1: EXTRAH, 0x27E6: EXTRAV, 0x27E7: EXTRAV, @@ -670,6 +669,10 @@ } }); + MathJax.Hub.Register.LoadHook(SVG.fontDir+"/Main/Regular/Main.js",function () { + SVG.FONTDATA.FONTS[MAIN][0x2212][0] = SVG.FONTDATA.FONTS[MAIN][0x002B][0]; // - needs height and depth of + + SVG.FONTDATA.FONTS[MAIN][0x2212][1] = SVG.FONTDATA.FONTS[MAIN][0x002B][1]; // - needs height and depth of + + }); MathJax.Hub.Register.LoadHook(SVG.fontDir+"/Size1/Regular/Main.js",function () { var i; for (i = 0x222B; i <= 0x222D; i++) diff --git a/unpacked/jax/output/SVG/fonts/Gyre-Termes/fontdata.js b/unpacked/jax/output/SVG/fonts/Gyre-Termes/fontdata.js index ff67c7956..8bfd7eaf3 100644 --- a/unpacked/jax/output/SVG/fonts/Gyre-Termes/fontdata.js +++ b/unpacked/jax/output/SVG/fonts/Gyre-Termes/fontdata.js @@ -21,7 +21,7 @@ (function (SVG,MML,AJAX,HUB) { - var VERSION = "2.6.0"; + var VERSION = "2.6.0"; var ALPHABETS = "GyreTermesMathJax_Alphabets", ARROWS = "GyreTermesMathJax_Arrows", @@ -138,7 +138,7 @@ offsetA: 0x1D670, offsetN: 0x1D7F6 }, - "-Gyre-Termes-variant": {fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, + "-Gyre-Termes-variant": {fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, "-tex-caligraphic": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1], italic: true}, "-tex-oldstyle": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1]}, "-tex-caligraphic-bold": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1], italic: true, bold: true}, @@ -157,7 +157,7 @@ remap: {0x03F5: 52, 0x03D1: 53, 0x03F0: 54, 0x03D5: 55, 0x03F1: 56, 0x03D6: 57, 0x03F4: 17}} ], - RULECHAR: 0x0305, + RULECHAR: 0x2212, REMAP: { 0x25C2: 0x25C0, @@ -204,7 +204,7 @@ HW: [[816,MAIN], [976,SIZE1], [1168,SIZE2], [1398,SIZE3], [1674,SIZE4], [2005,SIZE5], [2404,SIZE6], [2780,SIZE6,1.157]], stretch: {bot:[0x23A0,SYMBOLS], ext:[0x239F,SYMBOLS], top:[0x239E,SYMBOLS]} }, - 0x2D: {alias: 0x305, dir: H}, + 0x2D: {alias: 0x2212, dir: H}, 0x2F: { dir: V, @@ -256,7 +256,7 @@ 0x7E: {alias: 0x303, dir: H}, 0xAF: {alias: 0x332, dir: H}, 0x2C6: {alias: 0x302, dir: H}, - 0x2C9: {alias: 0x305, dir: H}, + 0x2C9: {alias: 0x2212, dir: H}, 0x2DC: {alias: 0x303, dir: H}, 0x302: { @@ -294,15 +294,15 @@ }, 0x333: EXTRAH, 0x33F: EXTRAH, - 0x2015: {alias: 0x305, dir: H}, + 0x2015: {alias: 0x2212, dir: H}, 0x2016: { dir: V, HW: [[800,MAIN], [960,SIZE1], [1152,SIZE2], [1382,SIZE3], [1658,SIZE4], [1990,SIZE5], [2388,SIZE6]], stretch: {bot:[0xE12A,SIZE6], ext:[0xE12B,SIZE6], top:[0xE12C,SIZE6]} }, - 0x2017: {alias: 0x305, dir: H}, - 0x203E: {alias: 0x305, dir: H}, + 0x2017: {alias: 0x2212, dir: H}, + 0x203E: {alias: 0x2212, dir: H}, 0x2044: { dir: V, @@ -473,9 +473,8 @@ 0x2211: EXTRAV, 0x2212: { - dir: H, - HW: [[500,MAIN]], - stretch: {left:[0xE127,SIZE6], rep:[0xE128,SIZE6], right:[0xE129,SIZE6]} + HW: [], + stretch: {rep:[0x2212,MAIN,0,0,0,-.224,-.224]} }, 0x2215: {alias: 0x2044, dir: V}, 0x221A: @@ -558,7 +557,7 @@ HW: [[596,SYMBOLS]], stretch: {ext:[0x23AA,SYMBOLS]} }, - 0x23AF: {alias: 0x305, dir: H}, + 0x23AF: {alias: 0x2212, dir: H}, 0x23B0: { dir: V, @@ -595,7 +594,7 @@ }, 0x23E0: EXTRAH, 0x23E1: EXTRAH, - 0x2500: {alias: 0x305, dir: H}, + 0x2500: {alias: 0x2212, dir: H}, 0x27A1: EXTRAH, 0x27E6: EXTRAV, 0x27E7: EXTRAV, @@ -670,6 +669,10 @@ } }); + MathJax.Hub.Register.LoadHook(SVG.fontDir+"/Main/Regular/Main.js",function () { + SVG.FONTDATA.FONTS[MAIN][0x2212][0] = SVG.FONTDATA.FONTS[MAIN][0x002B][0]; // - needs height and depth of + + SVG.FONTDATA.FONTS[MAIN][0x2212][1] = SVG.FONTDATA.FONTS[MAIN][0x002B][1]; // - needs height and depth of + + }); MathJax.Hub.Register.LoadHook(SVG.fontDir+"/Size1/Regular/Main.js",function () { var i; for (i = 0x222B; i <= 0x222D; i++) diff --git a/unpacked/jax/output/SVG/fonts/Latin-Modern/fontdata.js b/unpacked/jax/output/SVG/fonts/Latin-Modern/fontdata.js index 0eacda78a..f0966ad4f 100644 --- a/unpacked/jax/output/SVG/fonts/Latin-Modern/fontdata.js +++ b/unpacked/jax/output/SVG/fonts/Latin-Modern/fontdata.js @@ -21,7 +21,7 @@ (function (SVG,MML,AJAX,HUB) { - var VERSION = "2.6.0"; + var VERSION = "2.6.0"; var ALPHABETS = "LatinModernMathJax_Alphabets", ARROWS = "LatinModernMathJax_Arrows", @@ -140,7 +140,7 @@ offsetA: 0x1D670, offsetN: 0x1D7F6 }, - "-Latin-Modern-variant": {fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, + "-Latin-Modern-variant": {fonts: [VARIANTS,MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,NONUNICODE,SIZE1]}, "-tex-caligraphic": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1], italic: true}, "-tex-oldstyle": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1]}, "-tex-caligraphic-bold": {fonts: [MAIN,NORMAL,MONOSPACE,LATIN,ALPHABETS,MARKS,ARROWS,OPERATORS,SYMBOLS,SHAPES,MISC,VARIANTS,NONUNICODE,SIZE1], italic: true, bold: true}, @@ -159,7 +159,7 @@ remap: {0x03F5: 52, 0x03D1: 53, 0x03F0: 54, 0x03D5: 55, 0x03F1: 56, 0x03D6: 57, 0x03F4: 17}} ], - RULECHAR: 0x0305, + RULECHAR: 0x2212, REMAP: { 0x25C2: 0x25C0, @@ -206,7 +206,7 @@ HW: [[996,MAIN], [1094,SIZE1], [1194,SIZE2], [1444,SIZE3], [1792,SIZE4], [2092,SIZE5], [2392,SIZE6], [2990,SIZE7]], stretch: {bot:[0x23A0,SYMBOLS], ext:[0x239F,SYMBOLS], top:[0x239E,SYMBOLS]} }, - 0x2D: {alias: 0x305, dir: H}, + 0x2D: {alias: 0x2212, dir: H}, 0x2F: { dir: V, @@ -258,7 +258,7 @@ 0x7E: {alias: 0x303, dir: H}, 0xAF: {alias: 0x332, dir: H}, 0x2C6: {alias: 0x302, dir: H}, - 0x2C9: {alias: 0x305, dir: H}, + 0x2C9: {alias: 0x2212, dir: H}, 0x2DC: {alias: 0x303, dir: H}, 0x302: { @@ -270,11 +270,10 @@ dir: H, HW: [[370,MAIN], [652,SIZE1], [778,SIZE2], [931,SIZE3], [1115,SIZE4], [1335,SIZE5], [1599,SIZE6], [1915,SIZE7]] }, - 0x305: + 0x2212: { - dir: H, - HW: [[392,MARKS], [568,SIZE1]], - stretch: {left:[0xE0FB,SIZE7], rep:[0xE0FC,SIZE7], right:[0xE0FD,SIZE7]} + HW: [], + stretch: {rep:[0x2212,MAIN,0,0,0,-.31,-.31]} }, 0x306: EXTRAH, 0x30C: @@ -296,15 +295,15 @@ }, 0x333: EXTRAH, 0x33F: EXTRAH, - 0x2015: {alias: 0x305, dir: H}, + 0x2015: {alias: 0x2212, dir: H}, 0x2016: { dir: V, HW: [[1000,MAIN], [1202,SIZE1], [1444,SIZE2], [1734,SIZE3], [2084,SIZE4], [2502,SIZE5], [3004,SIZE6], [3606,SIZE7]], stretch: {bot:[0xE12A,SIZE7], ext:[0xE12B,SIZE7], top:[0xE12C,SIZE7]} }, - 0x2017: {alias: 0x305, dir: H}, - 0x203E: {alias: 0x305, dir: H}, + 0x2017: {alias: 0x2212, dir: H}, + 0x203E: {alias: 0x2212, dir: H}, 0x2044: { dir: V, @@ -555,7 +554,7 @@ HW: [[748,SYMBOLS]], stretch: {ext:[0x23AA,SYMBOLS]} }, - 0x23AF: {alias: 0x305, dir: H}, + 0x23AF: {alias: 0x2212, dir: H}, 0x23B0: { dir: V, @@ -592,7 +591,7 @@ }, 0x23E0: EXTRAH, 0x23E1: EXTRAH, - 0x2500: {alias: 0x305, dir: H}, + 0x2500: {alias: 0x2212, dir: H}, 0x27A1: EXTRAH, 0x27E6: EXTRAV, 0x27E7: EXTRAV, @@ -667,6 +666,10 @@ } }); + MathJax.Hub.Register.LoadHook(SVG.fontDir+"/Main/Regular/Main.js",function () { + SVG.FONTDATA.FONTS[MAIN][0x2212][0] = SVG.FONTDATA.FONTS[MAIN][0x002B][0]; // - needs height and depth of + + SVG.FONTDATA.FONTS[MAIN][0x2212][1] = SVG.FONTDATA.FONTS[MAIN][0x002B][1]; // - needs height and depth of + + }); MathJax.Hub.Register.LoadHook(SVG.fontDir+"/Size7/Regular/Main.js",function () { var u; u = SVG.FONTDATA.DELIMITERS[0x23DE].stretch.rep[0]; diff --git a/unpacked/jax/output/SVG/fonts/Neo-Euler/fontdata.js b/unpacked/jax/output/SVG/fonts/Neo-Euler/fontdata.js index 9f76bccab..113e7b91d 100644 --- a/unpacked/jax/output/SVG/fonts/Neo-Euler/fontdata.js +++ b/unpacked/jax/output/SVG/fonts/Neo-Euler/fontdata.js @@ -21,7 +21,7 @@ (function (SVG,MML,AJAX,HUB) { - var VERSION = "2.6.0"; + var VERSION = "2.6.0"; var ALPHABETS = "NeoEulerMathJax_Alphabets", ARROWS = "NeoEulerMathJax_Arrows", @@ -148,7 +148,7 @@ remap: {0x03F5: 52, 0x03D1: 53, 0x03F0: 54, 0x03D5: 55, 0x03F1: 56, 0x03D6: 57, 0x03F4: 17}} ], - RULECHAR: 0x00AF, + RULECHAR: 0x2212, REMAP: { 0x20F0: 0x002A, @@ -338,7 +338,11 @@ 0x220F: EXTRAV, 0x2210: EXTRAV, 0x2211: EXTRAV, - 0x2212: {alias: 0xAF, dir: H}, + 0x2212: { + dir: H, + HW: [], + stretch: {rep:[0x2212,MAIN,0,0,0,-.31,-.31]} + }, 0x2215: { dir: V, @@ -483,6 +487,10 @@ } }); + MathJax.Hub.Register.LoadHook(SVG.fontDir+"/Main/Regular/Main.js",function () { + SVG.FONTDATA.FONTS[MAIN][0x2212][0] = SVG.FONTDATA.FONTS[MAIN][0x002B][0]; // - needs height and depth of + + SVG.FONTDATA.FONTS[MAIN][0x2212][1] = SVG.FONTDATA.FONTS[MAIN][0x002B][1]; // - needs height and depth of + + }); MathJax.Hub.Register.LoadHook(SVG.fontDir+"/Size5/Regular/Main.js",function () { var u; u = SVG.FONTDATA.DELIMITERS[0x23DE].stretch.rep[0]; diff --git a/unpacked/jax/output/SVG/fonts/STIX-Web/fontdata-extra.js b/unpacked/jax/output/SVG/fonts/STIX-Web/fontdata-extra.js index 44bb64fd7..db3053663 100644 --- a/unpacked/jax/output/SVG/fonts/STIX-Web/fontdata-extra.js +++ b/unpacked/jax/output/SVG/fonts/STIX-Web/fontdata-extra.js @@ -25,6 +25,7 @@ var DELIMITERS = SVG.FONTDATA.DELIMITERS; var H = "H", V = "V"; + var ARROWREP = [0x2212,MAIN,0,0,0,-.26,-.26]; var ALPHABETSBOLDITALIC = "STIXMathJax_Alphabets-bold-italic", ALPHABETSBOLD = "STIXMathJax_Alphabets-bold", @@ -162,7 +163,7 @@ { dir: H, HW: [[786,MAIN]], - stretch: {left:[0x219E,MAIN], rep:[0x2212,MAIN]} + stretch: {left:[0x219E,MAIN], rep:ARROWREP} }, 0x219F: { @@ -174,7 +175,7 @@ { dir: H, HW: [[786,MAIN]], - stretch: {right:[0x21A0,MAIN], rep:[0x2212,MAIN]} + stretch: {right:[0x21A0,MAIN], rep:ARROWREP} }, 0x21A1: { @@ -216,13 +217,13 @@ { dir: H, HW: [[786,MAIN]], - stretch: {left:[0x2190,MAIN], rep:[0x2212,MAIN], right:[0xE0B5,ARROWS]} + stretch: {left:[0x2190,MAIN], rep:ARROWREP, right:[0xE0B5,ARROWS]} }, 0x21AA: { dir: H, HW: [[786,MAIN]], - stretch: {left:[0xE0B4,ARROWS], rep:[0x2212,MAIN], right:[0x2192,MAIN]} + stretch: {left:[0xE0B4,ARROWS], rep:ARROWREP, right:[0x2192,MAIN]} }, 0x21B0: { @@ -294,7 +295,7 @@ { dir: H, HW: [[847,MAIN]], - stretch: {right:[0x21C1,MAIN], rep:[0x2212,MAIN]} + stretch: {right:[0x21C1,MAIN], rep:ARROWREP} }, 0x21C2: { @@ -360,31 +361,31 @@ { dir: H, HW: [[806,ARROWS]], - stretch: {left:[0x21E4,ARROWS], rep:[0x2212,MAIN]} + stretch: {left:[0x21E4,ARROWS], rep:ARROWREP} }, 0x21E5: { dir: H, HW: [[806,ARROWS]], - stretch: {right:[0x21E5,ARROWS], rep:[0x2212,MAIN]} + stretch: {right:[0x21E5,ARROWS], rep:ARROWREP} }, 0x21FD: { dir: H, HW: [[806,ARROWS]], - stretch: {left:[0x21FD,ARROWS], rep:[0x2212,MAIN]} + stretch: {left:[0x21FD,ARROWS], rep:ARROWREP} }, 0x21FE: { dir: H, HW: [[806,ARROWS]], - stretch: {right:[0x21FE,ARROWS], rep:[0x2212,MAIN]} + stretch: {right:[0x21FE,ARROWS], rep:ARROWREP} }, 0x21FF: { dir: H, HW: [[886,ARROWS]], - stretch: {left:[0x21FD,ARROWS], rep:[0x2212,MAIN], right:[0x21FE,ARROWS]} + stretch: {left:[0x21FD,ARROWS], rep:ARROWREP, right:[0x21FE,ARROWS]} }, 0x220F: { @@ -609,7 +610,7 @@ { dir: H, HW: [[850,ARROWS]], - stretch: {left:[0x21BC,MAIN], rep:[0x2212,MAIN], right:[0x21C0,MAIN]} + stretch: {left:[0x21BC,MAIN], rep:ARROWREP, right:[0x21C0,MAIN]} }, 0x294F: { @@ -621,7 +622,7 @@ { dir: H, HW: [[850,ARROWS]], - stretch: {left:[0x21BD,MAIN], rep:[0x2212,MAIN], right:[0x21C1,MAIN]} + stretch: {left:[0x21BD,MAIN], rep:ARROWREP, right:[0x21C1,MAIN]} }, 0x2951: { @@ -633,13 +634,13 @@ { dir: H, HW: [[816,ARROWS]], - stretch: {left:[0x2952,ARROWS], rep:[0x2212,MAIN]} + stretch: {left:[0x2952,ARROWS], rep:ARROWREP} }, 0x2953: { dir: H, HW: [[816,ARROWS]], - stretch: {right:[0x2953,ARROWS], rep:[0x2212,MAIN]} + stretch: {right:[0x2953,ARROWS], rep:ARROWREP} }, 0x2954: { @@ -657,13 +658,13 @@ { dir: H, HW: [[816,ARROWS]], - stretch: {left:[0x2956,ARROWS], rep:[0x2212,MAIN]} + stretch: {left:[0x2956,ARROWS], rep:ARROWREP} }, 0x2957: { dir: H, HW: [[816,ARROWS]], - stretch: {right:[0x2957,ARROWS], rep:[0x2212,MAIN]} + stretch: {right:[0x2957,ARROWS], rep:ARROWREP} }, 0x2958: { @@ -681,13 +682,13 @@ { dir: H, HW: [[816,ARROWS]], - stretch: {left:[0x21BC,MAIN], rep:[0x2212,MAIN], right:[0x22A3,MAINBOLD,0.000,0.100,0.600]} + stretch: {left:[0x21BC,MAIN], rep:ARROWREP, right:[0x22A3,MAINBOLD,0.000,0.100,0.600]} }, 0x295B: { dir: H, HW: [[816,ARROWS]], - stretch: {left:[0xE0B6,ARROWS], rep:[0x2212,MAIN], right:[0x21C0,MAIN]} + stretch: {left:[0xE0B6,ARROWS], rep:ARROWREP, right:[0x21C0,MAIN]} }, 0x295C: { @@ -705,13 +706,13 @@ { dir: H, HW: [[816,ARROWS]], - stretch: {left:[0x21BD,MAIN], rep:[0x2212,MAIN], right:[0x22A3,MAINBOLD,0.000,0.100,0.600]} + stretch: {left:[0x21BD,MAIN], rep:ARROWREP, right:[0x22A3,MAINBOLD,0.000,0.100,0.600]} }, 0x295F: { dir: H, HW: [[816,ARROWS]], - stretch: {left:[0xE0B6,ARROWS], rep:[0x2212,MAIN], right:[0x21C1,MAIN]} + stretch: {left:[0xE0B6,ARROWS], rep:ARROWREP, right:[0x21C1,MAIN]} }, 0x2960: { diff --git a/unpacked/jax/output/SVG/fonts/STIX-Web/fontdata.js b/unpacked/jax/output/SVG/fonts/STIX-Web/fontdata.js index 86878424a..8f5eebf0b 100644 --- a/unpacked/jax/output/SVG/fonts/STIX-Web/fontdata.js +++ b/unpacked/jax/output/SVG/fonts/STIX-Web/fontdata.js @@ -21,7 +21,7 @@ (function (SVG,MML,AJAX,HUB) { - var VERSION = "2.6.0"; + var VERSION = "2.6.0"; var ALPHABETSBOLDITALIC = "STIXMathJax_Alphabets-bold-italic", ALPHABETSBOLD = "STIXMathJax_Alphabets-bold", @@ -80,6 +80,7 @@ VARIANTS = "STIXMathJax_Variants"; var H = "H", V = "V", EXTRAH = {load:"extra", dir:H}, EXTRAV = {load:"extra", dir:V}; + var ARROWREP = [0x2212,MAIN,0,0,0,-.26,-.26]; SVG.Augment({ FONTDATA: { @@ -396,7 +397,7 @@ { dir: H, HW: [[786,MAIN]], - stretch: {left:[0x2190,MAIN], rep:[0x23AF,SYMBOLS]} + stretch: {left:[0x2190,MAIN], rep:ARROWREP} }, 0x2191: { @@ -408,7 +409,7 @@ { dir: H, HW: [[786,MAIN]], - stretch: {rep:[0x23AF,SYMBOLS], right:[0x2192,MAIN]} + stretch: {rep:ARROWREP, right:[0x2192,MAIN]} }, 0x2193: { @@ -420,7 +421,7 @@ { dir: H, HW: [[850,MAIN]], - stretch: {left:[0x2190,MAIN], rep:[0x23AF,SYMBOLS], right:[0x2192,MAIN]} + stretch: {left:[0x2190,MAIN], rep:ARROWREP, right:[0x2192,MAIN]} }, 0x2195: { @@ -741,7 +742,8 @@ MathJax.Hub.Register.LoadHook(SVG.fontDir+"/Main/Regular/Main.js",function () { SVG.FONTDATA.FONTS[MAIN][0x22EE][0] += 400; // adjust height for \vdots SVG.FONTDATA.FONTS[MAIN][0x22F1][0] += 500; // adjust height for \ddots - SVG.FONTDATA.FONTS[MAIN][0x2212][1] += 100; // adjust depth for minus (arrow extender) + SVG.FONTDATA.FONTS[MAIN][0x2212][0] = SVG.FONTDATA.FONTS[MAIN][0x002B][0]; // - needs height and depth of + + SVG.FONTDATA.FONTS[MAIN][0x2212][1] = SVG.FONTDATA.FONTS[MAIN][0x002B][1]; // - needs height and depth of + SVG.FONTDATA.FONTS[MAIN][0x003D][1] += 100; // adjust depth for = (double arrow extender) }); MathJax.Hub.Register.LoadHook(SVG.fontDir+"/Size5/Regular/Main.js",function () { diff --git a/unpacked/jax/output/SVG/fonts/TeX/fontdata-extra.js b/unpacked/jax/output/SVG/fonts/TeX/fontdata-extra.js index c80cc2d8f..0390c4d5f 100644 --- a/unpacked/jax/output/SVG/fonts/TeX/fontdata-extra.js +++ b/unpacked/jax/output/SVG/fonts/TeX/fontdata-extra.js @@ -35,6 +35,8 @@ SIZE1 = "MathJax_Size1", SIZE4 = "MathJax_Size4"; var H = "H", V = "V"; + var ARROWREP = [0x2212,MAIN,0,0,0,-.31,-.31]; // add depth for arrow extender + var DARROWREP = [0x3D,MAIN,0,0,0,0,.1]; // add depth for arrow extender var delim = { 0x003D: // equal sign @@ -43,16 +45,16 @@ }, 0x219E: // left two-headed arrow { - dir: H, HW: [[1000,AMS]], stretch: {left:[0x219E,AMS], rep:[0x2212,MAIN]} + dir: H, HW: [[1000,AMS]], stretch: {left:[0x219E,AMS], rep:ARROWREP} }, 0x21A0: // right two-headed arrow { - dir: H, HW: [[1000,AMS]], stretch: {right:[0x21A0,AMS], rep:[0x2212,MAIN]} + dir: H, HW: [[1000,AMS]], stretch: {right:[0x21A0,AMS], rep:ARROWREP} }, 0x21A4: // left arrow from bar { dir: H, HW: [], - stretch: {min:1, left:[0x2190,MAIN], rep:[0x2212,MAIN], right:[0x2223,SIZE1,0,-.05,.9]} + stretch: {min:1, left:[0x2190,MAIN], rep:ARROWREP, right:[0x2223,SIZE1,0,-.05,.9]} }, 0x21A5: // up arrow from bar { @@ -62,7 +64,7 @@ 0x21A6: // right arrow from bar { dir: H, HW: [[1000,MAIN]], - stretch: {left:[0x2223,SIZE1,-.09,-.05,.9], rep:[0x2212,MAIN], right:[0x2192,MAIN]} + stretch: {left:[0x2223,SIZE1,-.09,-.05,.9], rep:ARROWREP, right:[0x2192,MAIN]} }, 0x21A7: // down arrow from bar { @@ -82,12 +84,12 @@ 0x21BC: // left harpoon with barb up { dir: H, HW: [[1000,MAIN]], - stretch: {left:[0x21BC,MAIN], rep:[0x2212,MAIN]} + stretch: {left:[0x21BC,MAIN], rep:ARROWREP} }, 0x21BD: // left harpoon with barb down { dir: H, HW: [[1000,MAIN]], - stretch: {left:[0x21BD,MAIN], rep:[0x2212,MAIN]} + stretch: {left:[0x21BD,MAIN], rep:ARROWREP} }, 0x21BE: // up harpoon with barb right { @@ -102,12 +104,12 @@ 0x21C0: // right harpoon with barb up { dir: H, HW: [[1000,MAIN]], - stretch: {right:[0x21C0,MAIN], rep:[0x2212,MAIN]} + stretch: {right:[0x21C0,MAIN], rep:ARROWREP} }, 0x21C1: // right harpoon with barb down { dir: H, HW: [[1000,MAIN]], - stretch: {right:[0x21C1,MAIN], rep:[0x2212,MAIN]} + stretch: {right:[0x21C1,MAIN], rep:ARROWREP} }, 0x21C2: // down harpoon with barb right { @@ -162,17 +164,17 @@ 0x2906: // leftwards double arrow from bar { dir: H, HW: [], - stretch: {min:1, left:[0x21D0,MAIN], rep:[0x3D,MAIN], right:[0x2223,SIZE1,0,-.1]} + stretch: {min:1, left:[0x21D0,MAIN], rep:DARROWREP, right:[0x2223,SIZE1,0,-.1]} }, 0x2907: // rightwards double arrow from bar { dir: H, HW: [], - stretch: {min:.7, left:[0x22A8,AMS,0,-.12], rep:[0x3D,MAIN], right:[0x21D2,MAIN]} + stretch: {min:.7, left:[0x22A8,AMS,0,-.12], rep:DARROWREP, right:[0x21D2,MAIN]} }, 0x294E: // left barb up right barb up harpoon { dir: H, HW: [], - stretch: {min:.5, left:[0x21BC,MAIN], rep:[0x2212,MAIN], right:[0x21C0,MAIN]} + stretch: {min:.5, left:[0x21BC,MAIN], rep:ARROWREP, right:[0x21C0,MAIN]} }, 0x294F: // up barb right down barb right harpoon { @@ -182,7 +184,7 @@ 0x2950: // left barb dow right barb down harpoon { dir: H, HW: [], - stretch: {min:.5, left:[0x21BD,MAIN], rep:[0x2212,MAIN], right:[0x21C1,MAIN]} + stretch: {min:.5, left:[0x21BD,MAIN], rep:ARROWREP, right:[0x21C1,MAIN]} }, 0x2951: // up barb left down barb left harpoon { @@ -192,12 +194,12 @@ 0x295A: // leftwards harpoon with barb up from bar { dir: H, HW: [], - stretch: {min:1, left:[0x21BC,MAIN], rep:[0x2212,MAIN], right:[0x2223,SIZE1,0,-.05,.9]} + stretch: {min:1, left:[0x21BC,MAIN], rep:ARROWREP, right:[0x2223,SIZE1,0,-.05,.9]} }, 0x295B: // rightwards harpoon with barb up from bar { dir: H, HW: [], - stretch: {min:1, left:[0x2223,SIZE1,-.05,-.05,.9], rep:[0x2212,MAIN], right:[0x21C0,MAIN]} + stretch: {min:1, left:[0x2223,SIZE1,-.05,-.05,.9], rep:ARROWREP, right:[0x21C0,MAIN]} }, 0x295C: // up harpoon with barb right from bar { @@ -212,12 +214,12 @@ 0x295E: // leftwards harpoon with barb down from bar { dir: H, HW: [], - stretch: {min:1, left:[0x21BD,MAIN], rep:[0x2212,MAIN], right:[0x2223,SIZE1,0,-.05,.9]} + stretch: {min:1, left:[0x21BD,MAIN], rep:ARROWREP, right:[0x2223,SIZE1,0,-.05,.9]} }, 0x295F: // rightwards harpoon with barb down from bar { dir: H, HW: [], - stretch: {min:1, left:[0x2223,SIZE1,-.05,-.05,.9], rep:[0x2212,MAIN], right:[0x21C1,MAIN]} + stretch: {min:1, left:[0x2223,SIZE1,-.05,-.05,.9], rep:ARROWREP, right:[0x21C1,MAIN]} }, 0x2960: // up harpoon with barb left from bar { diff --git a/unpacked/jax/output/SVG/fonts/TeX/fontdata.js b/unpacked/jax/output/SVG/fonts/TeX/fontdata.js index 1d6c89565..c9fa2f51f 100644 --- a/unpacked/jax/output/SVG/fonts/TeX/fontdata.js +++ b/unpacked/jax/output/SVG/fonts/TeX/fontdata.js @@ -38,8 +38,8 @@ SIZE4 = "MathJax_Size4"; var H = "H", V = "V", EXTRAH = {load:"extra", dir:H}, EXTRAV = {load:"extra", dir:V}; var STDHW = [[1000,MAIN],[1200,SIZE1],[1800,SIZE2],[2400,SIZE3],[3000,SIZE4]]; - var ARROWREP = [0x2212,MAIN,0,0,0,0,.1]; // add depth for arrow extender - var DARROWREP = [0x3D,MAIN,0,0,0,0,.1]; // add depth for arrow extender + var ARROWREP = [0x2212,MAIN,0,0,0,-.31,-.31]; // add depth for arrow extender + var DARROWREP = [0x3D,MAIN,0,0,0,0,.1]; // add depth for arrow extender SVG.Augment({ FONTDATA: { @@ -368,6 +368,10 @@ { dir: H, HW: [[333+250,MAIN],[555+250,SIZE1],[1000+330,SIZE2],[1443+330,SIZE3],[1887,SIZE4]] }, + 0x2013: // en-dash + { + dir: H, HW: [[500,MAIN]], stretch: {rep:[0x2013,MAIN]} + }, 0x2016: // vertical arrow extension { dir: V, HW: [[602,SIZE1],[1000,MAIN,null,0x2225]], stretch: {ext:[0x2225,MAIN]} @@ -426,8 +430,8 @@ }, 0x2212: // horizontal line { - dir: H, HW: [[778,MAIN]], stretch: {rep:[0x2212,MAIN], fuzz:300} - }, + dir: H, HW: [[.5,MAIN,0,0x2013]], stretch: {rep:ARROWREP, fuzz:300} + }, 0x221A: // \surd { dir: V, HW: STDHW, @@ -513,8 +517,9 @@ 0x0303: {alias: 0x02DC, dir:H}, // wide tilde 0x030C: {alias: 0x02C7, dir:H}, // wide caron 0x0332: {alias: 0x2212, dir:H}, // combining low line - 0x2015: {alias: 0x2212, dir:H}, // horizontal line - 0x2017: {alias: 0x2212, dir:H}, // horizontal line + 0x2014: {alias: 0x2013, dir:H}, // em-dash + 0x2015: {alias: 0x2013, dir:H}, // horizontal line + 0x2017: {alias: 0x2013, dir:H}, // horizontal line 0x203E: {alias: 0x00AF, dir:H}, // over line 0x2215: {alias: 0x002F, dir:V}, // division slash 0x2329: {alias: 0x27E8, dir:V}, // langle @@ -1558,13 +1563,15 @@ 0x3F5: [431,11,406,40,382,'227 -11Q149 -11 95 41T40 174Q40 262 87 322Q121 367 173 396T287 430Q289 431 329 431H367Q382 426 382 411Q382 385 341 385H325H312Q191 385 154 277L150 265H327Q340 256 340 246Q340 228 320 219H138V217Q128 187 128 143Q128 77 160 52T231 26Q258 26 284 36T326 57T343 68Q350 68 354 58T358 39Q358 36 357 35Q354 31 337 21T289 0T227 -11'] }; - SVG.FONTDATA.FONTS['MathJax_Main'][0x22EE][0] += 400; // adjust height for \vdots - SVG.FONTDATA.FONTS['MathJax_Main'][0x22F1][0] += 700; // adjust height for \ddots + SVG.FONTDATA.FONTS[MAIN][0x2212][0] = SVG.FONTDATA.FONTS[MAIN][0x002B][0]; // minus is size + SVG.FONTDATA.FONTS[MAIN][0x2212][1] = SVG.FONTDATA.FONTS[MAIN][0x002B][1]; // minus is size + SVG.FONTDATA.FONTS[MAIN][0x22EE][0] += 400; // adjust height for \vdots + SVG.FONTDATA.FONTS[MAIN][0x22F1][0] += 700; // adjust height for \ddots // // Add some spacing characters (more will come later) // - MathJax.Hub.Insert(SVG.FONTDATA.FONTS['MathJax_Main'],{ + MathJax.Hub.Insert(SVG.FONTDATA.FONTS[MAIN],{ 0x2000: [0,0,500,0,0,{space:1}], // en quad 0x2001: [0,0,1000,0,0,{space:1}], // em quad 0x2002: [0,0,500,0,0,{space:1}], // en space @@ -1582,13 +1589,13 @@ HUB.Register.StartupHook("SVG Jax Require",function () { HUB.Register.LoadHook(SVG.fontDir+"/Size4/Regular/Main.js",function () { - SVG.FONTDATA.FONTS['MathJax_Size4'][0xE154][0] += 200; // adjust height for brace extender - SVG.FONTDATA.FONTS['MathJax_Size4'][0xE154][1] += 200; // adjust depth for brace extender + SVG.FONTDATA.FONTS[SIZE4][0xE154][0] += 200; // adjust height for brace extender + SVG.FONTDATA.FONTS[SIZE4][0xE154][1] += 200; // adjust depth for brace extender }); - SVG.FONTDATA.FONTS['MathJax_Main'][0x2245][2] -= 222; // fix incorrect right bearing in font + SVG.FONTDATA.FONTS[MAIN][0x2245][2] -= 222; // fix incorrect right bearing in font HUB.Register.LoadHook(SVG.fontDir+"/Main/Bold/MathOperators.js",function () { - SVG.FONTDATA.FONTS['MathJax_Main-bold'][0x2245][2] -= 106; // fix incorrect right bearing in font + SVG.FONTDATA.FONTS[BOLD][0x2245][2] -= 106; // fix incorrect right bearing in font }); HUB.Register.LoadHook(SVG.fontDir+"/Typewriter/Regular/BasicLatin.js",function () {