From 63ed7a9ced86b83b390b6a7c21fd6e708742843b Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <bohl@edirom.de>
Date: Thu, 9 Jul 2015 01:06:11 +0200
Subject: [PATCH 1/5] make change of schemaRef optional and parametrizeable

---
 04 MEI cleaning/improveMusic.xsl | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/04 MEI cleaning/improveMusic.xsl b/04 MEI cleaning/improveMusic.xsl
index d2131d6..b83fe00 100644
--- a/04 MEI cleaning/improveMusic.xsl	
+++ b/04 MEI cleaning/improveMusic.xsl	
@@ -30,6 +30,11 @@
     </xd:doc>
     <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
     
+    <xd:doc scope="component">
+        <xd:desc>The newSchemaRef parameter defines a new URL for RNG and Schematron schemata; if empty the existing schemaRef will be retained</xd:desc>
+    </xd:doc>
+    <xsl:param name="newSchemaRef"/>
+    
     <xd:doc scope="component">
         <xd:desc>
             <xd:p>Parameter for mdiv id</xd:p>
@@ -782,17 +787,19 @@
         <xd:desc>Replace general mei-all.rng references with custom freidi-schema reference</xd:desc>
     </xd:doc>
     <xsl:template match="processing-instruction('xml-model')" mode="lastRun">
-        <xsl:choose>
-            <xsl:when test="contains(.,'relaxng')">
-                <xsl:processing-instruction name="xml-model">href="../../../schemata/rng/freidi-schema-musicSource.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"</xsl:processing-instruction>
-            </xsl:when>
-            <xsl:when test="contains(.,'schematron')">
-                <xsl:processing-instruction name="xml-model">href="../../../schemata/rng/freidi-schema-musicSource.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"</xsl:processing-instruction>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:apply-templates select="." mode="#current"/>
-            </xsl:otherwise>
-        </xsl:choose>
+        <xsl:if test="$newSchemaRef!=''">
+            <xsl:choose>
+                <xsl:when test="contains(.,'relaxng')">
+                    <xsl:processing-instruction name="xml-model"><xsl:text>href="</xsl:text><xsl:value-of select="$newSchemaRef"/><xsl:text>" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"</xsl:text></xsl:processing-instruction>
+                </xsl:when>
+                <xsl:when test="contains(.,'schematron')">
+                    <xsl:processing-instruction name="xml-model"><xsl:text>href="</xsl:text><xsl:value-of select="$newSchemaRef"/><xsl:text>" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"</xsl:text></xsl:processing-instruction>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:apply-templates select="." mode="#current"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:if>
     </xsl:template>
     
 </xsl:stylesheet>
\ No newline at end of file

From d7d5e0ee1d10fbbed776d01c658461f3a6c6c89d Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <bohl@edirom.de>
Date: Thu, 9 Jul 2015 01:07:44 +0200
Subject: [PATCH 2/5] fix typo

---
 04 MEI cleaning/improveMusic.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/04 MEI cleaning/improveMusic.xsl b/04 MEI cleaning/improveMusic.xsl
index b83fe00..3cd7e5a 100644
--- a/04 MEI cleaning/improveMusic.xsl	
+++ b/04 MEI cleaning/improveMusic.xsl	
@@ -25,7 +25,7 @@
     
     <xd:doc scope="component">
         <xd:desc>
-            <xd:p>Define output method as UTH-8 encoded XML with identation.</xd:p>
+            <xd:p>Define output method as UTF-8 encoded XML with identation.</xd:p>
         </xd:desc>
     </xd:doc>
     <xsl:output method="xml" indent="yes" encoding="UTF-8"/>

From 0ec3b1c9cedfdbc1ed653d03fcef707286f40305 Mon Sep 17 00:00:00 2001
From: bwbohl <bohl@edirom.de>
Date: Thu, 23 Jul 2015 11:51:49 +0200
Subject: [PATCH 3/5] changed repository reference

---
 04 MEI cleaning/improveMusic.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/04 MEI cleaning/improveMusic.xsl b/04 MEI cleaning/improveMusic.xsl
index 3cd7e5a..92596d4 100644
--- a/04 MEI cleaning/improveMusic.xsl	
+++ b/04 MEI cleaning/improveMusic.xsl	
@@ -753,7 +753,7 @@
                 <xsl:element name="changeDesc" namespace="http://www.music-encoding.org/ns/mei">
                     <xsl:variable name="text">
                         Content of <xsl:value-of select="$fileName"/> processed with <xsl:element name="ref" namespace="http://www.music-encoding.org/ns/mei">
-                          <xsl:attribute name="target" select="concat('https://github.com/Freischuetz-Digital/Tools/blob/',$FreiDi-Tools_version,'/04%20MEI%20cleaning/improveMusic.xsl')"/>improveMusic.xsl</xsl:element> from Freischütz Digital Tools <xsl:value-of select="$FreiDi-Tools_version"/> in order to resolve mei:bTrems, mei:fTrems, intermediary mei:scoreDefs and mei:staffDef, transform mei:artic and mei:accid to respective attributes, etc.</xsl:variable>
+                          <xsl:attribute name="target" select="concat('https://github.com/Detmolder-Hoftheater/Tools/blob/',$FreiDi-Tools_version,'/04%20MEI%20cleaning/improveMusic.xsl')"/>improveMusic.xsl</xsl:element> from Freischütz Digital Tools <xsl:value-of select="$FreiDi-Tools_version"/> in order to resolve mei:bTrems, mei:fTrems, intermediary mei:scoreDefs and mei:staffDef, transform mei:artic and mei:accid to respective attributes, etc.</xsl:variable>
                     
                     <xsl:element name="p" namespace="http://www.music-encoding.org/ns/mei">
                         <xsl:value-of select="normalize-space($text)"/>

From 47d5d3d708919cda91ca89e93c6ef5fb2d1b45aa Mon Sep 17 00:00:00 2001
From: bwbohl <bohl@edirom.de>
Date: Thu, 23 Jul 2015 12:04:40 +0200
Subject: [PATCH 4/5] retain old schemaRef if no new value is given

Previously the xml-model processing instruction were removed from the
file if $newSchemaRef was an empty string.
Now this case will lead to the old schema references being copied to
the result document.
---
 04 MEI cleaning/improveMusic.xsl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/04 MEI cleaning/improveMusic.xsl b/04 MEI cleaning/improveMusic.xsl
index 92596d4..0ce7235 100644
--- a/04 MEI cleaning/improveMusic.xsl	
+++ b/04 MEI cleaning/improveMusic.xsl	
@@ -787,8 +787,9 @@
         <xd:desc>Replace general mei-all.rng references with custom freidi-schema reference</xd:desc>
     </xd:doc>
     <xsl:template match="processing-instruction('xml-model')" mode="lastRun">
-        <xsl:if test="$newSchemaRef!=''">
-            <xsl:choose>
+        <xsl:choose>
+          <xsl:when test="$newSchemaRef!=''">
+              <xsl:choose>
                 <xsl:when test="contains(.,'relaxng')">
                     <xsl:processing-instruction name="xml-model"><xsl:text>href="</xsl:text><xsl:value-of select="$newSchemaRef"/><xsl:text>" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"</xsl:text></xsl:processing-instruction>
                 </xsl:when>
@@ -798,8 +799,12 @@
                 <xsl:otherwise>
                     <xsl:apply-templates select="." mode="#current"/>
                 </xsl:otherwise>
-            </xsl:choose>
-        </xsl:if>
+              </xsl:choose>
+            </xsl:when>
+          <xsl:otherwise>
+            <xsl:copy/>
+          </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
     
 </xsl:stylesheet>
\ No newline at end of file

From cb0449ccb86cffbbfafd23c1283f63e6fa6485c8 Mon Sep 17 00:00:00 2001
From: bwbohl <bohl@edirom.de>
Date: Thu, 23 Jul 2015 14:38:30 +0200
Subject: [PATCH 5/5] add latest schema ref and verify @meiversion.num

previously $newSchemaRef was blank
Now by default MEI 2.1.1 schemaRef is supplied and attribute
meiversion.num will be updated accordingly. The value depends on the
version number after 'MEI2013_v' in the newSchemaRef parameter.
---
 04 MEI cleaning/improveMusic.xsl | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/04 MEI cleaning/improveMusic.xsl b/04 MEI cleaning/improveMusic.xsl
index 0ce7235..20dae2e 100644
--- a/04 MEI cleaning/improveMusic.xsl	
+++ b/04 MEI cleaning/improveMusic.xsl	
@@ -33,7 +33,7 @@
     <xd:doc scope="component">
         <xd:desc>The newSchemaRef parameter defines a new URL for RNG and Schematron schemata; if empty the existing schemaRef will be retained</xd:desc>
     </xd:doc>
-    <xsl:param name="newSchemaRef"/>
+    <xsl:param name="newSchemaRef">https://raw.githubusercontent.com/music-encoding/music-encoding/MEI2013_v2.1.1/schemata/mei-all.rng</xsl:param>
     
     <xd:doc scope="component">
         <xd:desc>
@@ -211,6 +211,17 @@
         </xsl:copy>
     </xsl:template>
     
+    <xd:doc scope="component">
+        <xd:desc>
+            <xd:p>this template takes care that mei:mei element holds meiversion.num</xd:p>
+        </xd:desc>
+    </xd:doc>
+    <xsl:template match="@meiversion.num" mode="lastRun">
+        <xsl:attribute name="meiversion.num">
+            <xsl:value-of select="tokenize(substring-after($newSchemaRef,'MEI2013_v'),'/')[1]"/>
+        </xsl:attribute>
+    </xsl:template>
+    
     <xd:doc scope="component">
         <xd:desc>
             <xd:p>mei:pb elements are to be excluded from the result, as notation program specific page breaks are irrelevant for the project.</xd:p>