Merge pull request #200 from w3c/99-tremolos

99: Add unmeasured tremolos
w3c · Apr 10, 2017 · 0df67f2 · 0df67f2
2 parents e2cb3fc + 8a01377
commit 0df67f2
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 36 deletions.
diff --git a/schema/common.mod b/schema/common.mod
@@ -71,9 +71,12 @@
 	entity is used when there is a need to refer to an
 	intermediate point in the symbol, as for complex slurs
 	or for specifying formatting of symbols across system
-	breaks. The start-stop-single entity is used when the same
-	element is used for multi-note and single-note notations,
-	as for tremolos.
+	breaks. 
+
+	The start-stop-single entity is used when the same element
+	is used for multi-note and single-note notations, as for
+	groupings. The tremolo-type entity is used to distinguish
+	multi-note, single-note, and unmeasured tremolos.
 
 	The values of start, stop, and continue refer to how an
 	element appears in musical score order, not in MusicXML
@@ -97,13 +100,13 @@
 
 	In start-stop cases, ties can add more elements using a
 	continue type. This is typically used to specify the
-	formatting of cross-system ties, or to specify the shape of
-	very complex ties.
+	formatting of cross-system ties.
 -->
 <!ENTITY % start-stop "(start | stop)">
 <!ENTITY % start-stop-continue "(start | stop | continue)">
 <!ENTITY % start-stop-single "(start | stop | single)">
 <!ENTITY % tied-type "(start | stop | continue | let-ring)">
+<!ENTITY % tremolo-type "(start | stop | single | unmeasured)">
 
 <!--
 	The yes-no entity is used for boolean-like attributes.

diff --git a/schema/musicxml.xsd b/schema/musicxml.xsd
@@ -477,23 +477,9 @@ The values of start, stop, and continue refer to how an element appears in music
 		</xs:restriction>
 	</xs:simpleType>
 
-	<xs:simpleType name="tied-type">
-		<xs:annotation>
-			<xs:documentation>The tied-type type is used as an attribute of the tied element to specify where the visual representation of a tie begins and ends. A tied element which joins two notes of the same pitch can be specified with tied-type start on the first note and tied-type stop on the second note. To indicate a note should be undamped, use a single tied element with tied-type let-ring. For other ties that are visually attached to a single note, such as a tie leading into or out of a repeated section or coda, use two tied elements on the same note, one start and one stop.
-
-In start-stop cases, ties can add more elements using a continue type. This is typically used to specify the formatting of cross-system ties, or to specify the shape of very complex ties.</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="start"/>
-			<xs:enumeration value="stop"/>
-			<xs:enumeration value="continue"/>
-			<xs:enumeration value="let-ring"/>
-		</xs:restriction>
-	</xs:simpleType>
-
 	<xs:simpleType name="start-stop-single">
 		<xs:annotation>
-			<xs:documentation>The start-stop-single type is used for an attribute of musical elements that can be used for either multi-note or single-note musical elements, as for tremolos.</xs:documentation>
+			<xs:documentation>The start-stop-single type is used for an attribute of musical elements that can be used for either multi-note or single-note musical elements, as for groupings.</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:token">
 			<xs:enumeration value="start"/>
@@ -542,6 +528,20 @@ Distances in a MusicXML file are measured in tenths of staff space. Tenths are t
 		</xs:restriction>
 	</xs:simpleType>
 
+	<xs:simpleType name="tied-type">
+		<xs:annotation>
+			<xs:documentation>The tied-type type is used as an attribute of the tied element to specify where the visual representation of a tie begins and ends. A tied element which joins two notes of the same pitch can be specified with tied-type start on the first note and tied-type stop on the second note. To indicate a note should be undamped, use a single tied element with tied-type let-ring. For other ties that are visually attached to a single note, such as a tie leading into or out of a repeated section or coda, use two tied elements on the same note, one start and one stop.
+
+In start-stop cases, ties can add more elements using a continue type. This is typically used to specify the formatting of cross-system ties.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="start"/>
+			<xs:enumeration value="stop"/>
+			<xs:enumeration value="continue"/>
+			<xs:enumeration value="let-ring"/>
+		</xs:restriction>
+	</xs:simpleType>
+
 	<xs:simpleType name="time-only">
 		<xs:annotation>
 			<xs:documentation>The time-only type is used to indicate that a particular playback-related element only applies particular times through a repeated section. The value is a comma-separated list of positive integers arranged in ascending order, indicating which times through the repeated section that the element applies.</xs:documentation>
@@ -561,6 +561,18 @@ Distances in a MusicXML file are measured in tenths of staff space. Tenths are t
 		</xs:restriction>
 	</xs:simpleType>
 
+	<xs:simpleType name="tremolo-type">
+		<xs:annotation>
+			<xs:documentation>The tremolo-type is used to distinguish multi-note, single-note, and unmeasured tremolos.</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="start"/>
+			<xs:enumeration value="stop"/>
+			<xs:enumeration value="single"/>
+			<xs:enumeration value="unmeasured"/>
+		</xs:restriction>
+	</xs:simpleType>
+
 	<xs:simpleType name="trill-beats">
 		<xs:annotation>
 			<xs:documentation>The trill-beats type specifies the beats used in a trill-sound or bend-sound attribute group. It is a decimal value with a minimum value of 2.</xs:documentation>
@@ -5251,17 +5263,20 @@ Ties that are visually attached to only one note, other than undamped ties, shou
 
 	<xs:complexType name="tremolo">
 		<xs:annotation>
-			<xs:documentation>	The tremolo ornament can be used to indicate either single-note or double-note tremolos. Single-note tremolos use the single type, while double-note tremolos use the start and stop types. The default is "single" for compatibility with Version 1.1. The text of the element indicates the number of tremolo marks and is an integer from 0 to 8. Note that the number of attached beams is not included in this value, but is represented separately using the beam element.
-
-When using double-note tremolos, the duration of each note in the tremolo should correspond to half of the notated type value. A time-modification element should also be added with an actual-notes value of 2 and a normal-notes value of 1. If used within a tuplet, this 2/1 ratio should be multiplied by the existing tuplet ratio.
-
-Using repeater beams for indicating tremolos is deprecated as of MusicXML 3.0.</xs:documentation>
+			<xs:documentation>The tremolo ornament can be used to indicate single-note, double-note, or unmeasured tremolos. Single-note tremolos use the single type, double-note tremolos use the start and stop types, and unmeasured tremolos use the unmeasured type. The default is "single" for compatibility with Version 1.1. The text of the element indicates the number of tremolo marks and is an integer from 0 to 8. Note that the number of attached beams is not included in this value, but is represented separately using the beam element. The value should be 0 for unmeasured tremolos.
+
+	When using double-note tremolos, the duration of each note in the tremolo should correspond to half of the notated type value. A time-modification element should also be added with an actual-notes value of 2 and a normal-notes value of 1. If used within a tuplet, this 2/1 ratio should be multiplied by the existing tuplet ratio.
+
+	The smufl attribute specifies the glyph to use from the SMuFL tremolos range for an unmeasured tremolo. It is ignored for other tremolo types. The SMuFL buzzRoll glyph is used by default if the attribute is missing.
+
+	Using repeater beams for indicating tremolos is deprecated as of MusicXML 3.0.</xs:documentation>
 		</xs:annotation>
 		<xs:simpleContent>
 			<xs:extension base="tremolo-marks">
-				<xs:attribute name="type" type="start-stop-single" default="single"/>
+				<xs:attribute name="type" type="tremolo-type" default="single"/>
 				<xs:attributeGroup ref="print-style"/>
 				<xs:attributeGroup ref="placement"/>
+				<xs:attributeGroup ref="smufl"/>
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>

diff --git a/schema/note.mod b/schema/note.mod
@@ -735,14 +735,16 @@
 
 <!--
 	The tremolo ornament can be used to indicate either
-	single-note or double-note tremolos. Single-note tremolos
-	use the single type, while double-note tremolos use the
-	start and stop types. The default is "single" for
-	compatibility with Version 1.1. The text of the element
+	single-note, double-note, or unmeasured tremolos.
+	Single-note tremolos use the single type, double-note
+	tremolos use the start and stop types, and unmeasured
+	tremolos use the unmeasured type. The default is "single"
+	for compatibility with Version 1.1. The text of the element
 	indicates the number of tremolo marks and is an integer
-	from 0 to 8. Note that the number of attached beams is
-	not included in this value, but is represented separately
-	using the beam element.
+	from 0 to 8. Note that the number of attached beams is not
+	included in this value, but is represented separately using
+	the beam element. The value should be 0 for unmeasured
+	tremolos.
 
 	When using double-note tremolos, the duration of each note
 	in the tremolo should correspond to half of the notated type
@@ -751,14 +753,20 @@
 	used within a tuplet, this 2/1 ratio should be multiplied by
 	the existing tuplet ratio.
 
+	The smufl attribute specifies the glyph to use from the SMuFL
+	tremolos range for an unmeasured tremolo. It is ignored for
+	other tremolo types. The SMuFL buzzRoll glyph is used by
+	default if the attribute is missing.
+
 	Using repeater beams for indicating tremolos is deprecated as
 	of MusicXML 3.0.
 -->
 <!ELEMENT tremolo (#PCDATA)>
 <!ATTLIST tremolo
-    type %start-stop-single; "single"
+    type %tremolo-type; "single"
     %print-style;
     %placement;
+    %smufl;
 >
 
 <!--

diff --git a/schema/to30.xsl b/schema/to30.xsl
@@ -96,10 +96,17 @@
 
 <!--
     Remove tied elements which use the new let-ring
-    attribute for single-ended ties.
+    type for single-ended ties.
   -->
   <xsl:template
-    match="tied[. = 'let-ring']"/>
+    match="tied[@type = 'let-ring']"/>
+
+<!--
+    Remove tremolo elements which use the new unmeasured
+    type for unmeasured tremolos.
+  -->
+  <xsl:template
+    match="tremolo[@type = 'unmeasured']"/>
 
   <!--
     Remove notehead elements with new notehead values.
@@ -137,6 +144,7 @@
     match="accidental/@smufl | accidental-mark/@smufl |
 			arrow/@smufl | elision/@smufl |
 			notehead/@smufl | stopped/@smufl |
+			tremolo/@smufl |
 			other-articulation/@smufl | other-notation/@smufl |
 			other-ornament/@smufl | other-technical/@smufl"/>