@mathigon/hilbert
Advanced tools
Comparing version 1.1.13 to 1.1.14
@@ -121,2 +121,3 @@ "use strict"; | ||
"!=": "\u2260", | ||
"?=": "\u225F", | ||
"<=": "\u2264", | ||
@@ -189,3 +190,3 @@ ">=": "\u2265", | ||
var IDENTIFIER_SYMBOLS = [...LOWERCASE, ...UPPERCASE, ...GREEK, "$"]; | ||
var SIMPLE_SYMBOLS = "|()[]{}\xF7,!<>=*/+-\u2013\u2212~^_\u2026\xB0\u2022\u2225\u22A5'\u2220:%\u223C\u25B3"; | ||
var SIMPLE_SYMBOLS = "|()[]{}\xF7,!?<>=*/+-\u2013\u2212~^_\u2026\xB0\u2022\u2225\u22A5'\u2220:%\u223C\u25B3"; | ||
var COMPLEX_SYMBOLS = Object.values(SPECIAL_OPERATORS); | ||
@@ -256,2 +257,3 @@ var OPERATOR_SYMBOLS = [...SIMPLE_SYMBOLS, ...COMPLEX_SYMBOLS]; | ||
"\u2260": "does not equal", | ||
"\u225F": "is it equal?", | ||
"<": "is less than", | ||
@@ -741,3 +743,3 @@ ">": "is greater than", | ||
return `${args[0]}_${args[1]}^${args[2]}`; | ||
if ((0, import_core2.words)("+ * \xD7 \xB7 / = < > \u2264 \u2265 \u2248").includes(this.fn)) { | ||
if ((0, import_core2.words)("+ * \xD7 \xB7 / = < > \u2264 \u2265 \u2248 \u225F \u2260").includes(this.fn)) { | ||
return args.join(` ${this.fn} `); | ||
@@ -765,3 +767,3 @@ } | ||
} | ||
if ((0, import_core2.isOneOf)(this.fn, "+", "=", "<", ">", "\u2264", "\u2265", "\u2248")) { | ||
if ((0, import_core2.isOneOf)(this.fn, "+", "=", "<", ">", "\u2264", "\u2265", "\u2248", "\u225F", "\u2260")) { | ||
const fn = escape(this.fn); | ||
@@ -1083,3 +1085,3 @@ return argsF.join(`<mo value="${fn}">${fn}</mo>`); | ||
throw ExprError.invalidExpression(); | ||
const comp = tokens.findIndex((t) => isOperator(t, "= < > \u2264 \u2265")); | ||
const comp = tokens.findIndex((t) => isOperator(t, "= < > \u2264 \u2265 \u225F \u2260")); | ||
if (comp === 0) | ||
@@ -1086,0 +1088,0 @@ throw ExprError.startOperator(tokens[0]); |
@@ -83,2 +83,3 @@ // src/errors.ts | ||
"!=": "\u2260", | ||
"?=": "\u225F", | ||
"<=": "\u2264", | ||
@@ -151,3 +152,3 @@ ">=": "\u2265", | ||
var IDENTIFIER_SYMBOLS = [...LOWERCASE, ...UPPERCASE, ...GREEK, "$"]; | ||
var SIMPLE_SYMBOLS = "|()[]{}\xF7,!<>=*/+-\u2013\u2212~^_\u2026\xB0\u2022\u2225\u22A5'\u2220:%\u223C\u25B3"; | ||
var SIMPLE_SYMBOLS = "|()[]{}\xF7,!?<>=*/+-\u2013\u2212~^_\u2026\xB0\u2022\u2225\u22A5'\u2220:%\u223C\u25B3"; | ||
var COMPLEX_SYMBOLS = Object.values(SPECIAL_OPERATORS); | ||
@@ -218,2 +219,3 @@ var OPERATOR_SYMBOLS = [...SIMPLE_SYMBOLS, ...COMPLEX_SYMBOLS]; | ||
"\u2260": "does not equal", | ||
"\u225F": "is it equal?", | ||
"<": "is less than", | ||
@@ -703,3 +705,3 @@ ">": "is greater than", | ||
return `${args[0]}_${args[1]}^${args[2]}`; | ||
if (words("+ * \xD7 \xB7 / = < > \u2264 \u2265 \u2248").includes(this.fn)) { | ||
if (words("+ * \xD7 \xB7 / = < > \u2264 \u2265 \u2248 \u225F \u2260").includes(this.fn)) { | ||
return args.join(` ${this.fn} `); | ||
@@ -727,3 +729,3 @@ } | ||
} | ||
if (isOneOf(this.fn, "+", "=", "<", ">", "\u2264", "\u2265", "\u2248")) { | ||
if (isOneOf(this.fn, "+", "=", "<", ">", "\u2264", "\u2265", "\u2248", "\u225F", "\u2260")) { | ||
const fn = escape(this.fn); | ||
@@ -1045,3 +1047,3 @@ return argsF.join(`<mo value="${fn}">${fn}</mo>`); | ||
throw ExprError.invalidExpression(); | ||
const comp = tokens.findIndex((t) => isOperator(t, "= < > \u2264 \u2265")); | ||
const comp = tokens.findIndex((t) => isOperator(t, "= < > \u2264 \u2265 \u225F \u2260")); | ||
if (comp === 0) | ||
@@ -1048,0 +1050,0 @@ throw ExprError.startOperator(tokens[0]); |
{ | ||
"name": "@mathigon/hilbert", | ||
"version": "1.1.13", | ||
"version": "1.1.14", | ||
"license": "MIT", | ||
@@ -34,17 +34,17 @@ "homepage": "https://mathigon.io/hilbert", | ||
"dependencies": { | ||
"@mathigon/core": "1.1.14", | ||
"@mathigon/fermat": "1.1.13" | ||
"@mathigon/core": "1.1.15", | ||
"@mathigon/fermat": "1.1.14" | ||
}, | ||
"devDependencies": { | ||
"@types/tape": "5.6.4", | ||
"@typescript-eslint/eslint-plugin": "6.12.0", | ||
"@typescript-eslint/parser": "6.12.0", | ||
"esbuild": "0.19.8", | ||
"eslint": "8.54.0", | ||
"eslint-plugin-import": "2.29.0", | ||
"tape": "5.7.2", | ||
"ts-node": "10.9.1", | ||
"@typescript-eslint/eslint-plugin": "6.19.0", | ||
"@typescript-eslint/parser": "6.19.0", | ||
"esbuild": "0.19.11", | ||
"eslint": "8.56.0", | ||
"eslint-plugin-import": "2.29.1", | ||
"tape": "5.7.3", | ||
"ts-node": "10.9.2", | ||
"tslib": "2.6.2", | ||
"typescript": "5.2.2" | ||
"typescript": "5.3.3" | ||
} | ||
} |
@@ -11,3 +11,3 @@ // ============================================================================= | ||
import {BRACKETS, escape, isSpecialFunction, VOICE_STRINGS} from './symbols'; | ||
import {CustomFunction, ExprElement, ExprMap, ExprNumber, MathMLMap, VarMap} from './elements'; | ||
import {ExprElement, ExprMap, ExprNumber, MathMLMap, VarMap} from './elements'; | ||
import {ExprError} from './errors'; | ||
@@ -123,3 +123,3 @@ | ||
if (words('+ * × · / = < > ≤ ≥ ≈').includes(this.fn)) { | ||
if (words('+ * × · / = < > ≤ ≥ ≈ ≟ ≠').includes(this.fn)) { | ||
return args.join(` ${this.fn} `); | ||
@@ -154,3 +154,3 @@ } | ||
if (isOneOf(this.fn, '+', '=', '<', '>', '≤', '≥', '≈')) { | ||
if (isOneOf(this.fn, '+', '=', '<', '>', '≤', '≥', '≈', '≟', '≠')) { | ||
const fn = escape(this.fn); | ||
@@ -157,0 +157,0 @@ return argsF.join(`<mo value="${fn}">${fn}</mo>`); |
@@ -265,3 +265,3 @@ // ============================================================================= | ||
// Match comparison operators first | ||
const comp = tokens.findIndex(t => isOperator(t, '= < > ≤ ≥')); | ||
const comp = tokens.findIndex(t => isOperator(t, '= < > ≤ ≥ ≟ ≠')); | ||
if (comp === 0) throw ExprError.startOperator(tokens[0]); | ||
@@ -268,0 +268,0 @@ if (comp === tokens.length - 1) throw ExprError.endOperator(tokens[0]); |
@@ -42,2 +42,3 @@ // ============================================================================= | ||
'!=': '≠', | ||
'?=': '≟', | ||
'<=': '≤', | ||
@@ -116,3 +117,3 @@ '>=': '≥', | ||
const SIMPLE_SYMBOLS = '|()[]{}÷,!<>=*/+-–−~^_…°•∥⊥\'∠:%∼△'; | ||
const SIMPLE_SYMBOLS = '|()[]{}÷,!?<>=*/+-–−~^_…°•∥⊥\'∠:%∼△'; | ||
const COMPLEX_SYMBOLS = Object.values(SPECIAL_OPERATORS); | ||
@@ -159,2 +160,3 @@ export const OPERATOR_SYMBOLS = [...SIMPLE_SYMBOLS, ...COMPLEX_SYMBOLS]; | ||
'≠': 'does not equal', | ||
'≟': 'is it equal?', | ||
'<': 'is less than', | ||
@@ -161,0 +163,0 @@ '>': 'is greater than', |
@@ -76,2 +76,3 @@ // ============================================================================= | ||
test.equal(str('a != b'), 'a ≠ b'); | ||
test.equal(str('a ?= b'), 'a ≟ b'); | ||
test.end(); | ||
@@ -78,0 +79,0 @@ }); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
295896
4061
37
+ Added@mathigon/core@1.1.15(transitive)
+ Added@mathigon/fermat@1.1.14(transitive)
- Removed@mathigon/core@1.1.14(transitive)
- Removed@mathigon/fermat@1.1.13(transitive)
Updated@mathigon/core@1.1.15
Updated@mathigon/fermat@1.1.14