From 2b6070d601a04c2e67b2bed49527a849f0ae1611 Mon Sep 17 00:00:00 2001
From: Thorsten Vitt <thorsten.vitt@uni-wuerzburg.de>
Date: Mon, 8 Oct 2018 16:02:20 +0200
Subject: [PATCH] Undo f:overw -> mod translation

Cf. faustedition/faust-xml#648
---
 src/main/odd/faust-tei.xml            | 40 +++++++++++++++++++++++++++
 src/main/xproc/update-tei-sources.xsl | 38 ++++++++++++++++++++++++-
 2 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/src/main/odd/faust-tei.xml b/src/main/odd/faust-tei.xml
index 28b802d..891874f 100644
--- a/src/main/odd/faust-tei.xml
+++ b/src/main/odd/faust-tei.xml
@@ -496,6 +496,46 @@
 						</attList>
 					</elementSpec>
 					
+					<classSpec ident="model.linePart.overwritten" type="model"/>
+					
+					<elementSpec ident="under" ns="http://www.faustedition.net/ns" mode="add">
+						<desc>Das unter der Überschreibung stehende.</desc>
+						<classes>
+							<memberOf key="model.linePart.overwritten"/>
+						</classes>
+						<content>
+							<macroRef key="macro.lineContent"/>
+						</content>
+					</elementSpec>
+					
+					<elementSpec ident="over" ns="http://www.faustedition.net/ns" mode="add">
+						<desc>Das auf dem Überschriebenden stehende.</desc>
+						<classes>
+							<memberOf key="model.linePart.overwritten"/>
+						</classes>
+						<content>
+							<macroRef key="macro.lineContent"/>
+						</content>
+					</elementSpec>
+					
+					<elementSpec ident="overw" ns="http://www.faustedition.net/ns" mode="add">
+						<desc>Umgebung zur Kodierung von Überschreibungen.</desc>
+						<classes>
+							<memberOf key="model.zonePart"/>
+							<memberOf key="model.linePart"/>
+							<memberOf key="model.pPart.transcriptional"/>
+							<memberOf key="model.linePart.overwritten"/>
+							<memberOf key="att.global"/>
+						</classes>
+						<content>
+							<sequence minOccurs="2" maxOccurs="unbounded">
+								<classRef key="model.linePart.overwritten"/>
+							</sequence>
+						</content>
+					</elementSpec>
+					
+					
+					
 					<!-- Die folgenden Elemente werden auch im dokumentarischen Transkript benutzt: -->
 					<elementSpec ident="abbr" mode="change">
 						<classes mode="change">
diff --git a/src/main/xproc/update-tei-sources.xsl b/src/main/xproc/update-tei-sources.xsl
index 19d54fb..75c8f6f 100644
--- a/src/main/xproc/update-tei-sources.xsl
+++ b/src/main/xproc/update-tei-sources.xsl
@@ -42,6 +42,7 @@
         </mod>
     </xsl:template>
     
+    <!--
     <xsl:template match="f:overw">
         <mod>
             <xsl:attribute name="rend" select="('overwrite', @rend)" separator=" "/>
@@ -60,6 +61,40 @@
             <xsl:apply-templates select="@* except @rend, node()"/>
         </seg>
     </xsl:template>
+    -->
+    
+    <xsl:function name="f:attrib-without" as="attribute()?">
+        <xsl:param name="attrib" as="attribute()?"/>
+        <xsl:param name="without" as="xs:string"/>
+        <xsl:variable name="tokens" select="tokenize($attrib, '\s+')"/>
+        <xsl:variable name="clean-tokens" select="remove($tokens, index-of($tokens, $without))"/>
+        <xsl:choose>
+            <xsl:when test="empty($clean-tokens)"/>
+            <xsl:otherwise>
+                <xsl:attribute name="{name($attrib)}" select="string-join($clean-tokens, ' ')"/>
+            </xsl:otherwise>
+        </xsl:choose>        
+    </xsl:function>
+    
+    <!-- undo f:overw etc. -->
+    <xsl:template match="mod[tokenize(@rend, '\s+') = 'overwrite']">
+        <f:overw>
+            <xsl:sequence select="f:attrib-without(@rend, 'overwrite')"/>
+            <xsl:apply-templates select="@* except @rend, node()"/>
+        </f:overw>
+    </xsl:template>
+    
+    <xsl:template match="mod/seg[tokenize(@rend, '\s+') = 'over']">
+        <f:over>
+            <xsl:apply-templates select="f:attrib-without(@rend, 'over'), @* except @rend, node()"/>
+        </f:over>
+    </xsl:template>
+    
+    <xsl:template match="mod/seg[tokenize(@rend, '\s+') = 'under']">
+        <f:under>
+            <xsl:apply-templates select="f:attrib-without(@rend, 'under'), @* except @rend, node()"/>
+        </f:under>
+    </xsl:template>
     
     <!-- physical structure -->
     <xsl:template match="ge:document">
@@ -159,9 +194,10 @@
         </metamark>
     </xsl:template>
         
-    <xsl:template match="processing-instruction('oxygen')">
+    <xsl:template match="processing-instruction('oxygen')|processing-instruction('xml-model')[not(preceding::processing-instruction('xml-model'))]">
         <xsl:processing-instruction name="xml-model">href="http://dev.digital-humanities.de/ci/view/Faust/job/faust-schema-tei-340/lastSuccessfulBuild/artifact/target/schema/faust-tei.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"</xsl:processing-instruction>        
         <xsl:processing-instruction name="xml-model">href="http://dev.digital-humanities.de/ci/view/Faust/job/faust-schema-tei-340/lastSuccessfulBuild/artifact/target/schema/faust-tei.sch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"</xsl:processing-instruction>
     </xsl:template>
+    <xsl:template match="processing-instruction('xml-model')[preceding::processing-instruction('xml-model')]"/>
     
 </xsl:stylesheet>
\ No newline at end of file