Merge pull request #690 from TEIC/issue_687_duplicate_deleted_attr

fix complex merging of attrs, #687
TEIC · Jul 7, 2024 · dfe9ea2 · dfe9ea2
2 parents b44a478 + def5a6b
commit dfe9ea2
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/odds/odd2odd.xsl b/odds/odd2odd.xsl
@@ -1635,11 +1635,18 @@ of this software, even if advised of the possibility of such damage.
     </xsl:for-each>
     <!-- class attributes are ones where there is no direct correspondence in
     the source for this element -->
-    <xsl:apply-templates mode="justcopy"
-                         select="tei:attList/tei:attDef[(@mode eq 'change'
-                                 or @mode eq 'delete'
-                                 or @mode eq 'replace') and
-                                 not(@ident=$ORIGINAL/tei:attList//tei:attDef/@ident)]"/>
+    <xsl:if test="$ORIGINAL/self::tei:elementSpec">
+      <xsl:apply-templates mode="justcopy"
+                           select="tei:attList/tei:attDef
+				   [
+				     (    @mode eq 'change'
+                                       or @mode eq 'delete'
+                                       or @mode eq 'replace'
+				     )
+				     and
+                                     not( @ident = $ORIGINAL/tei:attList//tei:attDef/@ident )
+				   ]"/>
+    </xsl:if>
     <!-- any direct attRef elements -->
     <xsl:apply-templates mode="justcopy"
                          select="tei:attList/tei:attRef"/>