X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fmusicxml%2F01b-Pitches-Intervals.xml;h=fe38b07d004589de83be64daa6a6c7dc0f818dff;hb=2b1e4fd89d57bfecd23afbdeb55293792398f826;hp=c033498d522a0e26d6a757ab82bb47e480ce9ffa;hpb=7fdc4714403efef8b1b12bc55359bb384b87f81c;p=lilypond.git

diff --git a/input/regression/musicxml/01b-Pitches-Intervals.xml b/input/regression/musicxml/01b-Pitches-Intervals.xml
index c033498d52..fe38b07d00 100644
--- a/input/regression/musicxml/01b-Pitches-Intervals.xml
+++ b/input/regression/musicxml/01b-Pitches-Intervals.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
                                 "http://www.musicxml.org/dtds/partwise.dtd">
 <score-partwise>
-  <movement-title>Various piches and interval sizes</movement-title>
+  <movement-title>Various pitches and interval sizes</movement-title>
   <identification>
     <miscellaneous>
       <miscellaneous-field name="description">All pitch intervals in ascending 
@@ -50,6 +50,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="2">
       <note>
         <pitch>
           <step>C</step>
@@ -59,6 +61,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -69,7 +72,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="3">
       <note>
         <pitch>
           <step>D</step>
@@ -79,6 +85,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -89,7 +96,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="4">
       <note>
         <pitch>
           <step>D</step>
@@ -108,6 +118,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="5">
       <note>
         <pitch>
           <step>D</step>
@@ -117,6 +129,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -127,7 +140,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="6">
       <note>
         <pitch>
           <step>E</step>
@@ -137,6 +153,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -147,7 +164,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="7">
       <note>
         <pitch>
           <step>E</step>
@@ -166,6 +186,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="8">
       <note>
         <pitch>
           <step>E</step>
@@ -175,6 +197,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -185,7 +208,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="9">
       <note>
         <pitch>
           <step>F</step>
@@ -195,6 +221,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -205,7 +232,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="10">
       <note>
         <pitch>
           <step>F</step>
@@ -224,6 +254,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="11">
       <note>
         <pitch>
           <step>F</step>
@@ -233,6 +265,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -243,7 +276,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="12">
       <note>
         <pitch>
           <step>G</step>
@@ -253,6 +289,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -263,7 +300,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="13">
       <note>
         <pitch>
           <step>G</step>
@@ -282,6 +322,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="14">
       <note>
         <pitch>
           <step>G</step>
@@ -291,6 +333,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -301,7 +344,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="15">
       <note>
         <pitch>
           <step>A</step>
@@ -311,6 +357,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -321,7 +368,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="16">
       <note>
         <pitch>
           <step>A</step>
@@ -340,6 +390,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="17">
       <note>
         <pitch>
           <step>A</step>
@@ -349,6 +401,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -359,7 +412,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="18">
       <note>
         <pitch>
           <step>B</step>
@@ -369,6 +425,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -379,7 +436,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="19">
       <note>
         <pitch>
           <step>B</step>
@@ -398,6 +458,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="20">
       <note>
         <pitch>
           <step>B</step>
@@ -407,6 +469,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -417,7 +480,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="21">
       <note>
         <pitch>
           <step>C</step>
@@ -427,6 +493,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -437,7 +504,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="22">
       <note>
         <pitch>
           <step>C</step>
@@ -456,6 +526,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="23">
       <note>
         <pitch>
           <step>C</step>
@@ -465,6 +537,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -475,7 +548,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="24">
       <note>
         <pitch>
           <step>D</step>
@@ -485,6 +561,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -495,7 +572,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="25">
       <note>
         <pitch>
           <step>D</step>
@@ -514,6 +594,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="26">
       <note>
         <pitch>
           <step>D</step>
@@ -523,6 +605,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -533,7 +616,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="27">
       <note>
         <pitch>
           <step>E</step>
@@ -543,6 +629,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -553,7 +640,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="28">
       <note>
         <pitch>
           <step>E</step>
@@ -572,6 +662,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="29">
       <note>
         <pitch>
           <step>E</step>
@@ -581,6 +673,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -591,7 +684,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="30">
       <note>
         <pitch>
           <step>F</step>
@@ -601,6 +697,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -611,7 +708,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="31">
       <note>
         <pitch>
           <step>F</step>
@@ -630,6 +730,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="32">
       <note>
         <pitch>
           <step>F</step>
@@ -639,6 +741,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -649,7 +752,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="33">
       <note>
         <pitch>
           <step>G</step>
@@ -659,6 +765,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -669,7 +776,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="34">
       <note>
         <pitch>
           <step>G</step>
@@ -688,6 +798,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="35">
       <note>
         <pitch>
           <step>G</step>
@@ -697,6 +809,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -707,7 +820,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="36">
       <note>
         <pitch>
           <step>A</step>
@@ -717,6 +833,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -727,7 +844,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="37">
       <note>
         <pitch>
           <step>A</step>
@@ -746,6 +866,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="38">
       <note>
         <pitch>
           <step>A</step>
@@ -755,6 +877,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -765,7 +888,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
+    </measure>
+    <measure number="39">
       <note>
         <pitch>
           <step>B</step>
@@ -775,6 +901,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
       <note>
         <pitch>
@@ -785,7 +912,10 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
+    </measure>
+    <measure number="40">
       <note>
         <pitch>
           <step>B</step>
@@ -804,6 +934,8 @@
         <voice>1</voice>
         <type>quarter</type>
       </note>
+    </measure>
+    <measure number="41">
       <note>
         <pitch>
           <step>B</step>
@@ -813,6 +945,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>sharp</accidental>
       </note>
       <note>
         <pitch>
@@ -823,6 +956,7 @@
         <duration>1</duration>
         <voice>1</voice>
         <type>quarter</type>
+        <accidental>flat</accidental>
       </note>
     </measure>
   </part>