fix(in-measure clef layout): add as NoteSubGroup instead of ClefNote directly.

* fix(demo): extend sample name box length to not cut off sample titles

* fix(demo): sample names: last name first, then first names

* fix(demo): sample list: prevent comma cut-off, align height with backend selector

* fix(demo): fix css desired sample width

* fix(demo): Bach "C Dur" -> "C-Dur"

* fix(in-measure clef): add as NoteSubGroup instead of ClefNote directly. placement still bugged

part of #307

* in-measure clef: simplified adding modifier

* fix indentation

* add in-measure clefs to function test

* fix merge develop into fix/inMeasureClefLayout

* add in-measure clefs test file (but not to demo list)

* fix function test: clef for slurs

* fix(voices): fix multi-voice render shift e.g. in elite syncopations

fix #311

external/vexflow/vexflow.d.ts

@@ -203,6 +203,9 @@ declare namespace Vex {
             public setPosition(position: number): Modifier;
         }
 
+        export class NoteSubGroup extends Modifier {
+            constructor(notes: Object);
+        }
 
         export class StaveModifier extends Modifier {
             public static get Position() {
@@ -240,6 +243,8 @@ declare namespace Vex {
         
         export class ClefNote  extends Note {
             constructor(type: string, size: string, annotation: string);
+
+            public type: string;
         }
 
         export class Renderer {

src/MusicalScore/Graphical/VexFlow/VexFlowConverter.ts

@@ -218,8 +218,9 @@ export class VexFlowConverter {
             clef: vfClefType,
             duration: duration,
             keys: keys,
-            slash: gve.parentVoiceEntry.GraceNoteSlash
+            slash: gve.parentVoiceEntry.GraceNoteSlash,
         };
+
         if (!gve.parentVoiceEntry.IsGrace) {
             vfnote = new Vex.Flow.StaveNote(vfnoteStruct);
         } else {

src/MusicalScore/Graphical/VexFlow/VexFlowMeasure.ts

@@ -15,6 +15,7 @@ import {GraphicalStaffEntry} from "../GraphicalStaffEntry";
 import StaveConnector = Vex.Flow.StaveConnector;
 import StaveNote = Vex.Flow.StaveNote;
 import StemmableNote = Vex.Flow.StemmableNote;
+import NoteSubGroup = Vex.Flow.NoteSubGroup;
 import * as log from "loglevel";
 import {unitInPixels} from "./VexFlowMusicSheetDrawer";
 import {Tuplet} from "../../VoiceData/Tuplet";
@@ -617,15 +618,15 @@ export class VexFlowMeasure extends GraphicalMeasure {
                     graceGVoiceEntriesBefore.push(gve);
                     if (!graceSlur) {
                         graceSlur = gve.parentVoiceEntry.GraceSlur;
-                }
+                    }
                     continue;
-            }
+                }
                 (gve as VexFlowVoiceEntry).vfStaveNote = VexFlowConverter.StaveNote(gve);
                 if (graceGVoiceEntriesBefore.length > 0) {
                     const graceNotes: Vex.Flow.GraceNote[] = [];
                     for (let i: number = 0; i < graceGVoiceEntriesBefore.length; i++) {
                         graceNotes.push(VexFlowConverter.StaveNote(graceGVoiceEntriesBefore[i]));
-        }
+                    }
                     const graceNoteGroup: Vex.Flow.GraceNoteGroup = new Vex.Flow.GraceNoteGroup(graceNotes, graceSlur);
                     (gve as VexFlowVoiceEntry).vfStaveNote.addModifier(0, graceNoteGroup.beamNotes());
                     graceGVoiceEntriesBefore = [];
@@ -650,23 +651,23 @@ export class VexFlowMeasure extends GraphicalMeasure {
 
             const restFilledEntries: GraphicalVoiceEntry[] =  this.getRestFilledVexFlowStaveNotesPerVoice(voice);
             // create vex flow voices and add tickables to it:
-            // let graceGVoiceEntriesBefore: GraphicalVoiceEntry[] = [];
             for (const voiceEntry of restFilledEntries) {
-                if (!voiceEntry.parentVoiceEntry) {
-                    continue;
-                }
-                if (voiceEntry.parentVoiceEntry.IsGrace) {
-                    continue;
+                if (voiceEntry.parentVoiceEntry) {
+                    if (voiceEntry.parentVoiceEntry.IsGrace) {
+                        continue;
+                    }
                 }
+
                 const vexFlowVoiceEntry: VexFlowVoiceEntry = voiceEntry as VexFlowVoiceEntry;
 
                 // check for in-measure clefs:
                 // only add clefs in main voice (to not add them twice)
                 if (isMainVoice) {
                     const vfse: VexFlowStaffEntry = vexFlowVoiceEntry.parentStaffEntry as VexFlowStaffEntry;
-                    if (vfse.vfClefBefore !== undefined) {
-                        // add the clef as Vex.Flow.ClefNote
-                        this.vfVoices[voice.VoiceId].addTickable(vfse.vfClefBefore);
+                    if (vfse && vfse.vfClefBefore !== undefined) {
+                        // add clef as NoteSubGroup so that we get modifier layouting
+                        const clefModifier: NoteSubGroup = new NoteSubGroup( [vfse.vfClefBefore] );
+                        vexFlowVoiceEntry.vfStaveNote.addModifier(0, clefModifier);
                     }
                 }
                 this.vfVoices[voice.VoiceId].addTickable(vexFlowVoiceEntry.vfStaveNote);

test/data/OSMD_function_test_all.xml

@@ -7,7 +7,7 @@
   <identification>
     <encoding>
       <software>MuseScore 2.3.1</software>
-      <encoding-date>2018-07-19</encoding-date>
+      <encoding-date>2018-08-01</encoding-date>
       <supports element="accidental" type="yes"/>
       <supports element="beam" type="yes"/>
       <supports element="print" attribute="new-page" type="yes" value="yes"/>
@@ -59,12 +59,12 @@
       </score-part>
     </part-list>
   <part id="P1">
-    <measure number="1" width="200.30">
+    <measure number="1" width="205.05">
       <print>
         <system-layout>
           <system-margins>
             <left-margin>0.00</left-margin>
-            <right-margin>0.00</right-margin>
+            <right-margin>-0.00</right-margin>
             </system-margins>
           <top-system-distance>195.00</top-system-distance>
           </system-layout>
@@ -83,7 +83,7 @@
           <line>2</line>
           </clef>
         </attributes>
-      <note default-x="113.16" default-y="-15.00">
+      <note default-x="114.16" default-y="-15.00">
         <pitch>
           <step>C</step>
           <octave>5</octave>
@@ -91,13 +91,13 @@
         <duration>16</duration>
         <voice>1</voice>
         <type>whole</type>
-        <lyric number="1" default-x="9.90" default-y="-80.00">
+        <lyric number="1" default-x="11.65" default-y="-80.00">
           <syllabic>single</syllabic>
           <text>Ornaments:</text>
           </lyric>
         </note>
       </measure>
-    <measure number="2" width="121.15">
+    <measure number="2" width="120.56">
       <direction placement="above">
         <direction-type>
           <words default-y="40.00" relative-x="-75.25" relative-y="19.26" font-weight="bold" font-size="12">Ornaments</words>
@@ -127,7 +127,7 @@
           <text>Trill</text>
           </lyric>
         </note>
-      <note default-x="71.72" default-y="-15.00">
+      <note default-x="71.43" default-y="-15.00">
         <pitch>
           <step>C</step>
           <octave>5</octave>
@@ -147,14 +147,14 @@
           </lyric>
         </note>
       </measure>
-    <measure number="3" width="64.74">
+    <measure number="3" width="64.00">
       <note>
         <rest/>
         <duration>16</duration>
         <voice>1</voice>
         </note>
       </measure>
-    <measure number="4" width="170.31">
+    <measure number="4" width="169.72">
       <note default-x="62.57" default-y="-40.00">
         <pitch>
           <step>E</step>
@@ -181,7 +181,7 @@
         <type>half</type>
         </note>
       </measure>
-    <measure number="5" width="96.47">
+    <measure number="5" width="95.88">
       <note default-x="25.65" default-y="-5.00">
         <pitch>
           <step>E</step>
@@ -208,7 +208,7 @@
         <type>half</type>
         </note>
       </measure>
-    <measure number="6" width="134.34">
+    <measure number="6" width="133.60">
       <note default-x="42.81" default-y="-10.00">
         <pitch>
           <step>D</step>
@@ -235,14 +235,14 @@
         <type>half</type>
         </note>
       </measure>
-    <measure number="7" width="64.74">
+    <measure number="7" width="64.00">
       <note>
         <rest/>
         <duration>16</duration>
         <voice>1</voice>
         </note>
       </measure>
-    <measure number="8" width="225.43">
+    <measure number="8" width="224.69">
       <note default-x="85.85" default-y="-20.00">
         <pitch>
           <step>B</step>
@@ -340,17 +340,17 @@
         <type>quarter</type>
         </note>
       </measure>
-    <measure number="10" width="308.81">
+    <measure number="10" width="312.48">
       <print new-system="yes">
         <system-layout>
           <system-margins>
             <left-margin>0.00</left-margin>
-            <right-margin>0.00</right-margin>
+            <right-margin>-0.00</right-margin>
             </system-margins>
           <system-distance>94.25</system-distance>
           </system-layout>
         </print>
-      <note default-x="95.95" default-y="-15.00">
+      <note default-x="96.95" default-y="-15.00">
         <pitch>
           <step>C</step>
           <octave>5</octave>
@@ -358,13 +358,13 @@
         <duration>16</duration>
         <voice>1</voice>
         <type>whole</type>
-        <lyric number="1" default-x="9.90" default-y="-80.00">
+        <lyric number="1" default-x="11.65" default-y="-80.00">
           <syllabic>single</syllabic>
           <text>Articulations:</text>
           </lyric>
         </note>
       </measure>
-    <measure number="11" width="354.26">
+    <measure number="11" width="352.42">
       <direction placement="above">
         <direction-type>
           <words default-y="40.00" relative-x="-42.85" relative-y="18.29" font-weight="bold" font-size="12">Articulations</words>
@@ -390,7 +390,7 @@
           <text>Upbow</text>
           </lyric>
         </note>
-      <note default-x="80.85" default-y="-5.00">
+      <note default-x="80.55" default-y="-5.00">
         <pitch>
           <step>E</step>
           <octave>5</octave>
@@ -412,7 +412,7 @@
         <voice>1</voice>
         <type>quarter</type>
         </note>
-      <note default-x="194.16" default-y="0.00">
+      <note default-x="193.09" default-y="0.00">
         <pitch>
           <step>F</step>
           <octave>5</octave>
@@ -430,7 +430,7 @@
           <text>Fermata</text>
           </lyric>
         </note>
-      <note default-x="239.35" default-y="-5.00">
+      <note default-x="238.28" default-y="-5.00">
         <pitch>
           <step>E</step>
           <octave>5</octave>
@@ -448,7 +448,7 @@
         <type>quarter</type>
         </note>
       </measure>
-    <measure number="12" width="414.43">
+    <measure number="12" width="412.59">
       <note default-x="45.24" default-y="-30.00">
         <pitch>
           <step>G</step>
@@ -485,7 +485,7 @@
             </technical>
           </notations>
         </note>
-      <note default-x="138.22" default-y="-25.00">
+      <note default-x="137.85" default-y="-25.00">
         <pitch>
           <step>A</step>
           <octave>4</octave>
@@ -496,7 +496,7 @@
         <stem>up</stem>
         <beam number="1">continue</beam>
         </note>
-      <note default-x="182.30" default-y="-45.00">
+      <note default-x="181.57" default-y="-45.00">
         <pitch>
           <step>D</step>
           <octave>4</octave>
@@ -507,7 +507,7 @@
         <stem>up</stem>
         <beam number="1">end</beam>
         </note>
-      <note default-x="235.59" default-y="-5.00">
+      <note default-x="234.86" default-y="-5.00">
         <pitch>
           <step>E</step>
           <octave>5</octave>
@@ -527,7 +527,7 @@
           <text>SnapPizz</text>
           </lyric>
         </note>
-      <note default-x="280.59" default-y="-35.00">
+      <note default-x="279.85" default-y="-35.00">
         <pitch>
           <step>F</step>
           <octave>4</octave>
@@ -543,7 +543,7 @@
             </technical>
           </notations>
         </note>
-      <note default-x="324.67" default-y="-45.00">
+      <note default-x="323.57" default-y="-45.00">
         <pitch>
           <step>D</step>
           <octave>4</octave>
@@ -554,7 +554,7 @@
         <stem>down</stem>
         <beam number="1">continue</beam>
         </note>
-      <note default-x="368.75" default-y="-15.00">
+      <note default-x="367.28" default-y="-15.00">
         <pitch>
           <step>C</step>
           <octave>5</octave>
@@ -1410,7 +1410,80 @@
           </notations>
         </note>
       </measure>
-    <measure number="21" width="197.87">
+    <measure number="21" width="1077.49">
+      <print new-system="yes">
+        <system-layout>
+          <system-margins>
+            <left-margin>0.00</left-margin>
+            <right-margin>0.00</right-margin>
+            </system-margins>
+          <system-distance>94.25</system-distance>
+          </system-layout>
+        </print>
+      <note default-x="110.62" default-y="-40.00">
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <lyric number="1" default-x="6.58" default-y="-80.00" relative-x="1.53" relative-y="4.59">
+          <syllabic>single</syllabic>
+          <text>InMeasureClefs</text>
+          </lyric>
+        </note>
+      <attributes>
+        <clef>
+          <sign>F</sign>
+          <line>4</line>
+          </clef>
+        </attributes>
+      <note default-x="351.94" default-y="5.00">
+        <pitch>
+          <step>B</step>
+          <octave>3</octave>
+          </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        </note>
+      <attributes>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+          </clef>
+        </attributes>
+      <note default-x="593.26" default-y="-30.00">
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        </note>
+      <attributes>
+        <clef>
+          <sign>F</sign>
+          <line>4</line>
+          </clef>
+        </attributes>
+      <note default-x="834.58" default-y="10.00">
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        </note>
+      </measure>
+    <measure number="22" width="197.87">
       <print new-system="yes">
         <system-layout>
           <system-margins>
@@ -1420,13 +1493,19 @@
           <system-distance>94.25</system-distance>
           </system-layout>
         </print>
+      <attributes>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+          </clef>
+        </attributes>
       <note>
         <rest/>
         <duration>16</duration>
         <voice>1</voice>
         </note>
       </measure>
-    <measure number="22" width="236.55">
+    <measure number="23" width="236.55">
       <direction placement="above">
         <direction-type>
           <words default-y="40.00" relative-x="-36.99" relative-y="15.04" font-weight="bold" font-size="12">Slurs</words>
@@ -1483,7 +1562,7 @@
         <stem>down</stem>
         </note>
       </measure>
-    <measure number="23" width="214.36">
+    <measure number="24" width="214.36">
       <note default-x="12.00" default-y="-15.00">
         <pitch>
           <step>C</step>
@@ -1528,7 +1607,7 @@
           </notations>
         </note>
       </measure>
-    <measure number="24" width="214.36">
+    <measure number="25" width="214.36">
       <note default-x="12.00" default-y="-30.00">
         <pitch>
           <step>G</step>
@@ -1576,7 +1655,7 @@
         <stem>up</stem>
         </note>
       </measure>
-    <measure number="25" width="214.36">
+    <measure number="26" width="214.36">
       <note default-x="12.00" default-y="-30.00">
         <pitch>
           <step>G</step>
@@ -1621,7 +1700,7 @@
         <stem>down</stem>
         </note>
       </measure>
-    <measure number="26" width="296.88">
+    <measure number="27" width="296.88">
       <print new-system="yes">
         <system-layout>
           <system-margins>
@@ -1697,7 +1776,7 @@
         <stem>up</stem>
         </note>
       </measure>
-    <measure number="27" width="260.20">
+    <measure number="28" width="260.20">
       <note default-x="12.00" default-y="-25.00">
         <pitch>
           <step>A</step>
@@ -1753,7 +1832,7 @@
         <stem>up</stem>
         </note>
       </measure>
-    <measure number="28" width="260.20">
+    <measure number="29" width="260.20">
       <note default-x="12.00" default-y="-15.00">
         <pitch>
           <step>C</step>
@@ -1798,7 +1877,7 @@
         <stem>up</stem>
         </note>
       </measure>
-    <measure number="29" width="260.20">
+    <measure number="30" width="260.20">
       <note default-x="12.00" default-y="-20.00">
         <pitch>
           <step>B</step>
@@ -1846,7 +1925,7 @@
         <stem>up</stem>
         </note>
       </measure>
-    <measure number="30" width="290.88">
+    <measure number="31" width="290.88">
       <print new-system="yes">
         <system-layout>
           <system-margins>
@@ -1959,7 +2038,7 @@
         <stem>up</stem>
         </note>
       </measure>
-    <measure number="31" width="262.20">
+    <measure number="32" width="262.20">
       <note default-x="12.00" default-y="-25.00">
         <pitch>
           <step>A</step>
@@ -2071,7 +2150,7 @@
         <stem>down</stem>
         </note>
       </measure>
-    <measure number="32" width="262.20">
+    <measure number="33" width="262.20">
       <note default-x="12.00" default-y="-40.00">
         <pitch>
           <step>E</step>
@@ -2127,7 +2206,7 @@
         <stem>down</stem>
         </note>
       </measure>
-    <measure number="33" width="262.20">
+    <measure number="34" width="262.20">
       <note default-x="12.00" default-y="-20.00">
         <pitch>
           <step>B</step>
@@ -2175,14 +2254,14 @@
         <stem>up</stem>
         </note>
       </measure>
-    <measure number="34" width="132.09">
-      <print new-system="yes">
+    <measure number="35" width="132.09">
+      <print new-page="yes">
         <system-layout>
           <system-margins>
             <left-margin>0.00</left-margin>
             <right-margin>626.14</right-margin>
             </system-margins>
-          <system-distance>94.25</system-distance>
+          <top-system-distance>70.00</top-system-distance>
           </system-layout>
         </print>
       <note>
@@ -2191,21 +2270,21 @@
         <voice>1</voice>
         </note>
       </measure>
-    <measure number="35" width="103.42">
+    <measure number="36" width="103.42">
       <note>
         <rest/>
         <duration>16</duration>
         <voice>1</voice>
         </note>
       </measure>
-    <measure number="36" width="103.42">
+    <measure number="37" width="103.42">
       <note>
         <rest/>
         <duration>16</duration>
         <voice>1</voice>
         </note>
       </measure>
-    <measure number="37" width="112.42">
+    <measure number="38" width="112.42">
       <note>
         <rest/>
         <duration>16</duration>

test/data/OSMD_function_test_in-measure-clefs.xml

@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 3.1 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="3.1">
+  <work>
+    <work-title>In-Measure Clef Layout</work-title>
+    </work>
+  <identification>
+    <encoding>
+      <software>MuseScore 2.3.1</software>
+      <encoding-date>2018-07-26</encoding-date>
+      <supports element="accidental" type="yes"/>
+      <supports element="beam" type="yes"/>
+      <supports element="print" attribute="new-page" type="yes" value="yes"/>
+      <supports element="print" attribute="new-system" type="yes" value="yes"/>
+      <supports element="stem" type="yes"/>
+      </encoding>
+    </identification>
+  <defaults>
+    <scaling>
+      <millimeters>7.05556</millimeters>
+      <tenths>40</tenths>
+      </scaling>
+    <page-layout>
+      <page-height>1584</page-height>
+      <page-width>1224</page-width>
+      <page-margins type="even">
+        <left-margin>56.6929</left-margin>
+        <right-margin>56.6929</right-margin>
+        <top-margin>56.6929</top-margin>
+        <bottom-margin>113.386</bottom-margin>
+        </page-margins>
+      <page-margins type="odd">
+        <left-margin>56.6929</left-margin>
+        <right-margin>56.6929</right-margin>
+        <top-margin>56.6929</top-margin>
+        <bottom-margin>113.386</bottom-margin>
+        </page-margins>
+      </page-layout>
+    <word-font font-family="FreeSerif" font-size="10"/>
+    <lyric-font font-family="FreeSerif" font-size="11"/>
+    </defaults>
+  <credit page="1">
+    <credit-words default-x="612" default-y="1527.31" justify="center" valign="top" font-size="24">In-Measure Clef Layout</credit-words>
+    </credit>
+  <part-list>
+    <score-part id="P1">
+      <part-name>Piano</part-name>
+      <part-abbreviation>Pno.</part-abbreviation>
+      <score-instrument id="P1-I1">
+        <instrument-name>Piano</instrument-name>
+        </score-instrument>
+      <midi-device id="P1-I1" port="1"></midi-device>
+      <midi-instrument id="P1-I1">
+        <midi-channel>1</midi-channel>
+        <midi-program>1</midi-program>
+        <volume>78.7402</volume>
+        <pan>0</pan>
+        </midi-instrument>
+      </score-part>
+    </part-list>
+  <part id="P1">
+    <measure number="1" width="566.34">
+      <print>
+        <system-layout>
+          <system-margins>
+            <left-margin>21.00</left-margin>
+            <right-margin>0.00</right-margin>
+            </system-margins>
+          <top-system-distance>170.00</top-system-distance>
+          </system-layout>
+        <staff-layout number="2">
+          <staff-distance>65.00</staff-distance>
+          </staff-layout>
+        </print>
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          </key>
+        <time>
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+          </time>
+        <staves>2</staves>
+        <clef number="1">
+          <sign>G</sign>
+          <line>2</line>
+          </clef>
+        <clef number="2">
+          <sign>F</sign>
+          <line>4</line>
+          </clef>
+        </attributes>
+      <note default-x="77.35" default-y="-40.00">
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>1</staff>
+        </note>
+      <attributes>
+        <clef number="1">
+          <sign>F</sign>
+          <line>4</line>
+          </clef>
+        </attributes>
+      <note default-x="199.20" default-y="15.00">
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+        </note>
+      <note default-x="321.05" default-y="10.00">
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+        </note>
+      <note default-x="442.90" default-y="5.00">
+        <pitch>
+          <step>B</step>
+          <octave>3</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>1</staff>
+        </note>
+      <backup>
+        <duration>4</duration>
+        </backup>
+      <note default-x="77.35" default-y="-120.00">
+        <pitch>
+          <step>E</step>
+          <octave>3</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>5</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>2</staff>
+        </note>
+      <note default-x="199.20" default-y="-115.00">
+        <pitch>
+          <step>F</step>
+          <octave>3</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>5</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>2</staff>
+        </note>
+      <note default-x="321.05" default-y="-110.00">
+        <pitch>
+          <step>G</step>
+          <octave>3</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>5</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>2</staff>
+        </note>
+      <attributes>
+        <clef number="2">
+          <sign>G</sign>
+          <line>2</line>
+          </clef>
+        </attributes>
+      <note default-x="442.90" default-y="-150.00">
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>5</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>2</staff>
+        </note>
+      </measure>
+    <measure number="2" width="523.27">
+      <attributes>
+        <clef number="1">
+          <sign>G</sign>
+          <line>2</line>
+          </clef>
+        </attributes>
+      <note default-x="12.00" default-y="-50.00">
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>1</staff>
+        </note>
+      <note default-x="137.17" default-y="-45.00">
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>1</staff>
+        </note>
+      <note default-x="262.33" default-y="-40.00">
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>1</staff>
+        </note>
+      <note default-x="387.50" default-y="-35.00">
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>1</staff>
+        </note>
+      <backup>
+        <duration>4</duration>
+        </backup>
+      <note default-x="12.00" default-y="-145.00">
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>5</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>2</staff>
+        </note>
+      <attributes>
+        <clef number="2">
+          <sign>F</sign>
+          <line>4</line>
+          </clef>
+        </attributes>
+      <note default-x="137.17" default-y="-100.00">
+        <pitch>
+          <step>B</step>
+          <octave>3</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>5</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>2</staff>
+        </note>
+      <attributes>
+        <clef number="2">
+          <sign>G</sign>
+          <line>2</line>
+          </clef>
+        </attributes>
+      <note default-x="262.33" default-y="-135.00">
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>5</voice>
+        <type>quarter</type>
+        <stem>up</stem>
+        <staff>2</staff>
+        </note>
+      <attributes>
+        <clef number="2">
+          <sign>F</sign>
+          <line>4</line>
+          </clef>
+        </attributes>
+      <note default-x="387.50" default-y="-95.00">
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>1</duration>
+        <voice>5</voice>
+        <type>quarter</type>
+        <stem>down</stem>
+        <staff>2</staff>
+        </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+        </barline>
+      </measure>
+    </part>
+  </score-partwise>