]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/lilypond
authorJan Nieuwenhuizen <janneke@gnu.org>
Tue, 5 Feb 2008 07:44:41 +0000 (08:44 +0100)
committerJan Nieuwenhuizen <janneke@gnu.org>
Tue, 5 Feb 2008 07:44:41 +0000 (08:44 +0100)
166 files changed:
Documentation/user/editorial.itely
Documentation/user/fundamental.itely
Documentation/user/install.itely
Documentation/user/music-glossary.tely
Documentation/user/notation-appendices.itely
Documentation/user/pitches.itely
Documentation/user/policy.txt
Documentation/user/rhythms.itely
Documentation/user/spacing.itely
Documentation/user/templates.itely
Documentation/user/tweaks.itely
Documentation/user/writing-sections.txt [new file with mode: 0644]
Documentation/user/writing-texinfo.txt
input/lsr/adding-a-figured-bass-above-or-below-the-notes.ly
input/lsr/adding-ambiti-per-voice.ly
input/lsr/adding-an-extra-staff.ly
input/lsr/adding-and-extra-staff-at-a-line-break.ly
input/lsr/adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
input/lsr/adding-drum-parts.ly
input/lsr/adding-fingerings-to-tablatures.ly
input/lsr/adding-parentheses-around-an-expressive-mark.ly
input/lsr/adding-the-current-date-to-a-score.ly
input/lsr/adjusting-lyrics-vertical-spacing.ly
input/lsr/aligning-and-centering-instrument-names.ly
input/lsr/aligning-lyrics.ly
input/lsr/alignment-vertical-spacing.ly
input/lsr/altering-the-number-of-stems-in-a-beam.ly
input/lsr/ambiti-multiple-voices.ly
input/lsr/ancient-fonts.ly
input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly
input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly
input/lsr/ancient-time-signatures.ly
input/lsr/applying-noteheads-styles-depending-on-the-step-of-the-scale.ly
input/lsr/automatic-beam-subdivisions.ly
input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
input/lsr/beam-across-line-breaks.ly
input/lsr/blanking-staff-lines-using-the--whiteout-command.ly
input/lsr/breathing-sign.ly
input/lsr/broken-crescendo-hairpin.ly
input/lsr/caesura-railtracks-with-fermata.ly
input/lsr/center-text-below-hairpin-dynamics.ly
input/lsr/changing--flageolet-mark-size.ly
input/lsr/changing-an-individual-notes-size-in-a-chord.ly
input/lsr/changing-properties-for-individual-grobs.ly
input/lsr/changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
input/lsr/changing-the-chord-names-to-german-or-semi-german-notation.ly
input/lsr/changing-the-default-text-font-family.ly
input/lsr/changing-the-number-of-lines-in-a-staff.ly
input/lsr/changing-the-staff-size.ly
input/lsr/changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
input/lsr/chant-or-psalms-notation.ly
input/lsr/chord-name-exceptions.ly
input/lsr/clefs-commonly-tweaked-properties.ly
input/lsr/clip-systems.ly
input/lsr/clusters.ly
input/lsr/coloring-objects.ly
input/lsr/combining-dynamics-with-markup-texts.ly
input/lsr/combining-two-parts-on-the-same-staff.ly
input/lsr/compound-time-signatures.ly
input/lsr/conducting-signs,-measure-grouping-signs.ly
input/lsr/contemporary-glissando.ly
input/lsr/contexts-and-engravers.snippet-list
input/lsr/controlling-tuplet-bracket-visibility.ly
input/lsr/creating-a-sequence-of-notes-on-various-pitches.ly
input/lsr/creating-blank-staves.ly
input/lsr/creating-text-spanners.ly
input/lsr/custodes.ly
input/lsr/demo-midiinstruments.ly
input/lsr/demonstrating-all-headers.ly
input/lsr/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
input/lsr/drawing-boxes-around-grobs.ly
input/lsr/drawing-circles-around-various-objects.ly
input/lsr/editorial-and-educational-use.snippet-list
input/lsr/engravers-one-by-one.ly
input/lsr/expressive-marks.snippet-list
input/lsr/forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
input/lsr/formatting-lyrics-syllables.ly
input/lsr/generating-random-notes.ly
input/lsr/heavily-customized-polymetric-time-signatures.ly
input/lsr/how-to-put-ties-between-syllables-in-lyrics.ly
input/lsr/inserting-score-fragments-above-the-staff,-as-markups.ly
input/lsr/jazz-combo-template.ly
input/lsr/letter-tablature-formatting.ly
input/lsr/line-arrows.ly
input/lsr/makam.ly
input/lsr/making-an-object-invisible-with-the-transparent-property.ly
input/lsr/manually-controlling-beam-positions.ly
input/lsr/markup-lines.ly
input/lsr/move-specific-text.ly
input/lsr/non-traditional-key-signatures.ly
input/lsr/ottava-text.ly
input/lsr/outputting-the-version-number.ly
input/lsr/page-label.ly
input/lsr/piano-template-simple.ly
input/lsr/piano-template-with-centered-dynamics.ly
input/lsr/piano-template-with-centered-lyrics.ly
input/lsr/piano-template-with-melody-and-lyrics.ly
input/lsr/pitches.snippet-list
input/lsr/positioning-segno-and-coda-with-line-break.ly
input/lsr/preventing-extra-naturals-from-being-automatically-added.ly
input/lsr/preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
input/lsr/proportional-strict-notespacing.ly
input/lsr/quoting-another-voice-with-transposition.ly
input/lsr/quoting-another-voice.ly
input/lsr/rest-styles.ly
input/lsr/rhythmic-slashes.ly
input/lsr/rhythms.snippet-list
input/lsr/score-for-diatonic-accordion.ly
input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly
input/lsr/single-staff-template-with-notes-and-chords.ly
input/lsr/single-staff-template-with-notes-and-lyrics.ly
input/lsr/single-staff-template-with-only-notes.ly
input/lsr/skips-in-lyric-mode-2.ly
input/lsr/skips-in-lyric-mode.ly
input/lsr/spacing.snippet-list
input/lsr/staff-notation.snippet-list
input/lsr/string-quartet-template-simple.ly
input/lsr/string-quartet-template-with-separate-parts.ly
input/lsr/table-of-contents.ly
input/lsr/template.snippet-list
input/lsr/text.snippet-list
input/lsr/three-sided-box.ly
input/lsr/time-signature-in-parentheses.ly
input/lsr/transcription-of-ancient-music-with-incipit.ly
input/lsr/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
input/lsr/using-the--tweak-command-to-tweak-individual-grobs.ly
input/lsr/utf-8.ly
input/lsr/vertically-aligning-ossias-and-lyrics.ly
input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly
input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
input/lsr/vocal-ensemble-template.ly
input/lsr/vocal-music.snippet-list
input/lsr/volta-multi-staff.ly
input/regression/auto-change.ly
input/regression/bar-number.ly
input/regression/beam-extreme.ly
input/regression/beam-french.ly
input/regression/beam-position.ly
input/regression/collision-dots-move.ly
input/regression/dots.ly
input/regression/key-clefs.ly
input/regression/landscape.ly
input/regression/lyric-combine-new.ly
input/regression/lyric-combine-switch-voice.ly
input/regression/lyric-combine.ly
input/regression/lyric-hyphen.ly
input/regression/midi-drums.ly
input/regression/musicxml/02a-Articulations-Finale.xml [deleted file]
input/regression/musicxml/02a-Notations-MusicXML.xml [new file with mode: 0644]
input/regression/musicxml/02c-Articulations-Noteedit.xml [deleted file]
input/regression/musicxml/02d-Articulations-TwoStaves-Noteedit.xml [deleted file]
input/regression/musicxml/02e-Articulations-JScore.xml [deleted file]
input/regression/musicxml/02f-Articulations-MusicXML.xml [deleted file]
input/regression/musicxml/02g-ArticulationsNoAttributes-MusicXML.xml [deleted file]
input/regression/musicxml/04a-Spanners-Finale.xml
input/regression/quote-during.ly
input/regression/quote.ly
input/regression/rest-collision-beam-quantized.ly
input/regression/slur-rest.ly
python/musicexp.py
python/musicxml.py
scm/define-context-properties.scm
scm/define-grobs.scm
scm/part-combiner.scm
scripts/musicxml2ly.py
stepmake/stepmake/metafont-rules.make

index 11afc1a0f749dc0d61dcff10332c22b02ed72560..fde5388b7c816dad83a06a763d1422b24adf4d15 100644 (file)
@@ -170,9 +170,6 @@ Snippets: @lsrdir{Editorial,Editorial-annotations}.
 
 Internals Reference: @internalsref{Fingering}.
 
-Examples: @c @lsr{expressive,fingering-chords.ly}
-
-
 
 @node Hidden notes
 @unnumberedsubsubsec Hidden notes
@@ -195,10 +192,21 @@ e4 f4
 g4 a
 @end lilypond
 
+@seealso
+
+Snippets: @lsrdir{Editorial,Editorial-annotations}.
+
 
 @node Coloring objects
 @unnumberedsubsubsec Coloring objects
 
+@cindex colored objects
+@cindex colors
+@cindex coloring objects
+@cindex colored notes
+@cindex coloring notes
+@cindex notes, colored
+
 Individual objects may be assigned colors.  You may use the color
 names listed in the @ref{List of colors}.
 
@@ -211,6 +219,8 @@ d
 e
 @end lilypond
 
+@cindex x11-color
+
 The full range of colors defined for X11 can be accessed by using
 the Scheme function x11-color.  The function takes one argument
 that can be a symbol
@@ -272,8 +282,10 @@ you can get exact RGB colors by specifying
 
 @seealso
 
-Appendix: @ref{List of colors}.
+Notation Reference: @ref{List of colors}, @ref{Objects connected to
+the input}.
 
+Snippets: @lsrdir{Editorial,Editorial-annotations}.
 
 @refbugs
 Not all x11 colors are distinguishable in a web browser.  For web
@@ -293,6 +305,7 @@ for details.
 @cindex ghost notes
 @cindex notes, ghost
 @cindex notes, parenthesized
+@cindex parentheses
 
 Objects may be parenthesized by prefixing @code{\parenthesize} to
 the music event,
@@ -312,13 +325,19 @@ must be enclosed with @code{<>} as if it is a chord.
 < \parenthesize NOTE>
 @end example
 
+@seealso
+
+Snippets: @lsrdir{Editorial,Editorial-annotations}.
+
 
 @node Stems
 @unnumberedsubsubsec Stems
 
-Whenever a note is found, a @internalsref{Stem} object is created
-automatically.  For whole notes and rests, they are also created
-but made invisible.
+@cindex stem
+
+Whenever a note is found, a @code{Stem} object is created
+automatically.  For whole notes and rests, they are also created but
+made invisible.
 
 @refcommands
 
@@ -332,6 +351,11 @@ but made invisible.
 
 @commonprop
 
+@cindex stem, direction
+@cindex stem, up
+@cindex stem, down
+@cindex stem, neutral
+
 To change the direction of stems on the center line of the staff, use
 
 @lilypond[quote,ragged-right,fragment,relative=2,verbatim]
@@ -342,6 +366,10 @@ a4 b c b
 a4 b c b
 @end lilypond
 
+@seealso
+
+Snippets: @lsrdir{Editorial,Editorial-annotations}.
+
 
 @node Outside the staff
 @subsection Outside the staff
@@ -372,16 +400,18 @@ The following example demonstrates its use.
 @end lilypond
 
 @noindent
-There are two music functions, @code{balloonText} and
-@code{balloonGrobText}.  The latter takes the name of the grob to
-adorn, while the former may be used as an articulation on a note.
-The other arguments  are the offset and the text of the label.
+There are two music functions, @code{balloonGrobText} and
+@code{balloonText}; the former takes the name of the grob to adorn,
+while the latter may be used as an articulation on a note.  The other
+arguments are the offset and the text of the label.
 
 @cindex balloon
 @cindex notation, explaining
 
 @seealso
 
+Snippets: @lsrdir{Editorial,Editorial-annotations}.
+
 Internals Reference: @internalsref{text-balloon-interface}.
 
 
@@ -425,14 +455,18 @@ notes.
 >>
 @end lilypond
 
+@seealso
+
 Snippets: @lsrdir{Editorial,Editorial-annotations}.
 
 
 @node Blank music sheet
 @unnumberedsubsubsec Blank music sheet
 
-@cindex Sheet music, empty
-@cindex Staves, blank sheet
+@cindex sheet music, empty
+@cindex staves, blank sheet
+@cindex blank staff paper
+@cindex staff paper, blank
 
 A blank music sheet can be produced also by using invisible notes,
 and removing @code{Bar_number_engraver}.
@@ -459,6 +493,10 @@ emptymusic = {
 >>
 @end lilypond
 
+@seealso
+
+Snippets: @lsrdir{Editorial,Editorial-annotations}.
+
 
 @node Analysis brackets
 @unnumberedsubsubsec Analysis brackets
@@ -468,11 +506,10 @@ emptymusic = {
 @cindex musicological analysis
 @cindex note grouping bracket
 
-Brackets are used in musical analysis to indicate structure in
-musical pieces.  LilyPond supports a simple form of nested
-horizontal brackets.  To use this, add the
-@internalsref{Horizontal_bracket_engraver} to the
-@internalsref{Staff} context.  A bracket is started with
+Brackets are used in musical analysis to indicate structure in musical
+pieces.  LilyPond supports a simple form of nested horizontal
+brackets.  To use this, add the @code{Horizontal_bracket_engraver} to
+the @code{Staff} context.  A bracket is started with
 @code{\startGroup} and closed with @code{\stopGroup}.
 
 @lilypond[quote,ragged-right,verbatim]
@@ -491,6 +528,9 @@ horizontal brackets.  To use this, add the
 
 @seealso
 
-Internals Reference: @internalsref{HorizontalBracket}.
+Snippets: @lsrdir{Editorial,Editorial-annotations}.
+
+Internals Reference: @internalsref{HorizontalBracket},
+@internalsref{Horizontal_bracket_engraver}, @internalsref{Staff}.
 
 
index 8243f15958358dcd260ff0f7de706a76d2f245bc..88866e26751bb494f67256b340e29c8d6851ea61 100644 (file)
@@ -1084,6 +1084,7 @@ SopTwoLyrics = \lyricmode {
     >>
     \new Staff <<
       \new Voice = "SopTwo" {
+        \global
         \SopTwoMusic
       }
       \new Lyrics \lyricsto "SopTwo" {
@@ -1132,7 +1133,7 @@ VerseFour  = \lyricmode {
     >>
     \new Staff <<
       \clef "bass"
-      \new Voice = "Tenor" { \voiceOne \TenorMusic }
+      \new Voice = "Tenor" { \voiceOne \TimeKey \TenorMusic }
       \new Voice = "Bass"  { \voiceTwo \BassMusic  }
     >>
   >>
@@ -1432,11 +1433,11 @@ because we omitted the context name.
 @lilypond[quote,verbatim,ragged-right]
 <<
   \new Staff \relative c'' {
-    \set Staff.instrumentName = "Soprano"
+    \set Staff.instrumentName = #"Soprano"
     c4 c
  }
   \new Staff \relative c' {
-  \set instrumentName = "Alto"  % Wrong!
+  \set instrumentName = #"Alto"  % Wrong!
   d4 d 
  }
 >>
@@ -1866,7 +1867,7 @@ This looks a bit messy; the indentation is messed up now.  That is
 easily fixed.  Here's the complete soprano and cello template.
 
 @lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
+\version "2.11.37"
 sopranoMusic = \relative c' {
   \clef treble
   \key c \major
@@ -1925,7 +1926,7 @@ sopWords = \lyricmode {
 }
 altoMusic = \relative a' {
   \clef "treble"
-  r4 a2 a4 | fis4. fis8 a2 | g4 fis fis2 |
+  r4 a2 a4 | fis4. fis8 a2 | g4 fis e2 |
 }
 altoWords = \sopWords
 tenorMusic = \relative c' {
@@ -2345,3 +2346,4 @@ PedalOrganMusic = \relative c {
 
 
 
+
index 4821926c83157c83cf1a53acaa75b55db2b2cab5..ca8c94902dda7cde423c4aed32d0a98f51dc5977 100644 (file)
@@ -177,14 +177,8 @@ or lyrics.
 
 You can view the documentation online at
 @uref{http://lilypond.org/doc/}, but you can also build it locally.
-This process requires a successful compile of lilypond.  The
-documentation is built by issuing
-
-@example
-make web
-@end example
-
-Building the website requires some additional tools and packages
+This process requires a successful compile of lilypond, and some
+additional tools and packages
 
 @itemize
 @item The @uref{http://netpbm.sourceforge.net/,netpbm utilities}
@@ -197,13 +191,38 @@ and the patch from
 @uref{http://bugs.ghostscript.com/show_bug.cgi?id=688017}.
 @end itemize
 
-The HTML files can be installed into the standard documentation path
-by issuing
+The documentation is built by issuing
+
+@example
+make web
+@end example
+
+After compilation, the HTML documentation tree is available in
+@file{out-www/offline-root/}, and can be browsed locally.
+
+The HTML and PDF files can be installed into the standard documentation
+path by issuing
 
 @example
 make out=www web-install
 @end example
 
+It is also possible to build a documentation tree in
+@file{out-www/online-root/}, with special processing, so it can be used
+on a website with content negociation for automatic language selection;
+this can be achieved by issuing
+
+@example
+make WEB_TARGETS=online web
+@end example
+
+@noindent
+and both @q{offline} and @q{online} targets can be generated by issuing
+
+@example
+make WEB_TARGETS="offline online" web
+@end example
+
 
 @node Building LilyPond
 @subsection Building LilyPond
index 49e40c5f1f5ebf50964bf64aec5be18f89cb645f..e618107881bc685551f388d94d580099033b4ff6 100644 (file)
@@ -6876,7 +6876,7 @@ saxophone, and bassoon.
 
 
 @node Duration names notes and rests
-@chapter Duration names, notes and rests
+@chapter Duration names notes and rests
 
 @multitable @columnfractions .15 .26 .33 .26
 
index ccf8a4eb3b75f4eee35db8753d841e95ada558fb..3989a3525e764f357bda4a52a7e29635ccfdf8bd 100644 (file)
 * Overview of text markup commands::  
 * Overview of text markup list commands::  
 * List of articulations::       
+* All context properties::      
+* Layout properties::           
+* Identifiers::                 
+* Scheme functions::            
 @end menu
 
 
@@ -260,16 +264,26 @@ Here is a chart showing all scripts available,
 
 
 
-@ignore
-@n ode All context properties
-@a ppendixsec All context properties
+@node All context properties
+@appendixsec All context properties
 
-@i nclude context-properties.tely
+@include context-properties.tely
 
 
-@n ode Layout properties
-@ap pendixsec Layout properties
+@node Layout properties
+@appendixsec Layout properties
 
-@in clude layout-properties.tely
+@include layout-properties.tely
+
+
+@node Identifiers
+@appendixsec Identifiers
+
+@include identifiers.tely
+
+
+@node Scheme functions
+@appendixsec Scheme functions
+
+@include scheme-functions.tely
 
-@end ignore
index c329a5d11d9c4e5b2ede04a538258e2c354e5a7a..8b1325a7383ce5dc391ba6210b924e50b14316c6 100644 (file)
@@ -14,7 +14,7 @@
 {pitches-headword.ly}
 
 This section discusses how to specify the pitch of notes.  There
-are three steps to this process: input, modifying, and output.
+are three steps to this process: input, modification, and output.
 
 @menu
 * Writing pitches::             
@@ -29,7 +29,7 @@ are three steps to this process: input, modifying, and output.
 
 This section discusses how to input pitches.  There are two
 different ways to place notes in octaves: absolute and relative
-mode.  In most cases, relative mode will be more convient.
+mode.  In most cases, relative mode will be more convenient.
 
 @menu
 * Absolute octave entry::       
@@ -40,7 +40,7 @@ mode.  In most cases, relative mode will be more convient.
 
 
 @node Absolute octave entry
-@unnumberedsubsubsec Absolute octave entry
+@subsubsection Absolute octave entry
 
 @cindex pitch names
 @cindex pitches
@@ -84,7 +84,7 @@ Snippets: @lsrdir{Pitches,Pitches}.
 
 
 @node Relative octave entry
-@unnumberedsubsubsec Relative octave entry
+@subsubsection Relative octave entry
 
 @cindex relative
 @cindex relative octave specification
@@ -114,8 +114,8 @@ interval is determined without considering accidentals.
 
 @item
 An octave changing mark@tie{}@code{'} or@tie{}@code{,} can be added to
-respectively raise or lower a pitch by an extra octave, relatively to
-the pitch calculated without octave mark.
+respectively raise or lower a pitch by an extra octave, relative to
+the pitch calculated without an octave mark.
 
 @item
 Multiple octave changing marks can be used.  For example, @code{''}@tie{}and
@@ -162,7 +162,7 @@ large intervals:
 
 If the preceding item is a chord, the first note of the chord is
 used as the reference point for the octave placement of a
-following note or chord.  Inside of chords the next note is always
+following note or chord.  Inside chords, the next note is always
 relative to the preceding one.
 
 @lilypond[verbatim,quote,ragged-right]
@@ -178,8 +178,8 @@ relative to the preceding one.
 
 As explained above, the octave of pitches is calculated only with
 the note names, regardless of any alterations.  Therefore, an
-E-double-sharp sharp following a B will be placed higher, while an
-F-double-flat would be placed lower.  In other words, a
+E-double-sharp following a B will be placed higher, while an
+F-double-flat will be placed lower.  In other words, a
 double-augmented fourth is considered a smaller interval than a
 double-diminished fifth, regardless of the number of semitones
 that each interval contains.
@@ -219,7 +219,7 @@ discouraged.
 
 
 @node Accidentals
-@unnumberedsubsubsec Accidentals
+@subsubsection Accidentals
 
 @warning{New users are sometimes confused about accidentals and
 key signatures.  In LilyPond, note names are the raw input; key
@@ -284,8 +284,8 @@ natural signs.
 cis cis cis! cis? c c c! c?
 @end lilypond
 
-Accidentals are only printed on tied notes which begin a new
-system:
+Accidentals on tied notes are only printed at the beginning of a
+new system:
 
 @lilypond[verbatim,quote,ragged-right,fragment,relative=2]
 cis1 ~ cis ~
@@ -316,19 +316,19 @@ Snippets: @lsrdir{Pitches,Pitches}.
 @refbugs
 
 There are no generally accepted standards for denoting
-three-quarter flats, so LilyPond's symbol does not conform to any
-standard.
+quarter-tone accidentals, so LilyPond's symbol does not conform to
+any standard.
 
 
 
 @node Note names in other languages
-@unnumberedsubsubsec Note names in other languages
+@subsubsection Note names in other languages
 
 There are predefined sets of note names for various other
-languages.  To use them, include the language specific init file.
-For example, add @code{\include "english.ly"} to the top of the
-input file.  The available language files and the note names they
-define are:
+languages.  To use them, include the language-specific init file.
+For example, to use English notes names, add @code{\include
+"english.ly"} to the top of the input file.  The available
+language files and the note names they define are:
 
 @cindex note names, other languages
 
@@ -375,11 +375,23 @@ define are:
 @end multitable
 @end smallexample
 
+In Dutch, @code{aes} is contracted to @code{as}, but both forms
+are accepted in LilyPond.  Similarly, both @code{es} and
+@code{ees} are accepted.  This also applies to
+@code{aeses}@tie{}/@tie{}@code{ases} and
+@code{eeses}@tie{}/@tie{}@code{eses}.  Sometimes only these
+contracted names are defined in the corresponding language files.
+
+@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
+a2 as e es a ases e eses
+@end lilypond
+
+
 Some music uses microtones whose alterations are fractions of a
-@q{normal} sharp or flat.  The note names for quartertones defined
-in the various language files are listed in the following table.
-Here the prefixes @notation{semi-} and @notation{sesqui-} mean
-@q{half} and @q{one and a half}, respectively.  For the other
+@q{normal} sharp or flat.  The note names for quarter-tones
+defined in the various language files are listed in the following
+table.  Here the prefixes @notation{semi-} and @notation{sesqui-}
+mean @q{half} and @q{one and a half}, respectively.  For the other
 languages, no special names have been defined yet.
 
 @smallexample
@@ -406,21 +418,6 @@ languages, no special names have been defined yet.
 @end multitable
 @end smallexample
 
-In Dutch, @code{aes} is contracted to @code{as}, but both forms
-are accepted in LilyPond.  Similarly, both @code{es} and
-@code{ees} are accepted.  This also applies to
-@code{aeses}@tie{}/@tie{}@code{ases} and
-@code{eeses}@tie{}/@tie{}@code{eses}.  Sometimes only these
-contracted names are defined in the corresponding language files.
-
-@lilypond[verbatim,quote,ragged-right,fragment,relative=2]
-a2 as e es a ases e eses
-@end lilypond
-
-In some languages such as Norwegian and Swedish, the usual
-spelling for accidentals is a double @q{s} such as in @code{ciss}
-or @code{cess}.  For both historical reasons and a greater
-simplicity, LilyPond uses a single @q{s} for all these languages.
 
 @seealso
 
@@ -440,7 +437,7 @@ This section discusses how to modify pitches.
 @end menu
 
 @node Octave checks
-@unnumberedsubsubsec Octave checks
+@subsubsection Octave checks
 
 @cindex octave correction
 @cindex octave check
@@ -483,7 +480,7 @@ the @var{controlpitch}.
 @end lilypond
 
 Compare the two bars below.  The first and third @code{\octave}
-check fail, but the second ones passes without fail.
+check fail, but the second ones does not fail.
 
 @lilypond[verbatim,quote,ragged-right,fragment]
 \relative c'' {
@@ -506,7 +503,7 @@ Snippets: @lsrdir{Pitches,Pitches}.
 
 
 @node Transpose
-@unnumberedsubsubsec Transpose
+@subsubsection Transpose
 
 @cindex transpose
 @cindex transposition of pitches
@@ -523,7 +520,8 @@ syntax is
 This means that @var{musicexpr} is transposed by the interval
 between the pitches @var{frompitch} and @var{topitch}: any note
 with pitch @var{frompitch} is changed to @var{topitch} and any
-other note is transposed by the same interval.
+other note is transposed by the same interval.  Both pitches are
+entered in absolute mode.
 
 Consider a piece written in the key of D-major.  It can be
 transposed up to E-major; note that the key signature is
@@ -559,7 +557,7 @@ key signature will be printed.
 
 @code{\transpose} distinguishes between enharmonic pitches: both
 @code{\transpose c cis} or @code{\transpose c des} will transpose
-up half a tone.  The first version will print sharps and the notes
+up a semitone.  The first version will print sharps and the notes
 will remain on the same scale step, the second version will print
 flats on the scale step above.
 
@@ -579,8 +577,8 @@ show how to enter pitches in C (or @notation{concert pitch}) and
 typeset them for a transposing instrument, but the opposite is
 also possible if you for example have a set of instrumental parts
 and want to print a conductor's score.  For example, when entering
-music for a B-flat trumpet which begins on a notated E (concert
-D), one would write:
+music for a B-flat trumpet that begins on a notated E (concert D),
+one would write:
 
 @example
 musicInBflat = @{ e4 @dots{} @}
@@ -617,10 +615,10 @@ Internals Reference: @internalsref{TransposedMusic}.
 
 @refbugs
 
-If you want to use both @code{\transpose} and @code{\relative},
-you must put @code{\transpose} outside of @code{\relative}, since
-@code{\relative} will have no effect on music that appears inside
-a @code{\transpose}.
+The relative conversion will not affect @code{\transpose},
+@code{\chordmode} or @code{\relative} sections in its argument.
+To use relative mode within transposed music, an additional
+@code{\relative} must be placed inside @code{\transpose}.
 
 
 @node Displaying pitches
@@ -639,7 +637,7 @@ This section discusses how to alter the output of pitches.
 
 
 @node Clef
-@unnumberedsubsubsec Clef
+@subsubsection Clef
 
 @funindex \clef
 
@@ -658,7 +656,8 @@ This section discusses how to alter the output of pitches.
 @cindex varbaritone clef
 @cindex subbass clef
 
-The clef is set with the @code{\clef} @var{clefname} command:
+The clef is set with the @code{\clef} @var{clefname} command.
+Middle C is shown in every example.
 
 @lilypond[verbatim,quote,ragged-right,fragment,relative=1]
 \clef treble
@@ -671,35 +670,29 @@ c2 c
 c2 c
 @end lilypond
 
-Supported clefs include:
-
-@multitable @columnfractions .4 .6
-@headitem Clef @tab Position
-@item @code{treble, violin, G, G2} @tab
-G clef (g') on 2nd line
-@item @code{alto, C} @tab
-C clef (c') on 3rd line
-@item @code{tenor} @tab
-C clef (c') on 4th line
-@item @code{bass, F} @tab
-F clef (f) on 4th line
-@item @code{french} @tab
-G clef (g') on 1st line, so-called French violin clef
-@item @code{soprano} @tab
-C clef (c') on 1st line
-@item @code{mezzosoprano} @tab
-C clef (c') on 2nd line
-@item @code{baritone} @tab
-C clef (c') on 5th line
-@item @code{varbaritone} @tab
-F clef (f) on 3rd line
-@item @code{subbass} @tab
-F clef (f) on 5th line
-@item @code{percussion} @tab
-percussion clef
-@item @code{tab} @tab
-tablature clef
-@end multitable
+Other clefs include:
+
+@lilypond[verbatim,quote,ragged-right,fragment,relative=1]
+\clef french
+c2 c
+\clef soprano
+c2 c
+\clef mezzosoprano
+c2 c
+\clef baritone
+c2 c
+
+\break
+
+\clef varbaritone
+c2 c
+\clef subbass
+c2 c
+\clef percussion
+c2 c
+\clef tab
+c2 c
+@end lilypond
 
 Further supported clefs are described under @ref{Ancient clefs}.
 
@@ -707,13 +700,14 @@ By adding @code{_8} or @code{^8} to the clef name, the clef is
 transposed one octave down or up, respectively, and @code{_15} and
 @code{^15} transposes by two octaves.  The argument @var{clefname}
 must be enclosed in quotes when it contains underscores or digits.
-For example,
 
 @cindex choral tenor clef
 
 @lilypond[verbatim,quote,ragged-right,fragment,relative=1]
-\clef "treble_8" c1
-\clef "bass^15" c1
+\clef "treble_8"
+c2 c
+\clef "bass^15"
+c2 c
 @end lilypond
 
 
@@ -733,7 +727,7 @@ Internals Reference: @internalsref{Clef}.
 
 
 @node Key signature
-@unnumberedsubsubsec Key signature
+@subsubsection Key signature
 
 @cindex key signature
 @funindex \key
@@ -769,9 +763,9 @@ is done with the @code{\key} command:
 Here, @var{mode} should be @code{\major} or @code{\minor} to get a
 key signature of @var{pitch}-major or @var{pitch}-minor,
 respectively.  You may also use the standard mode names, also
-called @q{church modes}: @code{\ionian}, @code{\locrian},
-@code{\aeolian}, @code{\mixolydian}, @code{\lydian},
-@code{\phrygian}, and @code{\dorian}.
+called @q{church modes}: @code{\ionian}, @code{\dorian},
+@code{\phrygian}, @code{\lydian}, @code{\mixolydian},
+@code{\aeolian}, and @code{\locrian}.
 
 @lilypond[verbatim,quote,ragged-right,fragment,relative=2]
 \key g \major
@@ -803,7 +797,7 @@ Internals Reference: @internalsref{KeyCancellation},
 
 
 @node Ottava brackets
-@unnumberedsubsubsec Ottava brackets
+@subsubsection Ottava brackets
 
 @cindex ottava
 @cindex 15ma
@@ -843,7 +837,7 @@ Internals Reference: @internalsref{OttavaBracket}.
 
 
 @node Instrument transpositions
-@unnumberedsubsubsec Instrument transpositions
+@subsubsection Instrument transpositions
 
 @cindex transposition, MIDI
 @cindex transposition, instrument
@@ -863,7 +857,7 @@ other voices}.
 The pitch to use for @code{\transposition} should correspond to
 the real sound heard when a@tie{}@code{c'} written on the staff is
 played by the transposing instrument.  This pitch is entered in
-absolute mode, so an instrument which produces a real sound which
+absolute mode, so an instrument that produces a real sound which
 is one tone higher than the printed music should use
 @code{\transposition d'}.  @code{\transposition} should
 @emph{only} be used if the pitches are @emph{not} being entered in
@@ -930,13 +924,13 @@ Snippets: @lsrdir{Pitches,Pitches}.
 
 
 @node Automatic accidentals
-@unnumberedsubsubsec Automatic accidentals
+@subsubsection Automatic accidentals
 @cindex automatic accidentals
 
 @funindex set-accidental-style
 
 There are many different conventions on how to typeset
-accidentals.  LilyPond provides a function to specify which such
+accidentals.  LilyPond provides a function to specify which
 accidental style to use.  This function is called as follows
 
 @example
@@ -949,7 +943,7 @@ accidental style to use.  This function is called as follows
 The accidental style applies to the current @code{Staff} by
 default (with the exception of the styles @code{piano} and
 @code{piano-cautionary}, which are explained below).  Optionally,
-the function can take a second argument which determines in which
+the function can take a second argument that determines in which
 scope the style should be changed.  For example, to use the same
 style in all staves of the current @code{StaffGroup}, use
 
@@ -1150,7 +1144,7 @@ musicB = {
 
 This rule corresponds to the common practice in the twentieth
 century.  It prints the same accidentals as @code{default}, with
-two exceptions which serve to avoid ambiguity: after temporary
+two exceptions that serve to avoid ambiguity: after temporary
 accidentals, cancellation marks are printed also in the following
 measure (for notes in the same octave) and, in the same measure,
 for notes in other octaves.  Hence the naturals before
@@ -1618,7 +1612,7 @@ problematic notes.
 
 
 @node Ambitus
-@unnumberedsubsubsec Ambitus
+@subsubsection Ambitus
 @cindex ambitus
 
 The term @notation{ambitus} or @notation{ambit} denotes a range of
@@ -1629,7 +1623,7 @@ determine if it matches their capabilities.
 
 Ambits are denoted at the beginning of a piece near the initial
 clef.  The range is graphically specified by two note heads that
-represent the minimum and maximum pitch.  Accidentals are only
+represent the lowest and highest pitches.  Accidentals are only
 printed if they are not part of the key signature.
 
 @lilypond[verbatim,quote,ragged-right]
@@ -1682,7 +1676,7 @@ ambitus.
 @end menu
 
 @node Special note heads
-@unnumberedsubsubsec Special note heads
+@subsubsection Special note heads
 
 @cindex note heads, special
 
@@ -1716,7 +1710,7 @@ Internals Reference: @internalsref{NoteHead},
 
 
 @node Easy notation note heads
-@unnumberedsubsubsec Easy notation note heads
+@subsubsection Easy notation note heads
 
 @cindex note heads, practice
 @cindex note heads, easy notation
@@ -1759,7 +1753,7 @@ Internals Reference: @internalsref{NoteHead}.
 
 
 @node Shape note heads
-@unnumberedsubsubsec Shape note heads
+@subsubsection Shape note heads
 
 @cindex note heads, shape
 @funindex \key
@@ -1796,7 +1790,7 @@ Snippets: @lsrdir{Pitches,Pitches}.
 
 
 @node Improvisation
-@unnumberedsubsubsec Improvisation
+@subsubsection Improvisation
 
 @cindex improvisation
 @cindex slashed note heads
@@ -1821,6 +1815,14 @@ rhythm.  Such note heads can be created:
 }
 @end lilypond
 
+
+@refcommands
+
+@funindex \improvisationOn
+@funindex \improvisationOff
+
+@code{\improvisationOn}, @code{\improvisationOff}
+
 @seealso
 
 Snippets: @lsrdir{Pitches,Pitches}.
index 80bb6cc8b1096a9783961ddeff49b177233884f1..481394249972e99f936dffd7f963e70e4017a89f 100644 (file)
@@ -31,21 +31,29 @@ start-to-finish.
 
 * Notation Reference: a (hopefully complete) description of
   LilyPond input notation.  Some material from here may be
-  duplicated in the Learning Manual (for teaching).  The material is
-  presented in an approximate order of increasing difficulty, but
-  the goal is _not_ to provide a step-by-step learning environment.
-  For example, all material under "Pitches" should remain in that
-  section, even though microtonal accidentals may seem more advanced
-  than info about clefs or time signatures -- "Pitches" should be a
-  one-stop reference about the pitch portion of notes.  This section
-  is written in formal technical writing style.
-
-Users are not expected to read this manual from start to finish.
-However, they should be familiar with the material in the Learning
-Manual (particularly ``Fundamental Concepts''), so do not repeat
-that material in each section of this book.  Also, you should
-assume that users know what the notation means; explaining musical
-concepts happens in the Music Glossary.
+  duplicated in the Learning Manual (for teaching), but consider
+  the NR to be the "definitive" description of each notation
+  element, with the LM being an "extra".  The goal is _not_ to
+  provide a step-by-step learning environment -- do not avoid
+  using notation that has not be introduced previously in the
+  NR  (for example, use \break if appropriate).  This section is
+  written in formal technical writing style.
+
+Avoid duplication.  Although users are not expected to read this
+manual from start to finish, they should be familiar with the
+material in the Learning Manual (particularly ``Fundamental
+Concepts''), so do not repeat that material in each section of
+this book.  Also watch out for common constructs, like ^ - _ for
+directions -- those are explained in NR 3.  In NR 1, you can
+mention that "dynamics (or whatever) may be placed above or below
+the staff, for details see @ref{Up and down}".
+
+Most tweaks should be added to LSR and not placed directly in the
+.itely file.  In some cases, tweaks may be placed in the main
+text, but ask about this first.
+
+Finally, you should assume that users know what the notation
+means; explaining musical concepts happens in the Music Glossary.
 
 
 * Application Usage: information about using the program lilypond
index 648e92a296346079c21e77ba28659a03582a0863..9cb6de540f403aefb3e1938aedaebd868879a044 100644 (file)
@@ -12,7 +12,7 @@
 @lilypondfile[ragged-right,line-width=16\cm,staffsize=14,quote]
 {rhythms-headword.ly}
 
-This section discusses rhythms, durations, and bars.
+This section discusses rhythms, rests, durations, beaming and bars.
 
 @menu
 * Writing rhythms::             
@@ -37,20 +37,21 @@ This section discusses rhythms, durations, and bars.
 @node Durations
 @unnumberedsubsubsec Durations
 
-@cindex duration
-@cindex beams, automatic
+@cindex durations, of notes
+@cindex note durations
+
 @funindex \longa
 @funindex \breve
 @funindex \maxima
 
-When entering notes, durations are designated by numbers and dots:
-durations are entered as their reciprocal values.  For example, a
+Durations are designated by numbers and dots.
+Durations are entered as their reciprocal values.  For example, a
 quarter note is entered using a @code{4} (since it is a 1/4 note),
-while a half note is entered using a @code{2} (since it is a 1/2
+and a half note is entered using a @code{2} (since it is a 1/2
 note).  For notes longer than a whole you must use the
-@code{\longa} (a double breve) and @code{\breve} commands.  Note
-durations as short as 64th notes may be specified.  Shorter values
-are possible, but only as beamed notes.
+@code{\longa} (a double breve) and @code{\breve} commands.  
+Durations as short as 64th notes may be specified.  Shorter values
+are possible, but only as beamed notes:
 
 @c Two 64th notes are needed to obtain beams
 @lilypond[quote,ragged-right,verbatim,fragment,relative=2]
@@ -60,7 +61,7 @@ c4 c8 c16 c32 c64 c64
 @end lilypond
 
 @noindent
-and the same durations with automatic beaming turned off 
+and the same durations with automatic beaming turned off;
 see @ref{Automatic beams}:
 
 @c not strictly "writing rhythms"; more of a "displaying" thing,
@@ -72,6 +73,10 @@ c\longa c\breve c1 c2
 c4 c8 c16 c32 c64 c64
 @end lilypond
 
+A note with the duration of a quadruple breve may be entered with
+@code{\maxima}, but this is supported only within ancient music
+notation; see @ref{Ancient notation}.
+
 If the duration is omitted then it is set to the previously
 entered duration.  The default for the first note is a quarter
 note.
@@ -80,25 +85,36 @@ note.
 a a a2 a a4 a a1 a
 @end lilypond
 
+@cindex notes, dotted
+@cindex dotted notes
 
 @funindex .
 
-To obtain dotted note lengths, simply add a dot (@code{.}) to the
-number.  Double-dotted notes are produced in a similar way.
+To obtain dotted note lengths, place a dot (@code{.}) after the
+duration.  Double-dotted notes are specified by appending two
+dots, and so on.
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]
 a4 b c4. b8 a4. b4.. c8.
 @end lilypond
 
-Some durations cannot be entered using only binary durations
-and dots, and can only be represented by tying two or more 
-notes together.  Tied notes are covered in @ref{Ties}.
+Some durations cannot be represented with just binary durations
+and dots; they can only be represented by tying two or more
+notes together; see @ref{Ties}.
+
+For ways of specifying durations for the syllables of lyrics and
+ways of aligning lyrics to notes see @ref{Vocal music}.
+
+Optionally, notes can be spaced proportionately to their duration.
+For details of this and other settings which control proportional
+notation see @ref{Proportional notation}.
 
 @refcommands
 
 Dots are normally moved up to avoid staff lines, except in
 polyphonic situations.  The following commands may be used to
-force a particular direction manually:
+force a particular direction manually, and to return to the
+default behaviour:
 
 @funindex \dotsUp
 @code{\dotsUp},
@@ -107,23 +123,14 @@ force a particular direction manually:
 @funindex \dotsNeutral
 @code{\dotsNeutral}.
 
-For ways of specifying durations for the syllables of lyrics and
-ways of aligning lyrics to notes see @ref{Vocal music}.
-
-A note with the duration of a quadruple breve may be entered with
-@code{\maxima}, but this is supported only within ancient music
-notation; see @ref{Ancient notation}.
-
-Optionally, notes can be spaced proportionately to their duration.
-For details of this and other settings which control proportional
-notation see @ref{Proportional notation}.
-
 
 @seealso
 
-Music Glossary: @rglos{breve}, @rglos{longa}.
+Music Glossary: @rglos{breve}, @rglos{longa}, @rglos{note value}
+@rglos{Duration names notes and rests}.
 
-Notation Reference:@ref{Automatic beams}, @ref{Ties}, @ref{Writing rests}, @ref{Vocal music},
+Notation Reference: @ref{Automatic beams}, @ref{Ties},
+@ref{Writing rhythms}, @ref{Writing rests}, @ref{Vocal music},
 @ref{Ancient notation}, @ref{Proportional notation}.
 
 Snippets: @lsrdir{Rhythms,Rhythms}
@@ -134,7 +141,7 @@ Internals Reference: @internalsref{Dots},
 
 @refbugs
 
-@c duplicated in Durations and Rests.  -gp
+@c deliberately duplicated in Durations and Rests.  -gp
 There is no fundamental limit to rest durations (both in terms of
 longest and shortest), but the number of glyphs is limited: there
 are rests from 128th to maxima (8 x whole).
@@ -2515,3 +2522,4 @@ Internals Reference: @internalsref{Timing_translator},
 
 
 
+
index 03bcc9b7178f0fb42dd4ae149f532e1591b51b19..2d6136abf24e1c6bdba9242ae1754c99cebb2cce 100644 (file)
@@ -35,6 +35,7 @@ or stretched.
 * Breaks::                      
 * Vertical spacing::            
 * Horizontal spacing::          
+* Page layout MOVED FROM LM::   
 @end menu
 
 
@@ -563,7 +564,7 @@ The pairs
 * Page breaking::               
 * Optimal page breaking::       
 * Optimal page turning::        
-* Minimal page breaking::        
+* Minimal page breaking::       
 * Explicit breaks::             
 * Using an extra voice for breaks::  
 @end menu
@@ -2051,3 +2052,262 @@ to break across systems and pages.  See the respective parts of the manual
 for these related settings.
 
 
+
+@node Page layout MOVED FROM LM
+@section Page layout MOVED FROM LM
+
+@menu
+* Introduction to layout::      
+* Global sizes::                
+* Line breaks::                 
+* Page breaks::                 
+* Fitting music onto fewer pages::  
+@end menu
+
+@node Introduction to layout
+@subsection Introduction to layout
+
+The global paper layout is determined by three factors: 
+the page layout, the line breaks, and the spacing. These all 
+influence each other. The choice of spacing determines how 
+densely each system of music is set. This influences where line 
+breaks are chosen, and thus ultimately, how many pages a piece 
+of music takes.
+
+Settings which influence layout may be placed in two blocks.
+The @code{\paper @{...@}} block is placed outside any
+@code{\score @{...@}} blocks and contains settings that
+relate to the entire document.  The @code{\layout @{...@}}
+block is placed within a @code{\score @{...@}} block and
+contains settings for that particular score.  If you have
+only one @code{\score @{...@}} block the two have the same
+effect.  In general the commands shown in this section can
+be placed in either.
+
+Much more detail on the options for tweaking the laying out
+of music are contained in @ruser{Spacing issues}.
+
+@node Global sizes
+@subsection Global sizes
+
+TODO Check all these examples
+
+The default @strong{paper size} which LilyPond assumes in laying
+out the music is A4.  This may be changed in two ways:
+
+@example
+#(set-default-paper-size "a6")
+
+\paper @{
+#(set-paper-size "letter")
+@}
+@end example
+
+@noindent
+The first command sets the size of all pages. The second command
+sets the size of the pages to which the \paper block applies -- if
+the \paper block is at the top of the file, then it will apply
+to all pages.  Support for the following paper sizes is available:
+a6, a5, a4, a3, legal, letter, 11x17 (also known as tabloid).
+Setting the paper size automatically sets suitable margins and
+line length.
+
+If the symbol @code{landscape} is supplied as an argument to
+@code{set-default-paper-size}, the pages will be rotated by 90
+degrees, and wider line widths will be set correspondingly, e.g.
+
+@example
+#(set-default-paper-size "a6" 'landscape)
+@end example
+
+The default @strong{staff size} is set to 20 points.
+This may be changed in two ways:
+
+@example
+#(set-global-staff-size 14)
+
+\paper @{
+#(set-global-staff-size 16)
+@}
+@end example
+
+@noindent
+The first command sets the size in all pages. The second command
+sets the size in the pages to which the \paper block applies -\96 if
+the \paper block is at the top of the file, then it will apply
+to all pages.  All the fonts are automatically scaled to suit
+the new value of the staff size.
+
+@node Line breaks
+@subsection Line breaks
+
+Line breaks are normally determined automatically. They are chosen
+so that lines look neither cramped nor loose, and consecutive
+lines have similar density.  Occasionally you might want to
+override the automatic breaks; you can do this by specifying
+@code{\break}. This will force a line break at this point.  However,
+line breaks can only occur at the end of @q{complete} bars, i.e.,
+where there are no notes or tuplets left @q{hanging} over the bar
+line.  If you want to have a line break where there is no bar line,
+you can force an invisible bar line by entering @code{\bar ""},
+although again there must be no notes left hanging over in any of
+the staves at this point, or it will be ignored.
+
+The opposite command, @code{\noBreak}, forbids a line break at the
+bar line where it is inserted.
+
+The most basic settings influencing line spacing are @code{indent}
+and @code{line-width}. They are set in the @code{\layout} block.
+They control the indentation of the first line of music, and the
+lengths of the lines.
+
+If @code{ragged-right} is set to true in the @code{\layout} block,
+then systems end at their natural horizontal length, instead of
+being spread horizontally to fill the whole line. This is useful
+for short fragments, and for checking how tight the natural
+spacing is.
+
+The option @code{ragged-last} is similar to @code{ragged-right},
+but affects only the last line of the piece.
+
+@example
+\layout @{
+indent = #0
+line-width = #150
+ragged-last = ##t
+@}
+@end example
+
+@node Page breaks
+@subsection Page breaks
+
+The default page breaking may be overriden by inserting 
+@code{\pageBreak} or @code{\noPageBreak} commands.
+These commands are analogous to the @code{\break} and 
+@code{\noBreak} commands discused above and force or forbid 
+a page-break at the point where they are inserted.
+Of course, the @code{\pageBreak} command also forces a line break.
+Like @code{\break}, the @code{\pageBreak} command is effective only
+at the end of a @q{complete} bar as defined above.  For more
+details see @ruser{Page breaking} and following sections.
+
+There are also analogous settings to @code{ragged-right} and
+@code{ragged-last} which have the same effect on vertical spacing:
+@code{ragged-bottom} and @code{ragged-last-bottom}.  If set to
+@code{##t} the systems on all pages or just the last page
+respectively will not be justified vertically.
+
+For more details see @ruser{Vertical spacing}.
+
+@node Fitting music onto fewer pages
+@subsection Fitting music onto fewer pages
+
+Sometimes you can end up with one or two staves on a second
+(or third, or fourth...) page.  This is annoying, especially
+if you look at previous pages and it looks like there is plenty
+of room left on those.
+
+When investigating layout issues, @code{annotate-spacing} is
+an invaluable tool.  This command prints the values of various
+layout spacing commands; see @ruser{Displaying spacing}, for more
+details.  From the output of @code{annotate-spacing}, we can
+see which margins we may wish to alter.
+
+Other than margins, there are a few other options to save space:
+
+@itemize
+@item
+You may tell LilyPond to place systems as close together as
+possible (to fit as many systems as possible onto a page), but
+then to space those systems out so that there is no blank
+space at the bottom of the page.
+
+@example
+\paper @{
+  between-system-padding = #0.1
+  between-system-space = #0.1
+  ragged-last-bottom = ##f
+  ragged-bottom = ##f
+@}
+@end example
+
+@item
+You may force the number of systems (i.e., if LilyPond wants
+to typeset some music with 11 systems, you could force it to
+use 10).
+
+@example
+\paper @{
+  system-count = #10
+@}
+@end example
+
+@item
+Avoid (or reduce) objects which increase the vertical size of
+a system.  For example, volta repeats (or alternate repeats)
+require extra space.  If these repeats are spread over two
+systems, they will take up more space than one system with
+the volta repeats and another system without.
+
+Another example is moving dynamics which @q{stick out} of
+a system, as in the second bar here:
+
+@lilypond[verbatim,quote,fragment,ragged-right,relative=1]
+e4 c g\f c
+\override DynamicText #'extra-offset = #'( -2.2 . 2.0)
+e4 c g\f c
+@end lilypond
+
+@item
+Alter the horizontal spacing via @code{SpacingSpanner}.  See
+@ruser{Changing horizontal spacing}, for more details.  Here's
+an example first showing the default behaviour:
+
+@lilypond[verbatim,quote,ragged-right]
+\score {
+  \relative c'' {
+    g4 e e2 |
+    f4 d d2 |
+    c4 d e f |
+    g4 g g2 |
+    g4 e e2 |
+  }
+}
+@end lilypond
+
+@noindent
+and now with @code{common-shortest-duration} increased from the
+value of @code{1/4} (a quarter note is the most common in this
+example) to @code{1/2}:
+
+@lilypond[verbatim,quote,ragged-right]
+\score {
+  \relative c'' {
+    g4 e e2 |
+    f4 d d2 |
+    c4 d e f |
+    g4 g g2 |
+    g4 e e2 |
+  }
+  \layout {
+    \context {
+      \Score
+      \override SpacingSpanner
+                #'common-shortest-duration = #(ly:make-moment 1 2)
+    }
+  }
+}
+@end lilypond
+
+@noindent
+Note that this override cannot be modified dynamically, so it must
+always be placed in a @code{\context@{..@}} block so that it applies
+to the whole score.
+
+TODO Add description of using \context in this way earlier if it is
+not already anywhere  -td
+
+@end itemize
+
+
+
index a485ba4963f3daffbb9336eeff0c3440b34a00ae..9d710c5bec745625b0a1bf925e20f5f413dd863b 100644 (file)
@@ -28,526 +28,65 @@ beautiful printed scores!
 
 @node Single staff
 @appendixsec Single staff
-@appendixsubsec Notes only
 
-The first example gives you a staff with notes, suitable for a solo
-instrument or a melodic fragment.  Cut and paste this into a file,
-add notes, and you're finished!
+@appendixsubsec Notes only
 
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
-melody = \relative c' {
-   \clef treble
-   \key c \major
-   \time 4/4
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{single-staff-template-with-only-notes.ly}
 
-   a4 b c d
-}
-
-\score {
-   \new Staff \melody
-   \layout { }
-   \midi {}
-}
-@end lilypond
 
 @appendixsubsec Notes and lyrics
 
-The next example demonstrates a simple melody with lyrics.  Cut and
-paste, add notes, then words for the lyrics.  This example turns off
-automatic beaming, which is common for vocal parts.  If you want to use
-automatic beaming, you'll have to change or comment out the relevant
-line.
-
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
-melody = \relative c' {
-   \clef treble
-   \key c \major
-   \time 4/4
-
-   a4 b c d
-}
-
-text = \lyricmode {
-   Aaa Bee Cee Dee
-}
-
-\score{
-   <<
-      \new Voice = "one" {
-         \autoBeamOff
-         \melody
-      }
-      \new Lyrics \lyricsto "one" \text
-   >>
-   \layout { }
-   \midi { }
-}
-@end lilypond
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{single-staff-template-with-notes-and-lyrics.ly}
 
 @appendixsubsec Notes and chords
 
-Want to prepare a lead sheet with a melody and chords?  Look no further!
-
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
-melody = \relative c' {
-   \clef treble
-   \key c \major
-   \time 4/4
-
-   f4 e8[ c] d4 g |
-   a2 ~ a2 |
-}
-
-harmonies = \chordmode {
-   c4:m f:min7 g:maj c:aug d2:dim b:sus
-}
-
-\score {
-   <<
-      \new ChordNames {
-         \set chordChanges = ##t
-         \harmonies
-      }
-   \new Staff \melody
-   >>
-
-   \layout{ }
-   \midi { }
-}
-@end lilypond
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{single-staff-template-with-notes-and-chords.ly}
 
 @appendixsubsec Notes, lyrics, and chords.
 
-This template allows you to prepare a song with melody, words, and chords.
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{single-staff-template-with-notes,-lyrics,-and-chords.ly}
 
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
-melody = \relative c' {
-   \clef treble
-   \key c \major
-   \time 4/4
-
-   a b c d
-}
-
-text = \lyricmode {
-   Aaa Bee Cee Dee
-}
-
-harmonies = \chordmode {
-   a2 c2
-}
-
-\score {
-   <<
-      \new ChordNames {
-         \set chordChanges = ##t
-         \harmonies
-      }
-   \new Voice = "one" {
-      \autoBeamOff
-      \melody
-   }
-   \new Lyrics \lyricsto "one" \text
-   >>
-   \layout { }
-   \midi { }
-}
-@end lilypond
 
 @node Piano templates
 @appendixsec Piano templates
-@appendixsubsec Solo piano
-
-Here is a simple piano staff.
-
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
-upper = \relative c'' {
-   \clef treble
-   \key c \major
-   \time 4/4
 
-   a b c d
-}
-
-lower = \relative c {
-   \clef bass
-   \key c \major
-   \time 4/4
+@appendixsubsec Solo piano
 
-   a2 c
-}
-
-\score {
-   \new PianoStaff <<
-      \set PianoStaff.instrumentName = "Piano  "
-      \new Staff = "upper" \upper
-      \new Staff = "lower" \lower
-   >>
-   \layout { }
-   \midi { }
-}
-@end lilypond
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{piano-template-simple.ly}
 
 @appendixsubsec Piano and melody with lyrics
 
-Here is a typical song format: one staff with the melody and lyrics, with
-piano accompaniment underneath.
-
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
-melody = \relative c'' {
-   \clef treble
-   \key c \major
-   \time 4/4
-
-   a b c d
-}
-
-text = \lyricmode {
-   Aaa Bee Cee Dee
-}
-
-upper = \relative c'' {
-   \clef treble
-   \key c \major
-   \time 4/4
-
-   a b c d
-}
-
-lower = \relative c {
-   \clef bass
-   \key c \major
-   \time 4/4
-
-   a2 c
-}
-
-\score {
-   <<
-      \new Voice = "mel" {
-          \autoBeamOff
-          \melody
-      }
-      \new Lyrics \lyricsto mel \text
-
-      \new PianoStaff <<
-         \new Staff = "upper" \upper
-         \new Staff = "lower" \lower
-      >>
-   >>
-   \layout {
-      \context { \RemoveEmptyStaffContext }
-   }
-   \midi { }
-}
-@end lilypond
-
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{piano-template-with-melody-and-lyrics.ly}
 
 @appendixsubsec Piano centered lyrics
 
-Instead of having a full staff for the melody and lyrics, you can place
-the lyrics between the piano staff (and omit the separate melody staff).
-
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
-upper = \relative c'' {
-   \clef treble
-   \key c \major
-   \time 4/4
-
-   a b c d
-}
-
-lower = \relative c {
-   \clef bass
-   \key c \major
-   \time 4/4
-
-   a2 c
-}
-
-text = \lyricmode {
-   Aaa Bee Cee Dee
-}
-
-\score {
-  \new GrandStaff <<
-    \new Staff = upper { \new Voice = "singer" \upper }
-    \new Lyrics \lyricsto "singer" \text
-    \new Staff = lower {
-      \clef bass
-      \lower
-    }
-  >>
-  \layout {
-    \context { \GrandStaff \accepts "Lyrics" }
-    \context { \Lyrics \consists "Bar_engraver" }
-  }
-  \midi { }
-}
-@end lilypond
-
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{piano-template-with-centered-lyrics.ly}
 
 @appendixsubsec Piano centered dynamics
 
-Many piano scores have the dynamics centered between the two
-staves.  This requires a bit of tweaking to implement, but
-since the template is right here, you don't have to do the
-tweaking yourself.
-
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
-upper = \relative c'' {
-  \clef treble
-  \key c \major
-  \time 4/4
-
-  a b c d
-}
-
-lower = \relative c {
-  \clef bass
-  \key c \major
-  \time 4/4
-
-  a2 c
-}
-
-dynamics = {
-  s2\fff\> s4
-  s\!\pp
-}
-
-pedal = {
-  s2\sustainDown s2\sustainUp
-}
-
-\score {
-  \new PianoStaff <<
-    \new Staff = "upper" \upper
-    \new Dynamics = "dynamics" \dynamics
-    \new Staff = "lower" <<
-      \clef bass
-      \lower
-    >>
-    \new Dynamics = "pedal" \pedal
-  >>
-  \layout {
-    \context {
-      \type "Engraver_group"
-      \name Dynamics
-      \alias Voice % So that \cresc works, for example.
-      \consists "Output_property_engraver"
-
-      \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
-      \override DynamicLineSpanner #'Y-offset = #0
-      pedalSustainStrings = #'("Ped." "*Ped." "*")
-      pedalUnaCordaStrings = #'("una corda" "" "tre corde")
-
-      \consists "Piano_pedal_engraver"
-      \consists "Script_engraver"
-      \consists "Dynamic_engraver"
-      \consists "Text_engraver"
-
-      \override TextScript #'font-size = #2
-      \override TextScript #'font-shape = #'italic
-
-      \consists "Skip_event_swallow_translator"
-
-      \consists "Axis_group_engraver"
-    }
-    \context {
-      \PianoStaff
-      \accepts Dynamics
-    }
-  }
-}
-\score {
-  \new PianoStaff <<
-    \new Staff = "upper" << \upper \dynamics >>
-    \new Staff = "lower" << \lower \dynamics >>
-    \new Dynamics = "pedal" \pedal
-  >>
-  \midi {
-    \context {
-      \type "Performer_group"
-      \name Dynamics
-      \consists "Piano_pedal_performer"
-    }
-    \context {
-      \PianoStaff
-      \accepts Dynamics
-    }
-  }
-}
-@end lilypond
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{piano-template-with-centered-dynamics.ly}
 
 
 @node String quartet
 @appendixsec String quartet
-@appendixsubsec String quartet
-
-This template demonstrates a string quartet.  It also uses a @code{\global}
-section for time and key signatures.
-
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
 
-global= {
-  \time 4/4
-  \key c \major
-}
-
-violinOne = \new Voice { \relative c''{
-  \set Staff.instrumentName = "Violin 1 "
-
-  c2 d e1
-
-\bar "|." }}
-violinTwo = \new Voice { \relative c''{
-  \set Staff.instrumentName = "Violin 2 "
-
-  g2 f e1
-
-\bar "|." }}
-viola = \new Voice { \relative c' {
-  \set Staff.instrumentName = "Viola "
-  \clef alto
-
-  e2 d c1
-
-\bar "|." }}
-cello = \new Voice { \relative c' {
-  \set Staff.instrumentName = "Cello     "
-  \clef bass
-
-  c2 b a1
+@appendixsubsec String quartet
 
-\bar "|."}}
-
-\score {
-   \new StaffGroup <<
-      \new Staff << \global \violinOne >>
-      \new Staff << \global \violinTwo >>
-      \new Staff << \global \viola >>
-      \new Staff << \global \cello >>
-   >>
-   \layout { }
-   \midi { }
-}
-@end lilypond
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{string-quartet-template-simple.ly}
 
 @appendixsubsec String quartet parts
 
-The previous example produces a nice string quartet, but what if you
-needed to print parts?  This template demonstrates how to use the
-@code{\tag} feature to easily split a piece into individual parts.
-
-You need to split this template into separate files; the filenames
-are contained in comments at the beginning of each file.  @code{piece.ly}
-contains all the music definitions.  The other files -- @code{score.ly},
-@code{vn1.ly}, @code{vn2.ly}, @code{vla.ly}, and
-@code{vlc.ly} -- produce the appropiate part.
-
-@verbatim
-%%%%% piece.ly
-\version "2.11.38"
-
-global= {
-  \time 4/4
-  \key c \major
-}
-
-Violinone = \new Voice { \relative c''{
-  \set Staff.instrumentName = "Violin 1 "
-
-  c2 d e1
-
-\bar "|." }}   %*********************************
-Violintwo = \new Voice { \relative c''{
-  \set Staff.instrumentName = "Violin 2 "
-
-  g2 f e1
-
-\bar "|." }}   %*********************************
-Viola = \new Voice { \relative c' {
-  \set Staff.instrumentName = "Viola "
-  \clef alto
-
-  e2 d c1
-
-\bar "|." }}   %*********************************
-Cello = \new Voice { \relative c' {
-  \set Staff.instrumentName = "Cello     "
-  \clef bass
-
-  c2 b a1
-
-\bar "|."}}   %**********************************
-
-music = {
-  <<
-    \tag #'score \tag #'vn1 \new Staff { << \global \Violinone >> }
-    \tag #'score \tag #'vn2 \new Staff { << \global \Violintwo>> }
-    \tag #'score \tag #'vla \new Staff { << \global \Viola>> }
-    \tag #'score \tag #'vlc \new Staff { << \global \Cello>> }
-  >>
-}
-
-
-
-%%%%% score.ly
-\version "2.11.38"
-\include "piece.ly"
-#(set-global-staff-size 14)
-\score {
-  \new StaffGroup \keepWithTag #'score \music
-  \layout { }
-  \midi { }
-}
-
-
-%%%%% vn1.ly
-\version "2.11.38"
-\include "piece.ly"
-\score {
-  \keepWithTag #'vn1 \music
-  \layout { }
-}
-
-
-%%%%% vn2.ly
-\version "2.11.38"
-\include "piece.ly"
-\score {
-  \keepWithTag #'vn2 \music
-  \layout { }
-}
-
-
-%%%%% vla.ly
-\version "2.11.38"
-\include "piece.ly"
-\score {
-  \keepWithTag #'vla \music
-  \layout { }
-}
-
-
-%%%%% vlc.ly
-\version "2.11.38"
-\include "piece.ly"
-\score {
-  \keepWithTag #'vlc \music
-  \layout { }
-}
-@end verbatim
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{string-quartet-template-with-separate-parts.ly}
 
 
 @node Vocal ensembles
@@ -555,293 +94,18 @@ music = {
 
 @appendixsubsec SATB vocal score
 
-Here is a standard four-part SATB vocal score.  With larger ensembles,
-it's often useful to include a section which is included in all
-parts.  For example, the time signature and key signatures are almost
-always the same for all parts.
-
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
-global = {
-   \key c \major
-   \time 4/4
-}
-
-sopMusic = \relative c'' {
-   c4 c c8[( b)] c4
-}
-sopWords = \lyricmode {
-   hi hi hi hi
-}
-
-altoMusic = \relative c' {
-   e4 f d e
-}
-altoWords =\lyricmode {
-   ha ha ha ha
-}
-
-tenorMusic = \relative c' {
-   g4 a f g
-}
-tenorWords = \lyricmode {
-   hu hu hu hu
-}
-
-bassMusic = \relative c {
-   c4 c g c
-}
-bassWords = \lyricmode {
-   ho ho ho ho
-}
-
-\score {
-   \new ChoirStaff <<
-      \new Lyrics = sopranos { s1 }
-      \new Staff = women <<
-         \new Voice =
-           "sopranos" { \voiceOne << \global \sopMusic >> }
-         \new Voice =
-           "altos" { \voiceTwo << \global \altoMusic >> }
-      >>
-      \new Lyrics = "altos" { s1 }
-      \new Lyrics = "tenors" { s1 }
-      \new Staff = men <<
-         \clef bass
-         \new Voice =
-           "tenors" { \voiceOne <<\global \tenorMusic >> }
-         \new Voice =
-           "basses" { \voiceTwo <<\global \bassMusic >> }
-      >>
-      \new Lyrics = basses { s1 }
-
-      \context Lyrics = sopranos \lyricsto sopranos \sopWords
-      \context Lyrics = altos \lyricsto altos \altoWords
-      \context Lyrics = tenors \lyricsto tenors \tenorWords
-      \context Lyrics = basses \lyricsto basses \bassWords
-   >>
-
-   \layout {
-      \context {
-         % a little smaller so lyrics
-         % can be closer to the staff
-         \Staff
-         \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
-      }
-   }
-}
-@end lilypond
-
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{vocal-ensemble-template.ly}
 
 @appendixsubsec SATB vocal score and automatic piano reduction
 
-This template adds an automatic piano reduction to the SATB vocal
-score.  This demonstrates one of the strengths of LilyPond -- you
-can use a music definition more than once.  If you make any changes
-to the vocal notes (say, tenorMusic), then the changes will also
-apply to the piano reduction.
-
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
-global = {
-   \key c \major
-   \time 4/4
-}
-
-sopMusic = \relative c'' {
-   c4 c c8[( b)] c4
-}
-sopWords = \lyricmode {
-   hi hi hi hi
-}
-
-altoMusic = \relative c' {
-   e4 f d e
-}
-altoWords =\lyricmode {
-   ha ha ha ha
-}
-
-tenorMusic = \relative c' {
-   g4 a f g
-}
-tenorWords = \lyricmode {
-   hu hu hu hu
-}
-
-bassMusic = \relative c {
-   c4 c g c
-}
-bassWords = \lyricmode {
-   ho ho ho ho
-}
-
-\score {
-  <<
-    \new ChoirStaff <<
-      \new Lyrics = sopranos { s1 }
-      \new Staff = women <<
-        \new Voice =
-          "sopranos" { \voiceOne << \global \sopMusic >> }
-        \new Voice =
-          "altos" { \voiceTwo << \global \altoMusic >> }
-      >>
-      \new Lyrics = "altos" { s1 }
-      \new Lyrics = "tenors" { s1 }
-      \new Staff = men <<
-        \clef bass
-        \new Voice =
-          "tenors" { \voiceOne <<\global \tenorMusic >> }
-        \new Voice =
-          "basses" { \voiceTwo <<\global \bassMusic >> }
-      >>
-      \new Lyrics = basses { s1 }
-
-      \context Lyrics = sopranos \lyricsto sopranos \sopWords
-      \context Lyrics = altos \lyricsto altos \altoWords
-      \context Lyrics = tenors \lyricsto tenors \tenorWords
-      \context Lyrics = basses \lyricsto basses \bassWords
-    >>
-  \new PianoStaff <<
-    \new Staff <<
-      \set Staff.printPartCombineTexts = ##f
-      \partcombine
-      << \global \sopMusic >>
-      << \global \altoMusic >>
-    >>
-    \new Staff <<
-      \clef bass
-      \set Staff.printPartCombineTexts = ##f
-      \partcombine
-      << \global \tenorMusic >>
-      << \global \bassMusic >>
-    >>
-   >>
-  >>
-  \layout {
-    \context {
-      % a little smaller so lyrics
-      % can be closer to the staff
-      \Staff
-        \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
-    }
-  }
-}
-@end lilypond
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{vocal-ensemble-template-with-automatic-piano-reduction.ly}
 
 @appendixsubsec SATB with aligned contexts
 
-Here all the lyrics lines are placed using @code{alignAboveContext}
-and @code{alignBelowContext}.
-
-@lilypond[quote,verbatim,ragged-right]
-\version "2.11.38"
-global = {
-  \key c \major
-  \time 4/4
-}
-
-sopMusic = \relative c'' {
-  c4 c c8[( b)] c4
-}
-sopWords = \lyricmode {
-  hi hi hi hi
-}
-
-altoMusic = \relative c' {
-  e4 f d e
-}
-altoWords =\lyricmode {
-  ha ha ha ha
-}
-
-tenorMusic = \relative c' {
-  g4 a f g
-}
-tenorWords = \lyricmode {
-  hu hu hu hu
-}
-
-bassMusic = \relative c {
-  c4 c g c
-}
-bassWords = \lyricmode {
-  ho ho ho ho
-}
-
-\score {
-  \new ChoirStaff <<
-     \new Staff = women <<
-        \new Voice =
-          "sopranos" { \voiceOne << \global \sopMusic >> }
-        \new Voice =
-          "altos" { \voiceTwo << \global \altoMusic >> }
-     >>
-     \new Lyrics \with {alignAboveContext=women} \lyricsto sopranos \sopWords
-     \new Lyrics \with {alignBelowContext=women} \lyricsto altos \altoWords
-% we could remove the line about this with the line below, since we want
-% the alto lyrics to be below the alto Voice anyway.
-%    \new Lyrics \lyricsto altos \altoWords
-
-     \new Staff = men <<
-        \clef bass
-        \new Voice =
-          "tenors" { \voiceOne <<\global \tenorMusic >> }
-        \new Voice =
-          "basses" { \voiceTwo <<\global \bassMusic >> }
-     >>
-
-     \new Lyrics \with {alignAboveContext=men} \lyricsto tenors \tenorWords
-     \new Lyrics \with {alignBelowContext=men} \lyricsto basses \bassWords
-% again, we could replace the line above this with the line below.
-%    \new Lyrics \lyricsto basses \bassWords
-  >>
-
-  \layout {
-     \context {
-        % a little smaller so lyrics
-        % can be closer to the staff
-        \Staff
-        \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
-     }
-  }
-}
-
-
-\score {
-  \new ChoirStaff <<
-     \new Staff = women <<
-        \new Voice =
-          "sopranos" { \voiceOne << \global \sopMusic >> }
-        \new Voice =
-          "altos" { \voiceTwo << \global \altoMusic >> }
-     >>
-
-     \new Lyrics \with {alignAboveContext=women} \lyricsto sopranos \sopWords
-     \new Lyrics \lyricsto altos \altoWords
-
-     \new Staff = men <<
-        \clef bass
-        \new Voice =
-          "tenors" { \voiceOne <<\global \tenorMusic >> }
-        \new Voice =
-          "basses" { \voiceTwo <<\global \bassMusic >> }
-     >>
-
-     \new Lyrics \with {alignAboveContext=men} \lyricsto tenors \tenorWords
-     \new Lyrics \lyricsto basses \bassWords
-  >>
-
-  \layout {
-     \context {
-        % a little smaller so lyrics
-        % can be closer to the staff
-        \Staff
-        \override VerticalAxisGroup #'minimum-Y-extent = #'(-3 . 3)
-     }
-  }
-} 
-@end lilypond
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly}
 
 
 @c bad node name to avoid node name confict
@@ -850,573 +114,24 @@ bassWords = \lyricmode {
 
 @appendixsubsec Transcription of mensural music
 
-When transcribing mensural music, an incipit at the beginning of the
-piece is useful to indicate the original key and tempo.  While today
-musicians are used to bar lines in order to faster recognize rhythmic
-patterns, bar lines were not yet invented during the period of
-mensural music; in fact, the meter often changed after every few
-notes.  As a compromise, bar lines are often printed between the
-staves rather than on the staves.
-
-@lilypond[quote,verbatim,line-width=11.0\cm]
-\version "2.11.38"
-
-global = {
-  \set Score.skipBars = ##t
-
-  % incipit
-  \once \override Score.SystemStartBracket #'transparent = ##t
-  \override Score.SpacingSpanner #'spacing-increment = #1.0 % tight spacing
-  \key f \major
-  \time 2/2
-  \once \override Staff.TimeSignature #'style = #'neomensural
-  \override Voice.NoteHead #'style = #'neomensural
-  \override Voice.Rest #'style = #'neomensural
-  \set Staff.printKeyCancellation = ##f
-  \cadenzaOn % turn off bar lines
-  \skip 1*10
-  \once \override Staff.BarLine #'transparent = ##f
-  \bar "||"
-  \skip 1*1 % need this extra \skip such that clef change comes
-            % after bar line
-  \bar ""
-
-  % main
-  \revert Score.SpacingSpanner #'spacing-increment % CHECK: no effect?
-  \cadenzaOff % turn bar lines on again
-  \once \override Staff.Clef #'full-size-change = ##t
-  \set Staff.forceClef = ##t
-  \key g \major
-  \time 4/4
-  \override Voice.NoteHead #'style = #'default
-  \override Voice.Rest #'style = #'default
-
-  % TODO: setting printKeyCancellation back to #t must not
-  % occur in the first bar after the incipit.  Dto. for forceClef.
-  % Therefore, we need an extra \skip.
-  \skip 1*1
-  \set Staff.printKeyCancellation = ##t
-  \set Staff.forceClef = ##f
-
-  \skip 1*7 % the actual music
-
-  % let finis bar go through all staves
-  \override Staff.BarLine #'transparent = ##f
-
-  % finis bar
-  \bar "|."
-}
-
-discantusNotes = {
-  \transpose c' c'' {
-    \set Staff.instrumentName = "Discantus  "
-
-    % incipit
-    \clef "neomensural-c1"
-    c'1. s2   % two bars
-    \skip 1*8 % eight bars
-    \skip 1*1 % one bar
-
-    % main
-    \clef "treble"
-    d'2. d'4 |
-    b e' d'2 |
-    c'4 e'4.( d'8 c' b |
-    a4) b a2 |
-    b4.( c'8 d'4) c'4 |
-    \once \override NoteHead #'transparent = ##t c'1 |
-    b\breve |
-  }
-}
-
-discantusLyrics = \lyricmode {
-  % incipit
-  IV-
-
-  % main
-  Ju -- bi -- |
-  la -- te De -- |
-  o, om --
-  nis ter -- |
-  ra, __ om- |
-  "..." |
-  -us. |
-}
-
-altusNotes = {
-  \transpose c' c'' {
-    \set Staff.instrumentName = "Altus  "
-
-    % incipit
-    \clef "neomensural-c3"
-    r1        % one bar
-    f1. s2    % two bars
-    \skip 1*7 % seven bars
-    \skip 1*1 % one bar
-
-    % main
-    \clef "treble"
-    r2 g2. e4 fis g | % two bars
-    a2 g4 e |
-    fis g4.( fis16 e fis4) |
-    g1 |
-    \once \override NoteHead #'transparent = ##t g1 |
-    g\breve |
-  }
-}
-
-altusLyrics = \lyricmode {
-  % incipit
-  IV-
-
-  % main
-  Ju -- bi -- la -- te | % two bars
-  De -- o, om -- |
-  nis ter -- ra, |
-  "..." |
-  -us. |
-}
-
-tenorNotes = {
-  \transpose c' c' {
-    \set Staff.instrumentName = "Tenor  "
-
-    % incipit
-    \clef "neomensural-c4"
-    r\longa   % four bars
-    r\breve   % two bars
-    r1        % one bar
-    c'1. s2   % two bars
-    \skip 1*1 % one bar
-    \skip 1*1 % one bar
-
-    % main
-    \clef "treble_8"
-    R1 |
-    R1 |
-    R1 |
-    r2 d'2. d'4 b e' | % two bars
-    \once \override NoteHead #'transparent = ##t e'1 |
-    d'\breve |
-  }
-}
-
-tenorLyrics = \lyricmode {
-  % incipit
-  IV-
-
-  % main
-  Ju -- bi -- la -- te | % two bars
-  "..." |
-  -us. |
-}
-
-bassusNotes = {
-  \transpose c' c' {
-    \set Staff.instrumentName = "Bassus  "
-
-    % incipit
-    \clef "bass"
-    r\maxima  % eight bars
-    f1. s2    % two bars
-    \skip 1*1 % one bar
-
-    % main
-    \clef "bass"
-    R1 |
-    R1 |
-    R1 |
-    R1 |
-    g2. e4 |
-    \once \override NoteHead #'transparent = ##t e1 |
-    g\breve |
-  }
-}
-
-bassusLyrics = \lyricmode {
-  % incipit
-  IV-
-
-  % main
-  Ju -- bi- |
-  "..." |
-  -us. |
-}
-
-\score {
-  \new StaffGroup = choirStaff <<
-    \new Voice =
-      "discantusNotes" << \global \discantusNotes >>
-    \new Lyrics =
-      "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics }
-    \new Voice =
-      "altusNotes" << \global \altusNotes >>
-    \new Lyrics =
-      "altusLyrics" \lyricsto altusNotes { \altusLyrics }
-    \new Voice =
-      "tenorNotes" << \global \tenorNotes >>
-    \new Lyrics =
-      "tenorLyrics" \lyricsto tenorNotes { \tenorLyrics }
-    \new Voice =
-      "bassusNotes" << \global \bassusNotes >>
-    \new Lyrics =
-      "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics }
-  >>
-  \layout {
-    \context {
-      \Score
-
-      % no bars in staves
-      \override BarLine #'transparent = ##t
-
-      % incipit should not start with a start delimiter
-      \remove "System_start_delimiter_engraver"
-    }
-    \context {
-      \Voice
-
-      % no slurs
-      \override Slur #'transparent = ##t
-
-      % Comment in the below "\remove" command to allow line
-      % breaking also at those bar lines where a note overlaps
-      % into the next bar.  The command is commented out in this
-      % short example score, but especially for large scores, you
-      % will typically yield better line breaking and thus improve
-      % overall spacing if you comment in the following command.
-      %\remove "Forbid_line_break_engraver"
-    }
-  }
-}
-@end lilypond
-
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{ancient-notation-template----modern-transcription-of-mensural-music.ly}
 
 @appendixsubsec Gregorian transcription template
 
-This example demonstrates how to do modern transcription of Gregorian
-music.  Gregorian music has no measure, no stems; it uses only half and
-quarter note heads, and special marks, indicating rests of different length.
-
-@lilypond[quote,verbatim,ragged-right]
-\include "gregorian-init.ly"
-\version "2.11.38"
-
-chant = \relative c' {
-  \set Score.timing = ##f
-  f4 a2 \divisioMinima
-  g4 b a2 f2 \divisioMaior
-  g4( f) f( g) a2 \finalis
-}
-
-verba = \lyricmode {
-  Lo -- rem ip -- sum do -- lor sit a -- met
-}
-
-\score {
-  \new Staff <<
-    \new Voice = "melody" {
-      \chant
-    }
-    \new Lyrics = "one" \lyricsto melody \verba
-  >>
-
-  \layout {
-    \context {
-      \Staff
-      \remove "Time_signature_engraver"
-      \remove "Bar_engraver"
-      \override Stem #'transparent = ##t
-    }
-    \context {
-      \Voice
-      \override Stem #'length = #0
-    }
-    \context {
-      \Score
-      barAlways = ##t
-    }
-  }
-}
-@end lilypond
-
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{ancient-notation-template----modern-transcription-of-gregorian-music.ly}
 
 @node Jazz combo
 @appendixsec Jazz combo
 
-This is a much more complicated template, for a jazz ensemble.  Note that all
-instruments are notated in @code{\key c \major}.  This refers to the key in
-concert pitch; LilyPond will automatically transpose the key if the music
-is within a @code{\transpose} section.
-
-@c TODO must clean up this jazz combo example
-@c   - transpositions stated in names (ie "trumpet in Bb" or whatever)
-@c   - one global section, instead of "global" (time) and "key"
-@c   - does it need those wierd macros?  sl, nsl, etc.
-@c   - maybe ask Amelie Zapf to clean it up, or whether I should just
-@c     make whatever changes I feel like.
-
-@c TODO: produces a warning ; key change merge.
-@c The `line-width' argument is for the \header.
-
-@lilypond[quote,verbatim,ragged-right,line-width]
-\version "2.11.38"
-\header {
-  title = "Song"
-  subtitle = "(tune)"
-  composer = "Me"
-  meter = "moderato"
-  piece = "Swing"
-  tagline = \markup {
-    \column {
-      "LilyPond example file by Amelie Zapf,"
-      "Berlin 07/07/2003"
-    }
-  }
-  texidoc = "Jazz tune for combo
-             (horns, guitar, piano, bass, drums)."
-}
-
-#(set-global-staff-size 16)
-\include "english.ly"
-
-%%%%%%%%%%%% Some macros %%%%%%%%%%%%%%%%%%%
-
-sl = {
-  \override NoteHead #'style = #'slash
-  \override Stem #'transparent = ##t
-}
-nsl = {
-  \revert NoteHead #'style
-  \revert Stem #'transparent
-}
-cr = \override NoteHead #'style = #'cross
-ncr = \revert NoteHead #'style
-
-%% insert chord name style stuff here.
-
-jzchords = { }
-
-
-%%%%%%%%%%%% Keys'n'thangs %%%%%%%%%%%%%%%%%
-
-global = {
-  \time 4/4
-}
-
-Key = { \key c \major }
-
-% ############ Horns ############
-
-% ------ Trumpet ------
-trpt = \transpose c d \relative c'' {
-  \Key
-  c1 c c
-}
-trpharmony = \transpose c' d {
-  \jzchords
-}
-trumpet = {
-  \global
-  \set Staff.instrumentName = #"Trumpet"
-  \clef treble
-  <<
-    \trpt
-  >>
-}
-
-% ------ Alto Saxophone ------
-alto = \transpose c a \relative c' {
-  \Key
-  c1 c c
-}
-altoharmony = \transpose c' a {
-  \jzchords
-}
-altosax = {
-  \global
-  \set Staff.instrumentName = #"Alto Sax"
-  \clef treble
-  <<
-    \alto
-  >>
-}
-
-% ------ Baritone Saxophone ------
-bari = \transpose c a' \relative c {
-  \Key
-  c1 c \sl d4^"Solo" d d d \nsl
-}
-bariharmony = \transpose c' a \chordmode {
-  \jzchords s1 s d2:maj e:m7
-}
-barisax = {
-  \global
-  \set Staff.instrumentName = #"Bari Sax"
-  \clef treble
-  <<
-    \bari
-  >>
-}
-
-% ------ Trombone ------
-tbone = \relative c {
-  \Key
-  c1 c c
-}
-tboneharmony = \chordmode {
-  \jzchords
-}
-trombone = {
-  \global
-  \set Staff.instrumentName = #"Trombone"
-  \clef bass
-  <<
-    \tbone
-  >>
-}
-
-% ############ Rhythm Section #############
-
-% ------ Guitar ------
-gtr = \relative c'' {
-  \Key
-  c1 \sl b4 b b b \nsl c1
-}
-gtrharmony = \chordmode {
-  \jzchords
-  s1 c2:min7+ d2:maj9
-}
-guitar = {
-  \global
-  \set Staff.instrumentName = #"Guitar"
-  \clef treble
-  <<
-    \gtr
-  >>
-}
-
-%% ------ Piano ------
-rhUpper = \relative c'' {
-  \voiceOne
-  \Key
-  c1 c c
-}
-rhLower = \relative c' {
-  \voiceTwo
-  \Key
-  e1 e e
-}
-
-lhUpper = \relative c' {
-  \voiceOne
-  \Key
-  g1 g g
-}
-lhLower = \relative c {
-  \voiceTwo
-  \Key
-  c1 c c
-}
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{jazz-combo-template.ly}
 
-PianoRH = {
-  \clef treble
-  \global
-  \set Staff.midiInstrument = "acoustic grand"
-  <<
-    \new Voice = "one" \rhUpper
-    \new Voice = "two" \rhLower
-  >>
-}
-PianoLH = {
-  \clef bass
-  \global
-  \set Staff.midiInstrument = "acoustic grand"
-  <<
-    \new Voice = "one" \lhUpper
-    \new Voice = "two" \lhLower
-  >>
-}
 
-piano = {
-  <<
-    \set PianoStaff.instrumentName = #"Piano"
-    \new Staff = "upper" \PianoRH
-    \new Staff = "lower" \PianoLH
-  >>
-}
 
-% ------ Bass Guitar ------
-Bass = \relative c {
-  \Key
-  c1 c c
-}
-bass = {
-  \global
-  \set Staff.instrumentName = #"Bass"
-  \clef bass
-  <<
-    \Bass
-  >>
-}
-
-% ------ Drums ------
-up = \drummode {
-  hh4 <hh sn>4 hh <hh sn> hh <hh sn>4
-  hh4 <hh sn>4
-  hh4 <hh sn>4
-  hh4 <hh sn>4
-}
-
-down = \drummode {
-  bd4 s bd s bd s bd s bd s bd s
-}
-
-drumContents = {
-  \global
-  <<
-    \set DrumStaff.instrumentName = #"Drums"
-    \new DrumVoice { \voiceOne \up }
-    \new DrumVoice { \voiceTwo \down }
-  >>
-}
-
-%%%%%%%%% It All Goes Together Here %%%%%%%%%%%%%%%%%%%%%%
-
-\score {
-  <<
-    \new StaffGroup = "horns" <<
-      \new Staff = "trumpet" \trumpet
-      \new Staff = "altosax" \altosax
-      \new ChordNames = "barichords" \bariharmony
-      \new Staff = "barisax" \barisax
-      \new Staff = "trombone" \trombone
-    >>
-
-    \new StaffGroup = "rhythm" <<
-      \new ChordNames = "chords" \gtrharmony
-      \new Staff = "guitar" \guitar
-      \new PianoStaff = "piano" \piano
-      \new Staff = "bass" \bass
-      \new DrumStaff { \drumContents }
-    >>
-  >>
-
-  \layout {
-    \context { \RemoveEmptyStaffContext }
-    \context {
-      \Score
-      \override BarNumber #'padding = #3
-      \override RehearsalMark #'padding = #2
-      skipBars = ##t
-    }
-  }
-
-  \midi { }
-}
-@end lilypond
 
 @ignore
-
 This isn't very useful, and only duplicates material in
 "global issues".  And if this info changes, this section often
 gets forgotten.
index cfbca22610c19cffb149080b7e0a53cb36592ef9..c35303a3a01e461ba3c93929bbd01bb4c2afc100 100644 (file)
@@ -24,7 +24,6 @@ not yet complete.  Don't translate yet!
 * Appearance of objects::       
 * Placement of objects::        
 * Collisions of objects::       
-* Page layout::                 
 * Further tweaking::            
 @end menu
 
@@ -723,7 +722,21 @@ let us suppose the exercise is to supply the missing bar lines
 in a piece of music.  But the bar lines are normally inserted
 automatically.  How do we prevent them printing?
 
-As before, we go to the IR to find the layout object which prints
+Before we tackle this, let us remember that object properties
+are grouped in what are called @emph{interfaces} -- see
+@ref{Properties found in interfaces}.  This is simply to
+group together those properties that are commonly required
+together -- if one of them is required for an object, so are
+the others.  Some objects then need the properties in some
+interfaces, others need them from other interfaces.  The
+interfaces which contain the properties required by a 
+particular grob are listed in the IR at the bottom of the
+page describing that grob, and those properties may be
+viewed by looking at those interfaces.
+
+We explained how to find information about grobs in 
+@ref{Properties of layout objects}.  Using the same approach,
+we go to the IR to find the layout object which prints
 bar lines.  Going via @emph{Backend} and @emph{All layout objects}
 we find there
 is a layout object called @code{BarLine}.  Its properties include
@@ -735,6 +748,8 @@ of these can affect the visibility of bar lines (and, of course,
 by extension, many other layout objects too.)  Let's consider
 each of these in turn.
 
+@c FIXME: is this what you meant?
+@c TODO Change all other headings like this
 @subheading stencil
 @cindex stencil property
 
@@ -1522,13 +1537,22 @@ the default numerical values for some of the commonest
 outside-staff objects which are, by default, placed in the
 @code{Staff} Context.
 
-@multitable @columnfractions .3 .3
-@headitem Layout Object           @tab Priority
-@item @code{DynamicLineSpanner}   @tab @code{ 250}
-@item @code{DynamicText}          @tab @code{ 250}
-@item @code{OttavaBracket}        @tab @code{ 400}
-@item @code{TextScript}           @tab @code{ 450}
-@item @code{TextSpanner}          @tab @code{ 350}
+@multitable @columnfractions .3 .3 .3
+@headitem Layout Object           
+  @tab Priority     
+  @tab Controls position of:
+@item @code{DynamicLineSpanner}   
+  @tab @code{ 250}  
+  @tab All dynamic markings
+@item @code{OttavaBracket}        
+  @tab @code{ 400}
+  @tab Ottava brackets
+@item @code{TextScript}           
+  @tab @code{ 450}
+  @tab Markup text
+@item @code{TextSpanner}          
+  @tab @code{ 350}
+  @tab Text spanners
 @end multitable
 
 Here is an example showing the default placement of these.
@@ -1763,7 +1787,7 @@ These are properties of all grobs which support the
 
 By default, outside-staff objects are given a width of zero so
 that they may overlap in the horizontal direction.  This is done
-by by the trick of adding infinity to the leftmost extent and 
+by the trick of adding infinity to the leftmost extent and 
 minus infinity to the rightmost extent by setting the 
 @code{extra-spacing-width} to @code{'(+inf.0 . -inf.0)}.  So
 to ensure they do not overlap in the horizontal direction we
@@ -2723,268 +2747,12 @@ lhMusic = \relative c' {
 @end lilypond
 
 
-@node Page layout
-@section Page layout
-
-@menu
-* Introduction to layout::      
-* Global sizes::                
-* Line breaks::                 
-* Page breaks::                 
-* Fitting music onto fewer pages::  
-@end menu
-
-@node Introduction to layout
-@subsection Introduction to layout
-
-The global paper layout is determined by three factors: 
-the page layout, the line breaks, and the spacing. These all 
-influence each other. The choice of spacing determines how 
-densely each system of music is set. This influences where line 
-breaks are chosen, and thus ultimately, how many pages a piece 
-of music takes.
-
-Settings which influence layout may be placed in two blocks.
-The @code{\paper @{...@}} block is placed outside any
-@code{\score @{...@}} blocks and contains settings that
-relate to the entire document.  The @code{\layout @{...@}}
-block is placed within a @code{\score @{...@}} block and
-contains settings for that particular score.  If you have
-only one @code{\score @{...@}} block the two have the same
-effect.  In general the commands shown in this section can
-be placed in either.
-
-Much more detail on the options for tweaking the laying out
-of music are contained in @ruser{Spacing issues}.
-
-@node Global sizes
-@subsection Global sizes
-
-TODO Check all these examples
-
-The default @strong{paper size} which LilyPond assumes in laying
-out the music is A4.  This may be changed in two ways:
-
-@example
-#(set-default-paper-size "a6")
-
-\paper @{
-#(set-paper-size "letter")
-@}
-@end example
-
-@noindent
-The first command sets the size of all pages. The second command
-sets the size of the pages to which the \paper block applies -- if
-the \paper block is at the top of the file, then it will apply
-to all pages.  Support for the following paper sizes is available:
-a6, a5, a4, a3, legal, letter, 11x17 (also known as tabloid).
-Setting the paper size automatically sets suitable margins and
-line length.
-
-If the symbol @code{landscape} is supplied as an argument to
-@code{set-default-paper-size}, the pages will be rotated by 90
-degrees, and wider line widths will be set correspondingly, e.g.
-
-@example
-#(set-default-paper-size "a6" 'landscape)
-@end example
-
-The default @strong{staff size} is set to 20 points.
-This may be changed in two ways:
-
-@example
-#(set-global-staff-size 14)
-
-\paper @{
-#(set-global-staff-size 16)
-@}
-@end example
-
-@noindent
-The first command sets the size in all pages. The second command
-sets the size in the pages to which the \paper block applies -\96 if
-the \paper block is at the top of the file, then it will apply
-to all pages.  All the fonts are automatically scaled to suit
-the new value of the staff size.
-
-@node Line breaks
-@subsection Line breaks
-
-Line breaks are normally determined automatically. They are chosen
-so that lines look neither cramped nor loose, and consecutive
-lines have similar density.  Occasionally you might want to
-override the automatic breaks; you can do this by specifying
-@code{\break}. This will force a line break at this point.  However,
-line breaks can only occur at the end of @q{complete} bars, i.e.,
-where there are no notes or tuplets left @q{hanging} over the bar
-line.  If you want to have a line break where there is no bar line,
-you can force an invisible bar line by entering @code{\bar ""},
-although again there must be no notes left hanging over in any of
-the staves at this point, or it will be ignored.
-
-The opposite command, @code{\noBreak}, forbids a line break at the
-bar line where it is inserted.
-
-The most basic settings influencing line spacing are @code{indent}
-and @code{line-width}. They are set in the @code{\layout} block.
-They control the indentation of the first line of music, and the
-lengths of the lines.
-
-If @code{ragged-right} is set to true in the @code{\layout} block,
-then systems end at their natural horizontal length, instead of
-being spread horizontally to fill the whole line. This is useful
-for short fragments, and for checking how tight the natural
-spacing is.
-
-The option @code{ragged-last} is similar to @code{ragged-right},
-but affects only the last line of the piece.
-
-@example
-\layout @{
-indent = #0
-line-width = #150
-ragged-last = ##t
-@}
-@end example
-
-@node Page breaks
-@subsection Page breaks
-
-The default page breaking may be overriden by inserting 
-@code{\pageBreak} or @code{\noPageBreak} commands.
-These commands are analogous to the @code{\break} and 
-@code{\noBreak} commands discused above and force or forbid 
-a page-break at the point where they are inserted.
-Of course, the @code{\pageBreak} command also forces a line break.
-Like @code{\break}, the @code{\pageBreak} command is effective only
-at the end of a @q{complete} bar as defined above.  For more
-details see @ruser{Page breaking} and following sections.
-
-There are also analogous settings to @code{ragged-right} and
-@code{ragged-last} which have the same effect on vertical spacing:
-@code{ragged-bottom} and @code{ragged-last-bottom}.  If set to
-@code{##t} the systems on all pages or just the last page
-respectively will not be justified vertically.
-
-For more details see @ruser{Vertical spacing}.
-
-@node Fitting music onto fewer pages
-@subsection Fitting music onto fewer pages
-
-Sometimes you can end up with one or two staves on a second
-(or third, or fourth...) page.  This is annoying, especially
-if you look at previous pages and it looks like there is plenty
-of room left on those.
-
-When investigating layout issues, @code{annotate-spacing} is
-an invaluable tool.  This command prints the values of various
-layout spacing commands; see @ruser{Displaying spacing}, for more
-details.  From the output of @code{annotate-spacing}, we can
-see which margins we may wish to alter.
-
-Other than margins, there are a few other options to save space:
-
-@itemize
-@item
-You may tell LilyPond to place systems as close together as
-possible (to fit as many systems as possible onto a page), but
-then to space those systems out so that there is no blank
-space at the bottom of the page.
-
-@example
-\paper @{
-  between-system-padding = #0.1
-  between-system-space = #0.1
-  ragged-last-bottom = ##f
-  ragged-bottom = ##f
-@}
-@end example
-
-@item
-You may force the number of systems (i.e., if LilyPond wants
-to typeset some music with 11 systems, you could force it to
-use 10).
-
-@example
-\paper @{
-  system-count = #10
-@}
-@end example
-
-@item
-Avoid (or reduce) objects which increase the vertical size of
-a system.  For example, volta repeats (or alternate repeats)
-require extra space.  If these repeats are spread over two
-systems, they will take up more space than one system with
-the volta repeats and another system without.
-
-Another example is moving dynamics which @q{stick out} of
-a system, as in the second bar here:
-
-@lilypond[verbatim,quote,fragment,ragged-right,relative=1]
-e4 c g\f c
-\override DynamicText #'extra-offset = #'( -2.2 . 2.0)
-e4 c g\f c
-@end lilypond
-
-@item
-Alter the horizontal spacing via @code{SpacingSpanner}.  See
-@ruser{Changing horizontal spacing}, for more details.  Here's
-an example first showing the default behaviour:
-
-@lilypond[verbatim,quote,ragged-right]
-\score {
-  \relative c'' {
-    g4 e e2 |
-    f4 d d2 |
-    c4 d e f |
-    g4 g g2 |
-    g4 e e2 |
-  }
-}
-@end lilypond
-
-@noindent
-and now with @code{common-shortest-duration} increased from the
-value of @code{1/4} (a quarter note is the most common in this
-example) to @code{1/2}:
-
-@lilypond[verbatim,quote,ragged-right]
-\score {
-  \relative c'' {
-    g4 e e2 |
-    f4 d d2 |
-    c4 d e f |
-    g4 g g2 |
-    g4 e e2 |
-  }
-  \layout {
-    \context {
-      \Score
-      \override SpacingSpanner
-                #'common-shortest-duration = #(ly:make-moment 1 2)
-    }
-  }
-}
-@end lilypond
-
-@noindent
-Note that this override cannot be modified dynamically, so it must
-always be placed in a @code{\context@{..@}} block so that it applies
-to the whole score.
-
-TODO Add description of using \context in this way earlier if it is
-not already anywhere  -td
-
-@end itemize
-
-
 @node Further tweaking
 @section Further tweaking
 
 @menu
 * Other uses for tweaks::       
+* Using variables for tweaks::  
 * Other sources of information::  
 * Advanced tweaks with Scheme::  
 * Avoiding tweaks with slower processing::  
@@ -3094,6 +2862,10 @@ while the second (with no stencil) does not.
 
 @end itemize
 
+@node Using variables for tweaks
+@subsection Using variables for tweaks
+
+TODO Add section
 
 @node Other sources of information
 @subsection Other sources of information
@@ -3233,3 +3005,5 @@ In some cases (see issue 246), this must be done before
 
 
 
+
+
diff --git a/Documentation/user/writing-sections.txt b/Documentation/user/writing-sections.txt
new file mode 100644 (file)
index 0000000..3a0c767
--- /dev/null
@@ -0,0 +1,106 @@
+CHECKLIST FOR DOC SECTION REWRITES
+
+You've volunteered (or are considering volunteering) to edit a
+section of the NR.  Congratulations!  You'll learn a lot about
+this part of lilypond.  You'll also get thoroughly fed up with
+documentation work, and especially with me... but as they say,
+"you can't make an omelett without breaking a few eggs".  Welcome
+to egg-hood!
+
+REQUIRED READING
+
+- policy.txt
+- writing-texinfo.txt
+- this document :)
+- NR 1.1 Pitches.  Ideally, read it in your favorite output format
+  (either info, PDF, or HTML), *and* in source format
+  (pitches.itely).  This is our "demonstration" chapter, so the
+  below points really just boil down to "make it like
+  pitches.itely".
+
+
+WORKING
+
+I recommend working on one subsection at a time.  For each
+subsection,
+- check the mundane formatting.  Are the headings (@refcommands,
+  @seealso, etc) in the right order?
+- add any appropriate index entries.
+- check the links in the @seealso section -- links to music
+  glossary, internal references, and other NR sections are the
+  main concern.  Check for potential additions.
+- move LSR-worthy material into LSR.  Add the snippet (or
+  just send it to Valentin for adding), delete the material from
+  the .itely file, and add a @lilypondfile command.
+
+- check the examples and descriptions.  Do they still work?
+  *Do not* assume that the existing text is accurate/complete;
+  some of the manual is highly out of date.
+- is the material in the @refbugs  still accurate?
+- process anything on the TODO list on the GDP web site.
+- can the examples be improved (made more explanatory), or is
+  there any missing info?  (feel free to ask specific questions
+  on -user; a couple of people claimed to be interesting in being
+  "consultants" who would help with such questions)
+
+In general, I favor short text explanations with good examples --
+"an example is worth a thousand words".  When I worked on the
+docs, I spent about half my time just working on those tiny
+lilypond examples.  Making easily-understandable examples is much
+harder than it looks.
+
+
+TWEAKS
+
+In general, any \set or \override commands should go in the
+"select snippets" section, which means that they should go in LSR
+and not the .itely file.  For some cases, the command obviously
+belongs in the "main text" (ie not inside @refcommands or @seealso
+or whatever) -- instrument names are a good example of this.
+  \set Staff.instrumentName = #"foo"
+On the other side of this,
+  \override Score.Hairpin #'after-line-breaking = ##t
+clearly belongs in LSR.
+
+I'm quite willing to discuss specific cases if you think that a
+tweaks needs to be in the main text.  But items that can go into
+LSR are easier to maintain, so I'd like to move as much as
+possible into there.
+
+
+It would be "nice" if you spent a lot of time crafting nice tweaks
+for users... but my recommendation is *not* to do this.  There's a
+lot of doc work to do without adding examples of tweaks.  Tweak
+examples are trivial to add later -- they could be made by normal
+users, or by you after GDP is over.
+
+Basically, it's not something that needs to be done while I'm
+around.  Remember that I'm gone in August at the latest; there's a
+*lot* of doc work that should be done before then.  I strongly
+recommend that you save all the tweaks until later.
+
+
+FINAL
+
+- when you think you're finished, let me know.  I'll spend a few
+  minutes and send you a list of mistakes to fix.
+  (there's a *lot* of details to cover; we'll probably spend a
+  week going back and forth like this.  See earlier warning about
+  hating me by the time you're done with a doc section :)
+- I'll ask people on -user to review the Snippet list at this
+  time; correcting things on the Snippet list is much easier than
+  getting comments on the integrated snippets.
+- when we're both satisfied with the section, we'll invite
+  comments from -user.  Judging from my experience with Pitches,
+  it will take between three and five weeks to keep on revising
+  the "final" version.
+
+I personally found it quite frustrating to still be fixing
+problems in a doc section which I thought was "perfect" a whole
+bloody *month* ago.  Don't get me wrong; it's great that we get so
+many comments from -user.  :)   But just be aware that when you
+think you're finally done with a section, you're actually only
+halfway there.
+
+
+
index 11f49990c59221dfe1f27ad9d172ddcdac421d15..98272f9a6889b6d753fa443b49b9041bf902d767 100644 (file)
@@ -14,7 +14,7 @@ something, you can cut-and-paste that stuff into a new location.
 
 Most of the manual operates at the
        @node Foo
-       @unnumberedsubsubsec Foo
+       @subsubsection Foo
 level.  Sections are created with
        @node Foo
        @subsection Foo
@@ -29,8 +29,14 @@ commands.
 
 * Use two spaces for indentation in lilypond examples.  (no tabs)
 
+* All text strings should be prefaced with #.  LilyPond does not
+  strictly require this, but it is helpful to get users accustomed
+  to this scheme construct.  ie
+    \set Staff.instrumentName = #"cello"
+
 * If possible, only write one bar per line.  The notes on each
-  line should be an independent line.
+  line should be an independent line -- tweaks should occur on
+  their own line if possible.
   Bad:
     \override textscript #'padding = #3 c1^"hi"
   Good:
@@ -200,10 +206,12 @@ commands.
   required.  Any link in a doc section must be duplicated in the
   @seealso section at the bottom.
 
-* Introducing examples may be done with
+* Introducing examples must be done with
      . (ie finish the previous sentence/paragaph)
      : (ie `in this example:')
      , (ie `may add foo with the blah construct,')
+  The old "sentence runs directly into the example" method is not
+  allowed any more.
 
 * Abbrevs in caps, e.g., HTML, DVI, MIDI, etc.
 
@@ -218,10 +226,3 @@ commands.
   this is, don't say `Ba@ss{}tuba' but `Baßtuba'.  This ensures that
   all such characters appear in all output formats.
 
-* Don't use a @ref{link to another section} in the middle of a
-  sentence.  It looks ok in HTML, moderately bad in PDF, and
-  utterly horrible in INFO.  Instead, reword the sentence so that
-  users are encouraged to see @ref{link to another section}.
-  (at the end of the sentence)
-
-
index 7ef747f28e0172b6fa89d4bfb68fb6f791c3453c..b457150eaed98b7b073a3787c10489e3a73f3cce 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "chords, ancient-notation, contexts-and-engravers"
index 57cbb559b3c19f605eb5bf26d5544fbae9228c50..2be46181f91fded7f25bbc0f28e4be072d6cf67b 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "pitches, staff-notation, vocal-music"
index 1ae18b0a730c136dda6c2563ca49a1098e2d79d9..ff9d5a2777381b3d23f116c15cd462119e274ed3 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "staff-notation, contexts-and-engravers"
index 16c370faa8656cb375addd3939e08c4134a20a8f..8f1472e42aba51c3a1874912a43933136b0ba484 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "staff-notation, contexts-and-engravers, breaks"
index 4ffd3cf0fc45d3e1f325e62d54c450ad99da9113..15d77cbcffe4245d197c82572f918a890cccf3c7 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, expressive-marks"
index 6e76d637c262f98580d3e6a243dbc41b507e8c95..f9941b82c8205cf162745cb42ffd7be5725ec546 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, percussion"
index da8ec5ea629371b558274765d40cf791ccb910b9..64fb4d5f25df791fac9cd927dd557176e1f7d333 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "guitar"
index fcf98a1deedd387fcf1f36ec2b87189893e8c0a0..7341d4f224349bd5b86adc1b3b1471bbec903fed 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "expressive-marks"
index c1045bdfed1fc841a8c61dc0437ad1afb8a6f8fa..85ac4910c5c5544cf210efacfd2229d082330396 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "titles"
@@ -24,7 +24,7 @@ solution, you can format the date just as you like it by adapting the
 details on this format string: Formatting Calendar Time. 
 " }
 % begin verbatim
-\version "2.11.35"
+\version "2.11.38"
 % first, define a variable to hold the formatted date:
 date = #(strftime "%d-%m-%Y" (localtime (current-time)))
 
index 9d0a518ac8d31091cc942cce86f4e7b9ac361a47..68a31e707bc1f41e6e224c4ccdaa4736c113f4a2 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "text, vocal-music, spacing"
index 8794457dfa39a74a6465d5f010bd90ead113cfe6..586103c4a0de81a63b92d5e352ac6f3d9b1ee9f8 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "text, paper-and-layout, titles"
index d6c6fc9319b634ad533ad4374c62e7172443f806..1cb96225ba2e0c137931491681bc5fb132d83cf8 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "text, vocal-music"
index 5f71b712ecb13d45822ba0fcd0f26c424affdeb8..28e73ec1c40851c382df6b1582122bc87f14f2cb 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "tweaks-and-overrides, paper-and-layout, spacing"
index 81359ddc8841add99bfb780e14a37cb57af757c4..67d6605a4f87d239d06619ff9a14d27e1bdff8f4 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
index 08a64ad169d085d18b038e1644bf0bdbd23f6d9d..d6c563becfeb72aebcd735b1d4a9ddab5d6da4eb 100644 (file)
@@ -1,9 +1,9 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
-  lsrtags = "pitches"
+  lsrtags = "pitches, vocal-music"
  texidoc = "
 If you have multiple voices in a single staff and you want a single
 ambitus per staff rather than per voice, add the
@@ -16,8 +16,6 @@ ambitus per staff rather than per voice, add the
   }
 <<
   \new Voice \relative c'' {
-      % eliminates collision
-      \override Staff.Ambitus #'X-offset = #-1.0
       \voiceOne
       c4 a d e f1
     }
index eef25c714264920812e75dfc4d0794908633cb1d..55cf18912ceacf4163bc1368af0853a3089ebdf7 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "ancient-notation"
index fbaf650bdf77637a6d9ef2581ab2bbaa8a3cbb95..892b8942d0244c29e26c52df9902d13bf459b216 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "ancient-notation, template"
index 0e5d1b3e1f4ff5930162504bc795d186687a01f3..f42d442776147c07da7200973a75f4afe46dddde 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "ancient-notation, template"
index 34c0084249daa100eb1240900d419bb262b644ae..c8b0963a4e083b78d839e807407bdf091a69422e 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "ancient-notation"
index c6e68f26325bc9af66d4a1f443d69d8efb9a289e..70aef6b7b9981ef8c6d8f73736f6b7b5f556eb91 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "pitches, editorial-and-educational-use"
index e5e9bb7e65cf76ae63e02bfee5b10baf720dd892..2dbb41df46d9f8aa21ad232322d918d24014f5dc 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms"
index d2435bf06ff6bd4bd3caedabb5c58d1411236c21..8d008b750738ac9db970325453f7d9b909714c6b 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms"
index cbf5a6ee08f2d7598b6b9bab5ffa21a43133010f..ea2fc571a8fd17938dd8307710c22944200b4f92 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, breaks"
index 7d26111648a0f6913f76b9d09bd4e29a4fb22a94..b33e4ab0d12edcfa915660025875191092636b81 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "editorial-and-educational-use, text"
index 25a58aaaa2fde808f4fe33d850d5f11e305de4d9..f8d87e3870cc78ee7c93fb8fe96027fe07516035 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "expressive-marks"
index 164764ac91350185884baf74e6bb6683a473c650..56117a6cb86be0c46908e329e4f17a23e5c17471 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "expressive-marks"
index a6780af5cbe778b10a808dffd3f5284e38cb9d0a..08ee89a2858d6a097177f62298e3b04323b807e6 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"
index 117035b5b2ea9fcc35198a9cbcee29dfe42d050b..e427bfcfa97a51efe091945fe200bf7e98550621 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "expressive-marks, text"
index 834d8b21fd105eb5468678a09eaa4cc5f5cc211b..22724d65b1d3ef97fbfebb2b5f22691f8eeabb75 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "expressive-marks"
index e521e95e5f8e08d463693e7ee40f1cfeba10c2de..afcfe680e00953423087781f16df182aaac81293 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "simultaneous-notes, editorial-and-educational-use, tweaks-and-overrides"
index c9a11ee9d0817957e3906e66dd2c6764c6bbaf2e..c5c1976dc5994a436132f05b14b82741dc8ec045 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "tweaks-and-overrides"
index 9d8e2f1516373742f6e9a47bd9c8d89b9967af10..1a71ec3e8fb835a03bd60a5ab1922ffed25c3d12 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "expressive-marks, editorial-and-educational-use"
index 072d98624367bbff31282702ac052854ef848a69..03f64fea32cb2b224c921f8e6b6575831c1d6c4f 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "chords"
index 8612a64ff75650067ee960de2f3446fba4d8cbc9..1f87eb9fe991baddd670c1fd904f14c8f660c178 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "editorial-and-educational-use, text, tweaks-and-overrides"
index ff6fc15ac35d72c9a4335c572c5fa6db6bb7a649..7beb4a38b0b29b5caa4e5d5564588d48bb84836e 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "staff-notation"
index aeecc69820c5896f8d6655d4cd94938082393dc6..2c54e420a894ad6e63ccaba90a784bee16091aa3 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides, paper-and-layout"
index 8605a9cf7e0f093b380ffe72173aaa5a23a552c1..fa8bd79a8aba6d24b085297d5905d1281f659702 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, contexts-and-engravers"
index ac300809c5346589d41ec65cb7571a7df9e56f51..af4ca99b46fbf49f1eac80115bef7841b3e58eb4 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, vocal-music, ancient-notation, contexts-and-engravers"
index 8e174224d8240b381508aa07919039b9da39ec73..22cc2cb27adee110fdbe5eb9484879e1aadba335 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "chords"
index b394dd41df9e15d7a8280071768240e4856288fa..dac04fe9798199140e57e7258036fbf8ca57f127 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "pitches, staff-notation, editorial-and-educational-use, tweaks-and-overrides"
@@ -23,7 +23,7 @@ space. The clefOctavation value would normally be set to 7, -7, 15 or
 When a clef change takes place at a line break the new clef symbol is
 printed at both the end of the previous line and the beginning of the
 new line by default. If the warning clef at the end of the previous
-line in not required it can be suppressed by setting the
+line is not required it can be suppressed by setting the
 explicitClefVisibility Staff property to the value 
 @code{end-of-line-invisible}. The default behaviour can be recovered
 with  @code{\\unset Staff.explicitClefVisibility}.
index 48259b8474ef314198306f4d2e4ba8b74c21434c..2681cb08ab3f21a7c56ea2d2cf268da48dc53851 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
   doctitle = "Clip systems"
index 9093b2df6d909b5fd4bfd4f86b6352d4dd28f65c..e5b2c277071ba8e97f9711bf2e46c00b8249006d 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "simultaneous-notes, chords, piano-music"
index 75f6249134e5f10095953ed59dae2bb7fe706ac9..48ab991661e4488626897682e62d9ccbc9d4c625 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "editorial-and-educational-use, tweaks-and-overrides"
index 08839abbd079ccea3f265a9c5ceac919619d5ad2..52c146f7c47c4fedc5dab4b1451c3d818f08bba4 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "expressive-marks, text"
index 9c0b7722737d61047bee05f4c07fff3bb4fa7cfd..c493552014a8f7af8b5a664e819657dd09ec7508 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "simultaneous-notes, text"
index 1bb96252a7cc251f7c24c71fb3163681738579e4..37b840a30899535bb20b5d1296eb845210e74acf 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms"
index 6beb1d7e077a781f99701e8bdb04b0bed3e3e1d3..db28346ec3a09275bda2e7288449520ec8cb7755 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms"
index 7b8c9becb3f6ca7340d1b82e50a8bd7baf6f3a72..3b163adf2e8a02547150bdc6cc01256022d1799c 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "expressive-marks"
index 36426d1e602204515beeb85e7792a1391450af7a..7c14c06ec7f4c9c43bafa645ce68901b75b2e549 100644 (file)
@@ -1,8 +1,8 @@
 creating-blank-staves.ly
 chant-or-psalms-notation.ly
-adding-a-figured-bass-above-or-below-the-notes.ly
+adding-and-extra-staff-at-a-line-break.ly
 adding-an-extra-staff.ly
 vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
 engravers-one-by-one.ly
-adding-and-extra-staff-at-a-line-break.ly
+adding-a-figured-bass-above-or-below-the-notes.ly
index ed8dc33ce41c6071c1fc3f046fcc3b7ed87ff79c..d5707537d3333576576d1c9687a7b612c8669c16 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
index 8e1b779a1e264211570af8afbb3505c1bf66497b..2a19a9959c257caa563f51b8c33e5eecabef805d 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "pitches"
index 46c72b65d2b973011bfe11450ee875b6f51fec64..f44697755b278e10353e579bc6f6ce93e4607c9a 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "staff-notation, editorial-and-educational-use, contexts-and-engravers, paper-and-layout"
index f38e46bbd296cfe6f4ea55fe12510d4f29113479..34b4f2eb785299b72a3270aa61aa27aed593ef05 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "expressive-marks, text, tweaks-and-overrides"
index 0853632d32d6214430a42ca8658848b6cf0c2b67..a3d250f11d50f4d4bd1383691abada68deaa3db2 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "ancient-notation, tweaks-and-overrides"
index 8f2ae4fc2786c89b836212c52021eba49895fc14..4f7941129d102ab8325caec3072b91307bfdd107 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "vocal-music, piano-music, strings, midi"
@@ -9,7 +9,7 @@ Problem: How to know which MidiInstrument would be best for your
 composition? Solution: A Lilypond demo file. 
 " }
 % begin verbatim
-%\version "2.11.35"
+%\version "2.11.38"
 
 basemelodie = { c'4. \mf g  c'16 b' c'' d'' | e'' d'' e'' f'' g''4 g'''4 r | r1 }
 melodie = { \tempo 4 = 150 \basemelodie }
index 7f73eff6b1ab334062aa70f75f849bc22226969e..6870f153b3c327d13e3fbdc722eeb8f2baa14f8a 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "text, paper-and-layout, titles"
index 45e383e6539c9c4aa57a9b16043ce86f1218408b..2b054fdaa361131998ebc106796775b5b1382548 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "pitches"
index 9894d10ff5b1c0d62253ac1d119fde87820617c1..29d23925a9c097efa928871d2dacaaae5a791162 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
   doctitle = "Drawing boxes around grobs"
index c596551d60fc41c4f90f1bce724aae796d589f1f..a73b93ff6ca1b47f89fa05f90c185e20dc6c992d 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
   doctitle = "Drawing circles around various objects"
index 0708835a5db1a3b21ab16ce5323d36557bff81a4..022286d6071b37efd3f4847e8d69cd5d3e02965d 100644 (file)
@@ -1,5 +1,5 @@
-creating-blank-staves.ly
 applying-noteheads-styles-depending-on-the-step-of-the-scale.ly
+creating-blank-staves.ly
 changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
 coloring-objects.ly
 inserting-score-fragments-above-the-staff,-as-markups.ly
index 0f874131e9133021762afe20f4fd5fe1bede9c60..0069a9f92f7628f8b549db76257e90421d83aa5c 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "contexts-and-engravers"
index d688d8b1798a5a5abe9385061c94761237fe154e..7ed0da7c352070e49aa2c725f0f33b692cee1c66 100644 (file)
@@ -1,9 +1,9 @@
 combining-dynamics-with-markup-texts.ly
 creating-text-spanners.ly
-breathing-sign.ly
+adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
 changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
 caesura-railtracks-with-fermata.ly
-adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
+breathing-sign.ly
 center-text-below-hairpin-dynamics.ly
 contemporary-glissando.ly
 adding-parentheses-around-an-expressive-mark.ly
index c902900f5c5d951a1a8abf5311734e6f8ae45998..bb895aba3712e3cd81a3c25d7a97f3adf6177ef6 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, editorial-and-educational-use"
index 455e96962da5ce23f411aed262b2465fab56613b..037b35539217a87e2aac1d77aec5466ab115bb29 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "editorial-and-educational-use, text, vocal-music"
index 388273c307d35c3f22e05b039d99f0ab893bc39b..54720e2eabb7ded7780f893a3054885e4259bb0f 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "pitches"
index b0858086bb6032619c856d4342c6e99fa8714a46..0873ab4e5fa061ce95965d60fceb802e4ba85457 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, percussion"
index d0c17caf8dc416bf231729c212e69406bf3d0c94..9db3e3ae3eb263ad2ec6d5fee15b071576209600 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "text, vocal-music"
index 725100cbc1eb38df1bdfc1ff8bb9475534b0fcad..f80973921e72ebc78932a3212081757a707fe224 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "staff-notation, editorial-and-educational-use"
index f0a3f5fe128a5cc957debb84607e8990276a5be2..1fa05fc74fbf15f3e11d8ef1d85d5853b333b597 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "piano-music, percussion, guitar, template"
index fcf90a207fcc721e3054c0e5cc256858c9202a59..c2e7d3211b13c52715d24b3e13c9f5faa0f41210 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   doctitle = "Letter tablature formatting"
index e04344911510b5dc72bff7d7cf3bab48231e1c5d..1ab598090bb881c2e3d439d51379c47516ff3301 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
   doctitle = "Line arrows"
index 79b8ac85401fa02fd922c06ab3c8cbf7ddaf9600..74c7218e4bf93ea27da9b8645d652b22fc8919ee 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
   doctitle = "Makam"
index 8d20fd3a59c5018e04380d926859272a5583909c..d9208f04fb27690a13cd8ab72d4ac0c0ca76ad3b 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
   doctitle = "Making an object invisible with the transparent property"
index 2ed191b0c4182d4668f6f1cb5bf7e3f55c8fc607..cef8e0f13cd007f3ec597f417d13085d7c8947ab 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, tweaks-and-overrides"
index 64c007c2307f5d270cc28723e1c03d44543d8c51..c7c91a59ea6c01c273872946d7265f88cff2c8a7 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   doctitle = "Markup lines"
index 4ed8fa1f7f497a349dd3c97ff3359bce968c0c42..4ad574a0eb36aad4acc4a2e6d2521a6ae1718105 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 % possible rename to scheme- or something like that.  -gp
 \header {
   doctitle = "Move specific text"
index 62422ba4481aa04f31e43620b243350a1e0b2a86..fd57c48b66b63cee7f0f8277be52cd1c1afd555d 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "pitches, staff-notation"
index 0da459223310070aa9aaf1ae18bc9854f6340a89..d64bfa45db1575ccf71869c300ce2ceb655448da 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "pitches, text"
index 748c9079813e722b580dda49fba0210c405ef6c3..b825f8cb919b5dd617ca8bd49b109f74f9adc69a 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   doctitle = "Outputting the version number"
index 37372edf216d330706b529f32acaac5ec4a916e2..e6a50acf156194220eda4941b2a310723a1cf653 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
   doctitle = "Page label"
index 22cae45775d5c3e325f14ee9c90a699dabb2f366..06d260833ce6ebd7df65367df805a3fe52253e9b 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "piano-music, template"
index 0b65b98ac17ab013da78818ebd4ca16906b27240..383c6bcb32dc09c09c1182045018463a50183be9 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   doctitle = "Piano template with centered dynamics"
index 96968b7dc6343973c0291de45986213bf64207db..9727132ff76567e390e1c1698d4a9d0707ba7a37 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "text, piano-music, template"
index c7dea583137a07463b0efa91aace5af3cc29a80d..3b9f4c5f29ea324a01ab078bc423b79103af5680 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "vocal-music, piano-music, template"
index b1a49b2e7c03bf90fd4e94d02a81ec1e47bbff0f..6b85fe7a49d2648bcca7c4eaf6b932f3784c430b 100644 (file)
@@ -1,5 +1,5 @@
 applying-noteheads-styles-depending-on-the-step-of-the-scale.ly
-ambiti-multiple-voices.ly
+creating-a-sequence-of-notes-on-various-pitches.ly
 makam.ly
 transposing-pitches-with-minimum-accidentals-smart-transpose.ly
 ottava-text.ly
@@ -10,5 +10,5 @@ adding-ambiti-per-voice.ly
 clefs-commonly-tweaked-properties.ly
 dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
 preventing-natural-signs-from-being-printed-when-the-key-signature-changes.ly
-creating-a-sequence-of-notes-on-various-pitches.ly
+ambiti-multiple-voices.ly
 non-traditional-key-signatures.ly
index 0a4082c417ed65a33240f87ac245edb9ab649afd..a9604be799a7e9f881fd771b8f5b833ec22379c9 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "repeats, breaks"
index 70695f8e8741a4a0b4aae4d251e23e46440e0437..b802fc08217b64515c064a8995062e319d2ceea6 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "pitches"
index 803e54b7ba02bcc96667e7202cd62307cd120264..c7fbfb283c336d2a0a0274a97ec3537e663af6f0 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "pitches"
index e05e2542cacdb2bf4b7ed51db7868440b39c9209..050b6897087a3ce65a2d1ca0857a27513377612b 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "tweaks-and-overrides, spacing"
index 95ba983666e31306f7aadca14b81f596633af969..cd07810a5b57f2c4dfe675d511c78b67bba40d26 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 \header {
   doctitle = "Quoting another voice with transposition"
   lsrtags = "pitches,staff-notation"
index 7ad768a1217ebf5f4ca0a8086eea806850d1c66a..2380dc166f5ce76ad3216148a7a8eda5b8bafa14 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
   doctitle = "Quoting another voice"
index c38f21e90fd66135029ad3733a9598521e3d7af2..62cf4a07e848703958469f243f43fceff5c202cd 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, ancient-notation, tweaks-and-overrides"
index 5b8ab05a443622baba97e7610e4485d61a78d3c3..45e09b689086c44dd5e55a2b7150a6430620bc44 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, editorial-and-educational-use, tweaks-and-overrides"
index 35ce406627c5bb4e927942c7c4727f220e008c81..2a1edde5b98697aee82366c8ea5d193ef263f5f7 100644 (file)
@@ -1,19 +1,19 @@
 altering-the-number-of-stems-in-a-beam.ly
-chant-or-psalms-notation.ly
-heavily-customized-polymetric-time-signatures.ly
+adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
 conducting-signs,-measure-grouping-signs.ly
-skips-in-lyric-mode-2.ly
-automatic-beam-subdivisions.ly
+heavily-customized-polymetric-time-signatures.ly
 rhythmic-slashes.ly
-adding-beams,-slurs,-ties-etc.-when-using-tuplet-and-non-tuplet-rythms..ly
+skips-in-lyric-mode-2.ly
+manually-controlling-beam-positions.ly
+chant-or-psalms-notation.ly
 changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
 automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
 making-an-object-invisible-with-the-transparent-property.ly
-manually-controlling-beam-positions.ly
+automatic-beam-subdivisions.ly
 forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
 controlling-tuplet-bracket-visibility.ly
 beam-across-line-breaks.ly
-compound-time-signatures.ly
+skips-in-lyric-mode.ly
 adding-drum-parts.ly
 rest-styles.ly
-skips-in-lyric-mode.ly
+compound-time-signatures.ly
index ec1083213e8cf9e533a4f345eb1c7747792510d3..69ddae9f866594138310f50238a747f98d617fa2 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "template"
index 04c59caa1fbf21fa19c9e2d39ff674c5ad5579c5..8f05237b12e38ad748588a4a1ce5c1dd62216e69 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "vocal-music, chords, template"
index 95302edc3dd4a985e7c38f7543f2f3820cadd871..b80b8ea30e33f30ed2ae4eac5b5e6542f3e58013 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "chords, template"
index bc12e8363c6325e190ade768f434eccab7393e88..1ed0dcb4330e2fc1fde97d4665aa14c3c0d61d75 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "vocal-music, template"
index 7873a28e525d99f9ee279e8cf82f30aea02a8cba..49d7a2090cdfdd7267cb2befd21d03094c55bd9e 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "template"
index 558259919c027fe562eeb87a8c726672e23f423b..7d6a885fe9c7fb5f0443d2e704413197d6dbaf88 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, vocal-music"
index 402eaa6a3ece884cf6218111bcae793e20500bc7..9c5cc3cb80217d18ae9b13aa8bc2c328d853a441 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "rhythms, vocal-music"
index a0d5352384730414624a54f53d661e0f032a43f6..d9f5825d2e1e103ad235fda9f8ecc453a051ca18 100644 (file)
@@ -1,5 +1,5 @@
 alignment-vertical-spacing.ly
 vertically-aligning-ossias-and-lyrics.ly
 page-label.ly
-adjusting-lyrics-vertical-spacing.ly
 proportional-strict-notespacing.ly
+adjusting-lyrics-vertical-spacing.ly
index 1bde440670bc034cebc699604e55243c32c33033..51b72daef63999bd3247db763553f4485765df42 100644 (file)
@@ -1,13 +1,13 @@
 creating-blank-staves.ly
+time-signature-in-parentheses.ly
 adding-and-extra-staff-at-a-line-break.ly
 changing-the-number-of-lines-in-a-staff.ly
-time-signature-in-parentheses.ly
+inserting-score-fragments-above-the-staff,-as-markups.ly
 adding-an-extra-staff.ly
 changing-the-staff-size.ly
-quoting-another-voice.ly
+quoting-another-voice-with-transposition.ly
 adding-ambiti-per-voice.ly
 clefs-commonly-tweaked-properties.ly
+quoting-another-voice.ly
 volta-multi-staff.ly
-inserting-score-fragments-above-the-staff,-as-markups.ly
-quoting-another-voice-with-transposition.ly
 non-traditional-key-signatures.ly
index 98bbbb08d7574633411b6bde08b6b822907bc8e3..b5a07be2fa88bd5b06e45af64c14d27a3117b593 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "strings, template"
index bb6c13d12650a9a1e47fb5f6f9920e5894495e46..7f4be12db139ab054aa6b510355737261158a88a 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "strings, template"
index ecd2a989da56e58cc219928339cb6abeaaa8e24c..b7636826aebd10963274eaea0c1595a2b7285f6c 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
   doctitle = "Table of contents"
index 59b06c613003f94fdd4a141e68e2a39f338babca..8af6644e5a99342e8f7792020acffb241f94ab88 100644 (file)
@@ -1,17 +1,17 @@
 piano-template-with-centered-dynamics.ly
 single-staff-template-with-notes-and-lyrics.ly
 single-staff-template-with-only-notes.ly
-piano-template-with-centered-lyrics.ly
+jazz-combo-template.ly
 score-for-diatonic-accordion.ly
 piano-template-simple.ly
-string-quartet-template-with-separate-parts.ly
-ancient-notation-template----modern-transcription-of-gregorian-music.ly
 ancient-notation-template----modern-transcription-of-mensural-music.ly
-piano-template-with-melody-and-lyrics.ly
+ancient-notation-template----modern-transcription-of-gregorian-music.ly
+single-staff-template-with-notes-and-chords.ly
 string-quartet-template-simple.ly
 single-staff-template-with-notes,-lyrics,-and-chords.ly
-single-staff-template-with-notes-and-chords.ly
-vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
-jazz-combo-template.ly
+piano-template-with-melody-and-lyrics.ly
+string-quartet-template-with-separate-parts.ly
 vocal-ensemble-template.ly
+vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
+piano-template-with-centered-lyrics.ly
 vocal-ensemble-template-with-automatic-piano-reduction.ly
index 8d117ee76bb0f6db26260090b19cec809542725c..7a103584fc7692cf17164ead0db2aa648a378687 100644 (file)
@@ -3,16 +3,16 @@ creating-text-spanners.ly
 vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 markup-lines.ly
 center-text-below-hairpin-dynamics.ly
-piano-template-with-centered-lyrics.ly
+ottava-text.ly
 demonstrating-all-headers.ly
 changing-the-default-text-font-family.ly
-how-to-put-ties-between-syllables-in-lyrics.ly
+combining-two-parts-on-the-same-staff.ly
 aligning-and-centering-instrument-names.ly
 utf-8.ly
 outputting-the-version-number.ly
 blanking-staff-lines-using-the--whiteout-command.ly
 formatting-lyrics-syllables.ly
-combining-two-parts-on-the-same-staff.ly
-ottava-text.ly
+how-to-put-ties-between-syllables-in-lyrics.ly
+piano-template-with-centered-lyrics.ly
 adjusting-lyrics-vertical-spacing.ly
 aligning-lyrics.ly
index be8ed8e0c5ca99196db5e3702d1377c6f3859841..ce9b3a589b338dd3727ffe9be179c965cf200f4f 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "editorial-and-educational-use"
index 553e963822433ac98bab7a2e4de615d86ace6f53..db9ee9eeddfec7b10b3008d7e5465b0f0dc660df 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "staff-notation, tweaks-and-overrides"
index e8009ae0514af6be2ef978ca16a21f0901abfdd6..17699f6043d4d8501b9b27728b8270f6ed7206e7 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "ancient-notation, tweaks-and-overrides"
index 2b00d1a8c17257ec34d749a528d40e8484f7e93e..4bce592109fad2cf31c3fe33d01aa3d6304bcec1 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 \header {
   doctitle = "Transposing music with minimum accidentals"
   lsrtags = "pitches"
index 310a0fe5e5a2c7f6295d64bcba2825ebb8ad70d9..f178dc8d540c337423e48974ce1205b8cd7ef528 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
   doctitle = "Using the @code{\tweak} command to tweak individual grobs"
index 52b454077bdaebfe8123787e5452085dc89fcfb7..85c44ad8791145a6a10faeb6708854e927b93d84 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 %% Edit this file using a Unicode aware editor, such as GVIM, GEDIT, Emacs
 
index 2272cbf2c7f8b51db23a567f99404a26212314e3..ae90d7eced51f4260ebb988cf31171006a96a3b5 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "vocal-music, tweaks-and-overrides, spacing"
index a4bf30972f7cccea4ca236ba0f9a548638df5751..27d05f4a01faa772042adea854244872947d2ea7 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "vocal-music, piano-music, template"
index a608c855a5d945597c7269877d67e8d740a0e976..d3042b5a497d9a9f1f9868e0c9300972c7e31485 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "text, vocal-music, contexts-and-engravers, template"
index 895ad33a3540651dc951127bc5ab8eab0d75e294..35618505e9acabbca194e4a55115f73d015a2a26 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.11.35"
+\version "2.11.38"
 
 \header {
   lsrtags = "vocal-music, template"
index 427a1d526b4ae9a2af4b19b7109dcb5ba1889d41..398c1df27aac64972a8f247ace8500759cb67977 100644 (file)
@@ -1,16 +1,17 @@
 chant-or-psalms-notation.ly
 single-staff-template-with-notes-and-lyrics.ly
 skips-in-lyric-mode-2.ly
-vocal-ensemble-template-with-automatic-piano-reduction.ly
+skips-in-lyric-mode.ly
+aligning-lyrics.ly
 vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 how-to-put-ties-between-syllables-in-lyrics.ly
 adding-ambiti-per-voice.ly
-piano-template-with-melody-and-lyrics.ly
+vertically-aligning-ossias-and-lyrics.ly
 single-staff-template-with-notes,-lyrics,-and-chords.ly
-demo-midiinstruments.ly
+vocal-ensemble-template-with-automatic-piano-reduction.ly
 formatting-lyrics-syllables.ly
-vertically-aligning-ossias-and-lyrics.ly
-aligning-lyrics.ly
+piano-template-with-melody-and-lyrics.ly
+ambiti-multiple-voices.ly
 vocal-ensemble-template.ly
 adjusting-lyrics-vertical-spacing.ly
-skips-in-lyric-mode.ly
+demo-midiinstruments.ly
index 391e36b5f9948e7d448b2a2fc782c8d1e6570509..b171c518869a6e941e498bc840ef5e40ab6f6777 100644 (file)
@@ -1,6 +1,6 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.36"
+\version "2.11.38"
 \layout { ragged-right= ##t }
 \header {
   doctitle = "Volta multi-staff"
index 42bb9f1440cebdd23d802afeb6626d868bae49d1..4613aea986a28c527113f4b04436061d9cf4cfa0 100644 (file)
@@ -4,7 +4,7 @@
 \header {
 
 texidoc=" Auto change piano staff switches voices between up
-and down staves automatically rests are switched along with the coming
+and down staves automatically; rests are switched along with the coming
 note. When central C is reached, staff is not yet switched (by default).
 
 "
index 3dcab53c3102e377984fce497f40f1ab69fbc1eb..93ba77f917f24adc4d92fc0649781ca7c9799919 100644 (file)
@@ -3,7 +3,7 @@
 
 \header {
 
-texidoc="Bar number may be set and their padding adjusted individually.  
+texidoc="Bar numbers may be set and their padding adjusted individually.  
 The counting of bar numbers is started after the anacrusis.
 
 To prevent clashes at the beginning of a line, the padding may have to 
index b622dbd2770a4e8b270c6b4505f867430055f71f..49c78e8352f30b27b15c1223edde35840e52f567 100644 (file)
@@ -4,7 +4,7 @@
 texidoc="
 Beams should behave reasonably well, even under extreme circumstances.
 Stems may be short, but noteheads should never touch the beam.  Note that
-under normal circumstances, these beams would get knees here
+under normal circumstances, these beams would get knees.  Here
 @code{Beam.auto-knee-gap} was set to false.
 "
 }
index 141479d2f8d67197277ece6236fb09e49bbf6d89..46519952066cc93bcef5a2e10bd379be9081f118 100644 (file)
@@ -1,7 +1,7 @@
 \version "2.10.0"
 
 \header {
-    texidoc = "In french style beaming, the stems do not go between beams."
+    texidoc = "In French style beaming, the stems do not go between beams."
 }
 
 \layout { ragged-right= ##t }
index 40a7cb50b47da5a8973086e0a882bfd433058065..57590306d89067c0f07801753617e0a1e28c3ccd 100644 (file)
@@ -3,7 +3,7 @@
 \header{
 
   texidoc=" Beams on ledgered notes should always reach the middle staff
-line.  The second beam counting from the note head side, should never
+line.  The second beam, counting from the note head side, should never
 be lower than the second staff line.  This does not hold for grace
 note beams.  Override with @code{no-stem-extend}.  "
 
index b269de735450a87d3da95a4ebec287fbc72bc10c..a060f867efde5907b5f7c4368411725f0fb1e6b2 100644 (file)
@@ -1,8 +1,8 @@
 \version "2.10.0"
 \header {
     
-    texidoc = "If collision resolution finds dotted note head must
-       remain on left hand side, move dots to the right."
+    texidoc = "If dotted note heads must remain on the left side,  
+collision resolution moves the dots to the right."
 
 }
 
index 2512870dcdb2733b996c5dca28285d4d8650a8e9..efbeb87ab80dd42a346adcd6d923e2777b8ffc88 100644 (file)
@@ -1,7 +1,7 @@
 \version "2.10.0" \header{
 
 
-    texidoc=" Noteheads can have dots, and rests too.  
+    texidoc=" Both noteheads and rests can have dots.  
     Augmentation dots should never be printed on a staff line,
 but rather be shifted vertically. They should go up, but in case of
 multiple parts, the down stems have down shifted dots.  In case of
index 8d68529ea1a232cfe803d1691492c18dacd32a3d..6dc49cdfa1ede8de8cf789a55b9f6a3ba0b28484 100644 (file)
@@ -1,6 +1,7 @@
 
 \version "2.10.0"
-\header { texidoc = "Each clef have own accidental placing rules. " }
+\header { texidoc = "Each clef has its own accidental placing
+rules. "}
 
 #(set-global-staff-size 16)
 
index 230453f9f64e575dbc1f8598d753f3c934a4552a..24b74669ccb43908c386bd2470d2ab3d6d15ee8a 100644 (file)
@@ -1,5 +1,7 @@
 \version "2.10.0"
 #(set-default-paper-size "a6" 'landscape)
+\header { texidoc = " Scores may be printed in landcape mode."}
+
 
 pattern = \relative { a b c d \break }
 
index 36f814d485bdd7f9317a1a055993722ccb89bf6d..045f7ff2be7d19e309899cddf5cdca666814b49c 100644 (file)
@@ -1,10 +1,8 @@
 \version "2.10.0"
 \header {
-
   texidoc = "With the @code{\\lyricsto} mechanism, individual lyric
-    lines can be associated with one melody line. For each lyric line,
-    can be tuned whether to follow melismata or not."
-  
+    lines can be associated with one melody line. Each lyric line
+can be tuned to either follow or ignore melismata."
 }
 
 
index 2ab0764371fea3c1905fe7c1beb795cb1a9bb346..798dc13623f821f805c20308df5dc8d2980a390b 100644 (file)
@@ -1,7 +1,7 @@
 \header {
 
   texidoc = "Switching the melody to a different voice works even
-the switch occurs together with context instantiation."
+if the switch occurs together with context instantiation."
 
 }
 
index a43b25b9063c136c7f6dbdd44e876f3a1fa54a4d..dd8ec91e2debf4ab6d11e098e18ce6110300e705 100644 (file)
@@ -9,7 +9,7 @@ have melismata either by setting a property melismaBusy, or by setting
 automaticMelismas (which will set melismas during slurs and ties).  If
 you want a different order than first Music, then Lyrics, you must
 precook a chord of staves/lyrics and label those.  Of course, the
-lyrics ignores any other rhythms in the piece."
+lyrics ignore any other rhythms in the piece."
 
 }
 
index 95627b107aa334c18b447305b3cc60a8fdbe7611..7e1f52f7f67c07f5ab436ba91905885d1dcce16f 100644 (file)
@@ -9,7 +9,10 @@
 
 <<
     \context Staff  { c' (c') c'( c') }
-    \context Lyrics \lyricmode { bla -- alb xxx -- yyy }
+    \context Lyrics \lyricmode {
+      \override Lyrics . LyricSpace #'minimum-distance = #5.0
+      a -- b x -- y
+    }
 >>
 
 
index 2b799be25bb3a2a5c7fc7877b5ca5cadbf3a9b6c..4e48abde542150c144ac15faded1eb23d6846ea3 100644 (file)
@@ -1,7 +1,7 @@
-
-\version "2.10.0"
-
 \version "2.10.1" 
+\header {
+  texidoc = "Midi can create drums."
+}
 
 \score {
   \new DrumStaff <<
diff --git a/input/regression/musicxml/02a-Articulations-Finale.xml b/input/regression/musicxml/02a-Articulations-Finale.xml
deleted file mode 100644 (file)
index c65f1af..0000000
+++ /dev/null
@@ -1,989 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"\r
-                                "http://www.musicxml.org/dtds/partwise.dtd">\r
-<score-partwise>\r
-  <movement-title>Articulations Test</movement-title>\r
-  <identification>\r
-    <creator type="composer">Reinhold Kainhofer</creator>\r
-    <rights>Public Domain</rights>\r
-    <encoding>\r
-      <software>Finale 2007 for Windows</software>\r
-      <software>Dolet Light for Finale 2007</software>\r
-      <encoding-date>2007-08-31</encoding-date>\r
-    </encoding>\r
-  </identification>\r
-  <part-list>\r
-    <score-part id="P1">\r
-      <part-name>MusicXML Part</part-name>\r
-      <score-instrument id="P1-I1">\r
-        <instrument-name>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>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
-      <sound tempo="120"/>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <accent placement="below"/>\r
-            <staccato placement="below"/>\r
-          </articulations>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <staccatissimo placement="below"/>\r
-          </articulations>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <accent placement="below"/>\r
-          </articulations>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <accent placement="below"/>\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>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <strong-accent placement="above" type="up"/>\r
-          </articulations>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <strong-accent placement="above" type="up"/>\r
-            <staccato placement="above"/>\r
-          </articulations>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <tenuto placement="below"/>\r
-          </articulations>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <detached-legato placement="below"/>\r
-          </articulations>\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>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <accent placement="below"/>\r
-            <tenuto placement="below"/>\r
-          </articulations>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <fermata type="upright"/>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <ornaments>\r
-            <trill-mark placement="above"/>\r
-          </ornaments>\r
-        </notations>\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
-        <stem>up</stem>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="4">\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
-        <stem>up</stem>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <ornaments>\r
-            <wavy-line placement="below" relative-x="6" type="start"/>\r
-            <wavy-line placement="below" relative-x="16" type="stop"/>\r
-          </ornaments>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <ornaments>\r
-            <wavy-line placement="above" type="start"/>\r
-            <wavy-line placement="above" relative-x="15" type="stop"/>\r
-            <inverted-mordent placement="below"/>\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>1</duration>\r
-        <voice>1</voice>\r
-        <type>quarter</type>\r
-        <stem>up</stem>\r
-        <notations>\r
-          <ornaments>\r
-            <mordent placement="below"/>\r
-          </ornaments>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <ornaments>\r
-            <turn placement="above"/>\r
-          </ornaments>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <technical>\r
-            <up-bow placement="above"/>\r
-          </technical>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <technical>\r
-            <down-bow placement="above"/>\r
-          </technical>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="6">\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
-        <stem>up</stem>\r
-        <notations>\r
-          <technical>\r
-            <harmonic placement="below"/>\r
-          </technical>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <technical>\r
-            <harmonic placement="below"/>\r
-          </technical>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <technical>\r
-            <stopped placement="below"/>\r
-          </technical>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <technical>\r
-            <fingering placement="above">1</fingering>\r
-          </technical>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="7">\r
-      <print new-system="yes"/>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <technical>\r
-            <fingering placement="above">2</fingering>\r
-          </technical>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <technical>\r
-            <fingering placement="above">3</fingering>\r
-          </technical>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <technical>\r
-            <fingering placement="above">4</fingering>\r
-          </technical>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <technical>\r
-            <fingering placement="above">5</fingering>\r
-          </technical>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="8">\r
-      <direction placement="below">\r
-        <direction-type>\r
-          <pedal line="no" relative-x="-9" type="start"/>\r
-        </direction-type>\r
-      </direction>\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
-        <stem>up</stem>\r
-      </note>\r
-      <direction placement="below">\r
-        <direction-type>\r
-          <pedal line="no" type="stop"/>\r
-        </direction-type>\r
-      </direction>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <arpeggiate/>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <ornaments/>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="9">\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
-        <stem>up</stem>\r
-        <notations>\r
-          <ornaments/>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <ornaments/>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <caesura relative-x="21"/>\r
-          </articulations>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <breath-mark placement="above" relative-x="18"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="10">\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
-        <stem>up</stem>\r
-      </note>\r
-      <direction placement="below">\r
-        <direction-type>\r
-          <words relative-x="-7">(</words>\r
-        </direction-type>\r
-      </direction>\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
-        <stem>up</stem>\r
-      </note>\r
-      <direction placement="below">\r
-        <direction-type>\r
-          <words relative-x="15">)</words>\r
-        </direction-type>\r
-      </direction>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="11">\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <staccato placement="above"/>\r
-          </articulations>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <accent placement="above"/>\r
-          </articulations>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <accent placement="above"/>\r
-            <staccato placement="above"/>\r
-          </articulations>\r
-        </notations>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <accent placement="above"/>\r
-            <tenuto placement="above"/>\r
-          </articulations>\r
-        </notations>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="12">\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
-        <stem>up</stem>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="13">\r
-      <print new-system="yes"/>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="14">\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
-        <stem>up</stem>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="15">\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
-        <stem>up</stem>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="16">\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
-        <stem>up</stem>\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
-        <stem>up</stem>\r
-        <notations>\r
-          <articulations>\r
-            <accent placement="below"/>\r
-          </articulations>\r
-        </notations>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="17">\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
-        <stem>up</stem>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\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
-        <stem>up</stem>\r
-      </note>\r
-    </measure>\r
-    <!--=======================================================-->\r
-    <measure number="18">\r
-      <note>\r
-        <rest/>\r
-        <duration>4</duration>\r
-        <voice>1</voice>\r
-      </note>\r
-      <barline location="right">\r
-        <bar-style>light-heavy</bar-style>\r
-      </barline>\r
-    </measure>\r
-  </part>\r
-  <!--=========================================================-->\r
-</score-partwise>\r
diff --git a/input/regression/musicxml/02a-Notations-MusicXML.xml b/input/regression/musicxml/02a-Notations-MusicXML.xml
new file mode 100644 (file)
index 0000000..aad78ff
--- /dev/null
@@ -0,0 +1,1202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN"
+          "http://www.musicxml.org/dtds/partwise.dtd">
+<score-partwise version="2.0">
+  <movement-title>All MusicXML Notations</movement-title>
+  <identification/>
+  <part-list>
+    <score-part id="P1">
+      <part-name></part-name>
+    </score-part>
+  </part-list>
+  <!--=========================================================-->
+  <part id="P1">
+    <!-- General Notation elements (no spanners, which are tested separately):
+         fermata | arpeggiate | non-arpeggiate | accidental-mark -->
+    <measure number="1">
+      <attributes>
+        <divisions>1</divisions>
+        <key>
+          <fifths>0</fifths>
+          <mode>major</mode>
+        </key>
+        <clef>
+          <sign>G</sign>
+          <line>2</line>
+        </clef>
+      </attributes>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <fermata type="upright"/>
+        </notations>
+        <lyric number="1"><text>ferm.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <fermata>normal</fermata>
+        </notations>
+        <lyric number="1"><text>normal ferm.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <fermata>angled</fermata>
+        </notations>
+        <lyric number="1"><text>angled ferm.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <fermata>square</fermata>
+        </notations>
+        <lyric number="1"><text>square ferm.</text></lyric>
+      </note>
+    </measure>
+    <measure number="2">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <fermata type="inverted"/>
+        </notations>
+        <lyric number="1"><text>inv.ferm.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+        <lyric number="1"><text>arp.</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><arpeggiate/></notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><non-arpeggiate type="bottom"/></notations>
+        <lyric number="1"><text>non-arp.</text></lyric>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>E</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <chord/>
+        <pitch>
+          <step>G</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations><non-arpeggiate type="top"/></notations>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <accidental-mark placement="above">double-sharp</accidental-mark>
+        </notations>
+        <lyric number="1"><text>acc.mark</text></lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-light</bar-style>
+      </barline>
+    </measure>
+
+    <!-- Articulations: 
+            accent | strong-accent | staccato | tenuto |
+            detached-legato | staccatissimo | spiccato |
+            scoop | plop | doit | falloff | breath-mark |
+            caesura | stress | unstress | other-articulation -->
+    <measure number="3">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><accent/></articulations>
+        </notations>
+        <lyric number="1"><text>acc.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><strong-accent/></articulations>
+        </notations>
+        <lyric number="1"><text>str.-acc.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><staccato/></articulations>
+        </notations>
+        <lyric number="1"><text>stacc.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><tenuto/></articulations>
+        </notations>
+        <lyric number="1"><text>ten.</text></lyric>
+      </note>
+    </measure>
+    <measure number="4">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><detached-legato/></articulations>
+        </notations>
+        <lyric number="1"><text>det.-leg.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><staccatissimo/></articulations>
+        </notations>
+        <lyric number="1"><text>stacc.ss</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><spiccato/></articulations>
+        </notations>
+        <lyric number="1"><text>spicc.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><scoop/></articulations>
+        </notations>
+        <lyric number="1"><text>scoop</text></lyric>
+      </note>
+    </measure>
+    <measure number="5">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><plop/></articulations>
+        </notations>
+        <lyric number="1"><text>plop</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><doit/></articulations>
+        </notations>
+        <lyric number="1"><text>doit</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><falloff/></articulations>
+        </notations>
+        <lyric number="1"><text>falloff</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><breath-mark/></articulations>
+        </notations>
+        <lyric number="1"><text>breath</text></lyric>
+      </note>
+    </measure>
+    <measure number="6">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><caesura/></articulations>
+        </notations>
+        <lyric number="1"><text>caes.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><stress/></articulations>
+        </notations>
+        <lyric number="1"><text>stress</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations><unstress/></articulations>
+        </notations>
+        <lyric number="1"><text>unstr.</text></lyric>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-light</bar-style>
+      </barline>
+    </measure>
+
+    <!-- Ornaments:
+         trill-mark | turn | delayed-turn | inverted-turn |
+         shake | wavy-line | mordent | inverted-mordent | 
+         schleifer | tremolo | other-ornament), 
+         accidental-mark 
+         
+         Test cases for various tremolo options are in a separate 
+         unit test file
+         -->
+    <measure number="7">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><trill-mark/></ornaments>
+        </notations>
+        <lyric number="1"><text>tr.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><turn/></ornaments>
+        </notations>
+        <lyric number="1"><text>turn</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><delayed-turn/></ornaments>
+        </notations>
+        <lyric number="1"><text>del.turn</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><inverted-turn/></ornaments>
+        </notations>
+        <lyric number="1"><text>inv.turn</text></lyric>
+      </note>
+    </measure>
+    <measure number="8">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><shake/></ornaments>
+        </notations>
+        <lyric number="1"><text>shake</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments>
+            <wavy-line placement="below" type="start"/>
+          </ornaments>
+        </notations>
+        <lyric number="1"><syllabic>begin</syllabic><text>wavy</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments>
+            <wavy-line placement="below" type="stop"/>
+            <wavy-line placement="below" type="start"/>
+          </ornaments>
+        </notations>
+        <lyric number="1"><syllabic>continue</syllabic><text>wavy</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments>
+            <wavy-line placement="below" relative-x="16" type="stop"/>
+          </ornaments>
+        </notations>
+        <lyric number="1"><syllabic>end</syllabic><text>line</text></lyric>
+      </note>
+    </measure>
+    <measure number="9">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><mordent/></ornaments>
+        </notations>
+        <lyric number="1"><text>mord.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><inverted-mordent/></ornaments>
+        </notations>
+        <lyric number="1"><text>inv.mord.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><schleifer/></ornaments>
+        </notations>
+        <lyric number="1"><text>schl.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments><tremolo/></ornaments>
+        </notations>
+        <lyric number="1"><text>trem.</text></lyric>
+      </note>
+    </measure>
+    <measure number="10">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments>
+            <turn/>
+            <accidental-mark>natural</accidental-mark>
+          </ornaments>
+        </notations>
+        <lyric number="1"><text>turn+acc.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step>
+          <octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <ornaments>
+            <turn/>
+            <accidental-mark placement="above">sharp</accidental-mark>
+            <accidental-mark placement="above">three-quarters-flat</accidental-mark>
+          </ornaments>
+        </notations>
+        <lyric number="1"><text>turn+acc.(ab.+bel./rel to turn)</text></lyric>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-light</bar-style>
+      </barline>
+    </measure>
+
+    <!-- Technical:
+         up-bow | down-bow | harmonic | open-string |
+         thumb-position | fingering | pluck | double-tongue |
+         triple-tongue | stopped | snap-pizzicato | fret |
+         string | hammer-on | pull-off | bend | tap | heel |
+         toe | fingernails | other-technical -->
+    <measure number="11">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><up-bow/></technical>
+        </notations>
+        <lyric number="1"><text>up-b.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><down-bow/></technical>
+        </notations>
+        <lyric number="1"><text>down-b.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><harmonic/></technical>
+        </notations>
+        <lyric number="1"><text>harm.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><harmonic><natural/></harmonic></technical>
+        </notations>
+        <lyric number="1"><text>nat.harm.</text></lyric>
+      </note>
+    </measure>
+    <measure number="12">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><harmonic><artificial/></harmonic></technical>
+        </notations>
+        <lyric number="1"><text>art.harm.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><harmonic><natural/><base-pitch/></harmonic></technical>
+        </notations>
+        <lyric number="1"><text>nat.h./base</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><harmonic><natural/><touching-pitch/></harmonic></technical>
+        </notations>
+        <lyric number="1"><text>nat.h./touching</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><harmonic><natural/><sounding-pitch/></harmonic></technical>
+        </notations>
+        <lyric number="1"><text>nat.h./sounding</text></lyric>
+      </note>
+    </measure>
+    <measure number="13">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><open-string/></technical>
+        </notations>
+        <lyric number="1"><text>open-str.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><thumb-position/></technical>
+        </notations>
+        <lyric number="1"><text>thumb-pos.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering/></technical>
+        </notations>
+        <lyric number="1"><text>empty fing.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>1</fingering></technical>
+        </notations>
+        <lyric number="1"><text>fing.1</text></lyric>
+      </note>
+    </measure>
+    <measure number="14">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>2</fingering></technical>
+        </notations>
+        <lyric number="1"><text>fing.2</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>3</fingering></technical>
+        </notations>
+        <lyric number="1"><text>fing.3</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>4</fingering></technical>
+        </notations>
+        <lyric number="1"><text>fing.4</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>5</fingering></technical>
+        </notations>
+        <lyric number="1"><text>fing.5</text></lyric>
+      </note>
+    </measure>
+    <measure number="15">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>something</fingering></technical>
+        </notations>
+        <lyric number="1"><text>fing.sth.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingering>5</fingering><fingering substitution="yes">3</fingering><fingering alternate="yes">2</fingering></technical>
+        </notations>
+        <lyric number="1"><text>mult.fing.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><pluck/></technical>
+        </notations>
+        <lyric number="1"><text>empty pluck</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><pluck>a</pluck></technical>
+        </notations>
+        <lyric number="1"><text>pluck a</text></lyric>
+      </note>
+    </measure>
+    <measure number="16">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><double-tongue/></technical>
+        </notations>
+        <lyric number="1"><text>dbl.tng.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><triple-tongue/></technical>
+        </notations>
+        <lyric number="1"><text>trpl.tng.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><stopped/></technical>
+        </notations>
+        <lyric number="1"><text>stopped</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><snap-pizzicato/></technical>
+        </notations>
+        <lyric number="1"><text>snp.pizz.</text></lyric>
+      </note>
+    </measure>
+    <measure number="17">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fret/></technical>
+        </notations>
+        <lyric number="1"><text>empty fret</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fret>0</fret></technical>
+        </notations>
+        <lyric number="1"><text>fret0</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><string/></technical>
+        </notations>
+        <lyric number="1"><text>empty str.</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <string>5</string>
+          </technical>
+        </notations>
+        <lyric number="1"><text>str. 5</text></lyric>
+      </note>
+    </measure>
+    <measure number="18">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <hammer-on type="start"/>
+          </technical>
+        </notations>
+        <lyric number="1"><syllabic>begin</syllabic><text>hammer</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <hammer-on type="stop"/>
+          </technical>
+        </notations>
+        <lyric number="1"><syllabic>end</syllabic><text>on</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <pull-off type="start"/>
+          </technical>
+        </notations>
+        <lyric number="1"><syllabic>begin</syllabic><text>pull</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <pull-off type="stop"/>
+          </technical>
+        </notations>
+        <lyric number="1"><syllabic>end</syllabic><text>off</text></lyric>
+      </note>
+    </measure>
+    <measure number="19">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <bend><bend-alter>4</bend-alter></bend>
+          </technical>
+        </notations>
+        <lyric number="1"><text>bend</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <bend><bend-alter>3</bend-alter><release/><with-bar/></bend>
+          </technical>
+        </notations>
+        <lyric number="1"><text>bend 3 with-bar</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <bend><bend-alter>-5</bend-alter><pre-bend/></bend>
+          </technical>
+        </notations>
+        <lyric number="1"><text>pre-bend -(0.)5</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical>
+            <bend><bend-alter>5</bend-alter><release/></bend>
+          </technical>
+        </notations>
+        <lyric number="1"><text>bend release (3.)5</text></lyric>
+      </note>
+    </measure>
+    <measure number="20">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><tap/></technical>
+        </notations>
+        <lyric number="1"><text>tap</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><tap>T</tap></technical>
+        </notations>
+        <lyric number="1"><text>tap T</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><heel/></technical>
+        </notations>
+        <lyric number="1"><text>heel</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><toe substitution="yes"/></technical>
+        </notations>
+        <lyric number="1"><text>toe</text></lyric>
+      </note>
+    </measure>
+    <measure number="21">
+      <note>
+        <pitch>
+          <step>C</step><octave>5</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <technical><fingernails/></technical>
+        </notations>
+        <lyric number="1"><text>fingern.</text></lyric>
+      </note>
+      <note>
+        <rest/>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <note>
+        <rest/>
+        <duration>2</duration>
+        <voice>1</voice>
+        <type>half</type>
+      </note>
+      <barline location="right">
+        <bar-style>light-light</bar-style>
+      </barline>
+    </measure>
+    
+    <!-- General tests: multiple notations, directions, pedal spanners, etc. -->
+    <measure number="22">
+      <direction placement="below">
+        <direction-type>
+          <pedal line="no" relative-x="-9" type="start"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+      </note>
+      <direction placement="below">
+        <direction-type>
+          <pedal line="no" type="stop"/>
+        </direction-type>
+      </direction>
+      <note>
+        <pitch>
+          <step>G</step>
+          <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>
+        <notations>
+          <articulations>
+            <strong-accent placement="above" type="up"/>
+            <staccato placement="above"/>
+          </articulations>
+        </notations>
+        <lyric number="1"><text>both above</text></lyric>
+      </note>
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+        </pitch>
+        <duration>1</duration>
+        <voice>1</voice>
+        <type>quarter</type>
+        <notations>
+          <articulations>
+            <accent placement="below"/>
+            <tenuto placement="below"/>
+            <staccato placement="above"/>
+          </articulations>
+        </notations>
+        <lyric number="1"><text>ab./bel./bel.</text></lyric>
+      </note>
+      <barline location="right">
+        <bar-style>light-heavy</bar-style>
+      </barline>
+    </measure>
+
+  </part>
+</score-partwise>
diff --git a/input/regression/musicxml/02c-Articulations-Noteedit.xml b/input/regression/musicxml/02c-Articulations-Noteedit.xml
deleted file mode 100644 (file)
index e1f650c..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE score-partwise PUBLIC
-    "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
-    "http://www.musicxml.org/dtds/partwise.dtd">
-
-<score-partwise>
-       <work>
-       </work>
-
-       <identification>
-               <encoding>
-                       <software>NoteEdit</software>
-               </encoding>
-       </identification>
-
-       <part-list>
-               <score-part id="P1">
-                       <part-name>Staff 1</part-name>
-                       <score-instrument id="P1-I1">
-                               <instrument-name>Klavier 1</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>2</divisions>
-                               <key>
-                                       <fifths>-1</fifths>
-                               </key>
-                               <time>
-                                       <beats>4</beats>
-                                       <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                                       <sign>G</sign>
-                                       <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                               <notations>
-                                       <articulations>
-                                               <staccato/>
-                                       </articulations>
-                               </notations>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                               <notations>
-                                       <articulations>
-                                               <strong-accent/>
-                                       </articulations>
-                               </notations>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                               <notations>
-                                       <articulations>
-                                               <tenuto/>
-                                       </articulations>
-                               </notations>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                               <notations>
-                                       <articulations>
-                                               <staccatissimo/>
-                                       </articulations>
-                               </notations>
-                       </note>
-               </measure>
-               <measure number="2">
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                               <notations>
-                                       <articulations>
-                                               <accent/>
-                                       </articulations>
-                               </notations>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                               <notations>
-                                       <fermata type="upright"/>
-                               </notations>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>3</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <dot/>
-                               <stem>up</stem>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>1</duration>
-                               <voice>1</voice>
-                               <type>eighth</type>
-                               <stem>up</stem>
-                       </note>
-               </measure>
-               <measure number="3">
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                       </note>
-                       <barline location="right">
-                               <bar-style>light-heavy</bar-style>
-                               <repeat direction="backward"/>
-                       </barline>
-               </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/02d-Articulations-TwoStaves-Noteedit.xml b/input/regression/musicxml/02d-Articulations-TwoStaves-Noteedit.xml
deleted file mode 100644 (file)
index 93aaf24..0000000
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE score-partwise PUBLIC
-    "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
-    "http://www.musicxml.org/dtds/partwise.dtd">
-
-<score-partwise>
-       <work>
-               <work-title>Irgendein Lied</work-title>
-       </work>
-
-       <identification>
-               <creator type="composer">Rainer Zufall</creator>
-               <rights>Public Domain, so that the whole world can savely forget about it...</rights>
-               <encoding>
-                       <software>NoteEdit</software>
-               </encoding>
-       </identification>
-
-       <part-list>
-               <score-part id="P1">
-                       <part-name>Damen</part-name>
-                       <score-instrument id="P1-I1">
-                               <instrument-name>Klavier 1</instrument-name>
-                       </score-instrument>
-                       <midi-instrument id="P1-I1">
-                               <midi-channel>1</midi-channel>
-                               <midi-program>1</midi-program>
-                       </midi-instrument>
-               </score-part>
-               <score-part id="P2">
-                       <part-name>Herren</part-name>
-                       <score-instrument id="P2-I2">
-                               <instrument-name>Klavier 1</instrument-name>
-                       </score-instrument>
-                       <midi-instrument id="P2-I2">
-                               <midi-channel>2</midi-channel>
-                               <midi-program>1</midi-program>
-                       </midi-instrument>
-               </score-part>
-       </part-list>
-
-       <part id="P1">
-               <measure number="1">
-                       <attributes>
-                               <divisions>2</divisions>
-                               <key>
-                                       <fifths>-1</fifths>
-                               </key>
-                               <time>
-                                       <beats>4</beats>
-                                       <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                                       <sign>G</sign>
-                                       <line>2</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                               <notations>
-                                       <articulations>
-                                               <staccato/>
-                                       </articulations>
-                               </notations>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                               <notations>
-                                       <articulations>
-                                               <strong-accent/>
-                                       </articulations>
-                               </notations>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                               <notations>
-                                       <articulations>
-                                               <tenuto/>
-                                       </articulations>
-                               </notations>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                               <notations>
-                                       <articulations>
-                                               <staccatissimo/>
-                                       </articulations>
-                               </notations>
-                       </note>
-               </measure>
-               <measure number="2">
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                               <notations>
-                                       <articulations>
-                                               <accent/>
-                                       </articulations>
-                               </notations>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                               <notations>
-                                       <fermata type="upright"/>
-                               </notations>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>3</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <dot/>
-                               <stem>up</stem>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>1</duration>
-                               <voice>1</voice>
-                               <type>eighth</type>
-                               <stem>up</stem>
-                       </note>
-               </measure>
-               <measure number="3">
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                       </note>
-                       <note>
-                               <pitch>
-                                       <step>G</step>
-                                       <octave>4</octave>
-                               </pitch>
-                               <duration>2</duration>
-                               <voice>1</voice>
-                               <type>quarter</type>
-                               <stem>up</stem>
-                       </note>
-                       <barline location="right">
-                               <bar-style>light-heavy</bar-style>
-                               <repeat direction="backward"/>
-                       </barline>
-               </measure>
-       </part>
-       <part id="P2">
-               <measure number="1">
-                       <attributes>
-                               <divisions>2</divisions>
-                               <key>
-                                       <fifths>-1</fifths>
-                               </key>
-                               <time>
-                                       <beats>4</beats>
-                                       <beat-type>4</beat-type>
-                               </time>
-                               <clef>
-                                       <sign>F</sign>
-                                       <line>4</line>
-                               </clef>
-                       </attributes>
-                       <note>
-                               <pitch>
-                                       <step>D</step>
-                                       <octave>3</octave>
-                               </pitch>
-                               <duration>8</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                               <notations>
-                                       <articulations>
-                                               <staccato/>
-                                       </articulations>
-                               </notations>
-                       </note>
-                       <backup>
-                               <duration>8</duration>
-                       </backup>
-               </measure>
-               <measure number="2">
-                       <note>
-                               <pitch>
-                                       <step>D</step>
-                                       <octave>3</octave>
-                               </pitch>
-                               <duration>8</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                               <notations>
-                                       <articulations>
-                                               <staccato/>
-                                       </articulations>
-                               </notations>
-                       </note>
-                       <backup>
-                               <duration>8</duration>
-                       </backup>
-               </measure>
-               <measure number="3">
-                       <note>
-                               <pitch>
-                                       <step>D</step>
-                                       <octave>3</octave>
-                               </pitch>
-                               <duration>8</duration>
-                               <voice>1</voice>
-                               <type>whole</type>
-                               <notations>
-                                       <articulations>
-                                               <staccato/>
-                                       </articulations>
-                               </notations>
-                       </note>
-                       <backup>
-                               <duration>8</duration>
-                       </backup>
-                       <barline location="right">
-                               <bar-style>light-heavy</bar-style>
-                               <repeat direction="backward"/>
-                       </barline>
-               </measure>
-       </part>
-</score-partwise>
diff --git a/input/regression/musicxml/02e-Articulations-JScore.xml b/input/regression/musicxml/02e-Articulations-JScore.xml
deleted file mode 100644 (file)
index b05acb9..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE score-partwise PUBLIC 
-"-//Recordare//DTD MusicXML 1.0 Partwise//EN" 
-"http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise>
-<work>
-<work-title>JScore Articulations Test</work-title>
-</work>
-<identification>
-<creator type="composer">Reinhold Kainhofer</creator>
-<encoding>
-<software>JMSL's MusicXMLWriter by Nick Didkovsky. Java Music Specification Language by Nick Didkovsky and Phil Burk, (c) 2003 Nick Didkovsky, Phil Burk.  Available from: http://www.algomusic.com</software>
-</encoding>
-</identification>
-<part-list>
-<score-part id="P1" >
-<part-name>Voice 1</part-name>
-</score-part>
-</part-list>
-<part id="P1" >
-<measure number="1" >
-<attributes>
-<divisions>960</divisions>
-<key><fifths>0</fifths></key>
-<time><beats>4</beats><beat-type>4</beat-type></time>
-<clef><sign>G</sign><line>2</line></clef>
-</attributes>
-<direction placement="above">
-<direction-type>
-<metronome parentheses="yes" relative-y="18">
-<beat-unit>quarter</beat-unit> 
-<per-minute>60</per-minute>
-</metronome>
-</direction-type>
-<offset>72</offset>
-<sound tempo="60" />
-</direction>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<articulations>
-<accent placement="below" />
-</articulations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<articulations>
-<staccato placement="below" />
-</articulations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<articulations>
-<tenuto placement="below" />
-</articulations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<articulations>
-<strong-accent placement="below" />
-</articulations>
-</notations>
-</note>
-</measure>
-<measure number="2" >
-<attributes>
-<divisions>960</divisions>
-<key><fifths>0</fifths></key>
-<time><beats>4</beats><beat-type>4</beat-type></time>
-<clef><sign>G</sign><line>2</line></clef>
-</attributes>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<articulations>
-<accent placement="below" />
-<staccato placement="below" />
-</articulations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<articulations>
-<accent placement="below" />
-<tenuto placement="below" />
-</articulations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<articulations>
-<strong-accent placement="below" />
-<staccato placement="below" />
-</articulations>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<fermata type="upright" />
-</notations>
-</note>
-</measure>
-<measure number="3" >
-<attributes>
-<divisions>960</divisions>
-<key><fifths>0</fifths></key>
-<time><beats>4</beats><beat-type>4</beat-type></time>
-<clef><sign>G</sign><line>2</line></clef>
-</attributes>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<technical>
-<harmonic />
-</technical>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<ornaments>
-<trill-mark placement="above" />
-</ornaments>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<ornaments>
-<trill-mark placement="above" />
-</ornaments>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<ornaments>
-<trill-mark placement="above" />
-</ornaments>
-</notations>
-</note>
-</measure>
-<measure number="4" >
-<attributes>
-<divisions>960</divisions>
-<key><fifths>0</fifths></key>
-<time><beats>4</beats><beat-type>4</beat-type></time>
-<clef><sign>G</sign><line>2</line></clef>
-</attributes>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<ornaments>
-<trill-mark placement="above" />
-</ornaments>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<ornaments>
-<mordent placement="above" />
-</ornaments>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-<ornaments>
-<inverted-mordent placement="above" />
-</ornaments>
-</notations>
-</note>
-<note>
-<pitch>
-<step>G</step>
-<octave>4</octave>
-</pitch>
-<duration>960</duration>
-<voice>1</voice>
-<type>quarter</type>
-<notations>
-</notations>
-</note>
-</measure>
-</part>
-</score-partwise>
diff --git a/input/regression/musicxml/02f-Articulations-MusicXML.xml b/input/regression/musicxml/02f-Articulations-MusicXML.xml
deleted file mode 100644 (file)
index 86f799c..0000000
+++ /dev/null
@@ -1,761 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise>
-  <movement-title>Articulations Test</movement-title>
-  <identification>
-    <creator type="composer">Reinhold Kainhofer</creator>
-    <rights>Public Domain</rights>
-    <encoding>
-      <software>Kate</software>
-    </encoding>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>Test part</part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>12</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <accent/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <ornaments>
-                  <turn/>
-                  <accidental-mark>sharp</accidental-mark>
-                  <accidental-mark>three-quarters-flat</accidental-mark>
-                  <accidental-mark>natural</accidental-mark>
-              </ornaments>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <technical>
-                  <bend><bend-alter>4</bend-alter></bend>
-              </technical>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <breath-mark/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <caesura/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <ornaments>
-                  <delayed-turn/>
-              </ornaments>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <detached-legato/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <doit/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <technical>
-                  <double-tongue/>
-              </technical>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <technical>
-                  <down-bow/>
-              </technical>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <falloff/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <technical>
-                  <fingering/>
-              </technical>
-          </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <fingernails/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <fret/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <hammer-on type="start"/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <hammer-on type="stop"/>
-                    <harmonic/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <heel/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <ornaments>
-                    <inverted-mordent/>
-                </ornaments>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <ornaments>
-                    <!--inverted-turn/-->
-                </ornaments>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <ornaments>
-                    <mordent/>
-                </ornaments>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <open-string/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <plop/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <pluck/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <!--portato/-->
-                </technical>
-            </notations>
-        </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <pull-off type="start"/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <pull-off type="stop"/>
-                </technical>
-                <ornaments>
-                    <schleifer/>
-                </ornaments>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <scoop/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <ornaments>
-                    <shake/>
-                </ornaments>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <snap-pizzicato/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <spiccato/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <staccatissimo/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <staccato/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <stopped/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <!--stress/-->
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <string>5</string>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <strong-accent/>
-                </articulations>
-            </notations>
-        </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <tap/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <tenuto/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <thumb-position/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <toe/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <ornaments>
-                    <turn/>
-                </ornaments>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <ornaments>
-                    <tremolo>3</tremolo>
-                </ornaments>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <ornaments>
-                    <trill-mark/>
-                </ornaments>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <triple-tongue/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <!--unstress/-->
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <technical>
-                    <up-bow/>
-                </technical>
-            </notations>
-        </note>
-        <note>
-            <rest/>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-        </note>
-        <note>
-            <rest/>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-        </note>
-    </measure>
-    <!--=======================================================-->
-  </part>
-  <!--=========================================================-->
-</score-partwise>
diff --git a/input/regression/musicxml/02g-ArticulationsNoAttributes-MusicXML.xml b/input/regression/musicxml/02g-ArticulationsNoAttributes-MusicXML.xml
deleted file mode 100644 (file)
index 0ff1989..0000000
+++ /dev/null
@@ -1,765 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 1.0 Partwise//EN"
-                                "http://www.musicxml.org/dtds/partwise.dtd">
-<score-partwise>
-  <movement-title>Articulations Test</movement-title>
-  <identification>
-    <creator type="composer">Reinhold Kainhofer</creator>
-    <rights>Public Domain</rights>
-    <encoding>
-      <software>Kate</software>
-    </encoding>
-  </identification>
-  <part-list>
-    <score-part id="P1">
-      <part-name>Test part</part-name>
-    </score-part>
-  </part-list>
-  <!--=========================================================-->
-  <part id="P1">
-    <measure number="1">
-      <attributes>
-        <divisions>1</divisions>
-        <key>
-          <fifths>0</fifths>
-          <mode>major</mode>
-        </key>
-        <time symbol="common">
-          <beats>12</beats>
-          <beat-type>4</beat-type>
-        </time>
-        <clef>
-          <sign>G</sign>
-          <line>2</line>
-        </clef>
-      </attributes>
-      <sound tempo="120"/>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <accent/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <accidental-mark/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <bend/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <breath-mark/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <caesura/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <delayed-turn/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <detached-legato/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <doit/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <double-tongue/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <down-bow/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <falloff/>
-              </articulations>
-          </notations>
-      </note>
-      <note>
-          <pitch>
-              <step>C</step>
-              <octave>4</octave>
-          </pitch>
-          <duration>1</duration>
-          <voice>1</voice>
-          <type>quarter</type>
-          <stem>up</stem>
-          <notations>
-              <articulations>
-                  <fingering/>
-              </articulations>
-          </notations>
-      </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="2">
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <fingernails/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <fret/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <hammer-on/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <harmonic/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <heel/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <inverted-mordent/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <inverted-turn/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <mordent/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <open-string/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <plop/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <pluck/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <portato/>
-                </articulations>
-            </notations>
-        </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="3">
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <pull-off/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <schleifer/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <scoop/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <shake/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <snap-pizzicato/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <spiccato/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <staccatissimo/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <staccato/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <stopped/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <stress/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <string/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <strong-accent/>
-                </articulations>
-            </notations>
-        </note>
-    </measure>
-    <!--=======================================================-->
-    <measure number="4">
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <tap/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <tenuto/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <thumb-position/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <toe/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <turn/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <tremolo/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <trill-mark/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <triple-tongue/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <unstress/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <up-bow/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-            <notations>
-                <articulations>
-                    <wavy-line/>
-                </articulations>
-            </notations>
-        </note>
-        <note>
-            <pitch>
-                <step>C</step>
-                <octave>4</octave>
-            </pitch>
-            <duration>1</duration>
-            <voice>1</voice>
-            <type>quarter</type>
-            <stem>up</stem>
-        </note>
-    </measure>
-    <!--=======================================================-->
-  </part>
-  <!--=========================================================-->
-</score-partwise>
index 30744f7dc2ddd40eaefd3d9e80674191f312d8de..65bcf3fcbdb7e81a909fe4c05a0aaa2089a56e59 100644 (file)
         <stem>down</stem>\r
         <notations>\r
           <ornaments>\r
-            <wavy-line number="1" type="stop"/>\r
+            <wavy-line number="1" type="start"/>\r
           </ornaments>\r
         </notations>\r
       </note>\r
         <stem>down</stem>\r
         <notations>\r
           <ornaments>\r
-            <wavy-line default-y="10" number="1" type="start"/>\r
+            <wavy-line default-y="10" number="1" type="stop"/>\r
           </ornaments>\r
         </notations>\r
       </note>\r
         <stem>down</stem>\r
         <notations>\r
           <ornaments>\r
+            <wavy-line number="1" type="start"/>\r
             <wavy-line number="1" type="stop"/>\r
           </ornaments>\r
         </notations>\r
index d17d80d4c50b700fb25409b42a60b77eef2cf40e..185dba65da56997f1cf9605627f0c64f79341dd3 100644 (file)
@@ -4,7 +4,7 @@
     texidoc = "With @code{\\cueDuring} and @code{\\quoteDuring},
 fragments of previously entered music may be
 quoted. @code{quotedEventTypes} will determines what things are
-quoted. In this example, a 16th rests is not quoted, since
+quoted. In this example, a 16th rest is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
 
 }
index 1f29585f3c06829f71ad84b682525c47e561c5e5..64a361e15ae2666cc722423b7fd46b7db78db993 100644 (file)
@@ -3,7 +3,7 @@
 
     texidoc = "With @code{\\quote}, fragments of previously entered
 music may be quoted. @code{quotedEventTypes} will determines what
-things are quoted. In this example, a 16th rests is not quoted, since
+things are quoted. In this example, a 16th rest is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
 
 }
index 95f1e851fe811e1a1a10256ebcf175f33f0e7282..f2de829c3e858a88eb4a3ecd94c902055dae12f6 100644 (file)
@@ -1,5 +1,5 @@
 \header {
-  texidoc = "Rests under beams moved by whole staff spaces."
+  texidoc = "Rests under beams are moved by whole staff spaces."
 }
 
 \layout {
index fb1f40f7560f612a39fc495caa026fbc780d3ea5..c9d35453f3f93f5ad71bffc6db7b09c462384bac 100644 (file)
@@ -2,8 +2,8 @@
 \version "2.10.0"
 \header
 {
-  texidoc ="Slurs may be placed over rest. The slur will avoid colliding with
-the rest.
+  texidoc ="Slurs may be placed over rests. The slur will avoid
+colliding with the rests.
 
 "
 }
index 8fb4e5c31976c972e3544b182b15ccb14104b2a6..60c93521c307c7672181ca1571a4aef2e2dced2f 100644 (file)
@@ -519,11 +519,11 @@ class SequentialMusic (NestedMusic):
         value = None
         at = len( self.elements ) - 1
         while (at >= 0 and
-               not isinstance (self.elements[at], EventChord) and
+               not isinstance (self.elements[at], ChordEvent) and
                not isinstance (self.elements[at], BarLine)):
             at -= 1
 
-        if (at >= 0 and isinstance (self.elements[at], EventChord)):
+        if (at >= 0 and isinstance (self.elements[at], ChordEvent)):
             value = self.elements[at]
         return value
 
@@ -662,7 +662,7 @@ class Paper:
         printer.newline ()
 
 
-class EventChord (NestedMusic):
+class ChordEvent (NestedMusic):
     def __init__ (self):
         NestedMusic.__init__ (self)
         self.grace_elements = None
@@ -1178,7 +1178,7 @@ class MultiMeasureRest(Music):
   'elements
   (list (make-music (quote BarCheck))
         (make-music
-          'EventChord
+          'ChordEvent
           'elements
           (list (make-music
                   'MultiMeasureRestEvent
@@ -1366,7 +1366,7 @@ def test_pitch ():
 
 def test_printer ():
     def make_note ():
-        evc = EventChord()
+        evc = ChordEvent()
         n = NoteEvent()
         evc.append (n)
         return n
@@ -1396,21 +1396,21 @@ def test_printer ():
 def test_expr ():
     m = SequentialMusic()
     l = 2  
-    evc = EventChord()
+    evc = ChordEvent()
     n = NoteEvent()
     n.duration.duration_log = l
     n.pitch.step = 1
     evc.insert_around (None, n, 0)
     m.insert_around (None, evc, 0)
 
-    evc = EventChord()
+    evc = ChordEvent()
     n = NoteEvent()
     n.duration.duration_log = l
     n.pitch.step = 3
     evc.insert_around (None, n, 0)
     m.insert_around (None, evc, 0)
 
-    evc = EventChord()
+    evc = ChordEvent()
     n = NoteEvent()
     n.duration.duration_log = l
     n.pitch.step = 2 
@@ -1421,7 +1421,7 @@ def test_expr ():
     evc.type = 'treble'
     m.insert_around (None, evc, 0)
 
-    evc = EventChord()
+    evc = ChordEvent()
     tonic = Pitch ()
     tonic.step = 2
     tonic.alteration = -2
index 63296f193e0bfc484f118017713e8a2c369295ea..3074ee5b4174c9e27311d95b4b90334c22c8624d 100644 (file)
@@ -202,6 +202,21 @@ class Pitch (Music_xml_node):
            alter = int (ch.get_text ().strip ())
        return alter
 
+class Unpitched (Music_xml_node):
+    def get_step (self):
+       ch = self.get_unique_typed_child (get_class (u'display-step'))
+       step = ch.get_text ().strip ()
+       return step
+
+    def get_octave (self):
+       ch = self.get_unique_typed_child (get_class (u'display-octave'))
+
+       if ch:
+           octave = ch.get_text ().strip ()
+           return int (octave)
+       else:
+           return None
+
 class Measure_element (Music_xml_node):
     def get_voice_id (self):
        voice_id = self.get_maybe_exist_named_child ('voice')
@@ -309,8 +324,11 @@ class Note (Measure_element):
                     'whole': 0,
                     'breve': -1,
                     'long': -2}.get (log, 0)
+       elif self.get_maybe_exist_named_child (u'grace'):
+           # FIXME: is it ok to default to eight note for grace notes?
+           return 3
         else:
-            self.message ("Encountered note at %s without %s duration (no <type> element):" % (self.start, self.duration) )
+            self.message ("Encountered note at %s with %s duration (no <type> element):" % (self.start, self.duration) )
             return 0
 
     def get_factor (self):
@@ -879,6 +897,7 @@ class_dict = {
        'time-modification': Time_modification,
         'tuplet': Tuplet,
        'type': Type,
+       'unpitched': Unpitched,
         'wavy-line': Wavy_line,
         'wedge': Wedge,
         'words': Words,
index a80deb681c6ea1244ebaa4a5c39eec4a508e0230..e8c22474325ffa41203086b22a69bd6bbde5925a 100644 (file)
@@ -228,7 +228,7 @@ for the full staff.")
 
 
      (gridInterval ,ly:moment? "Interval for which to generate
-@ref{GridPoint}s.")
+@code{GridPoint}s.")
 
 
      (hairpinToBarline ,boolean? "If set, end a hairpin at the barline
index ef7dddbe9139ad62d5c9ac67a0ae19a7899d6fb4..187218c6173dc545f627806720a91efee63ede76 100644 (file)
        ;; todo: add X self alignment?
        (baseline-skip . 2)
        (side-axis . ,Y)
+       (avoid-slur . outside )
        (font-series . bold)
        (meta . ((class . Item)
                 (interfaces . (text-script-interface
index 81c6e3685075ffcd7fce1be946ebcf7da1ee5830..2f4d37a434b784cc231956aaae056cbc96688240 100644 (file)
@@ -230,8 +230,10 @@ Voice-state objects
     
     (set! (ly:music-property m 'elements) (list m1 m2))
     (set! (ly:music-property m 'split-list)
-         (determine-split-list (reverse! (cdr (assoc "one" evs1)) '())
-                               (reverse! (cdr (assoc "two" evs2)) '())))
+      (if (and (assoc "one" evs1) (assoc "two" evs2))
+         (determine-split-list (reverse! (cdr (assoc "one" evs1)) '())
+                               (reverse! (cdr (assoc "two" evs2)) '()))
+         '() ))
     m))
 
 (define-public (determine-split-list evl1 evl2)
index 8c775b7c5df6da17735ec6cd24daf11753e4929d..14c09dadbded444d28d8077e1d695c70481af767 100644 (file)
@@ -196,7 +196,6 @@ class PartGroupInfo:
         error_message ("Unprocessed PartGroupInfo %s encountered" % self)
         return ''
 
-
 def staff_attributes_to_string_tunings (mxl_attr):
     details = mxl_attr.get_maybe_exist_named_child ('staff-details')
     if not details:
@@ -219,7 +218,7 @@ def staff_attributes_to_string_tunings (mxl_attr):
 
         step = i.get_named_child (u'tuning-step')
         step = step.get_text ().strip ()
-        p.step = (ord (step) - ord ('A') + 7 - 2) % 7
+        p.step = musicxml_step_to_lily (step)
 
         octave = i.get_named_child (u'tuning-octave')
         octave = octave.get_text ().strip ()
@@ -757,27 +756,41 @@ def musicxml_spanner_to_lily_event (mxl_event):
     return ev
 
 def musicxml_direction_to_indicator (direction):
-    return { "above": 1, "upright": 1, "up":1, "below": -1, "downright": -1, "down": -1 }.get (direction, 0)
+    return { "above": 1, "upright": 1, "up":1, "below": -1, "downright": -1, "down": -1, "inverted": -1 }.get (direction, 0)
 
 def musicxml_fermata_to_lily_event (mxl_event):
     ev = musicexp.ArticulationEvent ()
-    ev.type = "fermata"
+    txt = mxl_event.get_text ()
+    # The contents of the element defined the shape, possible are normal, angled and square
+    ev.type = { "angled": "shortfermata", "square": "longfermata" }.get (txt, "fermata")
     if hasattr (mxl_event, 'type'):
       dir = musicxml_direction_to_indicator (mxl_event.type)
       if dir and options.convert_directions:
         ev.force_direction = dir
     return ev
 
-
 def musicxml_arpeggiate_to_lily_event (mxl_event):
     ev = musicexp.ArpeggioEvent ()
     ev.direction = musicxml_direction_to_indicator (getattr (mxl_event, 'direction', None))
     return ev
 
-
 def musicxml_tremolo_to_lily_event (mxl_event):
     ev = musicexp.TremoloEvent ()
-    ev.bars = mxl_event.get_text ()
+    txt = mxl_event.get_text ()
+    if txt:
+      ev.bars = txt
+    else:
+      ev.bars = "3"
+    return ev
+
+def musicxml_falloff_to_lily_event (mxl_event):
+    ev = musicexp.BendEvent ()
+    ev.alter = -4
+    return ev
+
+def musicxml_doit_to_lily_event (mxl_event):
+    ev = musicexp.BendEvent ()
+    ev.alter = 4
     return ev
 
 def musicxml_bend_to_lily_event (mxl_event):
@@ -785,6 +798,12 @@ def musicxml_bend_to_lily_event (mxl_event):
     ev.alter = mxl_event.bend_alter ()
     return ev
 
+def musicxml_caesura_to_lily_event (mxl_event):
+    ev = musicexp.MarkupEvent ()
+    # FIXME: default to straight or curved caesura?
+    ev.contents = "\\musicglyph #\"scripts.caesura.straight\""
+    ev.force_direction = 1
+    return ev
 
 def musicxml_fingering_event (mxl_event):
     ev = musicexp.ShortArticulationEvent ()
@@ -835,13 +854,13 @@ articulations_dict = {
     "accidental-mark": musicxml_accidental_mark,
     "bend": musicxml_bend_to_lily_event,
     "breath-mark": (musicexp.NoDirectionArticulationEvent, "breathe"),
-    #"caesura": "caesura",
+    "caesura": musicxml_caesura_to_lily_event,
     #"delayed-turn": "?",
     "detached-legato": (musicexp.ShortArticulationEvent, "_"), # or "portato"
-    #"doit": "",
+    "doit": musicxml_doit_to_lily_event,
     #"double-tongue": "",
     "down-bow": "downbow",
-    #"falloff": "",
+    "falloff": musicxml_falloff_to_lily_event,
     "fingering": musicxml_fingering_event,
     #"fingernails": "",
     #"fret": "",
@@ -868,7 +887,7 @@ articulations_dict = {
     "strong-accent": (musicexp.ShortArticulationEvent, "^"), # or "marcato"
     #"tap": "",
     "tenuto": (musicexp.ShortArticulationEvent, "-"), # or "tenuto"
-    #"thumb-position": "",
+    "thumb-position": "thumb",
     #"toe": "",
     "turn": "turn",
     "tremolo": musicxml_tremolo_to_lily_event,
@@ -1071,26 +1090,34 @@ instrument_drumtype_dict = {
 def musicxml_note_to_lily_main_event (n):
     pitch  = None
     duration = None
-        
-    mxl_pitch = n.get_maybe_exist_typed_child (musicxml.Pitch)
     event = None
+
+    mxl_pitch = n.get_maybe_exist_typed_child (musicxml.Pitch)
     if mxl_pitch:
         pitch = musicxml_pitch_to_lily (mxl_pitch)
-        event = musicexp.NoteEvent()
+        event = musicexp.NoteEvent ()
         event.pitch = pitch
 
         acc = n.get_maybe_exist_named_child ('accidental')
         if acc:
             # let's not force accs everywhere. 
             event.cautionary = acc.editorial
+
+    elif n.get_maybe_exist_typed_child (musicxml.Unpitched):
+       # Unpitched elements have display-step and can also have
+       # display-octave.
+       unpitched = n.get_maybe_exist_typed_child (musicxml.Unpitched)
+       event = musicexp.NoteEvent ()
+       event.pitch = musicxml_unpitched_to_lily (unpitched)
         
     elif n.get_maybe_exist_typed_child (musicxml.Rest):
         # rests can have display-octave and display-step, which are
         # treated like an ordinary note pitch
         rest = n.get_maybe_exist_typed_child (musicxml.Rest)
-        event = musicexp.RestEvent()
+        event = musicexp.RestEvent ()
         pitch = musicxml_restdisplay_to_lily (rest)
         event.pitch = pitch
+
     elif n.instrument_name:
         event = musicexp.NoteEvent ()
         drum_type = instrument_drumtype_dict.get (n.instrument_name)
@@ -1099,11 +1126,13 @@ def musicxml_note_to_lily_main_event (n):
         else:
             n.message ("drum %s type unknown, please add to instrument_drumtype_dict" % n.instrument_name)
             event.drum_type = 'acousticsnare'
-    
-    if not event:
+
+    else:
         n.message ("cannot find suitable event")
 
-    event.duration = musicxml_duration_to_lily (n)
+    if event:
+       event.duration = musicxml_duration_to_lily (n)
+
     return event
 
 
@@ -1150,7 +1179,7 @@ class LilyPondVoiceBuilder:
         self.set_duration (duration)
         
         # Insert all pending dynamics right after the note/rest:
-        if isinstance (music, musicexp.EventChord) and self.pending_dynamics:
+        if isinstance (music, musicexp.ChordEvent) and self.pending_dynamics:
             for d in self.pending_dynamics:
                 music.append (d)
             self.pending_dynamics = []
@@ -1203,7 +1232,7 @@ class LilyPondVoiceBuilder:
             skip.duration.factor = duration_factor
             skip.duration.dots = duration_dots
 
-            evc = musicexp.EventChord ()
+            evc = musicexp.ChordEvent ()
             evc.elements.append (skip)
             self.add_music (evc, diff)
 
@@ -1214,16 +1243,16 @@ class LilyPondVoiceBuilder:
 
         value = None
 
-        # if the position matches, find the last EventChord, do not cross a bar line!
+        # if the position matches, find the last ChordEvent, do not cross a bar line!
         at = len( self.elements ) - 1
         while (at >= 0 and
-               not isinstance (self.elements[at], musicexp.EventChord) and
+               not isinstance (self.elements[at], musicexp.ChordEvent) and
                not isinstance (self.elements[at], musicexp.BarLine)):
             at -= 1
 
         if (self.elements
             and at >= 0
-            and isinstance (self.elements[at], musicexp.EventChord)
+            and isinstance (self.elements[at], musicexp.ChordEvent)
             and self.begin_moment == starting_at):
             value = self.elements[at]
         else:
@@ -1234,7 +1263,7 @@ class LilyPondVoiceBuilder:
     def correct_negative_skip (self, goto):
         self.end_moment = goto
         self.begin_moment = goto
-        evc = musicexp.EventChord ()
+        evc = musicexp.ChordEvent ()
         self.elements.append (evc)
 
 
@@ -1245,6 +1274,12 @@ class VoiceData:
         self.lyrics_dict = {}
         self.lyrics_order = []
 
+def musicxml_step_to_lily (step):
+    if step:
+       return (ord (step) - ord ('A') + 7 - 2) % 7
+    else:
+       return None
+
 def musicxml_voice_to_lily_voice (voice):
     tuplet_events = []
     modes_found = {}
@@ -1358,13 +1393,12 @@ def musicxml_voice_to_lily_voice (voice):
             first_pitch = main_event.pitch
         ignore_lyrics = inside_slur or is_tied or is_chord
 
-        if hasattr (main_event, 'drum_type') and main_event.drum_type:
+        if main_event and hasattr (main_event, 'drum_type') and main_event.drum_type:
             modes_found['drummode'] = True
 
-
         ev_chord = voice_builder.last_event_chord (n._when)
         if not ev_chord: 
-            ev_chord = musicexp.EventChord()
+            ev_chord = musicexp.ChordEvent()
             voice_builder.add_music (ev_chord, n._duration)
 
         grace = n.get_maybe_exist_typed_child (musicxml.Grace)
@@ -1373,14 +1407,12 @@ def musicxml_voice_to_lily_voice (voice):
             if n.get_maybe_exist_typed_child (musicxml.Chord) and ev_chord.grace_elements:
                 grace_chord = ev_chord.grace_elements.get_last_event_chord ()
             if not grace_chord:
-                grace_chord = musicexp.EventChord ()
+                grace_chord = musicexp.ChordEvent ()
                 ev_chord.append_grace (grace_chord)
             if hasattr (grace, 'slash'):
                 # TODO: use grace_type = "appoggiatura" for slurred grace notes
                 if grace.slash == "yes":
                     ev_chord.grace_type = "acciaccatura"
-                elif grace.slash == "no":
-                    ev_chord.grace_type = "grace"
             # now that we have inserted the chord into the grace music, insert
             # everything into that chord instead of the ev_chord
             ev_chord = grace_chord
@@ -1468,12 +1500,6 @@ def musicxml_voice_to_lily_voice (voice):
             #         shake | wavy-line | mordent | inverted-mordent | 
             #         schleifer | tremolo | other-ornament, accidental-mark
             ornaments = notations.get_named_children ('ornaments')
-            for a in ornaments:
-                for ch in a.get_named_children ('tremolo'):
-                    ev = musicxml_tremolo_to_lily_event (ch)
-                    if ev: 
-                        ev_chord.append (ev)
-
             ornaments += notations.get_named_children ('articulations')
             ornaments += notations.get_named_children ('technical')
 
@@ -1524,7 +1550,7 @@ def musicxml_voice_to_lily_voice (voice):
             tuplet_events.append ((ev_chord, tuplet_event, frac))
 
     ## force trailing mm rests to be written out.   
-    voice_builder.add_music (musicexp.EventChord (), Rational (0))
+    voice_builder.add_music (musicexp.ChordEvent (), Rational (0))
     
     ly_voice = group_tuplets (voice_builder.elements, tuplet_events)
     ly_voice = group_repeats (ly_voice)
@@ -1560,7 +1586,6 @@ def musicxml_voice_to_lily_voice (voice):
     
     return return_value
 
-
 def musicxml_id_to_lily (id):
     digits = ['Zero', 'One', 'Two', 'Three', 'Four', 'Five',
               'Six', 'Seven', 'Eight', 'Nine', 'Ten']
@@ -1572,20 +1597,30 @@ def musicxml_id_to_lily (id):
     id = re.sub  ('[^a-zA-Z]', 'X', id)
     return id
 
-
 def musicxml_pitch_to_lily (mxl_pitch):
-    p = musicexp.Pitch()
+    p = musicexp.Pitch ()
     p.alteration = mxl_pitch.get_alteration ()
-    p.step = (ord (mxl_pitch.get_step ()) - ord ('A') + 7 - 2) % 7
+    p.step = musicxml_step_to_lily (mxl_pitch.get_step ())
     p.octave = mxl_pitch.get_octave () - 4
     return p
 
+def musicxml_unpitched_to_lily (mxl_unpitched):
+    p = None
+    step = mxl_unpitched.get_step ()
+    if step:
+       p = musicexp.Pitch ()
+       p.step = musicxml_step_to_lily (step)
+    octave = mxl_unpitched.get_octave ()
+    if octave and p:
+       p.octave = octave - 4
+    return p
+
 def musicxml_restdisplay_to_lily (mxl_rest):
     p = None
     step = mxl_rest.get_step ()
     if step:
-        p = musicexp.Pitch()
-        p.step = (ord (step) - ord ('A') + 7 - 2) % 7
+        p = musicexp.Pitch ()
+        p.step = musicxml_step_to_lily (step)
     octave = mxl_rest.get_octave ()
     if octave and p:
         p.octave = octave - 4
index 84f1dba059f36ee712b5d9de935c80dd1d35ee35..75fb84cb6775842c57829e7d0f58dcd1c3d0315e 100644 (file)
@@ -23,5 +23,5 @@ $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
                mv $$TMP/*pfb $(outdir) ; \
                rm -rf $$TMP
 
-$(outdir)/mf2pt1.mem:
-       cd $(outdir) && mpost -progname=mpost -ini ../mf2pt1 \\dump
+$(outdir)/mf2pt1.mem: mf2pt1.mp
+       cd $(outdir) && mpost -progname=mpost -ini $(top-src-dir)/mf/mf2pt1.mp \\dump