Merge branch 'origin/cancel_package' into beta.2

Author: dpvc

lib/TeX-lab.js

@@ -18,6 +18,8 @@ import '../mathjax3/input/tex/braket/BraketConfiguration.js';
 import '../mathjax3/input/tex/mhchem/MhchemConfiguration.js';
 import '../mathjax3/input/tex/physics/PhysicsConfiguration.js';
 import '../mathjax3/input/tex/verb/VerbConfiguration.js';
+import '../mathjax3/input/tex/cancel/CancelConfiguration.js';
+import '../mathjax3/input/tex/enclose/EncloseConfiguration.js';
 
 const jax = {
     TeX: new TeX(),

mathjax3-ts/input/tex/ParseUtil.ts

@@ -470,6 +470,30 @@ namespace ParseUtil {
     return (font ? {mathvariant: font} : {});
   };
 
+
+  /**
+   * Splits a package option list of the form [x=y,z=1] into an attribute list
+   * of the form {x: y, z: 1}.
+   * @param {string} attrib The attributes of the package.
+   * @param {{[key: string]: number}?} allowed A list of allowed options.
+   * @return {EnvList} The attribute list.
+   */
+  export function splitPackageOptions(attrib: string, allowed: {[key: string]: number} = {}): EnvList {
+    let def: EnvList = {};
+    if (attrib !== '') {
+      const attr = attrib.replace(/ /g, '').split(/,/);
+      for (let i = 0, m = attr.length; i < m; i++) {
+        const keyvalue = attr[i].split(/[:=]/);
+        if (allowed[keyvalue[0]]) {
+          let value = keyvalue[1];
+          def[keyvalue[0]] = (value === 'true') ? true :
+            (value === 'false') ? false : value;
+        }
+      }
+    }
+    return def;
+  }
+
 }
 
 export default ParseUtil;

mathjax3-ts/input/tex/cancel/CancelConfiguration.ts

@@ -0,0 +1,98 @@
+/*************************************************************
+ *
+ *  Copyright (c) 2018 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.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+/**
+ * @fileoverview Configuration file for the cancel package.
+ *
+ * @author [email protected] (Volker Sorge)
+ */
+
+import {Configuration} from '../Configuration.js';
+import TexParser from '../TexParser.js';
+import {TexConstant} from '../TexConstants.js';
+import {CommandMap} from '../SymbolMap.js';
+import {ParseMethod} from '../Types.js';
+import ParseUtil from '../ParseUtil.js';
+
+
+/**
+ * The attributes allowed in \enclose{notation}[attributes]{math}
+ * @type {{[key: string]: number}}
+ */
+const ALLOWED: {[key: string]: number} = {
+  color: 1, mathcolor: 1,
+  background: 1, mathbackground: 1,
+  padding: 1,
+  thickness: 1
+};
+
+
+// Namespace
+export let CancelMethods: Record<string, ParseMethod> = {};
+
+
+/**
+ * Parse function for cancel macros of the form \(b|x)cancel[attributes]{math}
+ * @param {TexParser} parser The current tex parser.
+ * @param {string} name The name of the calling macro.
+ * @param {string} notation The type of cancel notation to use.
+ */
+CancelMethods.Cancel = function(parser: TexParser, name: string, notation: string) {
+  const attr = parser.GetBrackets(name, '');
+  const math = parser.ParseArg(name);
+  const def = ParseUtil.splitPackageOptions(attr, ALLOWED);
+  def['notation'] = notation;
+  parser.Push(parser.create('node', 'menclose', [math], def));
+};
+
+
+/**
+ * Parse function implementing \cancelto{value}[attributes]{math}
+ * @param {TexParser} parser The current tex parser.
+ * @param {string} name The name of the calling macro.
+ * @param {string} notation The type of cancel notation to use.
+ */
+
+CancelMethods.CancelTo = function(parser: TexParser, name: string) {
+  const attr = parser.GetBrackets(name, '');
+  let value = parser.ParseArg(name);
+  const math = parser.ParseArg(name);
+  const def = ParseUtil.splitPackageOptions(attr, ALLOWED);
+  def ['notation'] = TexConstant.Notation.UPDIAGONALSTRIKE + ' ' +
+    TexConstant.Notation.UPDIAGONALARROW;
+  value = parser.create('node', 'mpadded', [value],
+                        {depth: '-.1em', height: ' + .1em', voffset: '.1em'});
+  parser.Push(parser.create('node', 'msup',
+                            [parser.create('node', 'menclose', [math], def), value]));
+};
+
+
+new CommandMap('cancel', {
+  cancel:   ['Cancel', TexConstant.Notation.UPDIAGONALSTRIKE],
+  bcancel:  ['Cancel', TexConstant.Notation.DOWNDIAGONALSTRIKE],
+  xcancel:  ['Cancel', TexConstant.Notation.UPDIAGONALSTRIKE + ' ' +
+             TexConstant.Notation.DOWNDIAGONALSTRIKE],
+  cancelto: 'CancelTo'
+}, CancelMethods);
+
+
+export const CancelConfiguration = Configuration.create(
+  'cancel', {handler: {macro: ['cancel']}}
+);
+
+

mathjax3-ts/input/tex/enclose/EncloseConfiguration.ts

@@ -0,0 +1,77 @@
+/*************************************************************
+ *
+ *  Copyright (c) 2018 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.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+
+/**
+ * @fileoverview Configuration file for the enclose package.
+ *
+ * @author [email protected] (Volker Sorge)
+ */
+
+import {Configuration} from '../Configuration.js';
+import TexParser from '../TexParser.js';
+import {TexConstant} from '../TexConstants.js';
+import {CommandMap} from '../SymbolMap.js';
+import {ParseMethod} from '../Types.js';
+import ParseUtil from '../ParseUtil.js';
+
+
+/**
+ * The attributes allowed in \enclose{notation}[attributes]{math}
+ * @type {{[key: string]: number}}
+ */
+const ALLOWED: {[key: string]: number} = {
+  arrow: 1,
+  color: 1, mathcolor: 1,
+  background: 1, mathbackground: 1,
+  padding: 1,
+  thickness: 1
+};
+
+
+// Namespace
+export let EncloseMethods: Record<string, ParseMethod> = {};
+
+
+/**
+ * Implements \enclose{notation}[attr]{math}
+ * (create <menclose notation="notation">math</menclose>)
+ * @param {TexParser} parser The current tex parser.
+ * @param {string} name The name of the calling macro.
+ */
+EncloseMethods.Enclose = function(parser: TexParser, name: string) {
+  let notation = parser.GetArgument(name).replace(/,/g, ' ');
+  const attr = parser.GetBrackets(name, '');
+  const math = parser.ParseArg(name);
+  const def = ParseUtil.splitPackageOptions(attr, ALLOWED);
+  def.notation = notation;
+  if (def.arrow) {
+    def.notation += ' updiagonalarrow';
+    delete def.arrow;
+  }
+  parser.Push(parser.create('node', 'menclose', [math], def));
+};
+
+
+new CommandMap('enclose', {enclose:   'Enclose'}, EncloseMethods);
+
+
+export const EncloseConfiguration = Configuration.create(
+  'enclose', {handler: {macro: ['enclose']}}
+);
+
+