From a287449d9e4624538b409d386a42d809a8efd066 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Mon, 7 Nov 2022 16:53:09 +0100
Subject: [PATCH 1/4] remove superfluous templates

the escape characters are already dealt with in https://github.com/Edirom/MerMEId/blob/ee8b0bfd49d64ec521a77373fd6552be2bf008c2/filter/xsl/filter_put.xsl#L333
---
 filter/xsl/filter_put.xsl | 45 ---------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/filter/xsl/filter_put.xsl b/filter/xsl/filter_put.xsl
index 187d4d95..28e2bf70 100644
--- a/filter/xsl/filter_put.xsl
+++ b/filter/xsl/filter_put.xsl
@@ -138,51 +138,6 @@
   <xsl:template match="m:titlePage[not(*)]"/>
   
   
-  <!-- Clean up double-escaped ampersands (&amp;) -->
-  <xsl:template match="text()[contains(.,'&amp;amp;')]">
-    <xsl:call-template name="cleanup_amp">
-      <xsl:with-param name="string" select="."/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="cleanup_amp">
-    <xsl:param name="string"/>
-    <xsl:variable name="remainder" select="substring-after($string,'&amp;amp;')"/>
-    <xsl:value-of select="substring-before($string,'&amp;amp;')"/>&amp;<xsl:choose>
-      <xsl:when test="contains($remainder,'&amp;amp;')">
-                <xsl:call-template name="cleanup_amp">
-          <xsl:with-param name="string" select="$remainder"/>
-                </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-                <xsl:value-of select="$remainder"/>
-            </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <!-- Trying to convert &nbsp; to &#160; ... -->
-  <xsl:template match="text()[contains(.,'&amp;nbsp;')]">
-    <xsl:call-template name="cleanup_nbsp">
-      <xsl:with-param name="string" select="."/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="cleanup_nbsp">
-    <xsl:param name="string"/>
-    <xsl:variable name="remainder" select="substring-after($string,'&amp;nbsp;')"/>
-    <xsl:value-of select="substring-before($string,'&amp;nbsp;')"/>&#160;<xsl:choose>
-      <xsl:when test="contains($remainder,'&amp;nbsp;')">
-        <xsl:call-template name="cleanup_nbsp">
-          <xsl:with-param name="string" select="$remainder"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$remainder"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-
   <!-- Delete duplicate language definitions (fixes an xforms problem) -->
   <xsl:template match="m:mei/m:meiHead/m:workList/m:work/m:langUsage/m:language[. = preceding-sibling::m:language]"/>
 

From 082b88a5921dcd3e81e866811077c4b538e464a7 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Mon, 7 Nov 2022 16:55:08 +0100
Subject: [PATCH 2/4] remove empty `@label` and `@level`

and fix spelling of `@auth.uri`
---
 filter/xsl/filter_put.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/filter/xsl/filter_put.xsl b/filter/xsl/filter_put.xsl
index 28e2bf70..6f42d6e0 100644
--- a/filter/xsl/filter_put.xsl
+++ b/filter/xsl/filter_put.xsl
@@ -117,8 +117,8 @@
 
 
   <!-- Remove empty attributes -->
-  <xsl:template match="@accid|@auth|@auth-uri|@cert|@codedval|@count|@enddate|@evidence|     
-    @isodate|@mode|@n|@notafter|@notbefore|@pname|@reg|@resp|     
+  <xsl:template match="@accid|@auth|@auth.uri|@cert|@codedval|@count|@enddate|@evidence|     
+    @isodate|@label|@level|@mode|@n|@notafter|@notbefore|@pname|@reg|@resp|     
     @solo|@startdate|@sym|@target|@targettype|@type|@unit|@xml:lang" mode="#all">
     <xsl:if test="not(normalize-space(data()) = '')">
       <xsl:sequence select="."/>

From c5a2a5ee524a13c4b2bd202c4018907f1b4c7e10 Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Mon, 7 Nov 2022 17:03:53 +0100
Subject: [PATCH 3/4] get rid of xsl modes

instead check text nodes for occurence of (escaped) tags to prevent endless recursion
---
 filter/xsl/filter_put.xsl | 43 +++++++++++++++------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/filter/xsl/filter_put.xsl b/filter/xsl/filter_put.xsl
index 6f42d6e0..c5120533 100644
--- a/filter/xsl/filter_put.xsl
+++ b/filter/xsl/filter_put.xsl
@@ -35,13 +35,10 @@
  
 
   <xsl:template match="/">
-    <xsl:variable name="new_doc">
-      <xsl:apply-templates select="*" mode="convertEntities"/>
-    </xsl:variable>
-    <xsl:copy-of select="$new_doc"/>
+    <xsl:apply-templates/>
   </xsl:template>
 
-  <xsl:template match="m:music" mode="#all">
+  <xsl:template match="m:music">
     <xsl:element name="music" namespace="http://www.music-encoding.org/ns/mei">
       <xsl:choose>
         <!-- If no new content has been uploaded into <music>, reinstate the original content from the database. -->
@@ -60,7 +57,7 @@
   <!-- CLEANING UP MEI -->
 
   <!-- Generate a value for empty @xml:id -->
-  <xsl:template match="@xml:id[.='']" mode="#all">
+  <xsl:template match="@xml:id[.='']">
     <xsl:call-template name="fill_in_id"/>
   </xsl:template>
 
@@ -80,7 +77,7 @@
   </xsl:template>
 
   <!-- Change duplicate IDs -->
-  <xsl:template match="*[@xml:id and count(key('ids', @xml:id)) &gt; 1]" mode="#all">
+  <xsl:template match="*[@xml:id and count(key('ids', @xml:id)) &gt; 1]">
     <xsl:variable name="duplicateID" select="@xml:id"/>
     <xsl:element name="{name()}">
       <xsl:apply-templates select="@*"/>
@@ -106,7 +103,7 @@
   </xsl:template>
 
   <!-- Add xml:id to certain elements if missing -->
-  <xsl:template match="m:expression | m:item | m:bibl | m:perfRes | m:perfResList | m:castItem" mode="#all">
+  <xsl:template match="m:item | m:bibl | m:perfRes | m:perfResList | m:castItem">
     <!-- Test if perfResList is like old instrumentation -->
     <xsl:element name="{name()}" namespace="http://www.music-encoding.org/ns/mei">
       <xsl:apply-templates select="@*"/>
@@ -119,7 +116,7 @@
   <!-- Remove empty attributes -->
   <xsl:template match="@accid|@auth|@auth.uri|@cert|@codedval|@count|@enddate|@evidence|     
     @isodate|@label|@level|@mode|@n|@notafter|@notbefore|@pname|@reg|@resp|     
-    @solo|@startdate|@sym|@target|@targettype|@type|@unit|@xml:lang" mode="#all">
+    @solo|@startdate|@sym|@target|@targettype|@type|@unit|@xml:lang">
     <xsl:if test="not(normalize-space(data()) = '')">
       <xsl:sequence select="."/>
     </xsl:if>
@@ -159,9 +156,9 @@
   </xsl:template>
 
 
-  <!-- Ensure correct order of elements -->
- 
-  <!-- NB: This template only matches in the default mode which is probably never called  -->
+  <!-- 
+    Ensure correct order of elements 
+  -->
   <xsl:template match="m:biblList">
     <xsl:element name="biblList" namespace="http://www.music-encoding.org/ns/mei">
       <xsl:apply-templates select="@*"/>
@@ -171,7 +168,6 @@
     </xsl:element>
   </xsl:template>
 
-  <!-- NB: This template only matches in the default mode which is probably never called  -->
   <xsl:template match="m:manifestation">
     <xsl:element name="manifestation" namespace="http://www.music-encoding.org/ns/mei">
       <xsl:apply-templates select="@*"/>
@@ -200,7 +196,6 @@
     </xsl:element>
   </xsl:template>
 
-  <!-- NB: This template only matches in the default mode which is probably never called  -->
   <xsl:template match="m:work">
     <xsl:element name="work" namespace="http://www.music-encoding.org/ns/mei">
       <xsl:apply-templates select="@*"/>
@@ -233,8 +228,6 @@
     </xsl:element>
   </xsl:template>
 
-
-  <!-- NB: This template only matches in the default mode which is probably never called  -->
   <xsl:template match="m:expression">
     <xsl:element name="expression" namespace="http://www.music-encoding.org/ns/mei">
       <xsl:apply-templates select="@*"/>
@@ -265,18 +258,14 @@
     </xsl:element>
   </xsl:template>
   
-
   <!-- END CLEANING -->
 
-
-  <!-- Convert entities to nodes -->
-  <xsl:template match="@*|*" mode="convertEntities">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()" mode="convertEntities"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="text()" mode="convertEntities" priority="1">
+  <!-- 
+    Process all text nodes that feature (escaped) tags
+    The check for tags looks for end tags (because start tags might bear attributes)
+    or empty elements.
+  -->
+  <xsl:template match="text()[matches(., '(&lt;/\w\s*&gt;)|(&lt;\w\s*/&gt;)')]">
     <xsl:call-template name="replace_nodes">
       <xsl:with-param name="text" select="."/>
     </xsl:call-template>
@@ -522,7 +511,7 @@
   </xsl:template>
   <!-- end utilities -->
 
-  <xsl:template match="m:revisionDesc" mode="convertEntities">
+  <xsl:template match="m:revisionDesc">
     <xsl:element name="revisionDesc">
       <xsl:variable name="penultimate" select="count(m:change)-1"/>
       <xsl:variable name="penultimateChange" select="m:change[$penultimate]"/>

From 3bc7654102b85822488e65986f685d451f57ba5a Mon Sep 17 00:00:00 2001
From: Peter Stadler <stadlerpeter@yahoo.fr>
Date: Tue, 22 Nov 2022 14:58:45 +0100
Subject: [PATCH 4/4] do NOT use angle brackets in text
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

it will be a mess …
---
 data/incipit_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/incipit_demo.xml b/data/incipit_demo.xml
index a9f20059..ae14e2be 100644
--- a/data/incipit_demo.xml
+++ b/data/incipit_demo.xml
@@ -380,7 +380,7 @@
                   </incip>
                   <creation xml:id="creation_a9b88e21"/>
                   <history xml:id="history_5b845292">
-                     <p>As MerMEId does not include a music notation editor, incipits encoded in MEI cannot be entered or edited directly in MerMEId. You can add MEI incipits, however, by uploading MEI files containing the encodings. When uploading an MEI file, MerMEId makes a copy of the first &amp;lt;score&amp;gt; element it encounters (whether in the file's header or in the &amp;lt;music&amp;gt; section) and inserts it as an incipit. If you need to make changes to the incipit, edit your MEI file and upload it again using MerMEId's 'Replace' button.</p>
+                     <p>As MerMEId does not include a music notation editor, incipits encoded in MEI cannot be entered or edited directly in MerMEId. You can add MEI incipits, however, by uploading MEI files containing the encodings. When uploading an MEI file, MerMEId makes a copy of the first 'score' element it encounters (whether in the file's header or in the 'music' section) and inserts it as an incipit. If you need to make changes to the incipit, edit your MEI file and upload it again using MerMEId's 'Replace' button.</p>
                   </history>
                   <perfMedium analog="marc:048" auth="marcmusperf" xml:id="perfMedium_5d276875"/>
                   <classification xml:id="classification_58460514">