small fix and new test file

rettinghaus · Oct 24, 2016 · 11cdd44 · 11cdd44
1 parent 4fc08cc
commit 11cdd44
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 365 deletions.
diff --git a/mei2ly.xsl b/mei2ly.xsl
@@ -2310,7 +2310,10 @@
         <xsl:text>\marcato</xsl:text>
       </xsl:when>
       <xsl:when test="$articulation = 'marc-stacc'">
-        <xsl:text>\marcato\staccato</xsl:text>
+        <xsl:text>\marcato</xsl:text>
+        <xsl:call-template name="artic">
+          <xsl:with-param name="articList" select="'stacc'" />
+        </xsl:call-template>
       </xsl:when>
       <xsl:when test="$articulation = 'spiccato'">
         <xsl:text>\staccato</xsl:text>

diff --git a/tests/README.md b/tests/README.md
@@ -1,5 +1,7 @@
 # MEILER TESTS
 This is an autogenerated overview of the testfiles.
+### [articulation.mei](articulation.mei)
+![articulation.mei](articulation.preview.png)
 ### [multirest-and-reh.mei](multirest-and-reh.mei)
 ![multirest-and-reh.mei](multirest-and-reh.preview.png)
 ### [namespace-prefixes.mei](namespace-prefixes.mei)

diff --git a/tests/annots-and-comments.preview.svg b/tests/annots-and-comments.preview.svg
diff --git a/tests/articulation.mei b/tests/articulation.mei
@@ -0,0 +1,66 @@
+<mei xmlns="http://www.music-encoding.org/ns/mei" meiversion="3.0.0">
+  <meiHead>
+    <fileDesc>
+      <titleStmt>
+        <title/>
+      </titleStmt>
+      <pubStmt/>
+    </fileDesc>
+  </meiHead>
+  <music>
+    <body>
+      <mdiv>
+        <score>
+          <scoreDef meter.count="9" meter.unit="4">
+            <staffGrp>
+              <staffDef n="1" clef.line="2" clef.shape="G" lines="5"/>
+            </staffGrp>
+          </scoreDef>
+          <section>
+            <measure n="1">
+              <staff n="1">
+                <layer n="1">
+                  <note artic="acc stacc ten stacciss" dur="4" oct="4" pname="g">
+                  </note>
+                  <note artic="acc" dur="4" oct="4" pname="g">
+                    <artic artic="acc"/>
+                  </note>
+                  <note dur="4" oct="4" pname="g">
+                    <artic artic="stacc" place="above"/>
+                  </note>
+                  <note dur="4" oct="4" pname="g">
+                    <artic artic="ten" place="above"/>
+                  </note>
+                  <note dur="4" oct="4" pname="g">
+                    <artic artic="stacciss" place="above"/>
+                  </note>
+                  <note dur="4" oct="4" pname="g">
+                    <artic artic="marc" place="above"/>
+                  </note>
+                  <note dur="4" oct="4" pname="g">
+                    <artic artic="marc-stacc" place="above"/>
+                  </note>
+                  <note dur="4" oct="4" pname="g">
+                    <artic artic="spicc"/>
+                  </note>
+                  <note dur="4" oct="4" pname="g">
+                    <artic artic="open"/>
+                  </note>
+                  <note dur="4" oct="4" pname="g">
+                    <artic artic="acc"/>
+                    <artic artic="stacc"/>
+                    <artic artic="marc"/>
+                    <artic artic="harm"/>
+                  </note>
+                  <note dur="4" oct="4" pname="g">
+                    <artic artic="acc stacc marc harm" place="above"/>
+                  </note>
+                </layer>
+              </staff>
+            </measure>
+          </section>
+        </score>
+      </mdiv>
+    </body>
+  </music>
+</mei>
diff --git a/tests/articulation.preview.png b/tests/articulation.preview.png
diff --git a/tests/color.preview.svg b/tests/color.preview.svg