Merge pull request #374 from mathjax/develop

1.3.0 release
mathjax · Dec 29, 2017 · a30432f · a30432f
2 parents b1618f8 + fd83f71
commit a30432f
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 266 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,8 @@ node_js:
 - '5'
 - '6'
 - '7'
+- '8'
+- '9'
 - stable
 sudo: false
 script:

diff --git a/README.md b/README.md
@@ -114,6 +114,7 @@ The following are the default input options.
   useGlobalCache: false,          // use common <defs> for all equations?
   linebreaks: false,              // automatic linebreaking
   equationNumbers: "none",        // automatic equation numbering ("none", "AMS" or "all")
+  cjkCharWidth: 13,               // width of CJK character
 
   math: "",                       // the math string to typeset
   format: "TeX",                  // the input format (TeX, inline-TeX, AsciiMath, or MathML)

diff --git a/lib/main.js b/lib/main.js
@@ -31,6 +31,7 @@ var fs = require('fs');
 var path = require('path');
 var url = require('url');
 var jsdom = require('jsdom').jsdom;
+var isFullwidthCodePoint = require('is-fullwidth-code-point');
 
 require('./patch/jsdom.js').patch(jsdom);  //  Fix some bugs in jsdom
 
@@ -47,6 +48,7 @@ var defaults = {
   useGlobalCache: false,          // use common <defs> for all equations?
   linebreaks: false,              // do linebreaking?
   equationNumbers: "none",        // or "AMS" or "all"
+  cjkCharWidth: 13,               // width of CJK character
 
   math: "",                       // the math to typeset
   format: "TeX",                  // the input format (TeX, inline-TeX, AsciiMath, or MathML)
@@ -309,7 +311,11 @@ function ConfigureMathJax() {
             if (def["font-weight"] === "") delete def["font-weight"];
             this.SUPER(arguments).Init.call(this,def);
             SVG.addText(this.element,text);
-            var bbox = {width: text.length * 8.5, height: 18, y: -12};
+            // tweaking font fallback behavior: https://github.com/mathjax/MathJax-node/issues/299
+            var textWidth = text.split('')
+              .map(function(c) { return isFullwidthCodePoint(c.codePointAt()) ? data.cjkCharWidth : 8.5 })
+              .reduce(function(a, b) { return a + b }, 0);
+            var bbox = {width: textWidth, height: 18, y: -12};
             scale *= 1000/SVG.em;
             this.element.setAttribute("font-family","monospace");
             this.element.setAttribute("transform","scale("+scale+") matrix(1 0 0 -1 0 0)");

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mathjax-node",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "API's for calling MathJax from node.js",
   "keywords": [
     "MathJax",
@@ -23,8 +23,9 @@
     "url": "git://github.com/mathjax/MathJax-node.git"
   },
   "dependencies": {
+    "is-fullwidth-code-point": "^2.0.0",
     "jsdom": "7.0 - 9.12",
-    "mathjax": "*"
+    "mathjax": "^2.7.2"
   },
   "scripts": {
     "test": "tape test/*.js"

diff --git a/test-files/sample-mml.html b/test-files/sample-mml.html
diff --git a/test-files/sample-tex.html b/test-files/sample-tex.html
diff --git a/test-files/test-am.html b/test-files/test-am.html
diff --git a/test-files/test-mml.html b/test-files/test-mml.html
diff --git a/test-files/test-mml2.html b/test-files/test-mml2.html
diff --git a/test-files/test-tex.html b/test-files/test-tex.html
diff --git a/test-files/tex-filter.txt b/test-files/tex-filter.txt
diff --git a/test/svg-full-width-chars.js b/test/svg-full-width-chars.js
@@ -0,0 +1,17 @@
+var tape = require('tape');
+var mjAPI = require("../lib/main.js");
+
+tape('the SVG output should renders full-width characters correctly', function(t) {
+  t.plan(1);
+
+  mjAPI.start();
+  var tex = '\\text{拾零}^i';
+
+  mjAPI.typeset({
+    math: tex,
+    format: "TeX",
+    svg: true
+  }, function(data) {
+    t.ok(data.width, '5.133ex', 'Width is correct');
+  });
+});