From a2748508bd0165d3c442b6d2a6956e3e0cc93465 Mon Sep 17 00:00:00 2001 From: Martin Hensel Date: Wed, 21 Feb 2018 09:18:31 +0100 Subject: [PATCH] 3.3.0 --- README.md | 16 +- mhchem.js | 573 +++++++++++++++++++++------------------------ package.json | 2 +- unpacked/mhchem.js | 124 +++++----- 4 files changed, 339 insertions(+), 376 deletions(-) diff --git a/README.md b/README.md index c56cb6b..79918f6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# MathJax/mhchem Extension 3.2 +# MathJax/mhchem Extension 3.3 -mhchem 3.2 is a 3rd-party extension to MathJax for typesetting chemical equations. +mhchem 3.3 is a 3rd-party extension to MathJax for typesetting chemical equations. ## Usage @@ -13,15 +13,19 @@ mhchem 3.2 is a 3rd-party extension to MathJax for typesetting chemical equation [The manual (including a live test drive)](https://mhchem.github.io/MathJax-mhchem/) -## Using the MathJax CDN +## Using cdnjs For information on how to load the extension and make the `\ce` command available, see the [official MathJax docs](http://docs.mathjax.org/en/latest/configuration.html#using-in-line-configuration-options). In short, use this config: - TeX: { - extensions: ["[Contrib]/mhchem/mhchem.js"] - } + MathJax.Ajax.config.path["mhchem"] = + "https://cdnjs.cloudflare.com/ajax/libs/mathjax-mhchem/3.3.0"; + MathJax.Hub.Config({ + TeX: { + extensions: ["[mhchem]/mhchem.js"] + } + }); ## Changes of v3.0.x (when compared to v2.6.0 "legacy: true") diff --git a/mhchem.js b/mhchem.js index 55d1af1..d980ec5 100644 --- a/mhchem.js +++ b/mhchem.js @@ -8,7 +8,7 @@ * --------------------------------------------------------------------- * * Copyright (c) 2011-2015 The MathJax Consortium - * Copyright (c) 2015-2017 Martin Hensel + * Copyright (c) 2015-2018 Martin Hensel * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,311 +22,270 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -MathJax.Extension["TeX/mhchem"]={version:"3.2.0"},MathJax.Hub.Register.StartupHook("TeX Jax Ready", -function(){var n=MathJax.InputJax.TeX,r=MathJax.Object.Subclass({string:"",Init: -function(n){this.string=n},Parse: -function(r){try{return o.go(t.go(this.string,r))}catch(r){n.Error(r)}}}),t={};t.go= -function(n,r){if(!n)return n;void 0===r&&(r="ce");var o="0",e={};e.pL=0,n=n.replace(/[\u2212\u2013\u2014\u2010]/g,"-"),n=n.replace(/[\u2026]/g,"...");for(var a,u,i=[];;){a!==n?(u=10,a=n):u--;var s=t.c[r],l=s.e.length;n:for(var h=0;h0))return i;if(c.s||(n=f.t),!c.u)break n}}}if(u<=0)throw["MhchemBugU","mhchem bug U. Please report."]}}, -t.j= -function(n,r){return r?n?n.concat(r):[].concat(r):n},t.w={"~C":/^$/,"~A":/^./,"~B":/^./,"%m":/^\s/,"%l":/^\s(?=[A-Z\\$])/,"~@":/^[a-z]/,x:/^x/,x$:/^x$/,i$:/^i$/,"~M":/^(?:[a-zA-Z\u03B1-\u03C9\u0391-\u03A9?@]|(?:\\(?:alpha|beta|gamma|delta|epsilon|zeta|eta|theta|iota|kappa|lambda|mu|nu|xi|omicron|pi|rho|sigma|tau|upsilon|phi|chi|psi|omega|Gamma|Delta|Theta|Lambda|Xi|Pi|Sigma|Upsilon|Phi|Psi|Omega)(?:\s+|\{\}|(?![a-zA-Z]))))+/,"@z":/^\\(?:alpha|beta|gamma|delta|epsilon|zeta|eta|theta|iota|kappa|lambda|mu|nu|xi|omicron|pi|rho|sigma|tau|upsilon|phi|chi|psi|omega|Gamma|Delta|Theta|Lambda|Xi|Pi|Sigma|Upsilon|Phi|Psi|Omega)(?:\s+|\{\}|(?![a-zA-Z]))/,"~P":/^(?:([a-z])(?:$|[^a-zA-Z]))$/,"@%":/^\$(?:([a-z])(?:$|[^a-zA-Z]))\$$/,"~O":/^(?:\$?[\u03B1-\u03C9]\$?|\$?\\(?:alpha|beta|gamma|delta|epsilon|zeta|eta|theta|iota|kappa|lambda|mu|nu|xi|omicron|pi|rho|sigma|tau|upsilon|phi|chi|psi|omega)\s*\$?)(?:\s+|\{\}|(?![a-zA-Z]))$/,"~u":/^[0-9]+/,"@h":/^[+\-]?(?:[0-9]+(?:[,.][0-9]+)?|[0-9]*(?:\.[0-9]+))/,"@g":/^[+\-]?[0-9]+(?:[.,][0-9]+)?/,"%T": -function(n){var r=n.match(/^(\+\-|\+\/\-|\+|\-|\\pm\s?)?([0-9]+(?:[,.][0-9]+)?|[0-9]*(?:\.[0-9]+)?)(\((?:[0-9]+(?:[,.][0-9]+)?|[0-9]*(?:\.[0-9]+)?)\))?(?:([eE]|\s*(\*|x|\\times|\u00D7)\s*10\^)([+\-]?[0-9]+|\{[+\-]?[0-9]+\}))?/);return r&&r[0]?{h:r.splice(1),t:n.substr(r[0].length)}:null},aj: -function(n){var r=n.match(/^(\+\-|\+\/\-|\+|\-|\\pm\s?)?([0-9]+(?:[,.][0-9]+)?|[0-9]*(?:\.[0-9]+)?)\^([+\-]?[0-9]+|\{[+\-]?[0-9]+\})/);return r&&r[0]?{h:r.splice(1),t:n.substr(r[0].length)}:null},"%n": -function(n){var r=this["@W"](n,"",/^\([a-z]{1,3}(?=[\),])/,")","");if(r&&r.t.match(/^($|[\s,;\)\]\}])/))return r;var t=n.match(/^(?:\((?:\\ca\s?)?\$[amothc]\$\))/);return t?{h:t[0],t:n.substr(t[0].length)}:null},ae:/^_\{(\([a-z]{1,3}\))\}/,"@K":/^(?:\\\{|\[|\()/,"@c":/^(?:\)|\]|\\\})/,", ":/^[,;]\s*/,",":/^[,;]/,".":/^[.]/,". ":/^([.\u22C5\u00B7\u2022])\s*/,"@i":/^\.\.\.(?=$|[^.])/,"* ":/^([*])\s*/,"@P": -function(n){return this["@W"](n,"^{","","","}")},"@L": -function(n){return this["@W"](n,"^","$","$","")},"^a":/^\^([0-9]+|[^\\_])/,"@O": -function(n){return this["@W"](n,"^",/^\\[a-zA-Z]+\{/,"}","","","{","}","",!0)},"@N": -function(n){return this["@W"](n,"^",/^\\[a-zA-Z]+\{/,"}","")},"^\\x":/^\^(\\[a-zA-Z]+)\s*/,"%U":/^\^(-?\d+)/,"'":/^'/,"@Y": -function(n){return this["@W"](n,"_{","","","}")},"@Q": -function(n){return this["@W"](n,"_","$","$","")},_9:/^_([+\-]?[0-9]+|[^\\])/,"@T": -function(n){return this["@W"](n,"_",/^\\[a-zA-Z]+\{/,"}","","","{","}","",!0)},"@S": -function(n){return this["@W"](n,"_",/^\\[a-zA-Z]+\{/,"}","")},"@R":/^_(\\[a-zA-Z]+)\s*/,"^_":/^(?:\^(?=_)|\_(?=\^)|[\^_]$)/,"{}":/^\{\}/,"%B": -function(n){return this["@W"](n,"","{","}","")},"%A": -function(n){return this["@W"](n,"{","","","}")},"@~": -function(n){return this["@W"](n,"","$","$","")},"@a": -function(n){return this["@W"](n,"${","","","}$")},"@@": -function(n){return this["@W"](n,"$","","","$")},"%D":/^[=<>]/,"#":/^[#\u2261]/,"+":/^\+/,"-$":/^-(?=[\s_},;\]\/]|$|\([a-z]+\))/,"-9":/^-(?=[0-9])/,"@f":/^-(?=(?:[spd]|sp)(?:$|[\s,;\)\]\}]))/,"-":/^-/,ai:/^(?:\\pm|\$\\pm\$|\+-|\+\/-)/,"~Q":/^(?:\+|(?:[\-=<>]|<<|>>|\\approx|\$\\approx\$)(?=\s|$|-?[0-9]))/,"~c":/^(?:v|\(v\)|\^|\(\^\))(?=$|[\s,;\)\]\}])/,"@r": -function(n){return this["@W"](n,"\\bond{","","","}")},"->":/^(?:<->|<-->|->|<-|<=>>|<<=>|<=>|[\u2192\u27F6\u21CC])/,"@m":/^[CMT](?=\[)/,"@o": -function(n){return this["@W"](n,"[","","","]")},al:/^(&|@q|\\hline)\s*/,"@p":/^(?:\\[,\ ;:])/,"@G": -function(n){return this["@W"](n,"",/^\\[a-zA-Z]+\{/,"}","","","{","}","",!0)},"@F": -function(n){return this["@W"](n,"",/^\\[a-zA-Z]+\{/,"}","")},"@t":/^\\ca(?:\s+|(?![a-zA-Z]))/,"@E":/^(?:\\[a-zA-Z]+\s*|\\[_&{}%])/,"~R":/^(?:[0-9]{1,2}[spdfgh]|[0-9]{0,2}sp)(?=$|[^a-zA-Z])/,"~S":/^[\/~|]/,"@y": -function(n){return this["@W"](n,"\\frac{","","","}","{","","","}")},"@A": -function(n){return this["@W"](n,"\\overset{","","","}","{","","","}")},"@C": -function(n){return this["@W"](n,"\\underset{","","","}","{","","","}")},"@B": -function(n){return this["@W"](n,"\\underbrace{","","","}_","{","","","}")},"@w": -function(n){return this["@W"](n,"\\color{","","","}")},"@x": -function(n){return this["@W"](n,"\\color{","","","}","{","","","}")},"@v": -function(n){return this["@W"](n,"\\color","\\","",/^(?=\{)/,"{","","","}")},"@u": -function(n){return this["@W"](n,"\\ce{","","","}")},"~Z":/^(?:[+-][IVX]+|\\pm\s*0|\$\\pm\$\s*0)$/,"a~":/^(?:[+-]?\s?[IVX]+|\\pm\s*0|\$\\pm\$\s*0)$/,"%d":/^[IVX]+/,"@j":/^[+\-]?(?:[0-9]+|\$[a-z]\$|[a-z])\/[0-9]+(?:\$[a-z]\$|[a-z])?$/,"~%": -function(n){var r;if(r=n.match(/^(?:(?:(?:\([+\-]?[0-9]+\/[0-9]+\)|[+\-]?(?:[0-9]+|\$[a-z]\$|[a-z])\/[0-9]+|[+\-]?[0-9]+[.,][0-9]+|[+\-]?\.[0-9]+|[+\-]?[0-9]+)(?:[a-z](?=\s*[A-Z]))?)|[+\-]?[a-z](?=\s*[A-Z])|\+(?!\s))/))return{h:r[0],t:n.substr(r[0].length)};var t=this["@W"](n,"","$","$","");return t&&(r=t.h.match(/^\$(?:\(?[+\-]?(?:[0-9]*[a-z]?[+\-])?[0-9]*[a-z](?:[+\-][0-9]*[a-z]?)?\)?|\+|-)\$$/))?{h:r[0],t:n.substr(r[0].length)}:null},"~a": -function(n){return this["~%"](n)},"@b":/^(?:[A-Z][a-z]{0,2}|i)(?=,)/,"~E": -function(n){if(n.match(/^\([a-z]+\)$/))return null;var r=n.match(/^(?:[a-z]|(?:[0-9\ \+\-\,\.\(\)]+[a-z])+[0-9\ \+\-\,\.\(\)]*|(?:[a-z][0-9\ \+\-\,\.\(\)]+)+[a-z]?)$/);return r?{h:r[0],t:n.substr(r[0].length)}:null},"%z":/^(?:pH|pOH|pC|pK|iPr|iBu)(?=$|[^a-zA-Z])/,"/":/^\s*(\/)\s*/,"//":/^\s*(\/\/)\s*/,"*":/^\s*\*\s*/,"@W": -function(n,r,t,o,e,a,u,i,s,l){var h=this["@V"](n,r);if(null===h)return null;if(n=n.substr(h.length),h=this["@V"](n,t),null===h)return null;var p=this["@U"](n,h.length,o||e);if(null===p)return null;var c=n.substring(0,o?p.y:p.z);if(a||u){var f=this["@W"](n.substr(p.y),a,u,i,s);if(null===f)return null;var m=[c,f.h];return l&&(m=m.join("")),{h:m,t:f.t}}return{h:c,t:n.substr(p.y)}}, -"@V": -function(n,r){if("string"==typeof r)return 0!==n.indexOf(r)?null:r;var t=n.match(r);return t?t[0]:null},"@U": -function(n,r,t){for(var o=0;r":{"0|1|2|3":{k:"r=",n:"r"},"a|as":{k:["~T","r="],n:"r"},"*":{k:["~T","r="],n:"r"}}, -"+":{o:{k:"~t",n:"d"},"d|D":{k:"d=",n:"d"},q:{k:"d=",n:"qd"},"qd|qD":{k:"d=",n:"qd"},dq:{k:["~T","d="],n:"d"},3:{k:["%j","~T","~Q"],n:"0"}}, -"~%":{"0|2":{k:"a=",n:"a"}}, -ai:{"0|1|2|a|as":{k:["%j","~T",{l:"~Q",m:"\\pm"}],n:"0"}}, -"~Q":{"0|1|2|a|as":{k:["%j","~T","~Q"],n:"0"}}, -"-$":{"o|q":{k:["~g","~T"],n:"qd"},d:{k:"d=",n:"d"},D:{k:["~T",{l:"~f",m:"-"}],n:"3"},q:{k:"d=",n:"qd"},qd:{k:"d=",n:"qd"},"qD|dq":{k:["~T",{l:"~f",m:"-"}],n:"3"}}, -"-9":{"3|o":{k:["~T",{l:"~J",m:"~I"}],n:"3"}}, -"@f":{o:{k:{l:"@e",m:!0},n:"2"},d:{k:{l:"@d",m:!0},n:"2"}}, -"-":{"0|1|2":{k:[{l:"~T",m:1},"%E",{l:"~f",m:"-"}],n:"3"},3:{k:{l:"~f",m:"-"}}, -a:{k:["~T",{l:"~J",m:"~I"}],n:"2"},as:{k:[{l:"~T",m:2},{l:"~f",m:"-"}],n:"3"},b:{k:"b="},o:{k:"@e",n:"2"},q:{k:"@e",n:"2"},"d|qd|dq":{k:"@d",n:"2"},"D|qD|p":{k:["~T",{l:"~f",m:"-"}],n:"3"}}, -"~a":{"1|3":{k:"a=",n:"a"}}, -"~M":{"0|1|2|3|a|as|b|p|bp|o":{k:"o=",n:"o"},"q|dq":{k:["~T","o="],n:"o"},"d|D|qd|qD":{k:"~N",n:"o"}}, -"~u":{o:{k:"q=",n:"q"},"d|D":{k:"q=",n:"dq"},q:{k:["~T","o="],n:"o"},a:{k:"o=",n:"o"}}, -"%l":{"b|p|bp":{}}, -"%m":{a:{n:"as"},0:{k:"%j"},"1|2":{k:"%k"},"r|rt|rd|%i|%h":{k:"~T",n:"0"},"*":{k:["~T","%k"],n:"1"}}, -al:{"1|2":{k:["~T",{l:"~K",m:"al"}]}, -"*":{k:["~T",{l:"~K",m:"al"}],n:"0"}}, -"@o":{"r|rt":{k:"%a",n:"rd"},"rd|%i":{k:"%f",n:"%h"}}, -"@i":{"o|d|D|dq|qd|qD":{k:["~T",{l:"~f",m:"..."}],n:"3"},"*":{k:[{l:"~T",m:1},{l:"~J",m:"~z"}],n:"1"}}, -". |* ":{"*":{k:["~T",{l:"~J",m:"~~"}],n:"1"}}, -"%n":{"*":{k:["~T","%p"],n:"1"}}, -"@K":{"a|as|o":{k:["o=","~T","%G"],n:"2"},"0|1|2|3":{k:["o=","~T","%G"],n:"2"},"*":{k:["~T","o=","~T","%G"],n:"2"}}, -"@c":{"0|1|2|3|b|p|bp|o":{k:["o=","%H"],n:"o"},"a|as|d|D|q|qd|qD|dq":{k:["~T","o=","%H"],n:"o"}}, -", ":{"*":{k:["~T","~q"],n:"0"}}, +MathJax.Extension["TeX/mhchem"]={version:"3.3.0"},MathJax.Hub.Register.StartupHook("TeX Jax Ready",function(){var t=MathJax.InputJax.TeX,n=MathJax.Object.Subclass({string:"", +Init:function(t){this.string=t}, +Parse:function(n){try{return a.go(e.go(this.string,n))}catch(n){t.Error(n)}}}),e={ +go:function(t,n){if(!t)return[];void 0===n&&(n="ce");var a,o="0",r={};r["@@"]=0,t=(t=(t=t.replace(/\n/g," ")).replace(/[\u2212\u2013\u2014\u2010]/g,"-")).replace(/[\u2026]/g,"...");for(var i=10,c=[];;){a!==t?(i=10,a=t):i--;var u=e.t[n],p=u.u[o]||u.u["*"];t:for(var s=0;s0))return c;if(f.k||(t=_.$),!f.A)break t}}if(i<=0)throw["MhchemBugU","mhchem bug U. Please report."]}}, +v:function(t,n){if(n)if(Array.isArray(n))for(var e=0;e]/,"#":/^[#\u2261]/,"+":/^\+/,"-$":/^-(?=[\s_},;\]/]|$|\([a-z]+\))/,"-9":/^-(?=[0-9])/,"@g":/^-(?=(?:[spd]|sp)(?:$|[\s,;\)\]\}]))/,"-":/^-/,"``":/^(?:\\pm|\$\\pm\$|\+-|\+\/-)/,"~N":/^(?:\+|(?:[\-=<>]|<<|>>|\\approx|\$\\approx\$)(?=\s|$|-?[0-9]))/,"~`":/^(?:v|\(v\)|\^|\(\^\))(?=$|[\s,;\)\]\}])/, +"@s":function(t){return e._.M(t,"\\bond{","","","}")},"->":/^(?:<->|<-->|->|<-|<=>>|<<=>|<=>|[\u2192\u27F6\u21CC])/,"@n":/^[CMT](?=\[)/, +"@p":function(t){return e._.M(t,"[","","","]")},"`c":/^(&|@r|\\hline)\s*/,"@q":/^(?:\\[,\ ;:])/, +"@H":function(t){return e._.M(t,"",/^\\[a-zA-Z]+\{/,"}","","","{","}","",!0)}, +"@G":function(t){return e._.M(t,"",/^\\[a-zA-Z]+\{/,"}","")},"@u":/^\\ca(?:\s+|(?![a-zA-Z]))/,"@F":/^(?:\\[a-zA-Z]+\s*|\\[_&{}%])/,"~O":/^(?:[0-9]{1,2}[spdfgh]|[0-9]{0,2}sp)(?=$|[^a-zA-Z])/,"~P":/^[\/~|]/, +"@z":function(t){return e._.M(t,"\\frac{","","","}","{","","","}")}, +"@B":function(t){return e._.M(t,"\\overset{","","","}","{","","","}")}, +"@D":function(t){return e._.M(t,"\\underset{","","","}","{","","","}")}, +"@C":function(t){return e._.M(t,"\\underbrace{","","","}_","{","","","}")}, +"@x":function(t){return e._.M(t,"\\color{","","","}")}, +"@y":function(t){return e._.M(t,"\\color{","","","}","{","","","}")}, +"@w":function(t){return e._.M(t,"\\color","\\","",/^(?=\{)/,"{","","","}")}, +"@v":function(t){return e._.M(t,"\\ce{","","","}")},"~W":/^(?:[+-][IVX]+|\\pm\s*0|\$\\pm\$\s*0)$/,"%Y":/^(?:[+-]?\s?[IVX]+|\\pm\s*0|\$\\pm\$\s*0)$/,"%a":/^[IVX]+/,"@k":/^[+\-]?(?:[0-9]+|\$[a-z]\$|[a-z])\/[0-9]+(?:\$[a-z]\$|[a-z])?$/, +"~@":function(t){var n;if(n=t.match(/^(?:(?:(?:\([+\-]?[0-9]+\/[0-9]+\)|[+\-]?(?:[0-9]+|\$[a-z]\$|[a-z])\/[0-9]+|[+\-]?[0-9]+[.,][0-9]+|[+\-]?\.[0-9]+|[+\-]?[0-9]+)(?:[a-z](?=\s*[A-Z]))?)|[+\-]?[a-z](?=\s*[A-Z])|\+(?!\s))/))return{s:n[0],$:t.substr(n[0].length)};var a=e._.M(t,"","$","$","");return a&&(n=a.s.match(/^\$(?:\(?[+\-]?(?:[0-9]*[a-z]?[+\-])?[0-9]*[a-z](?:[+\-][0-9]*[a-z]?)?\)?|\+|-)\$$/))?{s:n[0],$:t.substr(n[0].length)}:null}, +"~~":function(t){return this["~@"](t)},"@c":/^(?:[A-Z][a-z]{0,2}|i)(?=,)/, +"~B":function(t){if(t.match(/^\([a-z]+\)$/))return null;var n=t.match(/^(?:[a-z]|(?:[0-9\ \+\-\,\.\(\)]+[a-z])+[0-9\ \+\-\,\.\(\)]*|(?:[a-z][0-9\ \+\-\,\.\(\)]+)+[a-z]?)$/);return n?{s:n[0],$:t.substr(n[0].length)}:null},"%w":/^(?:pH|pOH|pC|pK|iPr|iBu)(?=$|[^a-zA-Z])/,"/":/^\s*(\/)\s*/,"//":/^\s*(\/\/)\s*/,"*":/^\s*[*.]\s*/}, +M:function(t,n,e,a,o,r,i,c,u,p){var s=function(t,n){if("string"==typeof n)return 0!==t.indexOf(n)?null:n;var e=t.match(n);return e?e[0]:null},_=s(t,n);if(null===_)return null;if(t=t.substr(_.length),null===(_=s(t,e)))return null;var f=function(t,n,e){for(var a=0;n":{"0|1|2|3":{h:"r=",g:"r"},"a|as":{h:["~Q","r="],g:"r"},"*":{h:["~Q","r="],g:"r"}}, +"+":{o:{h:"~q",g:"d"},"d|D":{h:"d=",g:"d"},q:{h:"d=",g:"qd"},"qd|qD":{h:"d=",g:"qd"},dq:{h:["~Q","d="],g:"d"},3:{h:["%g","~Q","~N"],g:"0"}}, +"~@":{"0|2":{h:"a=",g:"a"}}, +"``":{"0|1|2|a|as":{h:["%g","~Q",{l:"~N",S:"\\pm"}],g:"0"}}, +"~N":{"0|1|2|a|as":{h:["%g","~Q","~N"],g:"0"}}, +"-$":{"o|q":{h:["~d","~Q"],g:"qd"},d:{h:"d=",g:"d"},D:{h:["~Q",{l:"~c",S:"-"}],g:"3"},q:{h:"d=",g:"qd"},qd:{h:"d=",g:"qd"},"qD|dq":{h:["~Q",{l:"~c",S:"-"}],g:"3"}}, +"-9":{"3|o":{h:["~Q",{l:"~G",S:"~F"}],g:"3"}}, +"@g":{o:{h:["~Q",{l:"~G",S:"~F"}],g:"2"},d:{h:["~Q",{l:"~G",S:"~F"}],g:"2"}}, +"-":{"0|1|2":{h:[{l:"~Q",S:1},"~b",{l:"~c",S:"-"}],g:"3"},3:{h:{l:"~c",S:"-"}}, +a:{h:["~Q",{l:"~G",S:"~F"}],g:"2"},as:{h:[{l:"~Q",S:2},{l:"~c",S:"-"}],g:"3"},b:{h:"b="},o:{h:{l:"`d",S:!1},g:"2"},q:{h:{l:"`d",S:!1},g:"2"},"d|qd|dq":{h:{l:"`d",S:!0},g:"2"},"D|qD|p":{h:["~Q",{l:"~c",S:"-"}],g:"3"}}, +"~~":{"1|3":{h:"a=",g:"a"}}, +"~J":{"0|1|2|3|a|as|b|p|bp|o":{h:"o=",g:"o"},"q|dq":{h:["~Q","o="],g:"o"},"d|D|qd|qD":{h:"~K",g:"o"}}, +"~r":{o:{h:"q=",g:"q"},"d|D":{h:"q=",g:"dq"},q:{h:["~Q","o="],g:"o"},a:{h:"o=",g:"o"}}, +"%i":{"b|p|bp":{}}, +"%j":{a:{g:"as"},0:{h:"%g"},"1|2":{h:"%h"},"r|rt|rd|%f|%e":{h:"~Q",g:"0"},"*":{h:["~Q","%h"],g:"1"}}, +"`c":{"1|2":{h:["~Q",{l:"~H",S:"`c"}]}, +"*":{h:["~Q",{l:"~H",S:"`c"}],g:"0"}}, +"@p":{"r|rt":{h:"%~",g:"rd"},"rd|%f":{h:"%c",g:"%e"}}, +"@j":{"o|d|D|dq|qd|qD":{h:["~Q",{l:"~c",S:"..."}],g:"3"},"*":{h:[{l:"~Q",S:1},{l:"~G",S:"~w"}],g:"1"}}, +". |* ":{"*":{h:["~Q",{l:"~G",S:"@Y"}],g:"1"}}, +"%k":{"*":{h:["~Q","%m"],g:"1"}}, +"@L":{"a|as|o":{h:["o=","~Q","~X"],g:"2"},"0|1|2|3":{h:["o=","~Q","~X"],g:"2"},"*":{h:["~Q","o=","~Q","~X"],g:"2"}}, +"@d":{"0|1|2|3|b|p|bp|o":{h:["o=","~Y"],g:"o"},"a|as|d|D|q|qd|qD|dq":{h:["~Q","o=","~Y"],g:"o"}}, +", ":{"*":{h:["~Q","~n"],g:"0"}}, "^_":{"*":{}}, -"@P|@L":{"0|1|2|as":{k:"b=",n:"b"},p:{k:"b=",n:"bp"},"3|o":{k:"~t",n:"D"},q:{k:"d=",n:"qD"},"d|D|qd|qD|dq":{k:["~T","d="],n:"D"}}, -"^a|@O|@N|^\\x|'":{"0|1|2|as":{k:"b=",n:"b"},p:{k:"b=",n:"bp"},"3|o":{k:"~t",n:"d"},q:{k:"d=",n:"qd"},"d|qd|D|qD":{k:"d="},dq:{k:["~T","d="],n:"d"}}, -ae:{"d|D|q|qd|qD|dq":{k:["~T","q="],n:"q"}}, -"@Y|@Q|_9|@T|@S|@R":{"0|1|2|as":{k:"p=",n:"p"},b:{k:"p=",n:"bp"},"3|o":{k:"q=",n:"q"},"d|D":{k:"q=",n:"dq"},"q|qd|qD|dq":{k:["~T","q="],n:"q"}}, -"%D":{"0|1|2|3|a|as|o|q|d|D|qd|qD|dq":{k:[{l:"~T",m:2},"~f"],n:"3"}}, -"#":{"0|1|2|3|a|as|o":{k:[{l:"~T",m:2},{l:"~f",m:"#"}],n:"3"}}, -"{}":{"*":{k:{l:"~T",m:1},n:"1"}}, -"%B":{"0|1|2|3|a|as|b|p|bp":{k:"o=",n:"o"},"o|d|D|q|qd|qD|dq":{k:["~T","o="],n:"o"}}, -"@~":{a:{k:"a="},"0|1|2|3|as|b|p|bp|o":{k:"o=",n:"o"},"as|o":{k:"o="},"q|d|D|qd|qD|dq":{k:["~T","o="],n:"o"}}, -"@r":{"*":{k:[{l:"~T",m:2},"~f"],n:"3"}}, -"@y":{"*":{k:[{l:"~T",m:1},"~H"],n:"3"}}, -"@A":{"*":{k:[{l:"~T",m:2},"~X"],n:"3"}}, -"@C":{"*":{k:[{l:"~T",m:2},"%y"],n:"3"}}, -"@B":{"*":{k:[{l:"~T",m:2},"%w"],n:"3"}}, -"@x|@v":{"*":{k:[{l:"~T",m:2},"~k"],n:"3"}}, -"@w":{"*":{k:[{l:"~T",m:2},"~m"]}}, -"@u":{"*":{k:[{l:"~T",m:2},"ce"],n:"3"}}, -"@p":{"*":{k:[{l:"~T",m:1},"~s"],n:"1"}}, -"@G|@F|@E":{"0|1|2|3|a|as|b|p|bp|o|c0":{k:["o=","~T"],n:"3"},"*":{k:["~T","o=","~T"],n:"3"}}, -"~S":{"*":{k:[{l:"~T",m:1},"~s"],n:"3"}}, -"~B":{a:{k:"@Z",n:"o",s:!0},as:{k:[{l:"~T"},"%k"],n:"1",s:!0},"r|rt|rd|%i|%h":{k:["~T"],n:"0",s:!0},"*":{k:["~T","~s"],n:"3"}}}),g:{"~N": -function(n,r){var o;if(n.d.match(/^[0-9]+$/)){var e=n.d;n.d=void 0,o=this["~T"](n),n.b=e}else o=this["~T"](n);return t.g["o="](n,r),o},"~t": -function(n,r){n.d=r,n["%I"]="kv"},"~g": -function(n,r){if(n.yB){var o=t.j(o,this["~T"](n));return o=t.j(o,t.g["~f"](n,r,"-"))}n.d=r},"@e": -function(n,r,o){var e=o||this["@X"](n,r),a=t.j(null,this["~T"](n,r));return a=e?t.j(a,{l:"~I"}):t.j(a,t.g["~f"](n,r,"-"))},"@d": -function(n,r,o){var e,a=o||this["@X"](n,r);if(a)e=t.j(e,this["~T"](n,r)),e=t.j(e,{l:"~I"});else{var u=t.h("~u",n.d||"");u&&""===u.t?(e=t.j(null,t.g["d="](n,r)),e=t.j(e,this["~T"](n))):(e=t.j(e,this["~T"](n,r)),e=t.j(e,t.g["~f"](n,r,"-")))}return e},"@X": -function(n,r){var o=t.h("~R",n.o||""),e=t.h("~O",n.o||""),a=t.h("~P",n.o||""),u=t.h("@%",n.o||""),i="-"===r&&(o&&""===o.t||e||a||u);return!i||n.a||n.b||n.p||n.d||n.q||o||!a||(n.o="$"+n.o+"$"),i},"@Z": -function(n,r){n.o=n.a,n.a=void 0},"%k": -function(n,r){n.sb=!0},"%j": -function(n,r){n.sb=!1},"%E": -function(n,r){n.yB=!0},"%F": -function(n,r){n.yB=!1},"%G": -function(n,r){n.pL++},"%H": -function(n,r){n.pL--},"%p": -function(n,r){return r=t.go(r,"o"),{l:"%p",p1:r}}, -"~q": -function(n,r){var t=r.replace(/\s*$/,""),o=t!==r;return o&&0===n.pL?{l:"~n",p1:t}:{l:"~o",p1:t}}, -"~T": -function(n,r,o){var e;n.r?("M"===n.rdt?n.rd=t.go(n.rd,"%r"):"T"===n.rdt?n.rd=[{l:"%s",p1:n.rd}]:n.rd=t.go(n.rd),"M"===n.rqt?n.rq=t.go(n.rq,"%r"):"T"===n.rqt?n.rq=[{l:"%s",p1:n.rq}]:n.rq=t.go(n.rq),e={l:"~b",r:n.r,rd:n.rd,rq:n.rq}):(e=[],n.a||n.b||n.p||n.o||n.q||n.d||o?(n.sb&&e.push({l:"~D"}),n.o||n.q||n.d||n.b||n.p||2===o?n.o||n.q||n.d||!n.b&&!n.p?n.o&&"kv"===n["%I"]&&t.h("a~",n.d||"")?n["%I"]="~Y":n.o&&"kv"===n["%I"]&&!n.q&&(n["%I"]=void 0):(n.o=n.a,n.d=n.b,n.q=n.p,n.a=n.b=n.p=void 0):(n.o=n.a,n.a=void 0),n.a=t.go(n.a,"a"),n.b=t.go(n.b,"bd"),n.p=t.go(n.p,"pq"),n.o=t.go(n.o,"o"),"~Y"===n["%I"]?n.d=t.go(n.d,"~Y"):n.d=t.go(n.d,"bd"),n.q=t.go(n.q,"pq"),e.push({l:"~h",a:n.a,b:n.b,p:n.p,o:n.o,q:n.q,d:n.d,"%I":n["%I"]})):e=null);for(var a in n)"pL"!==a&&"yB"!==a&&delete n[a];return e},"a%": -function(n,r){var o=["{"];return o=t.j(o,t.go(r,"~Y")),o=o.concat(["}"])},"~H": -function(n,r){return{l:"~G",p1:t.go(r[0]),p2:t.go(r[1])}}, -"~X": -function(n,r){return{l:"~W",p1:t.go(r[0]),p2:t.go(r[1])}}, -"%y": -function(n,r){return{l:"%x",p1:t.go(r[0]),p2:t.go(r[1])}}, -"%w": -function(n,r){return{l:"%v",p1:t.go(r[0]),p2:t.go(r[1])}}, -"~k": -function(n,r){return{l:"~j",F:r[0],G:t.go(r[1])}}, -"r=": -function(n,r){n.r=(n.r||"")+r},"%b": -function(n,r){n.rdt=(n.rdt||"")+r},"%a": -function(n,r){n.rd=(n.rd||"")+r},"%g": -function(n,r){n.rqt=(n.rqt||"")+r},"%f": -function(n,r){n.rq=(n.rq||"")+r},"~Q": -function(n,r,t){return{l:"~Q",A:t||r}}}}, -t.c.a={e:t.C({"~C":{"*":{}}, -"@j":{0:{k:"@k"}}, -"~A":{0:{n:"1",s:!0}}, -"@@":{"*":{k:"%q",n:"1"}}, -",":{"*":{k:{l:"~J",m:"~r"}}}, -"~B":{"*":{k:"~s"}}}),g:{}}, -t.c.o={e:t.C({"~C":{"*":{}}, -"@j":{0:{k:"@k"}}, -"~A":{0:{n:"1",s:!0}}, -"~M":{"*":{k:"rm"}}, -"@t":{"*":{k:{l:"~J",m:"~i"}}}, -"@G|@F|@E":{"*":{k:"~s"}}, -"@a|@@":{"*":{k:"%r"}}, -"%A":{"*":{k:"%C"}}, -"~B":{"*":{k:"~s"}}}),g:{}}, -t.c["%s"]={e:t.C({"~C":{"*":{k:"~T"}}, -"%B":{"*":{k:"%t"}}, -"@a|@@":{"*":{k:"%r"}}, -"@z":{"*":{k:["~T","rm"]}}, -"@p|@G|@F|@E":{"*":{k:["~T","~s"]}}, -"~A":{"*":{k:"%t"}}}),g:{"~T": -function(n,r){if(n.text){var t={l:"%s",p1:n.text};for(var o in n)delete n[o];return t}return null}}}, -t.c.pq={e:t.C({"~C":{"*":{}}, -"%n":{"*":{k:"%p"}}, -i$:{0:{n:"!f",s:!0}}, -"@b":{0:{k:"rm",n:"0"}}, -"~E":{0:{n:"f",s:!0}}, -"@j":{0:{k:"@k"}}, -"~A":{0:{n:"!f",s:!0}}, -"@a|@@":{"*":{k:"%r"}}, -"%A":{"*":{k:"%s"}}, -"~@":{f:{k:"%r"}}, -"~M":{"*":{k:"rm"}}, -"@h":{"*":{k:"@l"}}, -",":{"*":{k:{l:"~K",m:"~p"}}}, -"@x|@v":{"*":{k:"~k"}}, -"@w":{"*":{k:"~m"}}, -"@u":{"*":{k:"ce"}}, -"@p|@G|@F|@E":{"*":{k:"~s"}}, -"~B":{"*":{k:"~s"}}}),g:{"%p": -function(n,r){return r=t.go(r,"o"),{l:"%K",p1:r}}, -"~k": -function(n,r){return{l:"~j",F:r[0],G:t.go(r[1],"pq")}}}}, -t.c.bd={e:t.C({"~C":{"*":{}}, -x$:{0:{n:"!f",s:!0}}, -"~E":{0:{n:"f",s:!0}}, -"~A":{0:{n:"!f",s:!0}}, -"@g":{"*":{k:"@l"}}, -".":{"*":{k:{l:"~J",m:"~y"}}}, -"~@":{f:{k:"%r"}}, -x:{"*":{k:{l:"~J",m:"@n"}}}, -"~M":{"*":{k:"rm"}}, -"'":{"*":{k:{l:"~J",m:"%%"}}}, -"@a|@@":{"*":{k:"%r"}}, -"%A":{"*":{k:"%s"}}, -"@x|@v":{"*":{k:"~k"}}, -"@w":{"*":{k:"~m"}}, -"@u":{"*":{k:"ce"}}, -"@p|@G|@F|@E":{"*":{k:"~s"}}, -"~B":{"*":{k:"~s"}}}),g:{"~k": -function(n,r){return{l:"~j",F:r[0],G:t.go(r[1],"bd")}}}}, -t.c["~Y"]={e:t.C({"~C":{"*":{}}, -"%d":{"*":{k:"%e"}}, -"@a|@@":{"*":{k:"%r"}}, -"~A":{"*":{k:"~s"}}}),g:{"%e": -function(n,r){return{l:"%d",p1:r}}}}, -t.c["%r"]={e:t.C({"~C":{"*":{k:"~T"}}, -"@u":{"*":{k:["~T","ce"]}}, -"%B|@p|@G|@F|@E":{"*":{k:"o="}}, -"~A":{"*":{k:"o="}}}),g:{"~T": -function(n,r){if(n.o){var t={l:"%r",p1:n.o};for(var o in n)delete n[o];return t}return null}}}, -t.c["%q"]={e:t.C({"~C":{"*":{k:"~T"}}, -"@u":{"*":{k:["~T","ce"]}}, -"%B|@p|@G|@F|@E":{"*":{k:"o="}}, -"-|+":{"*":{k:"%u"}}, -"~A":{"*":{k:"o="}}}),g:{"%u": -function(n,r){n.o=(n.o||"")+"{"+r+"}"},"~T": -function(n,r){if(n.o){var t={l:"%r",p1:n.o};for(var o in n)delete n[o];return t}return null}}}, -t.c["@l"]={e:t.C({"~C":{"*":{}}, -",":{"*":{k:"~q"}}, -"~A":{"*":{k:"~s"}}}),g:{"~q": -function(n,r){return{l:"~r"}}}}, -t.c.pu={e:t.C({"~C":{"*":{k:"~T"}}, -"@K|@c":{"0|a":{k:"~s"}}, -aj:{0:{k:"ak",n:"a"}}, -"%T":{0:{k:"%Z",n:"a"}}, -"%m":{"0|a":{}}, -ai:{"0|a":{k:{l:"~Q",m:"\\pm"},n:"0"}}, -"~Q":{"0|a":{k:"~s",n:"0"}}, -"//":{d:{k:"o=",n:"/"}}, -"/":{d:{k:"o=",n:"/"}}, -"%B|~A":{"0|d":{k:"d=",n:"d"},a:{k:["%m","d="],n:"d"},"/|q":{k:"q=",n:"q"}}}),g:{"%Z": -function(n,r){var o=[];return"+-"===r[0]||"+/-"===r[0]?o.push("\\pm "):r[0]&&o.push(r[0]),r[1]&&(o=t.j(o,t.go(r[1],"%X")),r[2]&&(r[2].match(/[,.]/)?o=t.j(o,t.go(r[2],"%X")):o.push(r[2])),r[3]=r[4]||r[3],r[3]&&(r[3]=r[3].trim(),"e"===r[3]||"*"===r[3].substr(0,1)?o.push({l:"%N"}):o.push({l:"%P"}))),r[3]&&o.push("10^{"+r[5]+"}"),o},ak: -function(n,r){var o=[];return"+-"===r[0]||"+/-"===r[0]?o.push("\\pm "):r[0]&&o.push(r[0]),o=t.j(o,t.go(r[1],"%X")),o.push("^{"+r[2]+"}"),o},"~Q": -function(n,r,t){return{l:"~Q",A:t||r}}, -"%m": -function(n,r){return{l:"%Q"}}, -"~T": -function(n,r){var o,e=t.h("%A",n.d||"");e&&""===e.t&&(n.d=e.h);var a=t.h("%A",n.q||"");a&&""===a.t&&(n.q=a.h),n.d&&(n.d=n.d.replace(/\u00B0C|\^oC|\^{o}C/g,"{}^{\\circ}C"),n.d=n.d.replace(/\u00B0F|\^oF|\^{o}F/g,"{}^{\\circ}F")),n.q?(n.d=t.go(n.d,"pu"),n.q=n.q.replace(/\u00B0C|\^oC|\^{o}C/g,"{}^{\\circ}C"),n.q=n.q.replace(/\u00B0F|\^oF|\^{o}F/g,"{}^{\\circ}F"),n.q=t.go(n.q,"pu"),"//"===n.o?o={l:"%S",p1:n.d,p2:n.q}:(o=n.d,o=n.d.length>1||n.q.length>1?t.j(o,{l:"%V"}):t.j(o,{l:"/"}),o=t.j(o,n.q))):o=t.go(n.d,"%R");for(var u in n)delete n[u];return o}}}, -t.c["%R"]={e:t.C({"~C":{"*":{k:"~T"}}, -"*":{"*":{k:["~T","%N"],n:"0"}}, -"@E":{"*":{k:"%c"},n:"1"},"%m":{"*":{k:["~T","%m"],n:"0"}}, -"@P|%U":{1:{k:"%U"}}, -"@h":{0:{k:"%c",n:"0"},1:{k:"%U",n:"0"}}, -"%B|~A":{"*":{k:"%c",n:"1"}}}),g:{"%N": -function(n,r){return{l:"%O"}}, -"%U": -function(n,r){n.rm+="^{"+r+"}"},"%m": -function(n,r){return{l:"ah"}}, -"~T": -function(n,r){var o;if(n.rm){var e=t.h("%A",n.rm||"");o=e&&""===e.t?t.go(e.h,"pu"):{l:"rm",p1:n.rm}}for(var a in n)delete n[a];return o}}}, -t.c["%X"]={e:t.C({"~C":{0:{k:"~U"},o:{k:"~V"}}, -",":{0:{k:["~U","~q"],n:"o"}}, -".":{0:{k:["~U","~s"],n:"o"}}, -"~A":{"*":{k:"%t"}}}),g:{"~q": -function(n,r){return{l:"~r"}}, -"~U": -function(n,r){var t=[];if(n.text.length>4){var o=n.text.length%3;0===o&&(o=3);for(var e=n.text.length-3;e>0;e-=3)t.push(n.text.substr(e,3)),t.push({l:"%W"});t.push(n.text.substr(0,o)),t.reverse()}else t.push(n.text);for(var a in n)delete n[a];return t},"~V": -function(n,r){var t=[];if(n.text.length>4){for(var o=n.text.length-3,e=0;e"===n.r||"<=>>"===n.r||"<<=>"===n.r||"<-->"===n.r?(r="\\long"+r,n.rd&&(r="\\overset{"+n.rd+"}{"+r+"}"),n.rq&&(r="\\underset{\\lower7mu{"+n.rq+"}}{"+r+"}"),r=" {}\\mathrel{"+r+"}{} "):(n.rq&&(r+="[{"+n.rq+"}]"),r+="{"+n.rd+"}",r=" {}\\mathrel{\\x"+r+"}{} "):r=" {}\\mathrel{\\long"+r+"}{} ",r},"~Q": -function(n){return o.K[n.A]}}, -J:{"->":"rightarrow","\u2192":"rightarrow","\u27f6":"rightarrow","<-":"leftarrow","<->":"leftrightarrow","<-->":"leftrightarrows","<=>":"rightleftharpoons","\u21cc":"rightleftharpoons","<=>>":"Rightleftharpoons","<<=>":"Leftrightharpoons"},I:{"-":"{-}",1:"{-}","=":"{=}",2:"{=}","#":"{\\equiv}",3:"{\\equiv}","~":"{\\tripledash}","~-":"{\\rlap{\\lower.1em{-}}\\raise.1em{\\tripledash}}","~=":"{\\rlap{\\lower.2em{-}}\\rlap{\\raise.2em{\\tripledash}}-}","~--":"{\\rlap{\\lower.2em{-}}\\rlap{\\raise.2em{\\tripledash}}-}","-~-":"{\\rlap{\\lower.2em{-}}\\rlap{\\raise.2em{-}}\\tripledash}","...":"{{\\cdot}{\\cdot}{\\cdot}}","....":"{{\\cdot}{\\cdot}{\\cdot}{\\cdot}}","->":"{\\rightarrow}","<-":"{\\leftarrow}","<":"{<}",">":"{>}"},L:{"%m":" ","~D":"~","%Q":"~",ah:"\\mkern3mu ","%W":"\\mkern2mu ","~r":"{,}","~n":"{{0}}\\mkern6mu ","~o":"{{0}}\\mkern3mu ","~p":"{{0}}\\mkern1mu ","~I":"\\text{-}","~~":"\\,{\\cdot}\\,","~y":"\\mkern1mu \\bullet\\mkern1mu ","@n":"{\\times}","%%":"\\prime ","%N":"\\cdot ","%O":"\\mkern1mu{\\cdot}\\mkern1mu ","%P":"\\times ","~i":"{\\sim}","^":"uparrow",v:"downarrow","~z":"\\ldots ","/":"/","%V":"\\,/\\,",al:"{0} "},K:{"+":" {}+{} ","-":" {}-{} ","=":" {}={} ","<":" {}<{} ",">":" {}>{} ","<<":" {}\\ll{} ",">>":" {}\\gg{} ","\\pm":" {}\\pm{} ","\\approx":" {}\\approx{} ","$\\approx$":" {}\\approx{} ",v:" \\downarrow{} ","(v)":" \\downarrow{} ","^":" \\uparrow{} ","(^)":" \\uparrow{} "},go: -function(n,r){if(!n)return n;for(var t="",o=!1,e=0;e1||r.q.length>1?n.push({l:"%S"}):n.push({l:"/"}),e.v(n,r.q))}else n=e.go(t.d,"%O");for(var i in t)delete t[i];return n}}}, +"%O":{u:e.C({"~z":{"*":{h:"~Q"}}, +"*":{"*":{h:["~Q","%K"],g:"0"}}, +"@F":{"*":{h:"%`"}}, +"%j":{"*":{h:["~Q","%j"],g:"0"}}, +"@Q|%R":{1:{h:"%R"}}, +"@i":{0:{h:"%`",g:"0"},1:{h:"%R",g:"0"}}, +"%y|~x":{"*":{h:"%`",g:"1"}}}),m:{ +"%K":function(){return{l:"%L"}}, +"%R":function(t,n){t.rm+="^{"+n+"}"}, +"%j":function(){return{l:"`%"}}, +"~Q":function(t){var n=[];if(t.rm){var a=e._.s("%x",t.rm||"");n=a&&""===a.$?e.go(a.s,"pu"):{l:"rm",p1:t.rm}}for(var o in t)delete t[o];return n}}}, +"%U":{u:e.C({"~z":{0:{h:"~R"},o:{h:"~S"}}, +",":{0:{h:["~R","~n"],g:"o"}}, +".":{0:{h:["~R","~p"],g:"o"}}, +"~x":{"*":{h:"%q"}}}),m:{ +"~n":function(){return{l:"~o"}}, +"~R":function(t){var n=[];if(t.F=t.F||"",t.F.length>4){var e=t.F.length%3;0===e&&(e=3);for(var a=t.F.length-3;a>0;a-=3)n.push(t.F.substr(a,3)),n.push({l:"%T"});n.push(t.F.substr(0,e)),n.reverse()}else n.push(t.F);for(var o in t)delete t[o];return n}, +"~S":function(t){var n=[];if(t.F=t.F||"",t.F.length>4){for(var e=t.F.length-3,a=0;a"===t.r||"<=>>"===t.r||"<<=>"===t.r||"<--\x3e"===t.r?(u="\\long"+u,i&&(u="\\overset{"+i+"}{"+u+"}"),c&&(u="\\underset{\\lower7mu{"+c+"}}{"+u+"}"),u=" {}\\mathrel{"+u+"}{} "):(c&&(u+="[{"+c+"}]"),u=" {}\\mathrel{\\x"+(u+="{"+i+"}")+"}{} "):u=" {}\\mathrel{\\long"+u+"}{} ",n=u;break;case"~N":n=a.J(t.B);break;case"`c":n=t.p1+" ";break;case"%j":n=" ";break;case"~A":case"%N":n="~";break;case"`%":n="\\mkern3mu ";break;case"%T":n="\\mkern2mu ";break;case"~o":n="{,}";break;case"~k":n="{"+t.p1+"}\\mkern6mu ";break;case"~l":n="{"+t.p1+"}\\mkern3mu ";break;case"~m":n="{"+t.p1+"}\\mkern1mu ";break;case"~F":n="\\text{-}";break;case"@Y":n="\\,{\\cdot}\\,";break;case"~v":n="\\mkern1mu \\bullet\\mkern1mu ";break;case"@o":n="{\\times}";break;case"%@":n="\\prime ";break;case"%K":n="\\cdot ";break;case"%L":n="\\mkern1mu{\\cdot}\\mkern1mu ";break;case"%M":n="\\times ";break;case"~f":n="{\\sim}";break;case"^":n="uparrow";break;case"v":n="downarrow";break;case"~w":n="\\ldots ";break;case"/":n="/";break;case"%S":n="\\,/\\,";break;default:throw["MhchemBugT","mhchem bug T. Please report."]}return n}, +H:function(t){switch(t){case"->":case"\u2192":case"\u27f6":return"rightarrow";case"<-":return"leftarrow";case"<->":return"leftrightarrow";case"<--\x3e":return"leftrightarrows";case"<=>":case"\u21cc":return"rightleftharpoons";case"<=>>":return"Rightleftharpoons";case"<<=>":return"Leftrightharpoons";default:throw["MhchemBugT","mhchem bug T. Please report."]}}, +j:function(t){switch(t){case"-":case"1":return"{-}";case"=":case"2":return"{=}";case"#":case"3":return"{\\equiv}";case"~":return"{\\tripledash}";case"~-":return"{\\rlap{\\lower.1em{-}}\\raise.1em{\\tripledash}}";case"~=":case"~--":return"{\\rlap{\\lower.2em{-}}\\rlap{\\raise.2em{\\tripledash}}-}";case"-~-":return"{\\rlap{\\lower.2em{-}}\\rlap{\\raise.2em{-}}\\tripledash}";case"...":return"{{\\cdot}{\\cdot}{\\cdot}}";case"....":return"{{\\cdot}{\\cdot}{\\cdot}{\\cdot}}";case"->":return"{\\rightarrow}";case"<-":return"{\\leftarrow}";case"<":return"{<}";case">":return"{>}";default:throw["MhchemBugT","mhchem bug T. Please report."]}}, +J:function(t){switch(t){case"+":return" {}+{} ";case"-":return" {}-{} ";case"=":return" {}={} ";case"<":return" {}<{} ";case">":return" {}>{} ";case"<<":return" {}\\ll{} ";case">>":return" {}\\gg{} ";case"\\pm":return" {}\\pm{} ";case"\\approx":case"$\\approx$":return" {}\\approx{} ";case"v":case"(v)":return" \\downarrow{} ";case"^":case"(^)":return" \\uparrow{} ";default:throw["MhchemBugT","mhchem bug T. Please report."]}}};MathJax.Extension["TeX/mhchem"].CE=n,t.Definitions.Add({macros:{ce:"CE",pu:"PU",xleftrightarrow:["Extension","AMSmath"],xrightleftharpoons:["Extension","AMSmath"],xRightleftharpoons:["Extension","AMSmath"],xLeftrightharpoons:["Extension","AMSmath"],longrightleftharpoons:["Macro","\\stackrel{\\textstyle{-}\\!\\!{\\rightharpoonup}}{\\smash{{\\leftharpoondown}\\!\\!{-}}}"],longRightleftharpoons:["Macro","\\stackrel{\\textstyle{-}\\!\\!{\\rightharpoonup}}{\\smash{\\leftharpoondown}}"],longLeftrightharpoons:["Macro","\\stackrel{\\textstyle\\vphantom{{-}}{\\rightharpoonup}}{\\smash{{\\leftharpoondown}\\!\\!{-}}}"],longleftrightarrows:["Macro","\\stackrel{\\longrightarrow}{\\smash{\\longleftarrow}\\Rule{0px}{.25em}{0px}}"],tripledash:["Macro","\\vphantom{-}\\raise2mu{\\kern2mu\\tiny\\text{-}\\kern1mu\\text{-}\\kern1mu\\text{-}\\kern2mu}"]}}, +null,!0),MathJax.Extension["TeX/AMSmath"]||t.Definitions.Add({macros:{xrightarrow:["Extension","AMSmath"],xleftarrow:["Extension","AMSmath"]}}, +null,!0),MathJax.Hub.Register.StartupHook("TeX AMSmath Ready",function(){t.Definitions.Add({macros:{xleftrightarrow:["xArrow",8596,6,6],xrightleftharpoons:["xArrow",8652,5,7],xRightleftharpoons:["xArrow",8652,5,7],xLeftrightharpoons:["xArrow",8652,5,7]}}, +null,!0)}),t.Parse.Augment({ +CE:function(t){var e=this.GetArgument(t),a=n(e).Parse();this.string=a+this.string.substr(this.i),this.i=0}, +PU:function(t){var e=this.GetArgument(t),a=n(e).Parse("pu");this.string=a+this.string.substr(this.i),this.i=0}}),MathJax.Hub.Startup.signal.Post("TeX mhchem Ready")}),MathJax.Ajax.loadComplete("[mhchem]/mhchem.js"); diff --git a/package.json b/package.json index 8fb8b69..820975d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "mathjax-mhchem", "filename": "mhchem.js", - "version": "3.1.0", + "version": "3.3.0", "description": "mhchem extension for MathJax", "keywords": [ "MathJax", diff --git a/unpacked/mhchem.js b/unpacked/mhchem.js index 1698556..69cb674 100644 --- a/unpacked/mhchem.js +++ b/unpacked/mhchem.js @@ -33,10 +33,10 @@ MathJax.Extension["TeX/mhchem"] = { - version: "3.2.0" + version: "3.3.0" }; -MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () { +MathJax.Hub.Register.StartupHook("TeX Jax Ready", function () { var TEX = MathJax.InputJax.TeX; @@ -77,7 +77,7 @@ MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () { // Call like // go("H2O"); // - go: function(input, stateMachine) { + go: function (input, stateMachine) { if (!input) { return []; } if (stateMachine === undefined) { stateMachine = 'ce'; } var state = '0'; @@ -195,7 +195,7 @@ MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () { } } }, - concatArray: function(a, b) { + concatArray: function (a, b) { if (b) { if (Array.isArray(b)) { for (var iB=0; iB 4) { - var a = buffer.text_.length % 3; - if (a === 0) { a = 3; } - for (var i=buffer.text_.length-3; i>0; i-=3) { - ret.push(buffer.text_.substr(i, 3)); - ret.push({ type_: '1000 separator' }); - } - ret.push(buffer.text_.substr(0, a)); - ret.reverse(); + var a = buffer.text_.length % 3; + if (a === 0) { a = 3; } + for (var i=buffer.text_.length-3; i>0; i-=3) { + ret.push(buffer.text_.substr(i, 3)); + ret.push({ type_: '1000 separator' }); + } + ret.push(buffer.text_.substr(0, a)); + ret.reverse(); } else { - ret.push(buffer.text_); + ret.push(buffer.text_); } for (var p in buffer) { delete buffer[p]; } return ret; @@ -1330,14 +1330,14 @@ MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () { var ret = []; buffer.text_ = buffer.text_ || ""; if (buffer.text_.length > 4) { - var a = buffer.text_.length - 3; - for (var i=0; i