Merge pull request #147 from w3c/95-ornaments

95: Complete SMuFL common ornaments range
w3c · Sep 28, 2016 · 23d042f · 23d042f
2 parents a1273ea + 87e1f04
commit 23d042f
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 10 deletions.
diff --git a/schema/musicxml.xsd b/schema/musicxml.xsd
@@ -4396,6 +4396,11 @@ If the parentheses attribute is set to yes, the notehead is parenthesized. It is
 						<xs:documentation>The vertical-turn element has the turn symbol shape arranged vertically going from upper left to lower right.</xs:documentation>
 					</xs:annotation>
 				</xs:element>
+				<xs:element name="inverted-vertical-turn" type="empty-trill-sound">
+					<xs:annotation>
+						<xs:documentation>The inverted-vertical-turn element has the turn symbol shape arranged vertically going from upper right to lower left.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
 				<xs:element name="shake" type="empty-trill-sound">
 					<xs:annotation>
 						<xs:documentation>The shake element has a similar appearance to an inverted-mordent element.</xs:documentation>
@@ -4404,12 +4409,12 @@ If the parentheses attribute is set to yes, the notehead is parenthesized. It is
 				<xs:element name="wavy-line" type="wavy-line"/>
 				<xs:element name="mordent" type="mordent">
 					<xs:annotation>
-						<xs:documentation>The mordent element represents the sign with the vertical line. The long attribute is "no" by default.</xs:documentation>
+						<xs:documentation>The mordent element represents the sign with the vertical line. The choice of which mordent sign is inverted differs between MusicXML and SMuFL. The long attribute is "no" by default.</xs:documentation>
 					</xs:annotation>
 				</xs:element>
 				<xs:element name="inverted-mordent" type="mordent">
 					<xs:annotation>
-						<xs:documentation>The inverted-mordent element represents the sign without the vertical line. The long attribute is "no" by default.</xs:documentation>
+						<xs:documentation>The inverted-mordent element represents the sign without the vertical line. The choice of which mordent is inverted differs between MusicXML and SMuFL. The long attribute is "no" by default.</xs:documentation>
 					</xs:annotation>
 				</xs:element>
 				<xs:element name="schleifer" type="empty-placement">
@@ -4418,6 +4423,11 @@ If the parentheses attribute is set to yes, the notehead is parenthesized. It is
 					</xs:annotation>
 				</xs:element>
 				<xs:element name="tremolo" type="tremolo"/>
+				<xs:element name="haydn" type="empty-trill-sound">
+					<xs:annotation>
+						<xs:documentation>The haydn element represents the Haydn ornament. This is defined in SMuFL as ornamentHaydn.</xs:documentation>
+					</xs:annotation>
+				</xs:element>
 				<xs:element name="other-ornament" type="other-placement-text">
 					<xs:annotation>
 					<xs:documentation>The other-ornament element is used to define any ornaments not yet in the MusicXML format. The smufl attribute can be used to specify a particular ornament, allowing application interoperability without requiring every SMuFL ornament to have a MusicXML element equivalent. Using the other-ornament element without the smufl attribute allows for extended representation, though without application interoperability.</xs:documentation>

diff --git a/schema/note.mod b/schema/note.mod
@@ -557,9 +557,10 @@
 -->
 <!ELEMENT ornaments
 	(((trill-mark | turn | delayed-turn | inverted-turn |
-	   delayed-inverted-turn | vertical-turn | shake |
-	   wavy-line | mordent | inverted-mordent | schleifer |
-	   tremolo | other-ornament), accidental-mark*)*)>
+	   delayed-inverted-turn | vertical-turn | 
+	   inverted-vertical-turn | shake | wavy-line | 
+	   mordent | inverted-mordent | schleifer | tremolo |
+	   haydn | other-ornament), accidental-mark*)*)>
 <!ELEMENT trill-mark EMPTY>
 <!ATTLIST trill-mark
     %print-style; 
@@ -613,6 +614,13 @@
     %trill-sound; 
 >
 
+<!ELEMENT inverted-vertical-turn EMPTY>
+<!ATTLIST inverted-vertical-turn
+    %print-style; 
+    %placement; 
+    %trill-sound; 
+>
+
 <!ELEMENT shake EMPTY>
 <!ATTLIST shake
     %print-style; 
@@ -628,11 +636,13 @@
 <!-- 
 	The long attribute for the mordent and inverted-mordent
 	elements is "no" by default. The mordent element represents
-	the sign with the vertical line; the inverted-mordent
-	element represents the sign without the vertical line.
-	The approach and departure attributes are used for compound
-	ornaments, indicating how the beginning and ending of the
-	ornament look relative to the main part of the mordent.
+	the mordent sign with the vertical line; the inverted-mordent
+	element represents the mordent sign without the vertical line.
+	The choice of which mordent is inverted differs between
+	MusicXML and SMuFL. The approach and departure attributes are
+	used for compound ornaments, indicating how the beginning and
+	ending of the ornament look relative to the main part of the
+	mordent.
 -->
 <!ELEMENT mordent EMPTY>
 <!ATTLIST mordent
@@ -692,6 +702,17 @@
     %placement; 
 >
 
+<!--
+	The haydn element represents the Haydn ornament. This is
+	defined in SMuFL as ornamentHaydn. 
+-->
+<!ELEMENT haydn EMPTY>
+<!ATTLIST haydn
+    %print-style; 
+    %placement; 
+    %trill-sound; 
+>
+
 <!--
 	The other-ornament element is used to define any ornaments
 	not yet in the MusicXML format. The smufl attribute can be

diff --git a/schema/to30.xsl b/schema/to30.xsl
@@ -51,6 +51,9 @@
 
   <!-- Additions in note.mod -->
 
+  <!-- Remove inverted-vertical-turn and haydn elements -->
+  <xsl:template
+    match="inverted-vertical-turn | haydn"/>
   <!-- 
     Remove accidental and accidental-mark elements with 
     the new accidental values.