From 1e44fe24b39bc371c2ad20b3338412392a2d4603 Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Thu, 13 Jun 2019 10:15:23 +0200
Subject: [PATCH 01/11] Manuscript: meiDocumentToFile() would return true even
 if file creation and writing failed

---
 tools/langs/manuscript.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index 073421a8..b72309bd 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -398,10 +398,11 @@
 
     meiDocumentToFile "(meidoc, filename) {
         meiout = _exportMeiDocument(meidoc);
-        Sibelius.CreateTextFile(filename);
-        Sibelius.AppendTextFile(filename, meiout, 1);
-
-        return true;
+        if (Sibelius.CreateTextFile(filename)) {
+            return Sibelius.AppendTextFile(filename, meiout, true);
+        } else {
+            return false;
+        }
 }"
 
     meiDocumentToString "(meidoc) {

From 347d6f019869da6d988ed13e1aa30b4b3df68527 Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Sun, 16 May 2021 12:05:45 +0200
Subject: [PATCH 02/11] ManuScript: Fix comment creation

---
 tools/langs/manuscript.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index b72309bd..bde832c3 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -46,7 +46,7 @@
 }"
 
     XMLComment "(comment) {
-    commentObj = Create('<!--', null);
+    commentObj = CreateElement('<!--', null);
     commentObj.text = comment;
     return commentObj;
 }"

From e6ba75d5f6c05119a91b01ff13a5c0ccf5de5826 Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Sun, 16 May 2021 12:35:34 +0200
Subject: [PATCH 03/11] ManuScript SetId() fix to not break getElementById() or
 getElementsByName()

---
 tools/langs/manuscript.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index bde832c3..4f7bdf1f 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -156,8 +156,18 @@
 GetId "(element) {
         return element._id;
 }"
-SetId "(element, value) {
-        element._id = value;
+SetId "(element, newId) {
+    oldId = element._id;
+    UnregisterId(oldId);
+    Self.MEIFlattened[newId] = element;
+    element._id = newId;
+}"
+UnregisterId "(id) {
+    // ManuScript dictionaries will return the empty string if an entry does
+    // not exists, so the most sensible way to cancel an element is to put the
+    // empty string in its place as ManuScript does not allow us to remove an
+    // entry entirely from a Dictionary
+    Self.MEIFlattened[id] = '';
 }"
 RemoveAttribute "(element, attrname) {
     // since there are no delete functions
@@ -221,7 +231,7 @@
     }
     res = CreateSparseArray();
     for each e in Self.MEIFlattened {
-        if (getName(e) = name) {
+        if (IsObject(e) and getName(e) = name) {
             res.Push(e);
         }
     }

From 2acdff216f001d51ef3d57a42492779ad1e63e65 Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Sun, 16 May 2021 13:03:38 +0200
Subject: [PATCH 04/11] Add RemoveChild() for ManuScript

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

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index 4f7bdf1f..2b7afbfe 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -105,6 +105,22 @@
         child._parent = element._id;
         element.children.Push(cid);
 }"
+RemoveChild "(element, child) {
+    child._parent = null;
+    UnregisterId(child._id);
+
+    newarr = CreateSparseArray();
+
+    for each elid in element.children
+    {
+        if (elid != child._id)
+        {
+            newarr.Push(elid);
+        }
+    }
+
+    element.children = newarr;
+}"
 GetAttributes "(element) {
     return element.attrs;
 }"

From baf0dc6eae8618519de1838cb4767f2bba359e8c Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Sun, 16 May 2021 12:18:53 +0200
Subject: [PATCH 05/11] ManuScript: Make AddChildAtPosition() simpler and more
 efficient

---
 tools/langs/manuscript.py | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index 2b7afbfe..59319ad2 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -86,19 +86,13 @@
         element.children = childarr;
 }"
 AddChildAtPosition "(element, child, position) {
+        AddChild(element, child);
         c = element.children;
-        r = CreateSparseArray();
-        // copy the children to the new array. Add two
-        // beyond the length since we'll be adding a new element.
-        for i = c.Length + 2 {
-            if (i = position) {
-                r[i] = child;
-                i = i + 1;
-            } else {
-                r[i] = c[i];
-            }
+        // shift all children that are at a higher index than `position`
+        for i = c.Length - 1 to position step -1 {
+            c[i] = c[i - 1];
         }
-        element.children = r;
+        element.children[position] = child._id;
 }"
 AddChild "(element, child) {
         cid = child._id;

From 81946d964db824d207e969b44781f44144d2c10c Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Mon, 15 Jun 2020 20:08:08 +0200
Subject: [PATCH 06/11] Manuscript: Write "tail" after element

Previously, this was only the case for self-closing elements
---
 tools/langs/manuscript.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index 59319ad2..92fb4bfc 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -380,11 +380,6 @@
         indent = indent - 1;
     }
 
-    if (Length(tl) > 0)
-    {
-        xmlout = xmlout & tl;
-    }
-
     // convertDictToXml takes care of adding the />
     // for tags that do not have children. We'll
     // take care of the terminal tag here for those
@@ -404,6 +399,11 @@
         }
     }
 
+    if (Length(tl) > 0)
+    {
+        xmlout = xmlout & tl;
+    }
+
     return xmlout;
 }"
 

From b3d960cf003d56e3fc95400f337479742fb757c9 Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Sun, 16 May 2021 14:03:35 +0200
Subject: [PATCH 07/11] Change ManuScript serialization to avoid added
 whitespace around text content

---
 tools/langs/manuscript.py | 81 ++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 48 deletions(-)

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index 92fb4bfc..54967c29 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -312,12 +312,22 @@
     {
         return '<' & name & spacer & attrstring & '>';
     }
+}"
+    childHasTail "(children) {
+    for each child in children
+    {
+        if (Length(GetTail(child)) > 0)
+        {
+            return true;
+        }
+    }
+    return false;
 }"
     convertDictToXml "(meiel, indent) {
+    // The indent parameter includes the leading line break
+
     xmlout = '';
     terminalTag = true;
-    trace('convert: ');
-    trace(meiel);
 
     nm = libmei.GetName(meiel);
     at = libmei.GetAttributes(meiel);
@@ -326,58 +336,45 @@
     tl = libmei.GetTail(meiel);
     id = libmei.GetId(meiel);
 
-    tabs = '';
-    if (indent > 0)
-    {
-        // add four spaces for every indent level.
-        arr = utils.CreateArrayBlanket('    ', indent);
-        tabs = JoinStrings(arr, '');
-    }
 
     // comments are simple so they're handled specially.
     if (nm = '<!--')
     {
-        xmlout = nm & ' ' & tx & ' -->
-';
+        xmlout = indent & nm & ' ' & tx & ' -->';
         return xmlout;
     }
 
-    if (ch or Length(tx) > 0)
+    if (ch.Length > 0 or Length(tx) > 0)
     {
         terminalTag = false;
     }
 
-    xmlout = createXmlTag(nm, id, at, terminalTag);
+    xmlout = indent & createXmlTag(nm, id, at, terminalTag);
+
+    hasTextChild = Length(tx) > 0 or childHasTail(ch);
 
-    if (Length(tx) > 0)
+    if (hasTextChild)
     {
-        endchar = '';
         xmlout = xmlout & tx;
+        // Do not add indentation whitespace as it might mess up text content
+        indent = '';
     }
-    else
-    {
-        xmlout = xmlout & '
-';
-    }
-
-    trace(ch);
 
     if (ch.Length > 0)
     {
-        indent = indent + 1;
+        if (indent != '')
+        {
+            innerIndent = indent & '    ';
+        }
+        else
+        {
+            innerIndent = '';
+        }
+
         for each child in ch
         {
-            if (child = null)
-            {
-                trace('child is null!');
-            }
-            else
-            {
-                trace(child);
-            }
-            xmlout = xmlout & tabs & convertDictToXml(child, indent);
+            xmlout = xmlout & convertDictToXml(child, innerIndent);
         }
-        indent = indent - 1;
     }
 
     // convertDictToXml takes care of adding the />
@@ -386,17 +383,7 @@
     // that do.
     if (not terminalTag)
     {
-        if (Length(tx) > 0)
-        {
-            xmlout = xmlout & '</' & nm & '>
-';
-        }
-        else
-        {
-            tabs = Substring(tabs, 0, Length(tabs) - 4);
-            xmlout = xmlout & tabs & '</' & nm & '>
-';
-        }
+        xmlout = xmlout & indent & '</' & nm & '>';
     }
 
     if (Length(tl) > 0)
@@ -408,10 +395,8 @@
 }"
 
     _exportMeiDocument "(meidoc) {
-        xdecl = '<?xml version=' & Chr(34) & '1.0' & Chr(34) & ' encoding=' & Chr(34) & 'UTF-16' & Chr(34) & ' ?>
-';
-        indent = 0;
-        meiout = xdecl & convertDictToXml(meidoc[0], indent);
+        xdecl = '<?xml version=' & Chr(34) & '1.0' & Chr(34) & ' encoding=' & Chr(34) & 'UTF-16' & Chr(34) & ' ?>';
+        meiout = xdecl & convertDictToXml(meidoc[0], Chr(10));
 
         return meiout;
     }"

From 642710ddd5c6e805c40b37f087ae9cee1500e21b Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Sun, 16 May 2021 15:11:18 +0200
Subject: [PATCH 08/11] Add Thomas Weber to authors in ManuScript

---
 tools/langs/manuscript.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index 54967c29..77d45bdf 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -848,7 +848,7 @@
 }
 """
 
-AUTHORS = "Andrew Hankinson, Alastair Porter, and Others"
+AUTHORS = "Andrew Hankinson, Alastair Porter, Thomas Weber and Others"
 
 FILE_TEMPLATE = """
 {{

From 712bd448611e6768e51dfb31d5f9cc124622dcb1 Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Sun, 16 May 2021 19:24:39 +0200
Subject: [PATCH 09/11] Remove surplus closing brace from ManuScript generation

---
 tools/langs/manuscript.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index 77d45bdf..ce18960c 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -845,7 +845,6 @@
     id = 'm-' & id;
     return id;
 }"
-}
 """
 
 AUTHORS = "Andrew Hankinson, Alastair Porter, Thomas Weber and Others"

From 3250888d1161a73a24828e24681eee60ecff1009 Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Mon, 23 Aug 2021 20:15:41 +0200
Subject: [PATCH 10/11] Revert to re-generating MEIFlattened when removing
 elements in ManuScript

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

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index ce18960c..49ed06cf 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -98,6 +98,9 @@
         cid = child._id;
         child._parent = element._id;
         element.children.Push(cid);
+        // The following might be redundant, but in case a child is removed from
+        // one parent and added to another, it's safer to re-register the ID.
+        Self.MEIFlattened[cid] = child;
 }"
 RemoveChild "(element, child) {
     child._parent = null;
@@ -167,17 +170,14 @@
         return element._id;
 }"
 SetId "(element, newId) {
-    oldId = element._id;
-    UnregisterId(oldId);
-    Self.MEIFlattened[newId] = element;
-    element._id = newId;
+    UnregisterId(element._id);
+    element._id = value;
+    Self.MEIFlattened[value] = element;
 }"
 UnregisterId "(id) {
-    // ManuScript dictionaries will return the empty string if an entry does
-    // not exists, so the most sensible way to cancel an element is to put the
-    // empty string in its place as ManuScript does not allow us to remove an
-    // entry entirely from a Dictionary
-    Self.MEIFlattened[id] = '';
+    olddict = Self._property:MEIFlattened;
+    newdict = removeKeyFromDictionary(olddict, oldid);
+    Self._property:MEIFlattened = newdict;
 }"
 RemoveAttribute "(element, attrname) {
     // since there are no delete functions

From 040acea75f1fd84dd3d5dc48bb8c352fe4277fdc Mon Sep 17 00:00:00 2001
From: Thomas Weber <thomas.weber@notengrafik.com>
Date: Tue, 24 Aug 2021 08:24:56 +0200
Subject: [PATCH 11/11] Fix ManuScript variable names

---
 tools/langs/manuscript.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/langs/manuscript.py b/tools/langs/manuscript.py
index 49ed06cf..87886903 100644
--- a/tools/langs/manuscript.py
+++ b/tools/langs/manuscript.py
@@ -171,12 +171,12 @@
 }"
 SetId "(element, newId) {
     UnregisterId(element._id);
-    element._id = value;
-    Self.MEIFlattened[value] = element;
+    element._id = newId;
+    Self.MEIFlattened[newId] = element;
 }"
 UnregisterId "(id) {
     olddict = Self._property:MEIFlattened;
-    newdict = removeKeyFromDictionary(olddict, oldid);
+    newdict = removeKeyFromDictionary(olddict, id);
     Self._property:MEIFlattened = newdict;
 }"
 RemoveAttribute "(element, attrname) {