Skip to content

Commit

Permalink
Adjust height and depth of minus to match plus, and fix arrow rep to …
Browse files Browse the repository at this point in the history 
…remove the extra when it is used as an arrow extender. Fix up some spacing and use shorthands for some font names. Resolves issue mathjax#1187.
  • Loading branch information
@dpvc
dpvc committed Jun 17, 2016
1 parent 1d9ba69 commit 8f628e0
Show file tree
Hide file tree
Showing 22 changed files with 319 additions and 236 deletions.
36 changes: 19 additions & 17 deletions unpacked/jax/output/CommonHTML/fonts/TeX/fontdata-extra.js
View file
Expand Up @@ -35,24 +35,26 @@
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
{
dir: H, HW: [[.767,MAIN]], stretch: {rep:[0x003D,MAIN]}
},
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
{
Expand All @@ -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
{
Expand All @@ -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
{
Expand All @@ -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
{
Expand Down Expand Up @@ -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
{
Expand All @@ -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
{
Expand All @@ -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
{
Expand All @@ -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
{
Expand Down
6 changes: 4 additions & 2 deletions unpacked/jax/output/CommonHTML/fonts/TeX/fontdata.js
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
29 changes: 18 additions & 11 deletions unpacked/jax/output/HTML-CSS/fonts/Asana-Math/fontdata.js
View file
Expand Up @@ -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",
Expand Down Expand Up @@ -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},
Expand All @@ -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,
Expand Down Expand Up @@ -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:
{
Expand Down Expand Up @@ -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:
{
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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:
{
Expand Down Expand Up @@ -506,7 +509,7 @@
},
0x23E0: EXTRAH,
0x23E1: EXTRAH,
0x2500: {alias: 0x305, dir: H},
0x2500: {alias: 0x2212, dir: H},
0x2758: {alias: 0x2223, dir: V},
0x27C5:
{
Expand Down Expand Up @@ -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];
Expand Down
28 changes: 16 additions & 12 deletions unpacked/jax/output/HTML-CSS/fonts/Gyre-Pagella/fontdata.js
View file
Expand Up @@ -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",
Expand Down Expand Up @@ -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},
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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:
{
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -598,7 +598,7 @@
},
0x23E0: EXTRAH,
0x23E1: EXTRAH,
0x2500: {alias: 0x305, dir: H},
0x2500: {alias: 0x2212, dir: H},
0x27A1: EXTRAH,
0x27E6: EXTRAV,
0x27E7: EXTRAV,
Expand Down Expand Up @@ -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++) {
Expand Down

0 comments on commit 8f628e0

Please sign in to comment.