Merge pull request #289 from mathjax/issue288

[main.js] add missing checks for htmlNode

Author: pkra

lib/main.js

@@ -684,7 +684,7 @@ function StartQueue() {
   //
   GetState(data.state);
 
-  var renderer = (data.html ? "CommonHTML" : "SVG");
+  var renderer = ( (data.html || data.htmlNode) ? "CommonHTML" : "SVG");
 
   //
   //  Set up a timeout timer to restart MathJax if it runs too long,
@@ -784,7 +784,7 @@ function SetRenderer(renderer) {
 }
 
 function RerenderSVG(result) {
-  if (data.html && data.svg) {
+  if ((data.html || data.htmlNode ) && (data.svg || data.svgNode)) {
     timer = setTimeout(RestartMathJax,data.timeout);
     var queue = MathJax.Callback.Queue(), $$ = window.Array;
     return queue.Push(

test/issue288.js

@@ -0,0 +1,26 @@
+var tape = require('tape');
+var mjAPI = require("../lib/main.js");
+
+tape('HTML output when requesting both SVG and HTML', function(t) {
+    t.plan(2);
+    mjAPI.start();
+    var tex = 'x';
+
+    mjAPI.typeset({
+        math: tex,
+        format: "TeX",
+        htmlNode: true,
+        svgNode: true
+    }, function(data) {
+        t.equal(data.htmlNode.className, 'mjx-chtml MJXc-display', 'htmlNode output is correct');
+    });
+
+    mjAPI.typeset({
+        math: tex,
+        format: "TeX",
+        html: true,
+        svgNode: true
+    }, function(data) {
+        t.ok(data.html, 'html output is present')
+    });
+});