From 8b439678f394ebbd67f10018caa2200253ba2946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= <georges.duperon@gmail.com>
Date: Wed, 28 Jun 2017 23:28:28 +0200
Subject: [PATCH] =?UTF-8?q?Avoid=20the=20need=20to=20put=20the=20$?=
 =?UTF-8?q?=E2=80=A6$=20and=20\[=E2=80=A6\]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MathJax/config/default.js |  2 +-
 dollar.rkt                | 68 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/MathJax/config/default.js b/MathJax/config/default.js
index 99092fe37..87edb5e65 100644
--- a/MathJax/config/default.js
+++ b/MathJax/config/default.js
@@ -101,7 +101,7 @@ MathJax.Hub.Config({
   //  jax array above, and "asciimath2jax.js" if you using "input/AsciiMath".
   //  Include "jsmath2jax.js" if you are converting from using jsMath to MathJax.
   //
-  extensions: ["tex2jax.js","TeX/AMSmath.js","TeX/AMSsymbols.js"],
+  extensions: ["jsMath2jax.js","TeX/AMSmath.js","TeX/AMSsymbols.js"],
   
   //
   //  Patterns to remove from before and after math script tags.  If you are not
diff --git a/dollar.rkt b/dollar.rkt
index bdb2112eb..080f51591 100644
--- a/dollar.rkt
+++ b/dollar.rkt
@@ -132,6 +132,56 @@ EOJS
    ;; </script>
    (load-script-string "MathJax/MathJax.js?config=default")))
 
+#;(define load-mathjax-code
+  (string->bytes/utf-8
+   (string-append (load-script-string "MathJax/MathJax.js?config=default")
+                  #<<EOJS
+(function(f) {
+  // A "simple" onLoad function
+  if (window.document.readyState == "complete") {
+    f();
+  } else if (window.document.addEventListener) {
+    window.document.addEventListener("DOMContentLoaded", f, false);
+  } else if (window.attachEvent) {
+    window.attachEvent("onreadystatechange", function() {
+      if (window.document.readyState == "complete") {
+        f();
+      }
+    });
+  } else {
+    var oldLoad = window.onload;
+    if (typeof(oldLoad) == "function") {
+      window.onload = function() {
+        try {
+          oldLoad();
+        } finally {
+          f();
+        }
+      };
+    } else {
+      window.onload = f;
+    }
+  }
+})(function() {
+  var wrap = function(elts, opn, cloz) {
+    var eltsX = [];
+    for (var i = 0; i < elts.length; i++) { eltsX[i] = elts[i]; }
+    for (var i = 0; i < eltsX.length; i++) {
+      var opntxt = document.createTextNode(opn);
+      var cloztxt = document.createTextNode(cloz);
+      var e = eltsX[i];
+      e.insertBefore(opntxt, e.firstChild);
+      e.appendChild(cloztxt);
+      e.className = e.className.replace(/\b(texMathInline|texMathDisplay)\b/g,
+                                        "texMath");
+    }
+  };
+  wrap(document.getElementsByClassName("texMathInline"), "\\(", "\\)");
+  wrap(document.getElementsByClassName("texMathDisplay"), "\\[", "\\]");
+});
+EOJS
+                  )))
+
 (define load-katex-code+style
   (string->bytes/utf-8
    (string-append (load-style-string "katex/katex.min.css")
@@ -194,21 +244,23 @@ EOJS
 (define tex-commands
   (string->bytes/utf-8 #<<EOTEX
 \def\texMath#1{#1}
-\def\texMathInline#1{$#1$}
-\def\texMathDisplay#1{\[#1\]}
+\def\texMathInline#1{\ensuremath{#1}}
+\def\texMathDisplay#1{\ifmmode #1\else\[#1\]\fi}
 EOTEX
                        ))
 
 (define math-inline-style-mathjax
-  (style "texMath"
-         (list #;(make-css-addition math-inline.css)
+  (style "math"
+         (list (alt-tag "span")
+               #;(make-css-addition math-inline.css)
                (install-resource mathjax-dir)
                (js-addition load-mathjax-code)
                'exact-chars)))
 
 (define math-display-style-mathjax
-  (style "texMath"
-         (list #;(make-css-addition math-inline.css)
+  (style "math"
+         (list (alt-tag "div")
+               #;(make-css-addition math-inline.css)
                (install-resource mathjax-dir)
                (js-addition load-mathjax-code)
                'exact-chars)))
@@ -236,14 +288,14 @@ EOTEX
                'exact-chars)))
 
 (define ($-mathjax strs)
-  (elem #:style math-inline-style-mathjax `("$" ,@strs "$")))
+  (elem #:style math-inline-style-mathjax strs))
 
 (define ($-katex strs)
   (elem #:style math-inline-style-katex
                 (map katex-convert-unicode (flatten strs))))
 
 (define ($$-mathjax strs)
-  (elem #:style math-display-style-mathjax `("\\[" ,@strs "\\]")))
+  (elem #:style math-display-style-mathjax strs))
 
 (define ($$-katex strs)
   (elem #:style math-display-style-katex