From 26a2361d419a33e2620ebf492c59e2a1bf4f62a1 Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Sun, 16 May 2021 16:48:11 +0200
Subject: [PATCH 1/3] Separate it from the ManuScript XML parser from the rest
 of the code

It needs some love to make it work again
---
 tools/langs/manuscript.py | 77 ++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 46 deletions(-)

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index 073421a8..12724c39 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -226,28 +226,6 @@
         }
     }
     return res;
-}"
-    getPositionInDocument "(obj) {
-    if (not Self.MEIFlattened) {
-        return false;
-    }
-    for i = 0 to Length(Self.MEIFlattened) {
-        if (Self.MEIFlattened[i] = obj) {
-            return i;
-        }
-    }
-    return false;
-}"
-    lookBack "(from, name) {
-    if (not Self.MEIFlattened) {
-        return false;
-    }
-    pos = getPositionInDocument(from);
-    for i = pos to 0 step -1 {
-        if (getName(Self.MEIFlattened[i]) = name) {
-            return Self.MEIFlattened[i];
-        }
-    }
 }"
     createXmlTag "(name, id, attributesList, isTerminal) {
     if (name = '<!--')
@@ -407,11 +385,6 @@
     meiDocumentToString "(meidoc) {
         return _exportMeiDocument(meidoc);
     }"
-    documentFromFile "(filename) {
-    res = _xmlImport(filename);
-
-    return res;
-}"
     popMode "(arr) {
     if (arr.Length > 0) {
         return arr.Pop();
@@ -447,6 +420,37 @@
 
         return string;
     }"
+
+generateRandomID "() {
+//$module(ExportGenerators.mss)
+    id = Self._property:MEIID + 1;
+    Self._property:MEIID = id;
+    id = 'm-' & id;
+    return id;
+}"
+}
+"""
+
+AUTHORS = "Andrew Hankinson, Alastair Porter, and Others"
+
+FILE_TEMPLATE = """
+{{
+    {license}
+    {classes}
+    {extras}
+}}
+"""
+
+# The XML parser code does not work at the moment because of how the code above 
+# has changed over time. It's kept anyway to facilitate future work on MEI 
+# import.
+XMLPARSER ="""
+    documentFromFile "(filename) {
+    res = _xmlImport(filename);
+
+    return res;
+}"
+
     _xmlImport "(filename) {
     /*
         Based on the Quick-n-Dirty XML parser at
@@ -831,25 +835,6 @@
     }
     return meidoc;
 }"
-
-generateRandomID "() {
-//$module(ExportGenerators.mss)
-    id = Self._property:MEIID + 1;
-    Self._property:MEIID = id;
-    id = 'm-' & id;
-    return id;
-}"
-}
-"""
-
-AUTHORS = "Andrew Hankinson, Alastair Porter, and Others"
-
-FILE_TEMPLATE = """
-{{
-    {license}
-    {classes}
-    {extras}
-}}
 """
 
 

From 60a82997a12d579e41df3d20e91d5fcc68ee9b2f Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Sun, 16 May 2021 17:00:21 +0200
Subject: [PATCH 2/3] Remove unused popMode() function from ManuScript

It's purpose is unclear.
---
 tools/langs/manuscript.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index 12724c39..533baf27 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -385,14 +385,6 @@
     meiDocumentToString "(meidoc) {
         return _exportMeiDocument(meidoc);
     }"
-    popMode "(arr) {
-    if (arr.Length > 0) {
-        return arr.Pop();
-    } else {
-        // return PRE
-        return 15;
-    }
-}"
     _encodeEntities "(string)
     {
         /*

From d4681a4c7750d170b63771ab1f405f73bd907fb7 Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Mon, 23 Aug 2021 19:43:42 +0200
Subject: [PATCH 3/3] manuscript: Do not remove popMode(), put it in the
 "parked" XML parser code

---
 tools/langs/manuscript.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index 533baf27..6779a9da 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -442,7 +442,14 @@
 
     return res;
 }"
-
+    popMode "(arr) {
+    if (arr.Length > 0) {
+        return arr.Pop();
+    } else {
+        // return PRE
+        return 15;
+    }
+}"
     _xmlImport "(filename) {
     /*
         Based on the Quick-n-Dirty XML parser at