]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond
authorJohn Mandereau <john.mandereau@gmail.com>
Sat, 22 Nov 2008 19:02:19 +0000 (20:02 +0100)
committerJohn Mandereau <john.mandereau@gmail.com>
Sat, 22 Nov 2008 19:02:19 +0000 (20:02 +0100)
46 files changed:
Documentation/user/lilypond-book.itely
Documentation/user/repeats.itely
Documentation/user/spacing.itely
Documentation/user/staff.itely
Documentation/user/tweaks.itely
Documentation/user/vocal.itely
input/lsr/book-parts.ly
input/new/book-parts.ly
input/regression/musicxml/12b-Tuplets-Finale.xml
input/regression/musicxml/12c-Tuplet-Styles.xml
input/regression/musicxml/12d-Tremolo-Tuplets.xml
input/regression/musicxml/12e-Nested-Tuplets.xml
input/regression/musicxml/12f-Tuplet-Display-NonStandard.xml [new file with mode: 0644]
input/regression/musicxml/16a-TransposingInstruments.xml
input/regression/musicxml/16b-TransposingInstruments-Full.xml
input/regression/property-nested-override.ly [new file with mode: 0644]
input/regression/repeat-percent-kerning.ly [new file with mode: 0644]
lily/accidental-engraver.cc
lily/bar-line.cc
lily/dot-configuration.cc
lily/duration-scheme.cc
lily/include/moment.hh
lily/include/percent-repeat-item.hh
lily/lily-guile.cc
lily/moment-scheme.cc
lily/moment.cc
lily/multi-measure-rest.cc
lily/percent-repeat-item.cc
lily/scale.cc
lily/stencil-scheme.cc
python/convertrules.py
python/musicexp.py
python/musicxml.py
scm/define-grob-interfaces.scm
scm/define-grob-properties.scm
scm/define-grobs.scm
scm/document-backend.scm
scm/font.scm
scm/framework-ps.scm
scm/ly-syntax-constructors.scm
scm/memory-trace.scm
scm/output-ps.scm
scripts/abc2ly.py
scripts/etf2ly.py
scripts/lilypond-invoke-editor.scm
scripts/musicxml2ly.py

index 2a426ceddd7ce658aa337c3e32f725296cca6687..34ebeab922260505c74f22cea8e360239100267b 100644 (file)
@@ -205,7 +205,7 @@ or
 \lilypond@{ YOUR LILYPOND CODE @}
 @end example
 
-Additionally, @code{\lilypondversion} displays the the current version
+Additionally, @code{\lilypondversion} displays the current version
 of lilypond.
 Running @command{lilypond-book} yields a file that can be further
 processed with @LaTeX{}. 
@@ -394,7 +394,7 @@ or
 @@lilypondfile[options,go,here]@{@var{filename}@}
 @end example
 
-Additionally, @code{@@lilypondversion} displays the the current version
+Additionally, @code{@@lilypondversion} displays the current version
 of lilypond.
 
 When @command{lilypond-book} is run on it, this results in a Texinfo
@@ -465,7 +465,7 @@ To include separate files, say
 <lilypondfile @var{option1} @var{option2} ...>@var{filename}</lilypondfile>
 @end example
 
-Additionally, @code{<lilypondversion/>} displays the the current version
+Additionally, @code{<lilypondversion/>} displays the current version
 of lilypond.
 
 
@@ -659,7 +659,7 @@ source file contain a comment containing @samp{begin verbatim} (without
 quotes), quoting the source in the verbatim block will start after the
 last occurrence of such a comment; similarly, quoting the source verbatim
 will stop just before the first occurrence of a comment containing
-@samp{end verbatim}, it there is any.  In the following source file
+@samp{end verbatim}, if there is any.  In the following source file
 example, the music will be interpreted in relative mode, but the
 verbatim quote will not show the @code{relative} block, i.e.
 
@@ -971,7 +971,7 @@ If you use the same filename extension for the input file than the
 extension @command{lilypond-book} uses for the output file, and if the
 input file is in the same directory as @command{lilypond-book} working
 directory, you must use @code{--output} option to make
-@command{lilypond-book} running, otherwise the will exit with an error
+@command{lilypond-book} running, otherwise it will exit with an error
 message like @qq{Output would overwrite input file}.
 
 
index 751a9cd1aa149cf0fa69f0c0b355f63a234dc6fe..21efda6142184bb6e5a2769d445e8ecf8c45e2b4 100644 (file)
@@ -293,7 +293,7 @@ b1
 Text can be included with the volta bracket.  The text can be a
 number or numbers or markup text, see @ref{Formatting text}.  The
 simplest way to use markup text is to define the markup first,
-then include the the markup in a Scheme list.
+then include the markup in a Scheme list.
 
 @lilypond[verbatim,quote]
 voltaAdLib = \markup { 1. 2. 3... \text \italic { ad lib. } }
index baabf804dc706ac7161d2a3ae3971cb5faa8b962..f7234ac0980f97c476fdfbebf491deffc6ccdebd 100644 (file)
@@ -1503,20 +1503,29 @@ example @code{NonMusicalPaperColumn} overrides with the special
 To understand how each of these different settings work, we begin
 by looking at an example that includes no overrides at all.
 
-@lilypond[quote,ragged-right]
-\new Score <<
-  \new Staff <<
-    \new Voice {
-      s1 * 6 \break
-      s1 * 6 \break
-      s1 * 6 \break
-    }
-    \new Voice { \repeat unfold 18 { c'4 c'4 c'4 c'4 } }
-  >>
-  \new Staff {
-    \repeat unfold 18 { d'4 d'4 d'4 d'4 }
+@c \book { } is required in these examples to ensure the spacing
+@c overrides can be seen between systems. -np
+
+@lilypond[quote]
+\header { tagline = ##f }
+\paper { left-margin = 0\mm }
+\book {
+  \score {
+    <<
+      \new Staff <<
+        \new Voice {
+          s1*5 \break
+          s1*5 \break
+          s1*5 \break
+        }
+        \new Voice { \repeat unfold 15 { c'4 c' c' c' } }
+      >>
+      \new Staff {
+        \repeat unfold 15 { d'4 d' d' d' }
+      }
+    >>
   }
->>
+}
 @end lilypond
 
 This score isolates line- and page-breaking information in a dedicated
@@ -1530,26 +1539,32 @@ the vertical startpoint of each system explicitly, we can set
 the @code{Y-offset} pair in the @code{line-break-system-details}
 attribute of the @code{NonMusicalPaperColumn} grob:
 
-@lilypond[quote,ragged-right]
-\new Score <<
-  \new Staff <<
-    \new Voice {
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-        #'line-break-system-details #'((Y-offset . 0))
-      s1 * 6 \break
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-        #'line-break-system-details #'((Y-offset . 40))
-      s1 * 6 \break
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-        #'line-break-system-details #'((Y-offset . 80))
-      s1 * 6 \break
-    }
-    \new Voice { \repeat unfold 18 { c'4 c'4 c'4 c'4 } }
-  >>
-  \new Staff {
-    \repeat unfold 18 { d'4 d'4 d'4 d'4 }
+@lilypond[quote]
+\header { tagline = ##f }
+\paper { left-margin = 0\mm }
+\book {
+  \score {
+    <<
+      \new Staff <<
+        \new Voice {
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 0))
+          s1*5 \break
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 40))
+          s1*5 \break
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 80))
+          s1*5 \break
+        }
+        \new Voice { \repeat unfold 15 { c'4 c' c' c' } }
+      >>
+      \new Staff {
+        \repeat unfold 15 { d'4 d' d' d' }
+      }
+    >>
   }
->>
+}
 @end lilypond
 
 Note that @code{line-break-system-details} takes an associative list of
@@ -1562,29 +1577,35 @@ explicitly, we can also set the vertical startpoint of each staff
 within each system manually.  We do this using the @code{alignment-offsets}
 subproperty of @code{line-break-system-details}.
 
-@lilypond[quote,ragged-right]
-\new Score <<
-  \new Staff <<
-    \new Voice {
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-        #'line-break-system-details #'((Y-offset . 20)
-          (alignment-offsets . (0 -15)))
-      s1 * 6 \break
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-        #'line-break-system-details #'((Y-offset . 60)
-          (alignment-offsets . (0 -15)))
-      s1 * 6 \break
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-        #'line-break-system-details #'((Y-offset . 100)
-          (alignment-offsets . (0 -15)))
-      s1 * 6 \break
-    }
-    \new Voice { \repeat unfold 18 { c'4 c'4 c'4 c'4 } }
-  >>
-  \new Staff {
-    \repeat unfold 18 { d'4 d'4 d'4 d'4 }
+@lilypond[quote]
+\header { tagline = ##f }
+\paper { left-margin = 0\mm }
+\book {
+  \score {
+    <<
+      \new Staff <<
+        \new Voice {
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 20)
+                                           (alignment-offsets . (0 -15)))
+          s1*5 \break
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 60)
+                                           (alignment-offsets . (0 -15)))
+          s1*5 \break
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 100)
+                                           (alignment-offsets . (0 -15)))
+          s1*5 \break
+        }
+        \new Voice { \repeat unfold 15 { c'4 c' c' c' } }
+      >>
+      \new Staff {
+        \repeat unfold 15 { d'4 d' d' d' }
+      }
+    >>
   }
->>
+}
 @end lilypond
 
 Note that here we assign two different values to the
@@ -1597,34 +1618,36 @@ additional spacing parameters (including, for example, a corresponding
 every system and every staff.  Finally, note that @code{alignment-offsets}
 specifies the vertical positioning of staves but not of staff groups.
 
-@lilypond[quote,ragged-right]
-\new Score <<
-  \new Staff <<
-    \new Voice {
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-      #'line-break-system-details #'((Y-offset . 0)
-        (alignment-offsets . (0 -30 -40)))
-      s1 * 6 \break
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-      #'line-break-system-details #'((Y-offset . 60)
-        (alignment-offsets . (0 -10 -20)))
-      s1 * 6 \break
-      \overrideProperty #"Score.NonMusicalPaperColumn"
-      #'line-break-system-details #'((Y-offset . 100)
-        (alignment-offsets . (0 -10, -40)))
-      s1 * 6 \break
-    }
-    \new Voice { \repeat unfold 18 { c'4 c'4 c'4 c'4 } }
-  >>
-  \new StaffGroup <<
-    \new Staff {
-      \repeat unfold 18 { d'4 d'4 d'4 d'4 }
-    }
-    \new Staff {
-      \repeat unfold 18 { e'4 e'4 e'4 e'4 }
-    }
-  >>
->>
+@lilypond[quote]
+\header { tagline = ##f }
+\paper { left-margin = 0\mm }
+\book {
+  \score {
+    <<
+      \new Staff <<
+        \new Voice {
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 0)
+                                           (alignment-offsets . (0 -30 -40)))
+          s1*5 \break
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 60)
+                                           (alignment-offsets . (0 -10 -20)))
+          s1*5 \break
+          \overrideProperty #"Score.NonMusicalPaperColumn"
+            #'line-break-system-details #'((Y-offset . 100)
+                                           (alignment-offsets . (0 -10 -40)))
+          s1*5 \break
+        }
+        \new Voice { \repeat unfold 15 { c'4 c' c' c' } }
+      >>
+      \new StaffGroup <<
+        \new Staff { \repeat unfold 15 { d'4 d' d' d' } }
+        \new Staff { \repeat unfold 15 { e'4 e' e' e' } }
+      >>
+    >>
+  }
+}
 @end lilypond
 
 Some points to consider:
index 146bc526c1d29e0c9677514ff1135bd029a1e8a1..4c8a0ecad6cbea8329d028ba383423a134f8177c 100644 (file)
@@ -13,9 +13,9 @@
 
 @lilypondfile[quote]{staff-headword.ly}
 
-This section explains how to influence the staff appearance, print
-scores with more than one staff, and how to apply specific
-performance marks to single staves.
+This section explains how to influence the appearance of staves,
+how to print scores with more than one staff, and how to add tempo
+indications and cue notes to staves.
 
 @menu
 * Displaying staves::
@@ -62,9 +62,10 @@ The basic staff context is @code{Staff}:
 \new Staff { c4 d e f }
 @end lilypond
 
-@code{DrumStaff} creates a five-line staff set up for a
-typical drum set.  It uses different names for each instrument.
-The instrument names are set using the @code{\drummode} command.
+The @code{DrumStaff} context creates a five-line staff set up for
+a typical drum set.  Each instrument is shown with a different
+symbol.  The instruments are entered in drum mode following a
+@code{\drummode} command, with each instrument specified by name.
 For details, see @ref{Percussion staves}.
 
 @lilypond[verbatim,quote]
@@ -73,14 +74,6 @@ For details, see @ref{Percussion staves}.
 }
 @end lilypond
 
-@c FIXME: remove when mentioned in NR 2.8
-@code{GregorianTranscriptionStaff} creates a staff to notate
-modern Gregorian chant.  It does not show bar lines.
-
-@lilypond[verbatim,quote,relative=2]
-\new GregorianTranscriptionStaff { c4 d e f e d }
-@end lilypond
-
 @code{RhythmicStaff} creates a single-line staff that only
 displays the rhythmic values of the input.  Real durations are
 preserved. For details, see @ref{Showing melody rhythms}.
@@ -100,6 +93,13 @@ There are two staff contexts specific for the notation of ancient
 music: @code{MensuralStaff} and @code{VaticanaStaff}.  They are
 described in @ref{Pre-defined contexts}.
 
+The @code{GregorianTranscriptionStaff} context creates a staff to
+notate modern Gregorian chant.  It does not show bar lines.
+
+@lilypond[verbatim,quote,relative=2]
+\new GregorianTranscriptionStaff { c4 d e f e d }
+@end lilypond
+
 New single staff contexts may be defined.  For details, see
 @ref{Defining new contexts}.
 
@@ -235,7 +235,6 @@ New staff group contexts may be defined.  For details, see
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {mensurstriche-layout-bar-lines-between-the-staves.ly}
-@c FIXME: move to NR 2.8.x when sectioning is ready
 
 
 @seealso
@@ -386,7 +385,9 @@ thickness.
 @end lilypond
 
 Ledger line thickness can be set independently of staff line
-thickness.
+thickness.  In the example the two numbers are factors multiplying
+the staff line thickness and the staff line spacing.  The two
+contributions are added to give the ledger line thickness.
 
 @lilypond[verbatim,quote,relative=1]
 \new Staff \with {
@@ -502,7 +503,7 @@ staff in the appropriate location:
 @end lilypond
 
 @noindent
-However, the above example is usually not the desired result.  To
+However, the above example is not what is usually desired.  To
 create ossia staves that are above the original staff, have no
 time signature or clef, and have a smaller font size, tweaks must
 be used.  The Learning Manual describes a specific technique to
@@ -671,8 +672,9 @@ block.  In orchestral scores, this style is known as @q{Frenched
 Score}.  By default, this command hides and removes all empty
 staves in a score except for those in the first system.
 
-@warning{An empty staff may only include multi-measure rests,
-skips, spacer rests, or a combination of these elements.}
+@warning{A staff is considered empty when it contains only
+multi-measure rests, skips, spacer rests, or a combination of these
+elements.}
 
 @lilypond[verbatim,quote,ragged-right]
 \layout {
@@ -1022,7 +1024,7 @@ Internals Reference:
 @cindex fragments
 @cindex cue notes
 
-It is very common for one voice to double the some of the music from
+It is very common for one voice to double some of the music from
 another voice.  For example, the first and second violins may play the
 same notes during a passage of music.  In LilyPond this is accomplished
 by letting one voice @emph{quote} the other voice without having to
index 7fc49398fc5839eb081ba44d300113809374cd07..cdb5568f8ef622b09b328c5aca5d37a767244d4c 100644 (file)
@@ -578,7 +578,7 @@ at first, so we can be sure the command is working.  We get:
 @end example
 
 Don't forget the @code{#'} preceding the
-property name and and @code{#} preceding the new value!
+property name and a @code{#} preceding the new value!
 
 The final question is, @q{Where should this command be
 placed?}  While you are unsure and learning, the best
@@ -3319,7 +3319,7 @@ and blanking the first up-stem in that voice, the tie appears to
 cross voices:
 
 @cindex Stem, example of overriding
-@cindex transparent propery, example
+@cindex transparent property, example
 
 @lilypond[quote,fragment,relative=2,verbatim]
 <<
index 85b636eecac6a3091808232b336d2dc9a1783d4b..16274e366be5025d2f6724f2b23129f673ff1d09 100644 (file)
@@ -627,7 +627,7 @@ single syllable; such vocalises are called melismas, or melismata.
 @c it might be better to present it first - vv
 
 You can define melismata entirely in the lyrics, by entering @code{_}
-for every extra note that has to be added to the the melisma.
+for every extra note that has to be added to the melisma.
 
 @c FIXME: clarify: __ is used to crate a lyric extender,
 @c _ is used to add a note to a melisma, so both __ and _ are needed.
index 7c3095dc007c30509bf9f6d737717fca3a82f90c..8cd6e3a05758594d2c8c3f91f1834fc5c1137ca4 100644 (file)
@@ -4,7 +4,7 @@
 
 \header {
   lsrtags = "paper-and-layout"
-  texidocs = "@code{\\bookpart} can be used to split a book into
+  texidoc = "@code{\\bookpart} can be used to split a book into
 several parts.
 Each part last page can be affected by @code{ragged-bottom-last}.
 Header and footer markups can detect a part last page, and make the
index 5da8877624a7042cb8eea318d7f7962c03e8f1ec..abb56b8460149ee984b0ccbc9a228c8a0572865e 100644 (file)
@@ -2,7 +2,7 @@
 
 \header {
   lsrtags = "paper-and-layout"
-  texidocs = "@code{\\bookpart} can be used to split a book into
+  texidoc = "@code{\\bookpart} can be used to split a book into
 several parts.
 Each part last page can be affected by @code{ragged-bottom-last}.
 Header and footer markups can detect a part last page, and make the
index 14d586a62e8c68bfd32a88ef0f3eb0dd58e87ed7..47f36b1af4c3848330a6760cf52b6ff2d47e0d8b 100644 (file)
@@ -6,7 +6,8 @@
     <miscellaneous>
       <miscellaneous-field name="description">Some tuplets (3:2, 3:2, 3:2, 4:2, 
           4:1, 7:3, 6:2) with the default tuplet bracket displaying the number 
-          of actual notes played.</miscellaneous-field>
+          of actual notes played. The second tuplet does not have a number 
+          attribute set.</miscellaneous-field>
     </miscellaneous>
   </identification>
   <part-list>
         </time-modification>
         <stem>up</stem>
         <notations>
-          <tuplet number="1" placement="above" type="start"/>
+          <tuplet placement="above" type="start"/>
         </notations>
       </note>
       <note>
         </time-modification>
         <stem>up</stem>
         <notations>
-          <tuplet number="1" type="stop"/>
+          <tuplet type="stop"/>
         </notations>
       </note>
       <note>
         </time-modification>
         <stem>down</stem>
         <notations>
-          <tuplet bracket="no" number="1" placement="above" type="start"/>
+          <tuplet number="1" placement="above" type="start"/>
         </notations>
       </note>
       <note>
index c8e063c2a27973a1c63341a28fb1f64c139861e6..6b55d4d8aba5c2fff69341523fd0d5aff2e1c316 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise version="1.1">\r
-  <identification>\r
-    <miscellaneous>\r
-      <miscellaneous-field name="description">Different tuplet styles:\r
-          default, none, x:y, x:y-note; Each with bracket, slur and none.\r
-          Finally, non-standard 4:3 and 17:2 tuplets are given.</miscellaneous-field>\r
-    </miscellaneous>\r
-  </identification>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name print-object="no">MusicXML Part</part-name>\r
-    </score-part>\r
-  </part-list>\r
-  <!--=========================================================-->\r
-  <part id="P1">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>408</divisions>\r
-        <key>\r
-          <fifths>0</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="yes" number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="yes" number="1" placement="below" show-number="none" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="yes" number="1" placement="below" show-number="both" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="yes" number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="2">\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" placement="below" show-number="none" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" placement="below" show-number="both" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="3">\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="no" number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="no" number="1" show-number="none" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="no" number="1" placement="below" show-number="both" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="no" number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>136</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="4">\r
-      <print new-system="yes">\r
-        <system-layout>\r
-          <system-distance>114</system-distance>\r
-        </system-layout>\r
-      </print>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>153</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>4</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" placement="below" show-number="both" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>153</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>4</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>153</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>4</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>153</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>4</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>17</actual-notes>\r
-          <normal-notes>3</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>204</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <beam number="1">begin</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>204</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <beam number="1">end</beam>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Different tuplet styles:
+          default, none, x:y, x:y-note; Each with bracket, slur and none.
+          Finally, non-standard 4:3 and 17:2 tuplets are given.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>408</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>5</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="none" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="both" show-type="actual" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" number="1" show-number="both" show-type="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="none" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" show-type="actual" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" line-shape="curved" number="1" show-number="both" show-type="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="none" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="both" show-type="actual" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="no" number="1" show-number="both" show-type="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <print new-system="yes">
+        <system-layout>
+          <system-distance>114</system-distance>
+        </system-layout>
+      </print>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>153</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" placement="below" show-number="both" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>153</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>153</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>153</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>4</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" placement="below" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>17</actual-notes>
+          <normal-notes>3</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>204</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>204</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
index 7a7792dfdd56c131519b92a6c57f242526be5c66..eee4d0f27fd682200fb3d9a1769fc2f0d45d154e 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise version="1.1">\r
-  <identification>\r
-    <miscellaneous>\r
-      <miscellaneous-field name="description">Tremolo tuplets are tuplets on \r
-          single notes with a tremolo ornament. The application shall correctly\r
-          import these notes with 2/3 or their time...</miscellaneous-field>\r
-    </miscellaneous>\r
-  </identification>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name print-object="no">MusicXML Part</part-name>\r
-    </score-part>\r
-  </part-list>\r
-  <!--=========================================================-->\r
-  <part id="P1">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>36</divisions>\r
-        <key>\r
-          <fifths>0</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time>\r
-          <beats>3</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-        <notations>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-        <notations>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-        <notations>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-          <articulations>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="2">\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="3">\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>72</duration>\r
-        <voice>1</voice>\r
-        <type>half</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>6</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="4">\r
-      <note>\r
-        <pitch>\r
-          <step>F</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>12</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <direction placement="below">\r
-        <direction-type>\r
-          <dynamics>\r
-            <fp/>\r
-          </dynamics>\r
-        </direction-type>\r
-      </direction>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>72</duration>\r
-        <voice>1</voice>\r
-        <type>half</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>6</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="5">\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>72</duration>\r
-        <voice>1</voice>\r
-        <type>half</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>6</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>36</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <dot/>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>eighth</normal-type>\r
-        </time-modification>\r
-        <notations>\r
-          <tuplet number="1" type="start"/>\r
-          <tuplet number="1" type="stop"/>\r
-          <ornaments>\r
-            <tremolo>1</tremolo>\r
-          </ornaments>\r
-        </notations>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Tremolo tuplets are tuplets on 
+          single notes with a tremolo ornament. The application shall correctly
+          import these notes with 2/3 or their time...</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>36</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time>
+          <beats>3</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="1" type="stop"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="1" type="stop"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+        <notations>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="1" type="stop"/>
+          <articulations>
+            <staccato placement="below"/>
+          </articulations>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>72</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>4</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>12</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <direction placement="below">
+        <direction-type>
+          <dynamics>
+            <fp/>
+          </dynamics>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>72</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>4</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>72</duration>
+        <voice>1</voice>
+        <type>half</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>6</actual-notes>
+          <normal-notes>4</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>36</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>eighth</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="start"/>
+          <tuplet number="1" type="stop"/>
+          <ornaments>
+            <tremolo>1</tremolo>
+          </ornaments>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
index c1a57feb07b812527206238bc42ca4a1af406e37..b85c0296d04592686ded1dc3852317f16952bfb1 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise version="1.1">\r
-  <identification>\r
-    <miscellaneous>\r
-      <miscellaneous-field name="description">Tuplets can be nested. Here \r
-          there is a 5:2 tuplet inside a 3:2 tuple (all consisting of written\r
-          eighth notes).</miscellaneous-field>\r
-    </miscellaneous>\r
-  </identification>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name print-object="no">MusicXML Part</part-name>\r
-      <score-instrument id="P1-I1">\r
-        <instrument-name>Acoustic Grand Piano</instrument-name>\r
-      </score-instrument>\r
-      <midi-instrument id="P1-I1">\r
-        <midi-channel>1</midi-channel>\r
-        <midi-program>1</midi-program>\r
-      </midi-instrument>\r
-    </score-part>\r
-  </part-list>\r
-  <!--=========================================================-->\r
-  <part id="P1">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>30</divisions>\r
-        <key>\r
-          <fifths>0</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time>\r
-          <beats>2</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>10</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>quarter</normal-type>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="yes" number="1" placement="below" type="start"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>10</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>quarter</normal-type>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>15</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-        <notations>\r
-          <tuplet bracket="yes" number="2" placement="below" type="start">\r
-            <tuplet-actual>\r
-              <tuplet-number>5</tuplet-number>\r
-              <tuplet-type>eighth</tuplet-type>\r
-            </tuplet-actual>\r
-            <tuplet-normal>\r
-              <tuplet-number>2</tuplet-number>\r
-              <tuplet-type>eighth</tuplet-type>\r
-            </tuplet-normal>\r
-          </tuplet>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>15</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>15</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>15</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">continue</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>15</actual-notes>\r
-          <normal-notes>4</normal-notes>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="2" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>10</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>quarter</normal-type>\r
-        </time-modification>\r
-        <beam number="1">begin</beam>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>10</duration>\r
-        <voice>1</voice>\r
-        <type>eighth</type>\r
-        <time-modification>\r
-          <actual-notes>3</actual-notes>\r
-          <normal-notes>2</normal-notes>\r
-          <normal-type>quarter</normal-type>\r
-        </time-modification>\r
-        <beam number="1">end</beam>\r
-        <notations>\r
-          <tuplet number="1" type="stop"/>\r
-        </notations>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Tuplets can be nested. Here 
+          there is a 5:2 tuplet inside a 3:2 tuple (all consisting of written
+          eighth notes).</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+      <score-instrument id="P1-I1">
+        <instrument-name>Acoustic Grand Piano</instrument-name>
+      </score-instrument>
+      <midi-instrument id="P1-I1">
+        <midi-channel>1</midi-channel>
+        <midi-program>1</midi-program>
+      </midi-instrument>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>30</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time>
+          <beats>2</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>10</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>quarter</normal-type>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet bracket="yes" number="1" placement="below" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>10</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>quarter</normal-type>
+        </time-modification>
+        <beam number="1">end</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">begin</beam>
+        <notations>
+          <tuplet bracket="yes" number="2" placement="below" type="start">
+            <tuplet-actual>
+              <tuplet-number>5</tuplet-number>
+              <tuplet-type>eighth</tuplet-type>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>2</tuplet-number>
+              <tuplet-type>eighth</tuplet-type>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">continue</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>15</actual-notes>
+          <normal-notes>4</normal-notes>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="2" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>10</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>quarter</normal-type>
+        </time-modification>
+        <beam number="1">begin</beam>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>10</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>quarter</normal-type>
+        </time-modification>
+        <beam number="1">end</beam>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/musicxml/12f-Tuplet-Display-NonStandard.xml b/input/regression/musicxml/12f-Tuplet-Display-NonStandard.xml
new file mode 100644 (file)
index 0000000..a0810b4
--- /dev/null
@@ -0,0 +1,615 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Displaying tuplet note types,
+          that might not coincide with the displayed note. The first two tuplets 
+          take the type from the note, the second two from the 
+          &lt;time-modification> element, the remaining pair of tuplets from the 
+          &lt;tuplet> notation element. The tuplets in measure 3 specify both 
+          a number of notes and a type inside the &lt;tuplet-actual> and 
+          &lt;tuplet-normal> elements, the ones in measure 4 specify only a 
+          note type (but no number), and the ones in measure 5 specify only a 
+          number of tuplet-notes (but no type, which is deduced from the 
+          note's type). The first tuplet of measures 3-5 uses 
+          'display-type="actual"', the second one 'display-type="both"'.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>408</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="actual" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-number>7</tuplet-number>
+              <tuplet-type>quarter</tuplet-type>
+              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>5</tuplet-number>
+              <tuplet-type>quarter</tuplet-type>
+              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-number>7</tuplet-number>
+              <tuplet-type>half</tuplet-type>
+              <tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>5</tuplet-number>
+              <tuplet-type>16th</tuplet-type>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="actual" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-type>quarter</tuplet-type>
+              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-type>quarter</tuplet-type>
+              <tuplet-dot/><tuplet-dot/><tuplet-dot/>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-type>half</tuplet-type>
+              <tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-type>16th</tuplet-type>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+          <normal-type>breve</normal-type>
+          <normal-dot/>
+          <normal-dot/>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-type="actual" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-number>7</tuplet-number>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>5</tuplet-number>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>136</duration>
+        <voice>1</voice>
+        <type>eighth</type>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet bracket="yes" show-number="both" show-type="both" number="1" type="start">
+            <tuplet-actual>
+              <tuplet-number>7</tuplet-number>
+              <tuplet-dot/>
+            </tuplet-actual>
+            <tuplet-normal>
+              <tuplet-number>5</tuplet-number>
+            </tuplet-normal>
+          </tuplet>
+        </notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>408</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <dot/>
+        <time-modification>
+          <actual-notes>3</actual-notes>
+          <normal-notes>2</normal-notes>
+        </time-modification>
+        <notations>
+          <tuplet number="1" type="stop"/>
+        </notations>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
index 82cb627510077e0a793ea17c4b36b6d7f5ee5b96..bbd3ef8c6b48161fdc606c0a665a7000051d08ea 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise version="1.1">\r
-  <identification>\r
-    <miscellaneous>\r
-      <miscellaneous-field name="description">Transposing instruments: Trumpet \r
-          in Bb, Horn in Eb, Piano; All of them show the C major scale (the \r
-          trumpet with 2 sharp, the horn with 3 sharp).</miscellaneous-field>\r
-    </miscellaneous>\r
-  </identification>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name>Trumpet in Bb</part-name>\r
-      <part-abbreviation>Bb Tpt.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P2">\r
-      <part-name>Horn in Eb</part-name>\r
-      <part-abbreviation>Hn.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P3">\r
-      <part-name>Piano</part-name>\r
-    </score-part>\r
-  </part-list>\r
-  <!--=========================================================-->\r
-  <part id="P1">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>2</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-1</diatonic>\r
-          <chromatic>-2</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>D</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>E</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>F</step>\r
-          <alter>1</alter>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="2">\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <alter>1</alter>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>D</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P2">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>3</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-5</diatonic>\r
-          <chromatic>-9</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <alter>1</alter>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>D</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="2">\r
-      <note>\r
-        <pitch>\r
-          <step>E</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>F</step>\r
-          <alter>1</alter>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <alter>1</alter>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P3">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>0</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>D</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>E</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>F</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="2">\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Transposing instruments: Trumpet 
+          in Bb, Horn in Eb, Piano; All of them show the C major scale (the 
+          trumpet with 2 sharp, the horn with 3 sharp).</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>Trumpet in Bb</part-name>
+      <part-abbreviation>Bb Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P2">
+      <part-name>Horn in Eb</part-name>
+      <part-abbreviation>Hn.</part-abbreviation>
+    </score-part>
+    <score-part id="P3">
+      <part-name>Piano</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>2</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-1</diatonic>
+          <chromatic>-2</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P2">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>3</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-5</diatonic>
+          <chromatic>-9</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <alter>1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P3">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>E</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>F</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+    </measure>
+    <!--=======================================================-->
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>B</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
index 84e1e484fe14faa0072f33f3afcff8f5d71e9beb..6a090be0e5fdd2bc5e5428ccc9cd6f0cb86b370b 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise version="1.1">\r
-  <identification>\r
-    <miscellaneous>\r
-      <miscellaneous-field name="description">Various transposition. Each\r
-          part plays a c'', just displayed in different display pitches.\r
-          The second-to-last staff uses a transposition where the displayed c'\r
-          is an actual f''' concert pitch. The final staff is an untransposed\r
-          instrument.</miscellaneous-field>\r
-    </miscellaneous>\r
-  </identification>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name>Clarinet in Eb</part-name>\r
-      <part-abbreviation>Eb Cl.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P2">\r
-      <part-name>Clarinet in Bb</part-name>\r
-      <part-abbreviation>Bb Cl.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P3">\r
-      <part-name>Clarinet in A</part-name>\r
-      <part-abbreviation>A Cl.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P4">\r
-      <part-name>Horn in F</part-name>\r
-      <part-abbreviation>Hn.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P5">\r
-      <part-name>Horn in Eb</part-name>\r
-      <part-abbreviation>Hn.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P6">\r
-      <part-name>Piccolo Trumpet in A</part-name>\r
-      <part-abbreviation>Picc.Tpt.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P7">\r
-      <part-name>Trumpet in Bb</part-name>\r
-      <part-abbreviation>Bb Tpt.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P8">\r
-      <part-name>Trumpet in C</part-name>\r
-      <part-abbreviation>C Tpt.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P9">\r
-      <part-name>Trumpet in D</part-name>\r
-      <part-abbreviation>D Tpt.</part-abbreviation>\r
-    </score-part>\r
-    <score-part id="P10">\r
-      <part-name>displayed c'=fis'''</part-name>\r
-    </score-part>\r
-    <score-part id="P11">\r
-      <part-name print-object="no">MusicXML Part</part-name>\r
-    </score-part>\r
-  </part-list>\r
-  <!--=========================================================-->\r
-  <part id="P1">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>4</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>2</diatonic>\r
-          <chromatic>3</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P2">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>3</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-1</diatonic>\r
-          <chromatic>-2</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>D</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P3">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>-2</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-2</diatonic>\r
-          <chromatic>-3</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>E</step>\r
-          <alter>-1</alter>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P4">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>2</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-4</diatonic>\r
-          <chromatic>-7</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>G</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P5">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>4</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-5</diatonic>\r
-          <chromatic>-9</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>A</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P6">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>-2</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>5</diatonic>\r
-          <chromatic>9</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>E</step>\r
-          <alter>-1</alter>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P7">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>3</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>-1</diatonic>\r
-          <chromatic>-2</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>D</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P8">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>1</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P9">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>-1</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>1</diatonic>\r
-          <chromatic>2</chromatic>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>B</step>\r
-          <alter>-1</alter>\r
-          <octave>4</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P10">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>7</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>F</sign>\r
-          <line>4</line>\r
-          <clef-octave-change>-1</clef-octave-change>\r
-        </clef>\r
-        <transpose>\r
-          <diatonic>3</diatonic>\r
-          <chromatic>6</chromatic>\r
-          <octave-change>3</octave-change>\r
-        </transpose>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>F</step>\r
-          <alter>1</alter>\r
-          <octave>1</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-  <part id="P11">\r
-    <measure number="1">\r
-      <attributes>\r
-        <divisions>1</divisions>\r
-        <key>\r
-          <fifths>1</fifths>\r
-          <mode>major</mode>\r
-        </key>\r
-        <time symbol="common">\r
-          <beats>4</beats>\r
-          <beat-type>4</beat-type>\r
-        </time>\r
-        <clef>\r
-          <sign>G</sign>\r
-          <line>2</line>\r
-        </clef>\r
-      </attributes>\r
-      <note>\r
-        <pitch>\r
-          <step>C</step>\r
-          <octave>5</octave>\r
-        </pitch>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-        <type>whole</type>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.1 Partwise//EN"
+                                "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="1.1">
+  <identification>
+    <miscellaneous>
+      <miscellaneous-field name="description">Various transposition. Each
+          part plays a c'', just displayed in different display pitches.
+          The second-to-last staff uses a transposition where the displayed c'
+          is an actual f''' concert pitch. The final staff is an untransposed
+          instrument.</miscellaneous-field>
+    </miscellaneous>
+  </identification>
+  <part-list>
+    <score-part id="P1">
+      <part-name>Clarinet in Eb</part-name>
+      <part-abbreviation>Eb Cl.</part-abbreviation>
+    </score-part>
+    <score-part id="P2">
+      <part-name>Clarinet in Bb</part-name>
+      <part-abbreviation>Bb Cl.</part-abbreviation>
+    </score-part>
+    <score-part id="P3">
+      <part-name>Clarinet in A</part-name>
+      <part-abbreviation>A Cl.</part-abbreviation>
+    </score-part>
+    <score-part id="P4">
+      <part-name>Horn in F</part-name>
+      <part-abbreviation>Hn.</part-abbreviation>
+    </score-part>
+    <score-part id="P5">
+      <part-name>Horn in Eb</part-name>
+      <part-abbreviation>Hn.</part-abbreviation>
+    </score-part>
+    <score-part id="P6">
+      <part-name>Piccolo Trumpet in A</part-name>
+      <part-abbreviation>Picc.Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P7">
+      <part-name>Trumpet in Bb</part-name>
+      <part-abbreviation>Bb Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P8">
+      <part-name>Trumpet in C</part-name>
+      <part-abbreviation>C Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P9">
+      <part-name>Trumpet in D</part-name>
+      <part-abbreviation>D Tpt.</part-abbreviation>
+    </score-part>
+    <score-part id="P10">
+      <part-name>displayed c'=fis'''</part-name>
+    </score-part>
+    <score-part id="P11">
+      <part-name print-object="no">MusicXML Part</part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>4</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>2</diatonic>
+          <chromatic>3</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P2">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>3</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-1</diatonic>
+          <chromatic>-2</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P3">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>-2</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-2</diatonic>
+          <chromatic>-3</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P4">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>2</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-4</diatonic>
+          <chromatic>-7</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P5">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>4</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-5</diatonic>
+          <chromatic>-9</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>A</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P6">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>-2</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>5</diatonic>
+          <chromatic>9</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>E</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P7">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>3</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>-1</diatonic>
+          <chromatic>-2</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>D</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P8">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>1</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P9">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>-1</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+        <transpose>
+          <diatonic>1</diatonic>
+          <chromatic>2</chromatic>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>B</step>
+          <alter>-1</alter>
+          <octave>4</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P10">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>7</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>F</sign>
+          <line>4</line>
+          <clef-octave-change>-1</clef-octave-change>
+        </clef>
+        <transpose>
+          <diatonic>3</diatonic>
+          <chromatic>6</chromatic>
+          <octave-change>3</octave-change>
+        </transpose>
+      </attributes>
+      <note>
+        <pitch>
+          <step>F</step>
+          <alter>1</alter>
+          <octave>1</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+  <part id="P11">
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>1</fifths>
+          <mode>major</mode>
+        </key>
+        <time symbol="common">
+          <beats>4</beats>
+          <beat-type>4</beat-type>
+        </time>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>4</duration>
+        <voice>1</voice>
+        <type>whole</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+  </part>
+  <!--=========================================================-->
+</score-partwise>
diff --git a/input/regression/property-nested-override.ly b/input/regression/property-nested-override.ly
new file mode 100644 (file)
index 0000000..710822b
--- /dev/null
@@ -0,0 +1,20 @@
+\version "2.11.64"
+\header {
+  texidoc = "Nested properties may be overridden using Scheme list
+syntax.  This test performs two property overrides: the first
+measure uses standard @code{\\override} syntax; the second uses a
+list.
+"
+}
+
+\relative c' {
+  \once \override TextSpanner #'bound-details #'left #'text = #"foo"
+  c4\startTextSpan
+  \once \override Tie #'details #'note-head-gap = #3
+  c4 ~ c c\stopTextSpan
+  
+  \once \override TextSpanner #'(bound-details left text) = #"foo"
+  c4\startTextSpan
+  \once \override Tie #'(details note-head-gap) = #3
+  c4 ~ c c\stopTextSpan
+}
diff --git a/input/regression/repeat-percent-kerning.ly b/input/regression/repeat-percent-kerning.ly
new file mode 100644 (file)
index 0000000..530fb1a
--- /dev/null
@@ -0,0 +1,21 @@
+\version "2.11.65"
+\header {
+  texidoc = "The positioning of dots and slashes in percent repeat
+glyphs can be altered using @code{dot-negative-kern} and
+@code{slash-negative-kern}."
+}
+
+<<
+  \new Staff {
+    \set Staff.instrumentName = #"(default)"
+    \repeat percent 2 { c'1 }
+    \repeat percent 2 { d'1 e' }
+  }
+  \new Staff {
+    \override PercentRepeat #'dot-negative-kern = #1.1
+    \repeat percent 2 { c'1 }
+    \override DoublePercentRepeat #'dot-negative-kern = #0
+    \override DoublePercentRepeat #'slash-negative-kern = #1
+    \repeat percent 2 { d'1 e' }
+  }
+>>
index c7440e51543393c2dde6dfd750bac6fd04bcd2c3..f2b5833d595aa646ca797ffa52ec57e202995a80 100644 (file)
@@ -262,8 +262,8 @@ LY_DEFINE (ly_find_accidentals_simple, "ly:find-accidentals-simple", 5, 0, 0,
           " key signature.  The @var{laziness} is the number of bars for which reminder"
           " accidentals are used (ie. if @var{laziness} is zero, we only cancel accidentals"
           " in the same bar; if @var{laziness} is three, we cancel accidentals up to three"
-          " bars after they first appear.  @var{octaveness} is either "
-          " @code{'same-octave} or @code{'any-octave} and it specifies whether "
+          " bars after they first appear.  @var{octaveness} is either"
+          " @code{'same-octave} or @code{'any-octave} and it specifies whether"
           " accidentals should be canceled in different octaves.")
 {
   LY_ASSERT_TYPE (unsmob_pitch, pitch_scm, 2);
index a7a50a85317ef36b78d44931211b2cbb89ec6d3a..304d541666a734396143dc6a8a433e3fa576f61d 100644 (file)
@@ -337,14 +337,14 @@ ADD_INTERFACE (Bar_line,
               " is a string which specifies the kind of bar line to print."
               "  Options are @code{:|}, @code{|:}, @code{:|:}, @code{:|.|:},"
               " @code{:|.:}, @code{||}, @code{|.}, @code{.|}, @code{.|.},"
-              " @code{|.|}, @code{:} and @code{\"dashed\"}.\n"
+              " @code{|.|}, @code{:} and @code{dashed}.\n"
               "\n"
               "These produce, respectively, a right repeat, a left repeat,"
               " a thick double repeat, a thin-thick-thin double repeat,"
               " a thin-thick double repeat, a double bar, a start bar,"
               " an end bar, a thick double bar, a thin-thick-thin bar,"
-              " a dotted bar and a dashed bar. "
-              " In addition, there is an option"
+              " a dotted bar and a dashed bar."
+              "  In addition, there is an option"
               " @code{||:} which is equivalent to @code{|:} except at line"
               " breaks, where it produces a double bar (@code{||}) at the"
               " end of the line and a repeat sign (@code{|:}) at the"
@@ -367,5 +367,3 @@ ADD_INTERFACE (Bar_line,
               "bar-size "
               "bar-extent "
               );
-
-
index c4cf852d1a7a154d254b4d315745eeafbf5aae15..584273df8b40ccf93ba85d44d9903bafc0894a1f 100644 (file)
@@ -48,7 +48,7 @@ Dot_configuration::print () const
   for (Dot_configuration::const_iterator i (begin ());
        i != end (); i++)
     printf ("%d, ", i->first);
-  printf ("} \n");
+  printf ("}\n");
 }
 
 /*
index d37147558112e5d64442d7a2fa44b7538341fe07..5bc12ea0731eebd694ee0caa4f1f3dc89e8b4b4c 100644 (file)
@@ -134,5 +134,5 @@ LY_DEFINE (ly_duration_factor, "ly:duration-factor",
 {
   LY_ASSERT_SMOB (Duration, dur, 1);
   Rational r = unsmob_duration (dur)->factor ();
-  return scm_cons (scm_from_int (r.num ()), scm_from_int (r.den ()));
+  return scm_cons (scm_from_int64 (r.num ()), scm_from_int64 (r.den ()));
 }
index a3b7544762b31079f3a8c005937d37ef33c3405f..a73b9961d1746ccc26dbe531fc7c43fa24f777ce 100644 (file)
@@ -41,8 +41,8 @@ public:
   void set_infinite (int k);
 
   bool to_bool () const;
-  int den () const;
-  int num () const;
+  I64 den () const;
+  I64 num () const;
   /*
     Deliver a copy of THIS as a smobified SCM
   */
index 990a31873df92696d4ebbb3e4de45e8d67537e28..be3f06247bdf261d2aad2b41c131269bab49f6c0 100644 (file)
@@ -18,7 +18,7 @@ public:
   DECLARE_GROB_INTERFACE();
   DECLARE_SCHEME_CALLBACK (beat_slash, (SCM));
   DECLARE_SCHEME_CALLBACK (double_percent, (SCM));
-  static Stencil x_percent (Grob *, int, Real, Real);
+  static Stencil x_percent (Grob *, int);
   static Stencil brew_slash (Grob *);
 };
 
index 9c88983e4c88586d90fc52f643feacaefd6af3c4..7c052876389b2ded1a402b2ed21bc2303cc196a8 100644 (file)
@@ -561,16 +561,16 @@ robust_scm2int (SCM k, int o)
 SCM
 ly_rational2scm (Rational r)
 {
-  return scm_divide (scm_from_long_long (r.numerator ()),
-                    scm_from_long_long (r.denominator ()));
+  return scm_divide (scm_from_int64 (r.numerator ()),
+                    scm_from_int64 (r.denominator ()));
 }
 
 
 Rational
 ly_scm2rational (SCM r)
 {
-  return Rational (scm_to_long_long (scm_numerator (r)),
-                  scm_to_long_long (scm_denominator (r)));
+  return Rational (scm_to_int64 (scm_numerator (r)),
+                  scm_to_int64 (scm_denominator (r)));
 }
 
 Rational
index 85155034c597bc6c3bd187d2960832a27f4b4387..89c69fa76df0ed4e6a7bc9cdf71017db4e88d04f 100644 (file)
@@ -111,7 +111,7 @@ LY_DEFINE (ly_moment_grace_numerator, "ly:moment-grace-numerator",
 
   Moment *ma = unsmob_moment (mom);
 
-  return scm_from_int (ma->grace_part_.numerator ());
+  return scm_from_int64 (ma->grace_part_.numerator ());
 }
 
 LY_DEFINE (ly_moment_grace_denominator, "ly:moment-grace-denominator",
@@ -121,7 +121,7 @@ LY_DEFINE (ly_moment_grace_denominator, "ly:moment-grace-denominator",
   LY_ASSERT_SMOB (Moment, mom, 1);
   Moment *ma = unsmob_moment (mom);
 
-  return scm_from_int (ma->grace_part_.denominator ());
+  return scm_from_int64 (ma->grace_part_.denominator ());
 }
 LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator",
           1, 0, 0, (SCM mom),
@@ -130,7 +130,7 @@ LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator",
   LY_ASSERT_SMOB (Moment, mom, 1);
   Moment *ma = unsmob_moment (mom);
 
-  return scm_from_int (ma->main_part_.numerator ());
+  return scm_from_int64 (ma->main_part_.numerator ());
 }
 
 LY_DEFINE (ly_moment_main_denominator, "ly:moment-main-denominator",
@@ -140,7 +140,7 @@ LY_DEFINE (ly_moment_main_denominator, "ly:moment-main-denominator",
   LY_ASSERT_SMOB (Moment, mom, 1);
   Moment *ma = unsmob_moment (mom);
 
-  return scm_from_int (ma->main_part_.denominator ());
+  return scm_from_int64 (ma->main_part_.denominator ());
 }
 
 LY_DEFINE (ly_moment_less_p, "ly:moment<?",
index 7516bf20e1a786eda78b6a4e3ce926e29b7df4e0..c9b3bd4250438b7ae09251f0ab17269d8db57ca4 100644 (file)
@@ -60,10 +60,10 @@ SCM
 Moment::as_scheme () const
 {
   return scm_list_5 (ly_symbol2scm ("ly:make-moment"),
-                    scm_from_int (main_part_.num ()),
-                    scm_from_int (main_part_.den ()),
-                    scm_from_int (grace_part_.num ()),
-                    scm_from_int (grace_part_.den ()));
+                    scm_from_int64 (main_part_.num ()),
+                    scm_from_int64 (main_part_.den ()),
+                    scm_from_int64 (grace_part_.num ()),
+                    scm_from_int64 (grace_part_.den ()));
 }
 
 SCM
@@ -129,13 +129,14 @@ Moment::operator %= (Moment const &src)
   grace_part_ %= src.main_part_;
 }
 
-int
+I64
 Moment::den () const
 {
+  /* TODO: ensure MSB == 0 here */
   return main_part_.den ();
 }
 
-int
+I64
 Moment::num () const
 {
   return main_part_.num ();
index d16a11e3dbddd9ba2655f44a7c79e67809477f37..d5b490d1e9701489547beb32be3606b7240d0944 100644 (file)
@@ -47,7 +47,7 @@ Multi_measure_rest::percent (SCM smob)
   Grob *me = unsmob_grob (smob);
   Spanner *sp = dynamic_cast<Spanner *> (me);
 
-  Stencil r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6);
+  Stencil r = Percent_repeat_item_interface::x_percent (me, 1);
 
   // ugh copy & paste.
 
index b0c86c45b46060154ffd6f8af538cb82d69940fb..a38f77cb9d5010f50665bc007bf7808741bd8ba7 100644 (file)
@@ -26,17 +26,17 @@ Percent_repeat_item_interface::brew_slash (Grob *me)
   return m;
 }
 
-/*
-  todo: use grob props for dot_neg_kern, slash_neg_kern?
-*/
 Stencil
-Percent_repeat_item_interface::x_percent (Grob *me, int count,
-                                         Real dot_neg_kern,
-                                         Real slash_neg_kern)
+Percent_repeat_item_interface::x_percent (Grob *me, int count)
 {
   Stencil m;
   Stencil s = brew_slash (me);
 
+  Real dot_neg_kern =
+    robust_scm2double (me->get_property ("dot-negative-kern"), 0.75);
+  Real slash_neg_kern =
+    robust_scm2double (me->get_property ("slash-negative-kern"), 1.6);
+
   for (int i = count; i--;)
     m.add_at_edge (X_AXIS, RIGHT, s, -slash_neg_kern);
   Stencil d1 = Font_interface::get_default_font (me)->find_by_name ("dots.dot");
@@ -47,6 +47,7 @@ Percent_repeat_item_interface::x_percent (Grob *me, int count,
   m.add_at_edge (X_AXIS, LEFT, d1, -dot_neg_kern);
   m.add_at_edge (X_AXIS, RIGHT, d2, -dot_neg_kern);
 
+  m.translate_axis (- m.extent (X_AXIS).center (), X_AXIS);
   return m;
 }
 
@@ -55,8 +56,7 @@ SCM
 Percent_repeat_item_interface::double_percent (SCM grob)
 {
   Grob *me = unsmob_grob (grob);
-  Stencil m = x_percent (me, 2, 0.75, 1.6);
-  m.translate_axis (- m.extent (X_AXIS).center (), X_AXIS);
+  Stencil m = x_percent (me, 2);
   return m.smobbed_copy ();
 }
 
@@ -74,6 +74,8 @@ ADD_INTERFACE (Percent_repeat_item_interface,
               "Repeats that look like percent signs.",
               
               /* properties */
+              "dot-negative-kern "
+              "slash-negative-kern "
               "slope "
               "thickness "
               );
index aa17285510e531d1823baa63a7d7fd87c0fee48a..924208486c5c7668c42b4f8bc72f3f82cec3c4a1 100644 (file)
@@ -18,9 +18,9 @@
 */
 LY_DEFINE (ly_make_scale, "ly:make-scale",
           1, 0, 0, (SCM steps),
-          "Create a scale. "
-          "The argument is a vector of rational numbers, each of which "
-          "represents the number of tones of a pitch above the tonic.")
+          "Create a scale."
+          "  The argument is a vector of rational numbers, each of which"
+          " represents the number of tones of a pitch above the tonic.")
 {
   bool type_ok = scm_is_vector (steps);
 
index de39fca5c340ca19e20cfaf14a41e9b4a0d12761..36f13e783cef0214e869ccea045f1f7594f77138 100644 (file)
@@ -341,11 +341,11 @@ LY_DEFINE (ly_round_filled_box, "ly:round-filled-box",
 }
 
 LY_DEFINE (ly_round_filled_polygon, "ly:round-filled-polygon",
-           2, 0, 0,
-           (SCM points, SCM blot),
-           "Make a @code{Stencil} object that prints a black polygon with "
-           "corners at the points defined by @var{points} (list of coordinate "
-           "pairs) and roundness @var{blot}.")
+          2, 0, 0,
+          (SCM points, SCM blot),
+          "Make a @code{Stencil} object that prints a black polygon with"
+          " corners at the points defined by @var{points} (list of coordinate"
+          pairs) and roundness @var{blot}.")
 {
   SCM_ASSERT_TYPE (scm_ilength (points) > 0, points, SCM_ARG1, __FUNCTION__, "list of coordinate pairs");
   LY_ASSERT_TYPE (scm_is_number, blot, 2);
index c0ae536a02846e054145a0fc47ede441d1a93371..2384699ceafb5c0c9b243d6f41362a361c8c4832 100644 (file)
@@ -2823,7 +2823,7 @@ def conv (str):
     str = re.sub (r"\\bigger", r"\\larger", str)
     return str
 
-@rule ((2, 11, 64), "systemSeparatorMarkup -> system-separator-markup, \n\
+@rule ((2, 11, 64), "systemSeparatorMarkup -> system-separator-markup,\n\
 InnerStaffGroup -> StaffGroup, InnerChoirStaff -> ChoirStaff")
 def conv (str):
     str = re.sub (r'systemSeparatorMarkup', r'system-separator-markup', str)
index c0b298f36797fd9a775c0afb588c77ea9bff4a37..6909adcdf86ca16d9abad67387d95a98966bbedb 100644 (file)
@@ -452,7 +452,68 @@ class RelativeMusic (MusicWrapper):
         relative_pitches = prev_relative_pitches
 
 class TimeScaledMusic (MusicWrapper):
+    def __init__ (self):
+        MusicWrapper.__init__ (self)
+        self.numerator = 1
+        self.denominator = 1
+        self.display_number = "actual" # valid values "actual" | "both" | None
+        # Display the basic note length for the tuplet:
+        self.display_type = None       # value values "actual" | "both" | None
+        self.display_bracket = "bracket" # valid values "bracket" | "curved" | None
+        self.actual_type = None   # The actually played unit of the scaling
+        self.normal_type = None   # The basic unit of the scaling
+        self.display_numerator = None
+        self.display_denominator = None
+
     def print_ly (self, func):
+        if self.display_bracket == None:
+            func ("\\once \\override TupletBracket #'stencil = ##f")
+            func.newline ()
+        elif self.display_bracket == "curved":
+            warning (_ ("Tuplet brackets of curved shape are not correctly implemented"))
+            func ("\\once \\override TupletBracket #'stencil = #ly:slur::print")
+            func.newline ()
+
+        base_number_function = {None: "#f", 
+             "actual": "tuplet-number::calc-denominator-text", 
+             "both": "tuplet-number::calc-fraction-text"}.get (self.display_number, None)
+        # If we have non-standard numerator/denominator, use our custom function
+        if self.display_number == "actual" and self.display_denominator:
+            base_number_function = "(tuplet-number::non-default-tuplet-denominator-text %s)" % self.display_denominator
+        elif self.display_number == "both" and (self.display_denominator or self.display_numerator):
+            if self.display_numerator:
+                num = self.display_numerator
+            else:
+                num = "#f"
+            if self.display_denominator:
+                den = self.display_denominator
+            else:
+                den = "#f"
+            base_number_function = "(tuplet-number::non-default-tuplet-fraction-text %s %s)" % (den, num)
+
+
+        if self.display_type == "actual" and self.normal_type:
+            # Obtain the note duration in scheme-mode, i.e. \longa as \\longa
+            base_duration = self.normal_type.ly_expression (None, True)
+            func ("\\once \\override TupletNumber #'text = #(tuplet-number::append-note-wrapper %s \"%s\")" %
+                (base_number_function, base_duration))
+            func.newline ()
+        elif self.display_type == "both": # TODO: Implement this using actual_type and normal_type!
+            warning (_ ("Tuplet brackets displaying both note durations are not implemented, using default"))
+            if self.display_number == None:
+                func ("\\once \\override TupletNumber #'stencil = ##f")
+                func.newline ()
+            elif self.display_number == "both":
+                func ("\\once \\override TupletNumber #'text = #%s" % base_number_function)
+                func.newline ()
+        else:
+            if self.display_number == None:
+                func ("\\once \\override TupletNumber #'stencil = ##f")
+                func.newline ()
+            elif self.display_number == "both":
+                func ("\\once \\override TupletNumber #'text = #%s" % base_number_function)
+                func.newline ()
+
         func ('\\times %d/%d ' %
            (self.numerator, self.denominator))
         func.add_factor (Rational (self.numerator, self.denominator))
index 588a469f970ea537749a3c27bbc4942a9fe65616..0c062648129914461a0cfbaa7a640573bd81129f 100644 (file)
@@ -401,6 +401,14 @@ class Note (Measure_element):
            return 3
         else:
             return None
+    
+    def get_duration_info (self):
+        log = self.get_duration_log ()
+        if log != None:
+            dots = len (self.get_typed_children (Dot))
+            return (log, dots)
+        else:
+            return None
 
     def get_factor (self):
         return 1
@@ -528,6 +536,13 @@ class Musicxml_voice:
             return self._lyrics
 
 
+def graces_to_aftergraces (pending_graces):
+    for gr in pending_graces:
+        gr._when = gr._prev_when
+        gr._measure_position = gr._prev_measure_position
+        gr._after_grace = True
+
+
 class Part (Music_xml_node):
     def __init__ (self):
         Music_xml_node.__init__ (self)
@@ -540,7 +555,7 @@ class Part (Music_xml_node):
             n = n._parent
 
         return n.get_named_child ('part-list')
-        
+       
     def interpret (self):
        """Set durations and starting points."""
         """The starting point of the very first note is 0!"""
@@ -615,10 +630,7 @@ class Part (Music_xml_node):
                    if n.get_name() == 'backup':
                        dur = - dur
                         # reset all graces before the backup to after-graces:
-                        for n in pending_graces:
-                            n._when = n._prev_when
-                            n._measure_position = n._prev_measure_position
-                            n._after_grace = True
+                        graces_to_aftergraces (pending_graces)
                         pending_graces = []
                    if n.get_maybe_exist_typed_child (Grace):
                        dur = Rational (0)
@@ -630,7 +642,7 @@ class Part (Music_xml_node):
 
                         rest._is_whole_measure = True
 
-                if (dur > Rational (0) 
+                if (dur > Rational (0)
                     and n.get_maybe_exist_typed_child (Chord)):
                     now = last_moment
                     measure_position = last_measure_position
@@ -676,10 +688,7 @@ class Part (Music_xml_node):
                         n.instrument_name = part_list.get_instrument (instrument.id)
 
             # reset all graces at the end of the measure to after-graces:
-            for n in pending_graces:
-                n._when = n._prev_when
-                n._measure_position = n._prev_measure_position
-                n._after_grace = True
+            graces_to_aftergraces (pending_graces)
             pending_graces = []
             # Incomplete first measures are not padded, but registered as partial
             if is_first_measure:
@@ -854,6 +863,16 @@ class Time_modification(Music_xml_node):
        a = self.get_maybe_exist_named_child ('normal-notes')
        return (int(a.get_text ()), int (b.get_text ()))
 
+    def get_normal_type (self):
+        tuplet_type = self.get_maybe_exist_named_child ('normal-type')
+        if tuplet_type:
+            dots = self.get_named_children ('normal-dot')
+            log = musicxml_duration_to_log (tuplet_type.get_text ().strip ())
+            return (log , len (dots))
+        else:
+            return None
+
+
 class Accidental (Music_xml_node):
     def __init__ (self):
        Music_xml_node.__init__ (self)
@@ -876,7 +895,40 @@ class Wedge (Music_xml_spanner):
     pass
 
 class Tuplet (Music_xml_spanner):
-    pass
+    def duration_info_from_tuplet_note (self, tuplet_note):
+        tuplet_type = tuplet_note.get_maybe_exist_named_child ('tuplet-type')
+        if tuplet_type:
+            dots = tuplet_note.get_named_children ('tuplet-dot')
+            log = musicxml_duration_to_log (tuplet_type.get_text ().strip ())
+            return (log, len (dots))
+        else:
+            return None
+
+    # Return tuplet note type as (log, dots)
+    def get_normal_type (self):
+        tuplet = self.get_maybe_exist_named_child ('tuplet-normal')
+        if tuplet:
+            return self.duration_info_from_tuplet_note (tuplet)
+        else:
+            return None
+
+    def get_actual_type (self):
+        tuplet = self.get_maybe_exist_named_child ('tuplet-actual')
+        if tuplet:
+            return self.duration_info_from_tuplet_note (tuplet)
+        else:
+            return None
+
+    def get_tuplet_note_count (self, tuplet_note):
+        if tuplet_note:
+            tuplet_nr = tuplet_note.get_maybe_exist_named_child ('tuplet-number')
+            if tuplet_nr: 
+                return int (tuplet_nr.get_text ())
+        return None
+    def get_normal_nr (self):
+        return self.get_tuplet_note_count (self.get_maybe_exist_named_child ('tuplet-normal'))
+    def get_actual_nr (self):
+        return self.get_tuplet_note_count (self.get_maybe_exist_named_child ('tuplet-actual'))
 
 class Bracket (Music_xml_spanner):
     pass
index b5ffda6574faa9f1fc4ed998284a1b62448b7e08..7185bd20d30e1aa5633761efcbeef44db1363430 100644 (file)
@@ -124,7 +124,7 @@ note)."
 (ly:add-interface
  'percent-repeat-interface
  "Beat, Double and single measure repeats."
- '(slope thickness))
+ '(dot-negative-kern slash-negative-kern slope thickness))
 
 (ly:add-interface
  'piano-pedal-interface
index ed1837c8c6329cce8ab341579435b3dd5eec873e..619adf31067cd52fc07bc2ba2c9ed8b6d795169f 100644 (file)
@@ -1,4 +1,4 @@
-;;;; grob-property-description.scm -- part of generated backend documentation
+;;;; define-grob-properties.scm -- part of generated backend documentation
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
@@ -168,6 +168,9 @@ other object.  Otherwise, it determines whether the object is placed
 be used: @code{#UP}=@code{1}, @code{#DOWN}=@code{-1},
 @code{#LEFT}=@code{-1}, @code{#RIGHT}=@code{1}, @code{#CENTER}=@code{0}.")
      (dot-count ,integer? "The number of dots.")
+     (dot-negative-kern ,number? "The space to remove between a dot
+a and slash in percent repeat glyphs.  Larger values bring the two
+elements closer together.")
      (dot-placement-list ,list? "List 
 consisting of @code{(@var{description} @var{string-number} 
 @var{fret-number} @var{finger-number})} 
@@ -566,6 +569,9 @@ is placed vertically.")
 @code{direction-source} with this to get the direction of this
 object.")
      (size ,number? "Size of object, relative to standard size.")
+     (slash-negative-kern ,number? "The space to remove between
+slashes in percent repeat glyphs.  Larger values bring the two
+elements closer together.")
      (slope ,number? "The slope of this object.")
      (slur-padding ,number? "Extra distance between slur and script.")
      (space-alist ,list? "A table that specifies distances between
index aa3b6ee197082361a0576ef3e67930849c2151a7..0c1df0a25714540f03ea860347b8b274114c8c4d 100644 (file)
        (X-offset . ,(grob::calc-property-by-copy 'X-offset)) 
        (Y-offset . ,(grob::calc-property-by-copy 'Y-offset)) 
        (meta . ((class . Item)
-                (interfaces . (text-interface
+                (interfaces . (balloon-interface
+                               text-interface
                                font-interface))))))
     (BarLine
      . (
                        ,(ly:make-simple-closure
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
 
-       (self-alignment-X . 1)
+       (self-alignment-X . ,RIGHT)
 
        ;; want the bar number before the clef at line start. 
        (break-align-symbols . (left-edge staff-bar))
                        (first-note . (minimum-fixed-space . 0.0))
                        (right-edge . (extra-space . 0.1))))
        (meta . ((class . Item)
-                (interfaces
-                 . (custos-interface
-                    staff-symbol-referencer-interface
-                    font-interface
-                    break-aligned-interface))))))
+                (interfaces  . (custos-interface
+                                staff-symbol-referencer-interface
+                                font-interface
+                                break-aligned-interface))))))
 
     (DotColumn
      . (
        (stencil . ,ly:percent-repeat-item-interface::double-percent)
        (non-musical . #t)
        (slope . 1.0)
+       (dot-negative-kern . 0.75)
+       (slash-negative-kern . 1.6)
        (font-encoding . fetaMusic)
        (width . 2.0)
        (thickness . 0.48)
        (shortest-duration-space . 1.6)
        (meta . ((class . Spanner)
                 (interfaces . (grace-spacing-interface
-                               
                                spacing-options-interface
                                spanner-interface))))))
+
     (GridPoint
      . (
        (X-extent . (0 . 0))
        (meta . ((class . Spanner)
                 (interfaces . (system-start-text-interface
                                side-position-interface
+                               self-alignment-interface
                                font-interface))))))
 
     (InstrumentSwitch
        (extra-spacing-width . (+inf.0 . -inf.0))
        (meta . ((class . Item)
                 (interfaces . (side-position-interface
+                               self-alignment-interface
                                text-interface
                                font-interface))))))
 
        (meta . ((class . Item)
                 (interfaces . (key-cancellation-interface
                                key-signature-interface
+                               staff-symbol-referencer-interface
                                font-interface
                                break-aligned-interface))))))
 
        (non-musical . #t)
        (meta . ((class . Item)
                 (interfaces . (key-signature-interface
+                               staff-symbol-referencer-interface
                                font-interface
                                break-aligned-interface))))))
     
        (stencil . ,ly:multi-measure-rest::percent)
        (slope . 1.0)
        (thickness . 0.48)
+       (dot-negative-kern . 0.75)
        (font-encoding . fetaMusic)
        (meta . ((class . Spanner)
                 (interfaces . (multi-measure-rest-interface
                                font-interface
-                               percent-repeat-interface
-                               ))))))
+                               percent-repeat-interface))))))
 
     (PercentRepeatCounter
      . (
        (horizontal-skylines . ,ly:separation-item::calc-skylines)
        (stencil . ,ly:separation-item::print)
        (meta . ((class . Item)
-                (interfaces . (
-                               separation-item-interface))))))
+                (interfaces . (separation-item-interface))))))
 
     (Slur
-     . ((details . ,default-slur-details)
+     . (
+       (details . ,default-slur-details)
        (control-points . ,ly:slur::calc-control-points)
        (direction . ,ly:slur::calc-direction)
        (springs-and-rods . ,ly:spanner::set-spacing-rods)
        
        (base-shortest-duration . ,(ly:make-moment 3 16))
        (meta . ((class . Spanner)
-                (interfaces . (
-                               spacing-options-interface                               
+                (interfaces . (spacing-options-interface
                                spacing-spanner-interface))))))
 
     (SpanBar
        (stem-attachment . (0.0 . 1.35))
        (font-series . bold)
        (meta . ((class . Item)
-                (interfaces
-                 . (rhythmic-head-interface
-                    font-interface rhythmic-grob-interface
-                    note-head-interface
-                    staff-symbol-referencer-interface
-                    text-interface))))))
+                (interfaces  . (rhythmic-head-interface
+                                font-interface
+                                rhythmic-grob-interface
+                                note-head-interface
+                                staff-symbol-referencer-interface
+                                text-interface))))))
 
     (TextScript
      . (
                                   ))
                          (right . ((Y . 0)
                                    (padding . 0.25)
-                                  ))
+                                   ))
                          ))
        (stencil . ,ly:line-spanner::print)
 
        (meta . ((class . Spanner)
                 (interfaces . (line-spanner-interface
+                               line-interface
                                side-position-interface
                                font-interface))))))
 
index 8d7bb3bc25c001b99634efb1e47298ebd6843bf3..dcaf5dcee19e61cea710a611e6e68fe617bb538f 100644 (file)
@@ -120,9 +120,9 @@ node."
            engraver-list))
        "."
 
-       "\n\nStandard settings: \n\n"
+       "\n\nStandard settings:\n\n"
        (grob-alist->texi description)
-       "\n\nThis object supports the following interface(s): \n"
+       "\n\nThis object supports the following interface(s):\n"
        (human-listify ifacedoc)
        "."))))
 
index eefc1c26ee9627316e43e11e09101d9e4ceebbe2..65ee3fec13c6c751b24e03785130eeb77822ebd7 100644 (file)
@@ -34,7 +34,7 @@
 (define-method (display (leaf <Font-tree-leaf>) port)
   (map (lambda (x) (display x port))
        (list
-       "#<Font-size-family: \n"
+       "#<Font-size-family:\n"
        (slot-ref leaf 'default-size) 
        (slot-ref leaf 'size-vector)
        "#>"
@@ -47,7 +47,7 @@
      (display x port))
 
    (list
-    "Font_node { \nqual: "
+    "Font_node {\nqual: "
     (font-qualifier node)
     "(def: "
     (font-default node)
@@ -59,7 +59,7 @@
      (display "=" port)
      (display (cdr x) port))
    (hash-table->alist (font-children node)))
-  (display "} } \n"))
+  (display "} }\n"))
 
 
 (define default-qualifier-order
index c7214da3c597d25c5dcf49210a1f90efe829ab1c..7486d5f64c32d8e10d747cef728f43f4d4562430 100644 (file)
     "set-ps-scale-to-lily-scale "
     "\n"))
   (ly:outputter-dump-stencil outputter page)
-  (ly:outputter-dump-string outputter "stroke grestore \nshowpage\n"))
+  (ly:outputter-dump-string outputter "stroke grestore\nshowpage\n"))
 
 (define (supplies-or-needs paper load-fonts?)
   (define (extract-names font)
 
       (if (not embed)
          (begin
-           (set! embed "% failed \n")
+           (set! embed "% failed\n")
            (ly:warning (_ "cannot extract file matching ~a from ~a") name filename)))
       embed))
 
 
     (display header port)
     (write-preamble paper load-fonts port)
-    (display "gsave set-ps-scale-to-lily-scale \n" port)
+    (display "gsave set-ps-scale-to-lily-scale\n" port)
     (ly:outputter-dump-stencil outputter dump-me)
     (display "stroke grestore\n%%Trailer\n%%EOF\n" port)
     (ly:outputter-close outputter)))
index 584dd6b3e17943623010c56e969c406ca94d3674..ee798233611a6a65361f1fae414962848a9f3cfa 100644 (file)
                  ((PropertySet) (list 'value (car args)))
                  ((PropertyUnset) '())
                  ((OverrideProperty) (list 'grob-value (car args)
-                                           'grob-property-path (cdr args)
+                                           'grob-property-path (if (list? (cadr args))
+                                                                   (cadr args)
+                                                                   (cdr args))
                                            'pop-first #t))
                  ((RevertProperty)
                   (if (list? (car args))
index 0b636377cceb580f793aa39d68e4141bf12a6963..39bedc18047c8b6f1e37dfeb7460727217bd216f 100644 (file)
         (format graph-out "~a ~a\n" time mem)
         (if stack
             (begin
-              (format stacks-out "~5a t = ~5a - delta-mem: ~15a - ~a \n" i
+              (format stacks-out "~5a t = ~5a - delta-mem: ~15a - ~a\n" i
                       time
                       (- mem last-mem) proc)
               (do
index 9274279a2cf732f61d2db234c88b5d9c586e7bfe..da3c25a211ad7127a1baed82e3f8bcc4cec44648 100644 (file)
              (list r g b)))
 
 ;; restore color from stack
-(define (resetcolor) "grestore \n")
+(define (resetcolor) "grestore\n")
 
 ;; rotation around given point
 (define (setrotation ang x y)
index 749baed3c84f3cc0914d591c9cd2ca4ad2dc3f0f..f272b8f299db6335c9adc7ea713e85e0f4b28c76 100644 (file)
@@ -216,7 +216,7 @@ def dump_slyrics (outf):
             m = k
         for i in range (len(slyrics[voice_idx_dict[k]])):
             l= alphabet(i)
-            outf.write ("\nwords%sV%s = \lyricmode {" % (m, l))
+            outf.write ("\nwords%sV%s = \\lyricmode {" % (m, l))
             outf.write ("\n" + slyrics [voice_idx_dict[k]][i])
             outf.write ("\n}")
 
@@ -254,7 +254,7 @@ def try_parse_q(a):
         denominator=array2[0]
         perminute=array2[1]
         duration = str (int (denominator) / int (numerator))
-        midi_specs = ' '.join(["    \n\t\t\context {\n\t\t \Score tempoWholesPerMinute = #(ly:make-moment ", perminute, " ", duration, ")\n\t\t }\n"])
+        midi_specs = ' '.join(["\n\t\t\\context {\n\t\t \\Score tempoWholesPerMinute = #(ly:make-moment ", perminute, " ", duration, ")\n\t\t }\n"])
     else:
         sys.stderr.write("abc2ly: Warning, unable to parse Q specification: %s\n" % a)
 
@@ -282,7 +282,7 @@ def dump_score (outf):
 
         l = ord( 'A' )
         for lyrics in slyrics [voice_idx_dict[k]]:
-            outf.write ("\n\t\\addlyrics { \n")
+            outf.write ("\n\t\\addlyrics {\n")
             if re.match('[1-9]',k):
                 m = alphabet (int (k))
             else:
@@ -650,12 +650,12 @@ def try_parse_header_line (ln, state):
             if a == 'C':
                 if not state.common_time:
                     state.common_time = 1
-                    voices_append (" \\override Staff.TimeSignature #\'style = #'C\n")
+                    voices_append (" \\override Staff.TimeSignature #'style = #'C\n")
                 a = '4/4'
             if a == 'C|':
                 if not state.common_time:
                     state.common_time = 1
-                    voices_append ("\\override Staff.TimeSignature #\'style = #'C\n")
+                    voices_append ("\\override Staff.TimeSignature #'style = #'C\n")
                 a = '2/2'
             if not length_specified:
                 set_default_len_from_time_sig (a)
@@ -779,7 +779,7 @@ def duration_to_lilypond_duration  (multiply_tup, defaultlen, dots):
             base = '\\breve'
             dots = 1
         if (multiply_tup[0] / multiply_tup[1]) == 4:
-            base = '\longa'
+            base = '\\longa'
     return '%s%s' % ( base, '.'* dots)
 
 class Parser_state:
index 39a6fba4abf08c2cc1a68c05aa95769539df7ec3..c23075055dd0f8a1a8949c75bd1f7d9f24ad51ae 100644 (file)
@@ -508,7 +508,7 @@ class Frame:
         if left[0]:
             str = str + rational_to_lily_skip (left)
 
-        str = str + '  | \n'
+        str = str + '  |\n'
         return str
         
 def encodeint (i):
@@ -615,7 +615,7 @@ class Staff:
                     fr = m.frames[x]
                 except IndexError:
                     sys.stderr.write ("Skipping nonexistent frame %d\n" % x)
-                    laystr = laystr + "%% non existent frame %d (skipped) \n" % x
+                    laystr = laystr + "%% non existent frame %d (skipped)\n" % x
                 if fr:
                     first_frame = fr
                     if gap <> (0,1):
index d847be27e9c0475e1063e1755e0b1166b686b930..194d51fa491eb6c696a2e71eee1fccc6da689b48 100644 (file)
@@ -42,7 +42,7 @@
     (define-public (_ x) x))
 
 (define (show-version port)
-  (format port "~a (GNU LilyPond) ~a \n" PROGRAM-NAME TOPLEVEL-VERSION))
+  (format port "~a (GNU LilyPond) ~a\n" PROGRAM-NAME TOPLEVEL-VERSION))
 
 (define (show-help port)
   (format port (_ "Usage: lilypond-invoke-editor [textedit://]FILE:LINE:CHAR:COLUMN
index e2a54008e321eef92b447d57d51f77a525eb710b..326a6d62eb12cc6a8ca87464bc7bc4d87c5b31a3 100644 (file)
@@ -44,6 +44,7 @@ def error_message (str):
 
 needed_additional_definitions = []
 additional_definitions = {
+
   "snappizzicato": """#(define-markup-command (snappizzicato layout props) ()
   (interpret-markup layout props
     (markup #:stencil
@@ -54,6 +55,7 @@ additional_definitions = {
             (list 'draw-line 0.1 0 0.1 0 1)
             '(-0.1 . 0.1) '(0.1 . 1)))
         0.7 X))))""",
+
   "eyeglasses": """eyeglassesps = #"0.15 setlinewidth
       -0.9 0 translate
       1.1 1.1 scale
@@ -72,7 +74,33 @@ additional_definitions = {
       3.30 2.00 lineto
       3.42 2.26 3.80 2.40 3.65 1.70 curveto
       stroke"
-eyeglasses =  \markup { \with-dimensions #'(0 . 4.4) #'(0 . 2.5) \postscript #eyeglassesps }"""
+eyeglasses =  \markup { \with-dimensions #'(0 . 4.4) #'(0 . 2.5) \postscript #eyeglassesps }""",
+
+  "tuplet-note-wrapper": """      % a formatter function, which is simply a wrapper around an existing 
+      % tuplet formatter function. It takes the value returned by the given
+      % function and appends a note of given length. 
+  #(define-public ((tuplet-number::append-note-wrapper function note) grob)
+    (let* ((txt (if function (function grob) #f)))
+      (if txt 
+        (markup txt #:fontsize -5 #:note note UP)
+        (markup #:fontsize -5 #:note note UP)
+      )
+    )
+  )""",
+
+  "tuplet-non-default-denominator": """#(define ((tuplet-number::non-default-tuplet-denominator-text denominator) grob)
+  (number->string (if denominator 
+                      denominator 
+                      (ly:event-property (event-cause grob) 'denominator))))
+""",
+
+  "tuplet-non-default-fraction": """#(define ((tuplet-number::non-default-tuplet-fraction-text denominator numerator) grob)
+    (let* ((ev (event-cause grob))
+           (den (if denominator denominator (ly:event-property ev 'denominator)))
+           (num (if numerator numerator (ly:event-property ev 'numerator))))
+       (format "~a:~a" den num)))
+"""
+
 }
 
 def round_to_two_digits (val):
@@ -446,24 +474,27 @@ def extract_score_structure (part_list, staffinfo):
 
 
 def musicxml_duration_to_lily (mxl_note):
-    d = musicexp.Duration ()
     # if the note has no Type child, then that method returns None. In that case,
     # use the <duration> tag instead. If that doesn't exist, either -> Error
-    d.duration_log = mxl_note.get_duration_log ()
-    if d.duration_log == None:
-        if mxl_note._duration > 0:
-            return rational_to_lily_duration (mxl_note._duration)
-        else:
-            mxl_note.message (_ ("Encountered note at %s without type and duration (=%s)") % (mxl_note.start, mxl_note._duration) )
-            return None
-    else:
-        d.dots = len (mxl_note.get_typed_children (musicxml.Dot))
+    dur = mxl_note.get_duration_info ()
+    if dur:
+        d = musicexp.Duration ()
+        d.duration_log = dur[0]
+        d.dots = dur[1]
         # Grace notes by specification have duration 0, so no time modification 
         # factor is possible. It even messes up the output with *0/1
         if not mxl_note.get_maybe_exist_typed_child (musicxml.Grace):
             d.factor = mxl_note._duration / d.get_length ()
         return d
 
+    else:
+        if mxl_note._duration > 0:
+            return rational_to_lily_duration (mxl_note._duration)
+        else:
+            mxl_note.message (_ ("Encountered note at %s without type and duration (=%s)") % (mxl_note.start, mxl_note._duration) )
+            return None
+
+
 def rational_to_lily_duration (rational_len):
     d = musicexp.Duration ()
 
@@ -593,6 +624,68 @@ def group_repeats (music_list):
     return music_list
 
 
+# Extract the settings for tuplets from the <notations><tuplet> and the 
+# <time-modification> elements of the note:
+def musicxml_tuplet_to_lily (tuplet_elt, time_modification):
+    tsm = musicexp.TimeScaledMusic ()
+    fraction = (1,1)
+    if time_modification:
+        fraction = time_modification.get_fraction ()
+    tsm.numerator = fraction[0]
+    tsm.denominator  = fraction[1]
+
+
+    normal_type = tuplet_elt.get_normal_type ()
+    if not normal_type and time_modification:
+        normal_type = time_modification.get_normal_type ()
+    if not normal_type and time_modification:
+        note = time_modification.get_parent ()
+        if note:
+            normal_type = note.get_duration_info ()
+    if normal_type:
+        normal_note = musicexp.Duration ()
+        (normal_note.duration_log, normal_note.dots) = normal_type
+        tsm.normal_type = normal_note
+
+    actual_type = tuplet_elt.get_actual_type ()
+    if actual_type:
+        actual_note = musicexp.Duration ()
+        (actual_note.duration_log, actual_note.dots) = normal_type
+        tsm.actual_type = actual_note
+
+    # Obtain non-default nrs of notes from the tuplet object!
+    tsm.display_numerator = tuplet_elt.get_normal_nr ()
+    tsm.display_denominator = tuplet_elt.get_actual_nr ()
+
+    print ("num: %s, den: %s" % (tsm.display_numerator, tsm.display_denominator))
+
+
+    if hasattr (tuplet_elt, 'bracket') and tuplet_elt.bracket == "no":
+        tsm.display_bracket = None
+    elif hasattr (tuplet_elt, 'line-shape') and getattr (tuplet_elt, 'line-shape') == "curved":
+        tsm.display_bracket = "curved"
+    else:
+        tsm.display_bracket = "bracket"
+
+    display_values = {"none": None, "actual": "actual", "both": "both"}
+    if hasattr (tuplet_elt, "show-number"):
+        tsm.display_number = display_values.get (getattr (tuplet_elt, "show-number"), "actual")
+    if tsm.display_number == "actual" and tsm.display_denominator:
+        print "Add denom-function\n";
+        needed_additional_definitions.append ("tuplet-non-default-denominator")
+    elif tsm.display_number == "both" and (tsm.display_numerator or tsm.display_denominator):
+        print "Add fraction-function\n";
+        needed_additional_definitions.append ("tuplet-non-default-fraction")
+    else:
+        print "No display-function, display_number=%s, den=%s\n" % (tsm.display_number, tsm.display_denominator);
+
+    if hasattr (tuplet_elt, "show-type"):
+        if getattr (tuplet_elt, "show-type") == "actual":
+            needed_additional_definitions.append ("tuplet-note-wrapper")
+        tsm.display_type = display_values.get (getattr (tuplet_elt, "show-type"), None)
+
+    return tsm
+
 
 def group_tuplets (music_list, events):
 
@@ -606,25 +699,28 @@ def group_tuplets (music_list, events):
     brackets = {}
 
     j = 0
-    for (ev_chord, tuplet_elt, fraction) in events:
+    for (ev_chord, tuplet_elt, time_modification) in events:
         while (j < len (music_list)):
             if music_list[j] == ev_chord:
                 break
             j += 1
-        nr = tuplet_elt.number
+        nr = 0
+        if hasattr (tuplet_elt, 'number'):
+            nr = getattr (tuplet_elt, 'number')
         if tuplet_elt.type == 'start':
-            tuplet_info = [j, None, fraction]
+            tuplet_object = musicxml_tuplet_to_lily (tuplet_elt, time_modification)
+            tuplet_info = [j, None, tuplet_object]
             indices.append (tuplet_info)
             brackets[nr] = tuplet_info
         elif tuplet_elt.type == 'stop':
             bracket_info = brackets.get (nr, None)
             if bracket_info:
-                bracket_info[1] = j
+                bracket_info[1] = j # Set the ending position to j
                 del brackets[nr]
 
     new_list = []
     last = 0
-    for (i1, i2, frac) in indices:
+    for (i1, i2, tsm) in indices:
         if i1 > i2:
             continue
 
@@ -633,12 +729,8 @@ def group_tuplets (music_list, events):
         last = i2 + 1
         seq.elements = music_list[i1:last]
 
-        tsm = musicexp.TimeScaledMusic ()
         tsm.element = seq
 
-        tsm.numerator = frac[0]
-        tsm.denominator  = frac[1]
-
         new_list.append (tsm)
 
     new_list.extend (music_list[last:])
@@ -1996,12 +2088,8 @@ def musicxml_voice_to_lily_voice (voice):
         #    accidental-mark | other-notation
         for notations in notations_children:
             for tuplet_event in notations.get_tuplets():
-                mod = n.get_maybe_exist_typed_child (musicxml.Time_modification)
-                frac = (1,1)
-                if mod:
-                    frac = mod.get_fraction ()
-
-                tuplet_events.append ((ev_chord, tuplet_event, frac))
+                time_mod = n.get_maybe_exist_typed_child (musicxml.Time_modification)
+                tuplet_events.append ((ev_chord, tuplet_event, time_mod))
 
             # First, close all open slurs, only then start any new slur
             # TODO: Record the number of the open slur to dtermine the correct