From 1d70045065614276d45569f959e020a524aa59eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20M=C3=A4der?= <maeder@phys.ethz.ch>
Date: Tue, 6 Apr 2021 14:52:55 +0200
Subject: [PATCH] Refactor maths config options to nested structure

---
 src/editor/deserialize.ts | 8 ++++----
 src/editor/serialize.ts   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts
index 979c70140d..a0c4d74275 100644
--- a/src/editor/deserialize.ts
+++ b/src/editor/deserialize.ts
@@ -143,11 +143,11 @@ function parseElement(n: HTMLElement, partCreator: PartCreator, lastNode: HTMLEl
             // math nodes are translated back into delimited latex strings
             if (n.hasAttribute("data-mx-maths")) {
                 const delimLeft = (n.nodeName == "SPAN") ?
-                    (SdkConfig.get()['latex_maths_delims'] || {})['inline_left'] || "\\(" :
-                    (SdkConfig.get()['latex_maths_delims'] || {})['display_left'] || "\\[";
+                    ((SdkConfig.get()['latex_maths_delims'] || {})['inline'] || {})['left'] || "\\(" :
+                    ((SdkConfig.get()['latex_maths_delims'] || {})['display'] || {})['left'] || "\\[";
                 const delimRight = (n.nodeName == "SPAN") ?
-                    (SdkConfig.get()['latex_maths_delims'] || {})['inline_right'] || "\\)" :
-                    (SdkConfig.get()['latex_maths_delims'] || {})['display_right'] || "\\]";
+                    ((SdkConfig.get()['latex_maths_delims'] || {})['inline'] || {})['right'] || "\\)" :
+                    ((SdkConfig.get()['latex_maths_delims'] || {})['display'] || {})['right'] || "\\]";
                 const tex = n.getAttribute("data-mx-maths");
                 return partCreator.plain(delimLeft + tex + delimRight);
             } else if (!checkDescendInto(n)) {
diff --git a/src/editor/serialize.ts b/src/editor/serialize.ts
index fc4a8d4314..3d7aff6720 100644
--- a/src/editor/serialize.ts
+++ b/src/editor/serialize.ts
@@ -92,8 +92,8 @@ export function htmlSerializeIfNeeded(model: EditorModel, {forceHTML = false} =
         patternNames.forEach(function(patternName) {
             patternTypes.forEach(function(patternType) {
                 // get the regex replace pattern from config or use the default
-                const pattern = (SdkConfig.get()["latex_maths_delims"] ||
-                    {})[patternType + "_pattern_" + patternName] ||
+                const pattern = (((SdkConfig.get()["latex_maths_delims"] ||
+                    {})[patternType] || {})["pattern"] || {})[patternName] ||
                     patternDefaults[patternName][patternType];
 
                 md = md.replace(RegExp(pattern, "gms"), function(m, p1, p2) {