Merge branch 'master' into bottleneck_documentation

3 files changed, 2 insertions, 55 deletions

diff --git a/src/Alpha_complex/test/Alpha_complex_unit_test.cpp b/src/Alpha_complex/test/Alpha_complex_unit_test.cpp
index 622fcae8..b46b6da5 100644
--- a/src/Alpha_complex/test/Alpha_complex_unit_test.cpp
+++ b/src/Alpha_complex/test/Alpha_complex_unit_test.cpp
@@ -42,7 +42,7 @@
 // Use dynamic_dimension_tag for the user to be able to set dimension
 typedef CGAL::Epick_d< CGAL::Dynamic_dimension_tag > Kernel_d;
 // Use static dimension_tag for the user not to be able to set dimension
-typedef CGAL::Epick_d< CGAL::Dimension_tag<2> > Kernel_s;
+typedef CGAL::Epick_d< CGAL::Dimension_tag<3> > Kernel_s;
 // The triangulation uses the default instantiation of the TriangulationDataStructure template parameter
 
 typedef boost::mpl::list<Kernel_d, Kernel_s> list_of_kernel_variants;
diff --git a/src/Doxyfile.in b/src/Doxyfile.in
index 5b1b8ecc..f80d4505 100644
--- a/src/Doxyfile.in
+++ b/src/Doxyfile.in
@@ -1441,7 +1441,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # The default value is: http://cdn.mathjax.org/mathjax/latest.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_RELPATH        = ../common
+MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
diff --git a/src/common/doc/MathJax.js b/src/common/doc/MathJax.js
deleted file mode 100644
index 35e1994e..00000000
--- a/src/common/doc/MathJax.js
+++ /dev/null
@@ -1,53 +0,0 @@
-(function () {
-  var newMathJax = 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js';
-  var oldMathJax = 'cdn.mathjax.org/mathjax/latest/MathJax.js';
-
-  var replaceScript = function (script, src) {
-    //
-    //  Make redirected script
-    //
-    var newScript = document.createElement('script');
-    newScript.src = newMathJax + src.replace(/.*?(\?|$)/, '$1');
-    //
-    //  Move onload and onerror handlers to new script
-    //
-    newScript.onload = script.onload; 
-    newScript.onerror = script.onerror;
-    script.onload = script.onerror = null;
-    //
-    //  Move any content (old-style configuration scripts)
-    //
-    while (script.firstChild) newScript.appendChild(script.firstChild);
-    //
-    //  Copy script id
-    //
-    if (script.id != null) newScript.id = script.id;
-    //
-    //  Replace original script with new one
-    //
-    script.parentNode.replaceChild(newScript, script);
-    //
-    //  Issue a console warning
-    //
-    console.warn('WARNING: cdn.mathjax.org has been retired. Check https://www.mathjax.org/cdn-shutting-down/ for migration tips.')
-  }
-
-  if (document.currentScript) {
-    var script = document.currentScript;
-    replaceScript(script, script.src);
-  } else {
-    //
-    // Look for current script by searching for one with the right source
-    //
-    var n = oldMathJax.length;
-    var scripts = document.getElementsByTagName('script');
-    for (var i = 0; i < scripts.length; i++) {
-      var script = scripts[i];
-      var src = (script.src || '').replace(/.*?:\/\//,'');
-      if (src.substr(0, n) === oldMathJax) {
-        replaceScript(script, src);
-        break;
-      }
-    }
-  }
-})();
\ No newline at end of file