Skip to content

Commit 068b907

Browse files
dpvcdpvc
committed
Merge pull request #630 from fred-wang/issue612
First step in Issue #612 (Move TeX/STIX font data from boldsymbol extension)
2 parents dc1364e + 6f3051e commit 068b907

File tree

4 files changed

+41
-62
lines changed

4 files changed

+41
-62
lines changed

‎unpacked/extensions/TeX/boldsymbol.js

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -72,58 +72,4 @@ MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () {
7272

7373
});
7474

75-
MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () {
76-
var HTMLCSS = MathJax.OutputJax["HTML-CSS"];
77-
var FONTS = HTMLCSS.FONTDATA.FONTS;
78-
var VARIANT = HTMLCSS.FONTDATA.VARIANT;
79-
80-
if (HTMLCSS.fontInUse === "TeX") {
81-
FONTS["MathJax_Caligraphic-bold"] = "Caligraphic/Bold/Main.js";
82-
83-
VARIANT["-tex-caligraphic-bold"] =
84-
{fonts:["MathJax_Caligraphic-bold","MathJax_Main-bold","MathJax_Main","MathJax_Math","MathJax_Size1"],
85-
offsetA: 0x41, variantA: "bold-italic"};
86-
VARIANT["-tex-oldstyle-bold"] =
87-
{fonts:["MathJax_Caligraphic-bold","MathJax_Main-bold","MathJax_Main","MathJax_Math","MathJax_Size1"]};
88-
89-
if (HTMLCSS.msieCheckGreek && HTMLCSS.Font.testFont({
90-
family:"MathJax_Greek", weight:"bold", style:"italic", testString: HTMLCSS.msieCheckGreek
91-
})) {
92-
VARIANT["bold-italic"].offsetG = 0x391; VARIANT["bold-italic"].variantG = "-Greek-Bold-Italic";
93-
VARIANT["-Greek-Bold-Italic"] = {fonts:["MathJax_Greek-bold-italic"]};
94-
FONTS["MathJax_Greek-bold-italic"] = "Greek/BoldItalic/Main.js";
95-
}
96-
97-
if (MathJax.Hub.Browser.isChrome && !MathJax.Hub.Browser.versionAtLeast("5.0")) {
98-
VARIANT["-tex-caligraphic-bold"].remap = {0x54: [0xE2F0,"-WinChrome"]};
99-
}
100-
101-
} else if (HTMLCSS.fontInUse === "STIX") {
102-
VARIANT["-tex-caligraphic-bold"] = {
103-
fonts:["STIXGeneral-bold-italic","STIXNonUnicode-bold-italic","STIXNonUnicode","STIXGeneral","STIXSizeOneSym"],
104-
offsetA: 0xE247, noLowerCase: 1
105-
};
106-
VARIANT["-tex-oldstyle-bold"] = {
107-
fonts:["STIXGeneral-bold","STIXNonUnicode-bold","STIXGeneral","STIXSizeOneSym"], offsetN: 0xE263,
108-
remap: {0xE264: 0xE267, 0xE265: 0xE26B, 0xE266: 0xE26F, 0xE267: 0xE273,
109-
0xE268: 0xE277, 0xE269: 0xE27B, 0xE26A: 0xE27F, 0xE26B: 0xE283,
110-
0xE26C: 0xE287}
111-
};
112-
}
113-
});
114-
115-
MathJax.Hub.Register.StartupHook("SVG Jax Ready",function () {
116-
var SVG = MathJax.OutputJax.SVG;
117-
var FONTS = SVG.FONTDATA.FONTS;
118-
var VARIANT = SVG.FONTDATA.VARIANT;
119-
120-
FONTS["MathJax_Caligraphic-bold"] = "Caligraphic/Bold/Main.js";
121-
122-
VARIANT["-tex-caligraphic-bold"] =
123-
{fonts:["MathJax_Caligraphic-bold","MathJax_Main-bold","MathJax_Main","MathJax_Math","MathJax_Size1"],
124-
offsetA: 0x41, variantA: "bold-italic"};
125-
VARIANT["-tex-oldstyle-bold"] =
126-
{fonts:["MathJax_Caligraphic-bold","MathJax_Main-bold","MathJax_Main","MathJax_Math","MathJax_Size1"]};
127-
});
128-
12975
MathJax.Ajax.loadComplete("[MathJax]/extensions/TeX/boldsymbol.js");

‎unpacked/jax/output/HTML-CSS/fonts/STIX/fontdata.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,17 @@
105105
0xE26A: 0xE285}},
106106
"-tex-mathit": {fonts: [ITALIC,NONUNII,GENERAL,NONUNI,SIZE1], italic:true, noIC:true},
107107
"-largeOp": {fonts:[SIZE1,"STIXIntegralsD",NONUNI,GENERAL]},
108-
"-smallOp": {}
108+
"-smallOp": {},
109+
"-tex-caligraphic-bold": {
110+
fonts:["STIXGeneral-bold-italic","STIXNonUnicode-bold-italic","STIXNonUnicode","STIXGeneral","STIXSizeOneSym"], bold:true,
111+
offsetA: 0xE247, noLowerCase: 1
112+
},
113+
"-tex-oldstyle-bold": {
114+
fonts:["STIXGeneral-bold","STIXNonUnicode-bold","STIXGeneral","STIXSizeOneSym"], bold:true, offsetN: 0xE263,
115+
remap: {0xE264: 0xE267, 0xE265: 0xE26B, 0xE266: 0xE26F,
116+
0xE267: 0xE273, 0xE268: 0xE277, 0xE269: 0xE27B,
117+
0xE26A: 0xE27F, 0xE26B: 0xE283, 0xE26C: 0xE287}
118+
}
109119
},
110120

111121
RANGES: [

‎unpacked/jax/output/HTML-CSS/fonts/TeX/fontdata.js

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
"MathJax_SansSerif-bold": "SansSerif/Bold/Main.js",
6767
"MathJax_SansSerif-italic": "SansSerif/Italic/Main.js",
6868
"MathJax_Script": "Script/Regular/Main.js",
69-
"MathJax_Typewriter": "Typewriter/Regular/Main.js"
69+
"MathJax_Typewriter": "Typewriter/Regular/Main.js",
70+
"MathJax_Caligraphic-bold": "Caligraphic/Bold/Main.js"
7071
},
7172

7273
VARIANT: {
@@ -132,7 +133,10 @@
132133
0x210F:[0x210F,MML.VARIANT.NORMAL] // \hslash
133134
}},
134135
"-largeOp": {fonts:[SIZE2,SIZE1,MAIN]},
135-
"-smallOp": {fonts:[SIZE1,MAIN]}
136+
"-smallOp": {fonts:[SIZE1,MAIN]},
137+
"-tex-caligraphic-bold": {fonts:["MathJax_Caligraphic-bold","MathJax_Main-bold","MathJax_Main","MathJax_Math","MathJax_Size1"], bold:true,
138+
offsetA: 0x41, variantA: "bold-italic"},
139+
"-tex-oldstyle-bold": {fonts:["MathJax_Caligraphic-bold","MathJax_Main-bold","MathJax_Main","MathJax_Math","MathJax_Size1"], bold:true}
136140
},
137141

138142
RANGES: [
@@ -1590,7 +1594,7 @@
15901594
HTMLCSS.FONTDATA.REMAP[0x2CB] = 0x60; // grave
15911595
HTMLCSS.FONTDATA.REMAP[0x2DA] = 0xB0; // ring above
15921596

1593-
var testString = HTMLCSS.msieCheckGreek =
1597+
var testString =
15941598
String.fromCharCode(0x393)+" "+String.fromCharCode(0x3A5)+" "+String.fromCharCode(0x39B);
15951599

15961600
HTMLCSS.FONTDATA.RANGES.push({name: "IEgreek", low: 0x03B1, high: 0x03C9, offset: "IEG", add: 32});
@@ -1762,6 +1766,20 @@
17621766
};
17631767

17641768
}
1769+
1770+
if (HTMLCSS.Font.testFont({family:"MathJax_Greek", weight:"bold", style:"italic", testString: testString})) {
1771+
HTMLCSS.Augment({
1772+
FONTDATA: {
1773+
VARIANT: {
1774+
"bold-italic": {offsetG: 0x391,
1775+
variantG: "-Greek-Bold-Italic"},
1776+
"-Greek-Bold-Italic": {fonts:["MathJax_Greek-bold-italic"]}
1777+
},
1778+
FONTS: {"MathJax_Greek-bold-italic": "Greek/BoldItalic/Main.js"}
1779+
}
1780+
});
1781+
}
1782+
17651783
}
17661784

17671785
if (HTMLCSS.msieIE6) {
@@ -1879,7 +1897,6 @@
18791897
delete HTMLCSS.FONTDATA.REMAPACCENT["\u2192"];
18801898
}
18811899
if (browser.isPC && !MathJax.Hub.Browser.versionAtLeast("5.0")) {
1882-
// FIXME: patch caligraphic bold, too
18831900
var WinChrome = "-WinChrome";
18841901
HTMLCSS.Augment({
18851902
FONTDATA: {
@@ -1888,6 +1905,7 @@
18881905
bold: {remap: {0xE2F1: [0x3E,WinChrome]}},
18891906
italic: {remap: {0x64: [0x64,WinChrome]}},
18901907
"-tex-caligraphic": {remap: {0x54: [0x54,WinChrome]}},
1908+
"-tex-caligraphic-bold": {remap: {0x54: [0xE2F0,WinChrome]}},
18911909
"-largeOp": {remap: {0x2A00: [0x2A00,WinChrome]}},
18921910
"-smallOp": {remap: {0x22C3: [0x22C3,WinChrome]}},
18931911
"-WinChrome": {fonts:["MathJax_WinChrome"]}
@@ -1918,8 +1936,9 @@
19181936
0xE2F0: [720,69,644,38,947], // stix-lowercase u italic slashed
19191937
0xE2F1: [587,85,894,96,797] // stix-lowercase u bold italic slashed
19201938
};
1921-
1939+
19221940
}
1941+
19231942
}
19241943

19251944
});

‎unpacked/jax/output/SVG/fonts/TeX/fontdata.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@
6464
"MathJax_SansSerif-bold": "SansSerif/Bold/Main.js",
6565
"MathJax_SansSerif-italic": "SansSerif/Italic/Main.js",
6666
"MathJax_Script": "Script/Regular/Main.js",
67-
"MathJax_Typewriter": "Typewriter/Regular/Main.js"
67+
"MathJax_Typewriter": "Typewriter/Regular/Main.js",
68+
"MathJax_Caligraphic-bold": "Caligraphic/Bold/Main.js"
6869
},
6970

7071
VARIANT: {
@@ -130,7 +131,10 @@
130131
0x210F:[0x210F,MML.VARIANT.NORMAL] // \hslash
131132
}},
132133
"-largeOp": {fonts:[SIZE2,SIZE1,MAIN]},
133-
"-smallOp": {fonts:[SIZE1,MAIN]}
134+
"-smallOp": {fonts:[SIZE1,MAIN]},
135+
"-tex-caligraphic-bold": {fonts:["MathJax_Caligraphic-bold","MathJax_Main-bold","MathJax_Main","MathJax_Math","MathJax_Size1"], bold:true,
136+
offsetA: 0x41, variantA: "bold-italic"},
137+
"-tex-oldstyle-bold": {fonts:["MathJax_Caligraphic-bold","MathJax_Main-bold","MathJax_Main","MathJax_Math","MathJax_Size1"], bold:true}
134138
},
135139

136140
RANGES: [

0 commit comments

Comments
 (0)