[Pkg-javascript-commits] [mathjax] 01/01: Refresh no_extra_fonts.diff for 2.4.

[Dmitry Shachnev]

This is an automated email from the git hooks/post-receive script.

mitya57-guest pushed a commit to branch master
in repository mathjax.

commit d7b37b2b36353656f70f3267d3757fd4b283dadd
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jun 15 15:03:48 2014 +0400

    Refresh no_extra_fonts.diff for 2.4.
---
 debian/changelog                   |  1 +
 debian/patches/no_extra_fonts.diff | 54 +++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4972403..92206a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mathjax (2.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Update debian/copyright.
+  * Refresh no_extra_fonts.diff.
   * Stop forcing xz compression, it is default now.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Sun, 15 Jun 2014 14:50:55 +0400
diff --git a/debian/patches/no_extra_fonts.diff b/debian/patches/no_extra_fonts.diff
index e0dd25d..8288aa7 100644
--- a/debian/patches/no_extra_fonts.diff
+++ b/debian/patches/no_extra_fonts.diff
@@ -1,11 +1,11 @@
 Description: disable extra fonts, we do not ship them at the moment
 Author: Dmitry Shachnev <mitya57 at gmail.com>
 Forwarded: not-needed
-Last-Update: 2014-02-12
+Last-Update: 2014-05-15
 
 --- a/unpacked/extensions/MathMenu.js
 +++ b/unpacked/extensions/MathMenu.js
-@@ -1087,13 +1087,7 @@
+@@ -1109,13 +1109,7 @@
            ITEM.RADIO(["TeXImage","TeX (image)"],   "font", {action: MENU.Font}),
            ITEM.RULE(),
            ITEM.RADIO(["STIXLocal","STIX (local)"], "font", {action: MENU.Font}),
@@ -22,33 +22,27 @@ Last-Update: 2014-02-12
            ITEM.RADIO("MathJax", "context"),
 --- a/unpacked/jax/output/HTML-CSS/jax.js
 +++ b/unpacked/jax/output/HTML-CSS/jax.js
-@@ -334,11 +334,6 @@
-         else if (settings.font === "TeXimage") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = ""}
-         else if (settings.font === "STIXlocal") {this.config.availableFonts = ["STIX"]; this.config.preferredFont = "STIX"; this.config.webFont = "STIX-Web"}
-         else if (settings.font === "STIXWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "STIX-Web"}
--        else if (settings.font === "AsanaMathWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "Asana-Math"}
--        else if (settings.font === "GyrePagellaWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "Gyre-Pagella"}
--        else if (settings.font === "GyreTermesWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "Gyre-Termes"}
--        else if (settings.font === "LatinModernWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "Latin-Modern"}
--        else if (settings.font === "NeoEulerWeb") {this.config.availableFonts = []; this.config.preferredFont = ""; this.config.webFont = "Neo-Euler"}
-       }
-       var font = this.Font.findFont(this.config.availableFonts,this.config.preferredFont);
-       if (!font && this.allowWebFonts) {font = this.config.webFont; if (font) {this.webFonts = true}}
+@@ -373,11 +373,6 @@
+       TeXImage:       ["",""],
+       STIXLocal:      ["STIX","STIX-Web"],
+       STIXWeb:        "STIX-Web",
+-      AsanaMathWeb:   "Asana-Math",
+-      GyrePagellaWeb: "Gyre-Pagella",
+-      GyreTermesWeb:  "Gyre-Termes",
+-      LatinModernWeb: "Latin-Modern",
+-      NeoEulerWeb:    "Neo-Euler"
+     },
+     
+     fontInUse: "generic",
 --- a/unpacked/jax/output/SVG/jax.js
 +++ b/unpacked/jax/output/SVG/jax.js
-@@ -99,15 +99,6 @@
-       if (settings.scale) {this.config.scale = settings.scale}
-       this.SUPER(arguments).Config.apply(this,arguments);
-       this.fontInUse = this.config.font;
--      if (settings.font && settings.font !== "Auto") {
--        if (settings.font === "TeXWeb") {this.fontInUse = "TeX"}
--        else if (settings.font === "STIXWeb") {this.fontInUse = "STIX-Web"}
--        else if (settings.font === "AsanaMathWeb") {this.fontInUse = "Asana-Math"}
--        else if (settings.font === "GyrePagellaWeb") {this.fontInUse = "Gyre-Pagella"}
--        else if (settings.font === "GyreTermesWeb") {this.fontInUse = "Gyre-Termes"}
--        else if (settings.font === "LatinModernWeb") {this.fontInUse = "Latin-Modern"}
--        else if (settings.font === "NeoEulerWeb") {this.fontInUse = "Neo-Euler"}
--      }
-       this.fontDir += "/" + this.fontInUse;
-       if (!this.require) {this.require = []}
-       this.require.push(this.fontDir+"/fontdata.js");
+@@ -101,8 +101,7 @@
+ 
+     hideProcessedMath: true,           // use display:none until all math is processed
+ 
+-    fontNames: ["TeX","STIX","STIX-Web","Asana-Math",
+-                "Gyre-Termes","Gyre-Pagella","Latin-Modern","Neo-Euler"],
++    fontNames: ["TeX","STIX","STIX-Web","Asana-Math"],
+ 
+ 
+     Config: function () {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/mathjax.git