Merge pull request #1372 from mathjax/issue3452

Only replace mhchem arrows when mhchem versions are available.  (mathjax/MathJax#3452)

Author: dpvc

testsuite/tests/input/tex/Mhchem.test.ts

@@ -5588,7 +5588,7 @@ describe('Mhchem-Ams', () => {
 
   /********************************************************************************/
 
-  it('Mhchem leftrightarrrow', () => {
+  it('Mhchem leftrightarrow', () => {
     toXmlMatch(
       tex2mml('\\ce{A\\leftrightarrow B}'),
       `<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\ce{A\\leftrightarrow B}" display="block">
@@ -5607,6 +5607,25 @@ describe('Mhchem-Ams', () => {
 
   /********************************************************************************/
 
+  it('Mhchem rightleftharpoons', () => {
+    toXmlMatch(
+      tex2mml('\\ce{A\\rightleftharpoons B}'),
+      `<math xmlns="http://www.w3.org/1998/Math/MathML" data-latex="\\ce{A\\rightleftharpoons B}" display="block">
+         <mrow data-mjx-texclass="ORD" data-latex="{\\mathrm{A}\\rightleftharpoons \\mathrm{B}}">
+           <mrow data-mjx-texclass="ORD" data-latex="\\mathrm{A}">
+             <mi mathvariant="normal" data-latex="A">A</mi>
+           </mrow>
+           <mo data-mjx-alternate="1" stretchy="false" data-latex="\\rightleftharpoons">&#x21CC;</mo>
+           <mrow data-mjx-texclass="ORD" data-latex="\\mathrm{B}">
+             <mi mathvariant="normal" data-latex="B">B</mi>
+           </mrow>
+         </mrow>
+       </math>`
+    );
+  });
+
+  /********************************************************************************/
+
 });
 
 /**********************************************************************************/

ts/input/tex/mhchem/MhchemConfiguration.ts

@@ -52,8 +52,15 @@ export const MhchemUtils = {
 /**
  * Replace these constructs in mhchem output now that we have stretchy versions
  * of the needed arrows
+ *
+ * @param {string} match   The matching macro name
+ * @param {string} arrow   The arrow name (without the backslash).
+ * @returns {string}       The mhchem arrow name, if there is one.
  */
-export const MhchemReplacements = new Map<string, RegExp>([
+export const MhchemReplacements = new Map<
+  string | ((match: string, arrow: string) => string),
+  RegExp
+>([
   [
     '\\mhchemx$3[$1]{$2}',
     /\\underset{\\lower2mu{(.*?)}}{\\overset{(.*?)}{\\long(.*?)}}/g,
@@ -72,7 +79,12 @@ export const MhchemReplacements = new Map<string, RegExp>([
     /\\rlap\{\\lower\.2em\{-\}\}\\rlap\{\\raise.2em\{-\}\}\\tripledash/g,
   ],
   [
-    '\\mhchem$1',
+    (match: string, arrow: string) => {
+      const mharrow = `mhchem${arrow}`;
+      return mhchemChars.lookup(mharrow) || mhchemMacros.lookup(mharrow)
+        ? `\\${mharrow}`
+        : match;
+    },
     /\\(x?(?:long)?(?:left|right|[Ll]eftright|[Rr]ightleft)(?:arrow|harpoons))/g,
   ],
 ]);
@@ -90,7 +102,7 @@ export const MhchemMethods: { [key: string]: ParseMethod } = {
     try {
       tex = mhchemParser.toTex(arg, machine);
       for (const [name, pattern] of MhchemReplacements.entries()) {
-        tex = tex.replace(pattern, name);
+        tex = tex.replace(pattern, name as string);
       }
     } catch (err) {
       throw new TexError(err[0], err[1]);
@@ -106,7 +118,7 @@ export const MhchemMethods: { [key: string]: ParseMethod } = {
 /**
  * The command macros
  */
-new CommandMap('mhchem', {
+const mhchemMacros = new CommandMap('mhchem', {
   ce: [MhchemMethods.Machine, 'ce'],
   pu: [MhchemMethods.Machine, 'pu'],
   mhchemxrightarrow: [MhchemMethods.xArrow, 0xe429, 5, 9],
@@ -121,7 +133,7 @@ new CommandMap('mhchem', {
 /**
  * The character macros
  */
-new CharacterMap('mhchem-chars', MhchemUtils.relmo, {
+const mhchemChars = new CharacterMap('mhchem-chars', MhchemUtils.relmo, {
   tripledash: ['\uE410', { stretchy: false }],
   mhchemBondTD: ['\uE411', { stretchy: false }],
   mhchemBondTDD: ['\uE412', { stretchy: false }],