From 05f92338869ec3e14e4c771cafd07d050e65422e Mon Sep 17 00:00:00 2001 From: Peter Krautzberger Date: Tue, 17 Feb 2015 11:02:36 +0100 Subject: [PATCH 1/3] Update with recent fixes from @davidcarlisle Fixes #1024 --- unpacked/extensions/MathML/mml3.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/unpacked/extensions/MathML/mml3.js b/unpacked/extensions/MathML/mml3.js index ac6fac035..575953eea 100644 --- a/unpacked/extensions/MathML/mml3.js +++ b/unpacked/extensions/MathML/mml3.js @@ -3,7 +3,7 @@ * MathJax/extensions/MathML/mml3.js * * This file implements an XSLT transform to convert some MathML 3 - * constructs to constructs MathJax can bit render. The transform is + * constructs to constructs MathJax can render. The transform is * performed in a pre-filter for the MathML input jax, so that the * Show Math As menu will still show the Original MathML correctly, * but the transformed MathML can be obtained from the regular MathML menu. @@ -15,24 +15,24 @@ * } * * in your configuration. - * + * * A portion of this file is taken from mml3mj.xsl which is - * Copyright (c) David Carlisle 2008-2014 + * Copyright (c) David Carlisle 2008-2015 * and is used by permission of David Carlisle, who has agreed to allow us * to release it under the Apache2 license (see below). That portion is * indicated via comments. - * + * * The remainder falls under the copyright that follows. * --------------------------------------------------------------------- * * Copyright (c) 2013-2015 The MathJax Consortium - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -42,7 +42,7 @@ MathJax.Extension["MathML/mml3"] = { - version: "2.5.0" + version: "2.5.1" }; MathJax.Hub.Register.StartupHook("MathML Jax Ready",function () { @@ -74,11 +74,11 @@ MathJax.Hub.Register.StartupHook("MathML Jax Ready",function () { /* * The following is taken from mml3mj.xsl * (https://web-xslt.googlecode.com/svn/trunk/ctop/mml3mj.xsl) - * which is Copyright (c) David Carlisle 2008-2014. + * which is Copyright (c) David Carlisle 2008-2015. * It is used by permission of David Carlisle, who has agreed to allow it to * be released under the Apache License, Version 2.0. */ - var mml3Stylesheet = ' this[\'node-set\'] = function (x) { return x; })(][}{)(][}{\)(}{><top right 0decimalpoint decimalpoint.decimalpoint*0.1em0.15em0.2em0.15em0)(/\\:=top)'; + var mml3Stylesheet = ' this[\'node-set\'] = function (x) { return x; })(][}{)(][}{\)(}{><top right 0decimalpoint decimalpoint.decimalpoint*0.1em0.15em0.2em0.15em0)(/\\:=top)'; /* * End of mml3mj.xsl material. */ From 3308957304f4276f02645bc02ac88395c94a74f5 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Thu, 19 Feb 2015 08:58:01 -0500 Subject: [PATCH 2/3] Fix some comments. --- unpacked/jax/output/HTML-CSS/jax.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unpacked/jax/output/HTML-CSS/jax.js b/unpacked/jax/output/HTML-CSS/jax.js index a7f706eda..1564dfbdc 100644 --- a/unpacked/jax/output/HTML-CSS/jax.js +++ b/unpacked/jax/output/HTML-CSS/jax.js @@ -1857,8 +1857,8 @@ HTMLaddAttributes: function(span) { // // Copy RDFa, aria, and other tags from the MathML to the HTML-CSS - // output spans Don't copy those in the MML.nocopyAttributes list, - // the ignoreMMLattributes configuration list, or anything tha + // output spans. Don't copy those in the MML.nocopyAttributes list, + // the ignoreMMLattributes configuration list, or anything that // already exists as a property of the span (e.g., no "onlick", etc.) // If a name in the ignoreMMLattributes object is set to false, then // the attribute WILL be copied. From 13ebde0937e48a29190c65149abc87235b08e739 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Thu, 19 Feb 2015 08:59:23 -0500 Subject: [PATCH 3/3] Correct computation of TeX class for maction elements (handle embellished operators correctly). --- unpacked/jax/element/mml/jax.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpacked/jax/element/mml/jax.js b/unpacked/jax/element/mml/jax.js index d8fac27bd..2909c5053 100644 --- a/unpacked/jax/element/mml/jax.js +++ b/unpacked/jax/element/mml/jax.js @@ -1274,7 +1274,10 @@ MathJax.ElementJax.mml.Augment({ // Make sure tooltip has proper spacing when typeset (see issue #412) this.data[1].setTeXclass(); } - return this.selected().setTeXclass(prev); + var selected = this.selected(); + prev = selected.setTeXclass(prev); + this.updateTeXclass(selected); + return prev; } });