add cis

Author: iproctor

dist/mathlive.js

@@ -4187,7 +4187,12 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
             return REVERSE_MATH_SYMBOLS[s] || s;
         }
         if (parseMode === 'text') {
-            return (Object.keys(TEXT_SYMBOLS).find((x) => TEXT_SYMBOLS[x] === s) || s);
+            let textSymbol = Object.keys(TEXT_SYMBOLS).find((x) => TEXT_SYMBOLS[x] === s);
+            if (!textSymbol) {
+                const hex = s.codePointAt(0).toString(16);
+                textSymbol = '^'.repeat(hex.length) + hex;
+            }
+            return textSymbol;
         }
         return s;
     }
@@ -4439,12 +4444,12 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
         }
         return result;
     }
-    function getValue(mode, symbol) {
+    /**
+     * Gets the value of a symbol in math mode
+     */
+    function getValue(symbol) {
         var _a, _b;
-        if (mode === 'math') {
-            return (_b = (_a = MATH_SYMBOLS[symbol]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : symbol;
-        }
-        return TEXT_SYMBOLS[symbol] ? TEXT_SYMBOLS[symbol] : symbol;
+        return (_b = (_a = MATH_SYMBOLS[symbol]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : symbol;
     }
     function emit(symbol, parent, atom, emitFn) {
         var _a, _b, _c;
@@ -4459,8 +4464,9 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
         if (atom.body && ((_c = (_b = FUNCTIONS[symbol]) === null || _b === void 0 ? void 0 : _b.params) === null || _c === void 0 ? void 0 : _c.length) === 1) {
             return symbol + '{' + emitFn(atom, atom.body) + '}';
         }
-        // No custom emit function provided, return the symbol (could be a character)
-        return symbol;
+        // No custom emit function provided, return an escaped version of the symbol
+        const hex = symbol.codePointAt(0).toString(16);
+        return '^'.repeat(hex.length) + hex;
     }
     function getEnvironmentDefinition(name) {
         var _a;
@@ -4541,6 +4547,9 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
             else if (TEXT_SYMBOLS[symbol]) {
                 info = { value: TEXT_SYMBOLS[symbol] };
             }
+            else if (parseMode === 'text') {
+                info = { value: symbol };
+            }
         }
         // Special case `f`, `g` and `h` are recognized as functions.
         if (info &&
@@ -5435,6 +5444,7 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
         'cotg',
         'csc',
         'cosec',
+        'cis',
         'deg',
         'dim',
         'exp',
@@ -7310,7 +7320,7 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
      * scriptscriptstyle.
      */
     function makeSmallDelim(type, delim, style, center, context, classes = '') {
-        const text = makeSymbol('Main-Regular', getValue('math', delim));
+        const text = makeSymbol('Main-Regular', getValue(delim));
         const span = makeStyleWrap(type, text, context.mathstyle, style, classes);
         if (center) {
             span.setTop((1 - context.mathstyle.sizeMultiplier / style.sizeMultiplier) *
@@ -7327,7 +7337,7 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
      * Size3, or Size4 fonts. It is always rendered in textstyle.
      */
     function makeLargeDelim(type, delim, size, center, context, classes = '') {
-        const result = makeStyleWrap(type, makeSymbol('Size' + size + '-Regular', getValue('math', delim), 'delimsizing size' + size), context.mathstyle, MATHSTYLES.textstyle, classes);
+        const result = makeStyleWrap(type, makeSymbol('Size' + size + '-Regular', getValue(delim), 'delimsizing size' + size), context.mathstyle, MATHSTYLES.textstyle, classes);
         if (center) {
             result.setTop((1 - context.mathstyle.sizeMultiplier) *
                 context.mathstyle.metrics.axisHeight);
@@ -7351,7 +7361,7 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
         else if (font === 'Size4-Regular') {
             sizeClass = ' delim-size4';
         }
-        return makeSymbol(font, getValue('math', symbol), 'delimsizinginner' + sizeClass);
+        return makeSymbol(font, getValue(symbol), 'delimsizinginner' + sizeClass);
     }
     /**
      * Make a stacked delimiter out of a given delimiter, with the total height at
@@ -7364,7 +7374,7 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
         let middle;
         let repeat;
         let bottom;
-        top = repeat = bottom = getValue('math', delim);
+        top = repeat = bottom = getValue(delim);
         middle = null;
         // Also keep track of what font the delimiters are in
         let font = 'Size1-Regular';
@@ -7512,16 +7522,16 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
             repeat = top = ' ';
         }
         // Get the metrics of the four sections
-        const topMetrics = getCharacterMetrics(getValue('math', top), font);
+        const topMetrics = getCharacterMetrics(getValue(top), font);
         const topHeightTotal = topMetrics.height + topMetrics.depth;
-        const repeatMetrics = getCharacterMetrics(getValue('math', repeat), font);
+        const repeatMetrics = getCharacterMetrics(getValue(repeat), font);
         const repeatHeightTotal = repeatMetrics.height + repeatMetrics.depth;
-        const bottomMetrics = getCharacterMetrics(getValue('math', bottom), font);
+        const bottomMetrics = getCharacterMetrics(getValue(bottom), font);
         const bottomHeightTotal = bottomMetrics.height + bottomMetrics.depth;
         let middleHeightTotal = 0;
         let middleFactor = 1;
         if (middle !== null) {
-            const middleMetrics = getCharacterMetrics(getValue('math', middle), font);
+            const middleMetrics = getCharacterMetrics(getValue(middle), font);
             middleHeightTotal = middleMetrics.height + middleMetrics.depth;
             middleFactor = 2; // repeat symmetrically above and below middle
         }
@@ -7765,7 +7775,7 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
             sequence = stackAlwaysDelimiterSequence;
         }
         // Look through the sequence
-        const delimType = traverseSequence(getValue('math', delim), height, sequence, context);
+        const delimType = traverseSequence(getValue(delim), height, sequence, context);
         // Depending on the sequence element we decided on,
         // call the appropriate function.
         if (delimType.type === 'small') {
@@ -9302,14 +9312,10 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
                 if (this.peek() === '^') {
                     // It might be a ^^ command (inline hex character)
                     this.get();
-                    let hex = this.match(/^\^\^[0-9a-f][0-9a-f][0-9a-f][0-9a-f]/);
+                    // There can be zero to six carets with the same number of hex digits
+                    const hex = this.match(/^(\^(\^(\^(\^[0-9a-f])?[0-9a-f])?[0-9a-f])?[0-9a-f])?[0-9a-f][0-9a-f]/);
                     if (hex) {
-                        // It's a ^^^^ hex char
-                        return String.fromCodePoint(parseInt(hex.slice(2), 16));
-                    }
-                    hex = this.match(/^[0-9a-f][0-9a-f]/);
-                    if (hex) {
-                        return String.fromCodePoint(parseInt(hex, 16));
+                        return String.fromCodePoint(parseInt(hex.slice(hex.lastIndexOf('^') + 1), 16));
                     }
                 }
                 return next;
@@ -11333,7 +11339,7 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
             // there isn't a valid delimiter after `\right`, we'll
             // consider the `\right` missing and set the `rightDelim` to undefined
             const rightDelim = this.scanDelim();
-            const result = new Atom(this.parseMode, 'leftright');
+            const result = new Atom(this.parseMode, 'leftright', '', this.style);
             result.leftDelim = leftDelim;
             result.rightDelim = rightDelim !== null && rightDelim !== void 0 ? rightDelim : undefined;
             result.inner = close === 'right';
@@ -11882,7 +11888,8 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
             const atom = new Atom(this.parseMode, 'group', parseString(def, this.parseMode, args, this.macros, false, this.onError));
             atom.captureSelection = true;
             atom.symbol = macro;
-            atom.latex = macro + tokensToString(this.tokens.slice(initialIndex));
+            atom.latex =
+                macro + tokensToString(this.tokens.slice(initialIndex, this.index));
             return atom;
         }
         /**
@@ -14830,8 +14837,8 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
             ifMode: 'text',
             command: 'moveToPreviousPlaceholder',
         },
-        { key: '[Escape]', ifMode: 'math', command: ['switch-mode', 'command'] },
-        { key: '\\', ifMode: 'math', command: ['switch-mode', 'command'] },
+        { key: '[Escape]', ifMode: 'math', command: ['switchMode', 'command'] },
+        { key: '\\', ifMode: 'math', command: ['switchMode', 'command'] },
         {
             key: 'alt+[Equal]',
             ifMode: 'math',
@@ -14928,7 +14935,7 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
         {
             key: 'shift+[Quote]',
             ifMode: 'text',
-            command: ['switch-mode', 'math', '”', ''],
+            command: ['switchMode', 'math', '”', ''],
         },
         // WOLFRAM MATHEMATICA BINDINGS
         {
@@ -17288,7 +17295,9 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
         selector = selector.replace(/-\w/g, (m) => m[1].toUpperCase());
         if (((_a = COMMANDS[selector]) === null || _a === void 0 ? void 0 : _a.target) === 'model') {
             if (/^(delete|transpose|add)/.test(selector)) {
-                mathfield.resetKeystrokeBuffer();
+                if (selector !== 'deletePreviousChar') {
+                    mathfield.resetKeystrokeBuffer();
+                }
             }
             if (/^(delete|transpose|add)/.test(selector) &&
                 mathfield.mode !== 'command') {
@@ -17883,6 +17892,7 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
         sec: { mode: 'math', value: '\\sec' },
         csc: { mode: 'math', value: '\\csc' },
         cot: { mode: 'math', value: '\\cot' },
+        cis: { mode: 'math', value: '\\cis' },
         log: { mode: 'math', value: '\\log' },
         ln: { mode: 'math', value: '\\ln' },
         exp: { mode: 'math', value: '\\exp' },
@@ -22000,7 +22010,18 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
         // see 5.3)
         if (mathfield.mode !== 'command' &&
             (!evt || (!evt.ctrlKey && !evt.metaKey))) {
-            if (!mightProducePrintableCharacter(evt)) {
+            if (keystroke === '[Backspace]') {
+                // Special case for backspace
+                mathfield.keystrokeBuffer = mathfield.keystrokeBuffer.slice(0, -1);
+                mathfield.keystrokeBufferStates.push(mathfield.getUndoRecord());
+                if (mathfield.config.inlineShortcutTimeout) {
+                    // Set a timer to reset the shortcut buffer
+                    mathfield.keystrokeBufferResetTimer = setTimeout(() => {
+                        mathfield.resetKeystrokeBuffer();
+                    }, mathfield.config.inlineShortcutTimeout);
+                }
+            }
+            else if (!mightProducePrintableCharacter(evt)) {
                 // It was a non-alpha character (PageUp, End, etc...)
                 mathfield.resetKeystrokeBuffer();
             }
@@ -26017,7 +26038,15 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
                 [atoms, tokens] = options.parse('text', tokens, options);
                 result = [...result, ...atoms];
             }
-            else if (token.length === 1) {
+            else if (token === '<$>' || token === '<$$>') {
+                // Mode-shift
+                const subtokens = tokens.slice(0, tokens.findIndex((x) => x === token));
+                tokens = tokens.slice(subtokens.length + 1);
+                const [atoms] = options.parse('math', subtokens, options);
+                result = [...result, ...atoms];
+            }
+            else if (token === '<{>' || token === '<}>') ;
+            else {
                 const info = getInfo(token, 'text', options.macros);
                 if (!info) {
                     error({ code: 'unexpected-token' });
@@ -26033,20 +26062,6 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
                     error({ code: 'unexpected-token' });
                 }
             }
-            else if (token === '<$>' || token === '<$$>') {
-                // Mode-shift
-                const subtokens = tokens.slice(0, tokens.findIndex((x) => x === token));
-                tokens = tokens.slice(subtokens.length + 1);
-                const [atoms] = options.parse('math', subtokens, options);
-                result = [...result, ...atoms];
-            }
-            else if (token === '<{>' || token === '<}>') ;
-            else {
-                error({
-                    code: 'unexpected-token',
-                    arg: token,
-                });
-            }
         }
         return [result, tokens];
     }
@@ -30930,6 +30945,7 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
             '\\tanh': 'Tanh',
             '\\tg': 'Tan',
             '\\th': 'Tanh',
+            '\\cis': 'Cis',
         }[latex]) !== null && _a !== void 0 ? _a : latex;
         if (isInverse) {
             head = [INVERSE_FUNCTION, head];
@@ -33354,6 +33370,7 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
         csch: '\\csch %0',
         sech: '\\sech %0',
         coth: '\\coth %0',
+        cis: '\\cis %0',
         arcsin: '\\arcsin %0',
         arccos: '\\arccos %0',
         arctan: '\\arctan %0',
@@ -36215,6 +36232,20 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
         $typedText(text) {
             onTypedText(this, text);
         }
+        getCaretPosition() {
+            const caretPosition = getCaretPosition(this.field);
+            return caretPosition
+                ? { x: caretPosition.x, y: caretPosition.y }
+                : null;
+        }
+        setCaretPosition(x, y) {
+            const oldPath = this.model.clone();
+            const anchor = pathFromPoint(this, x, y, { bias: 0 });
+            const result = setPath(this.model, anchor, 0);
+            this.model.announce('move', oldPath);
+            requestUpdate(this);
+            return result;
+        }
         canUndo() {
             return this.undoManager.canUndo();
         }
@@ -37307,6 +37338,7 @@ M500 241 v40 H399408 v-40z M500 435 v40 H400000 v-40z`,
         '\\tanh',
         '\\tg',
         '\\th',
+        '\\cis',
     ], UNCOMMON);
     metadata('Functions', ['\\ln', '\\log', '\\exp', '\\lim'], SUPERCOMMON);
     metadata('Functions', ['\\dim', '\\ker', '\\deg', '\\det', '\\mod', '\\min', '\\max'], COMMON);