Skip to content
Snippets Groups Projects
Commit ce3068fb authored by Chris Sangwin's avatar Chris Sangwin
Browse files

Candidate fix to issue #860.

parent 7641ff5f
No related branches found
No related tags found
No related merge requests found
...@@ -28,6 +28,7 @@ require(__DIR__ . '/../../../../config.php'); ...@@ -28,6 +28,7 @@ require(__DIR__ . '/../../../../config.php');
require_once($CFG->libdir . '/clilib.php'); require_once($CFG->libdir . '/clilib.php');
$baseurl = 'https://raw.githubusercontent.com/numbas/unicode-math-normalization/main/final_data/'; $baseurl = 'https://raw.githubusercontent.com/numbas/unicode-math-normalization/main/final_data/';
$baseurl = 'https://raw.githubusercontent.com/sangwinc/unicode-math-normalization/iss001/final_data/';
$greek = file_get_contents($baseurl . 'greek.json'); $greek = file_get_contents($baseurl . 'greek.json');
$letters = file_get_contents($baseurl . 'letters.json'); $letters = file_get_contents($baseurl . 'letters.json');
$subscripts = file_get_contents($baseurl . 'subscripts.json'); $subscripts = file_get_contents($baseurl . 'subscripts.json');
...@@ -112,7 +113,11 @@ foreach ($symbols as $key => $value) { ...@@ -112,7 +113,11 @@ foreach ($symbols as $key => $value) {
case '<=': case '<=':
case '>': case '>':
case '<': case '<':
if ($key !== $value[0]) {
$symbolconversion[$key] = $value[0]; $symbolconversion[$key] = $value[0];
} else {
echo "\n" . mb_ord($key) . ' was not added!';
}
} }
} }
...@@ -122,8 +127,6 @@ foreach ($superscripts as $key => $value) { ...@@ -122,8 +127,6 @@ foreach ($superscripts as $key => $value) {
if (mb_detect_encoding($value[0], 'ASCII', true) === false) { if (mb_detect_encoding($value[0], 'ASCII', true) === false) {
if (isset($commonsymbolconversion[$value[0]])) { if (isset($commonsymbolconversion[$value[0]])) {
$superscriptsconversion[$key] = $commonsymbolconversion[$value[0]]; $superscriptsconversion[$key] = $commonsymbolconversion[$value[0]];
} else {
// Ignore for now.
} }
} else { } else {
$superscriptsconversion[$key] = $value[0]; $superscriptsconversion[$key] = $value[0];
...@@ -136,8 +139,6 @@ foreach ($subscripts as $key => $value) { ...@@ -136,8 +139,6 @@ foreach ($subscripts as $key => $value) {
if (mb_detect_encoding($value[0], 'ASCII', true) === false) { if (mb_detect_encoding($value[0], 'ASCII', true) === false) {
if (isset($commonsymbolconversion[$value[0]])) { if (isset($commonsymbolconversion[$value[0]])) {
$subscriptsconversion[$key] = $commonsymbolconversion[$value[0]]; $subscriptsconversion[$key] = $commonsymbolconversion[$value[0]];
} else {
// Ignore for now.
} }
} else { } else {
$subscriptsconversion[$key] = $value[0]; $subscriptsconversion[$key] = $value[0];
......
...@@ -151,7 +151,6 @@ class stack_ast_filter_025_no_trig_power implements stack_cas_astfilter { ...@@ -151,7 +151,6 @@ class stack_ast_filter_025_no_trig_power implements stack_cas_astfilter {
} }
} }
if ($node instanceof MP_FunctionCall && if ($node instanceof MP_FunctionCall &&
$node->name instanceof MP_Identifier) { $node->name instanceof MP_Identifier) {
$bad = false; $bad = false;
......
...@@ -40,5 +40,23 @@ ...@@ -40,5 +40,23 @@
"\u2aab": ">", "\u2aab": ">",
"\u2aac": "<=", "\u2aac": "<=",
"\u2aad": ">=", "\u2aad": ">=",
"\u02c6": "^" "\u02c6": "^",
"\u2768": "(",
"\u2769": ")",
"\u276a": "(",
"\u276b": ")",
"\u2772": "[",
"\u2773": "[",
"\u2774": "{",
"\u2775": "}",
"\ufe59": "(",
"\ufe5a": ")",
"\ufe5b": "{",
"\ufe5c": "}",
"\uff08": "(",
"\uff09": ")",
"\uff3b": "[",
"\uff3d": "]",
"\uff5b": "{",
"\uff5d": "}"
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment