Merge pull request #158 from w3c/81-miscellaneous-percussion

81: Complete SMuFL miscellaneous percussion range

schema/direction.mod

@@ -407,9 +407,9 @@
 >
 
 <!--
-	The glass element represents pictograms for glass
-	percussion instruments. The one valid value is
-	wind chimes.
+	The glass element represents pictograms for glass percussion
+	instruments. Valid values are glass harmonica, glass harp,
+	and wind chimes.
 -->
 <!ELEMENT glass (#PCDATA)>
 
@@ -419,11 +419,11 @@
 	bell, bell plate, bell tree, brake drum, cencerro, 
 	Chinese cymbal, cowbell, crash cymbals, crotale, cymbal tongs,
 	domed gong, finger cymbals, flexatone, gong, hi-hat,
-	high-hat cymbals, handbell, jingle bells, shell bells, sistrum,
-	sizzle cymbal, sleigh bells, suspended cymbal, tam tam,
-	triangle, and Vietnamese hat. The hi-hat value refers to a
-	pictogram like Stone's high-hat cymbals, but without the long
-	vertical line at the bottom.
+	high-hat cymbals, handbell, jaw harp, jingle bells,
+	musical saw, shell bells, sistrum, sizzle cymbal, sleigh bells,
+	suspended cymbal, tam tam, triangle, and Vietnamese hat. The
+	hi-hat value refers to a pictogram like Stone's high-hat
+	cymbals, but without the long vertical line at the bottom.
 -->
 <!ELEMENT metal (#PCDATA)>
 

schema/musicxml.xsd

@@ -861,6 +861,8 @@ Distances in a MusicXML file are measured in tenths of staff space. Tenths are t
 			<xs:documentation>The glass type represents pictograms for glass percussion instruments.</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:string">
+			<xs:enumeration value="glass harmonica"/>
+			<xs:enumeration value="glass harp"/>
 			<xs:enumeration value="wind chimes"/>
 		</xs:restriction>
 	</xs:simpleType>
@@ -1028,7 +1030,9 @@ The "other" kind is used when the harmony is entirely composed of add elements.
 			<xs:enumeration value="hi-hat"/>
 			<xs:enumeration value="high-hat cymbals"/>
 			<xs:enumeration value="handbell"/>
+			<xs:enumeration value="jaw harp"/>
 			<xs:enumeration value="jingle bells"/>
+			<xs:enumeration value="musical saw"/>
 			<xs:enumeration value="shell bells"/>
 			<xs:enumeration value="sistrum"/>
 			<xs:enumeration value="sizzle cymbal"/>

schema/to30.xsl

@@ -161,10 +161,15 @@
     match="direction[direction-type[percussion[effect[
         . = 'lotus flute' or . = 'megaphone']]]]"/>
 
+  <xsl:template 
+    match="direction[direction-type[percussion[glass[
+        . = 'glass harmonica' or . = 'glass harp']]]]"/>
+
   <xsl:template 
     match="direction[direction-type[percussion[metal[
         . = 'agogo' or . = 'bell tree' or
-        . = 'cencerro' or . = 'jingle bells' or
+        . = 'cencerro' or . = 'jaw harp' or
+        . = 'jingle bells' or . = 'musical saw' or
         . = 'shell bells']]]]"/>
 
   <!-- Remove new image attributes -->