don't duplicate IDs with sameas

rettinghaus · Mar 31, 2020 · 903895a · 903895a
1 parent 2d683f5
commit 903895a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/mei2ly.xsl b/mei2ly.xsl
@@ -1091,7 +1091,15 @@
     </xsl:if>
     <xsl:if test="$useSvgBackend">
       <xsl:text>\tweak output-attributes #&apos;</xsl:text>
-      <xsl:call-template name="setSvgAttr" />
+      <xsl:choose>
+        <xsl:when test="ancestor::mei:staff/descendant::mei:rest/@sameas = $restKey">
+          <!-- no IDs -->
+          <xsl:text>((class . rest)) </xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:call-template name="setSvgAttr" />
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:if>
     <xsl:if test="@color">
       <xsl:text>\tweak color #</xsl:text>

diff --git a/tests/merging-rests.mei b/tests/merging-rests.mei
@@ -44,11 +44,11 @@
               <staff n="1">
                 <layer n="1">
                   <rest dur="4" xml:id="rest01a" />
-                  <rest dur="4" sameas="#rest02b" />
+                  <rest dur="4" sameas="#rest02b" xml:id="rest01b" />
                   <rest dur="4" xml:id="rest01c" />
                 </layer>
                 <layer n="2">
-                  <rest sameas="#rest01a" />
+                  <rest sameas="#rest01a" xml:id="rest02a" />
                   <rest dur="4" xml:id="rest02b" loc="6" color="gray"/>
                   <rest dur="4" xml:id="rest02c" />
                 </layer>

diff --git a/tests/merging-rests.preview.svg b/tests/merging-rests.preview.svg