LSR: update

diff --git a/input/lsr/adding-ambiti-per-voice.ly b/input/lsr/adding-ambiti-per-voice.ly
index f310d35521716b15dfdab781b53bfe709f4e1f35..08d6b570aa0b83ca677963deef9fac3e4d9b232d 100644 (file)
--- a/input/lsr/adding-ambiti-per-voice.ly
+++ b/input/lsr/adding-ambiti-per-voice.ly
@@ -8,7 +8,6 @@ Ambits can be added per voice. In that case, the ambitus must be moved
 manually to prevent collisions. 
 " }
 % begin verbatim
-{
 \new Staff <<
   \new Voice \with {
     \consists "Ambitus_engraver"
@@ -24,5 +23,3 @@ manually to prevent collisions.
        es4 f g as b1
   }
 >>
-
-}

diff --git a/input/lsr/ambiti-multiple-voices.ly b/input/lsr/ambiti-multiple-voices.ly
index 1e7c786f5beaad66e9673ce515115135065274e8..7980ae7842e47c8dc225b53a5175141553ddc59a 100644 (file)
--- a/input/lsr/ambiti-multiple-voices.ly
+++ b/input/lsr/ambiti-multiple-voices.ly
@@ -7,11 +7,11 @@
 If you have multiple voices in a single staff and you want a single
 ambitus per staff rather than per voice, add the
 @code{Ambitus_engraver} to the @code{Staff} context rather than to the
-@code{Voice} context. This example uses
+@code{Voice} context. Therefore, in this example, one need to use
 
-@code{\\override Ambitus #'X-offset = #-1.0}
+@code{\\override Staff.Ambitus #'X-offset = #-1.0}
 
-to move the ambitus to the left.  The same effect could have been
+to move the ambitus to the left.  The same effect could also have been
 achieved with @code{extra-offset}, but then the formatting system would
 not reserve space for the moved object. 
 " }
@@ -20,20 +20,14 @@ not reserve space for the moved object.
   \consists "Ambitus_engraver"
   }
 <<
-  \new Voice \with {
-    \remove "Ambitus_engraver"
-  } 
-    \relative c'' {
-      \override Ambitus #'X-offset = #-1.0
+  \new Voice \relative c'' {
+      \override Staff.Ambitus #'X-offset = #-1.0
       \voiceOne
-      c4 a d e f2
+      c4 a d e f1
     }
-  \new Voice \with {
-    \remove "Ambitus_engraver"
-  } 
-    \relative c' {
+  \new Voice \relative c' {
       \voiceTwo
-      es4 f g as b2
+      es4 f g as b1
     }
 >>
 

diff --git a/input/lsr/clefs-commonly-tweaked-properties.ly b/input/lsr/clefs-commonly-tweaked-properties.ly
index 1e7c33729f2b65f0df866ce667244ee51974037b..b1ce2f4b278fc433e14b9a314065959150ded5d3 100644 (file)
--- a/input/lsr/clefs-commonly-tweaked-properties.ly
+++ b/input/lsr/clefs-commonly-tweaked-properties.ly
@@ -24,9 +24,8 @@ 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
 explicitClefVisibility Staff property to the value 
-@code{end-of-line-invisible: \\set Staff.explicitClefVisibility =
-#end-of-line-invisible} The default behaviour can be recovered with 
-@code{\\unset Staff.explicitClefVisibility}.
+@code{end-of-line-invisible}. The default behaviour can be recovered
+with  @code{\\unset Staff.explicitClefVisibility}.
 
 
 The following examples show the possibilities when setting these
@@ -37,44 +36,48 @@ line, they do not.
 % begin verbatim
 {
            % The default treble clef
-           c'4
+           c'1
            % The standard bass clef
            \set Staff.clefGlyph = #"clefs.F"
            \set Staff.clefPosition = #2
            \set Staff.middleCPosition = #6
-           c'4
+           c'
            % The baritone clef
            \set Staff.clefGlyph = #"clefs.C"
            \set Staff.clefPosition = #4
            \set Staff.middleCPosition = #4
-           c'4
+           c'
            % The standard choral tenor clef
            \set Staff.clefGlyph = #"clefs.G"
            \set Staff.clefPosition = #-2
            \set Staff.clefOctavation = #-7
            \set Staff.middleCPosition = #1
-           c'4
+           c'
            % A non-standard clef
            \set Staff.clefPosition = #0
            \set Staff.clefOctavation = #0
            \set Staff.middleCPosition = #-4
-           c'4 \break
-
+           c' \break
+           
+           
            % The following clef changes do not preserve
            % the normal relationship between notes and clefs:
 
            \set Staff.clefGlyph = #"clefs.F"
            \set Staff.clefPosition = #2
-           c'4
+           c'
            \set Staff.clefGlyph = #"clefs.G"
-           c'4
+           c'
            \set Staff.clefGlyph = #"clefs.C"
-           c'4
+           c'
            \set Staff.clefOctavation = #7
-           c'4
+           c'
            \set Staff.clefOctavation = #0
            \set Staff.clefPosition = #0
-           c'4
+           c'
+           
+           % Here we go back to the normal clef:
+           
            \set Staff.middleCPosition = #4
-           c'4
+           c'
          }

diff --git a/input/lsr/contexts-and-engravers.snippet-list b/input/lsr/contexts-and-engravers.snippet-list
index 36426d1e602204515beeb85e7792a1391450af7a..7c14c06ec7f4c9c43bafa645ce68901b75b2e549 100644 (file)
--- a/input/lsr/contexts-and-engravers.snippet-list
+++ b/input/lsr/contexts-and-engravers.snippet-list
@@ -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

diff --git a/input/lsr/editorial-and-educational-use.snippet-list b/input/lsr/editorial-and-educational-use.snippet-list
index 3bda01fc7eefed3e34ce78cfbe39dfd402a4c585..022286d6071b37efd3f4847e8d69cd5d3e02965d 100644 (file)
--- a/input/lsr/editorial-and-educational-use.snippet-list
+++ b/input/lsr/editorial-and-educational-use.snippet-list
@@ -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
@@ -9,4 +9,5 @@ three-sided-box.ly
 clefs-commonly-tweaked-properties.ly
 blanking-staff-lines-using-the--whiteout-command.ly
 forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly
+formatting-lyrics-syllables.ly
 changing-an-individual-notes-size-in-a-chord.ly

diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list
index d688d8b1798a5a5abe9385061c94761237fe154e..7ed0da7c352070e49aa2c725f0f33b692cee1c66 100644 (file)
--- a/input/lsr/expressive-marks.snippet-list
+++ b/input/lsr/expressive-marks.snippet-list
@@ -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

diff --git a/input/lsr/formatting-lyrics-syllables.ly b/input/lsr/formatting-lyrics-syllables.ly
new file mode 100644 (file)
index 0000000..1d81d8d
--- /dev/null
+++ b/input/lsr/formatting-lyrics-syllables.ly
@@ -0,0 +1,26 @@
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+%% Tags: editorial-and-educational-use, text, vocal-music
+\version "2.11.35"
+
+\header { texidoc = "
+To format single lyrics syllables, you can simply use \\markup @{ ....
+@} on these lyrics!
+" }
+% begin verbatim
+% Tip taken from http://lists.gnu.org/archive/html/lilypond-user/2007-12/msg00215.html
+\header {
+  title = "Markup can be used inside lyrics!" 
+}
+% begin verbatim
+melody = \relative c'' { c4 c c c  }
+lyr = \lyricmode { 
+  Lyrics \markup { \italic can } \markup {\with-color #red contain } 
+  \markup {\fontsize #8 \bold "Markup!" } 
+}
+
+\context Staff << 
+  \context Voice = "mel" << \melody >>
+  \context Lyrics \lyricsto "mel" \lyr
+>>
+

diff --git a/input/lsr/non-traditional-key-signatures.ly b/input/lsr/non-traditional-key-signatures.ly
index ba03e67d89b712cf850fa987bf36158599ef97c9..6464006a41ae456f4e9bbade7f6a34f1460afcec 100644 (file)
--- a/input/lsr/non-traditional-key-signatures.ly
+++ b/input/lsr/non-traditional-key-signatures.ly
@@ -4,18 +4,23 @@
 \version "2.11.35"
 
 \header { texidoc = "
-The commonly used @code{\\key} command sets the context property
-Staff.keySignature. However, non-standard key signatures can be
-specified by setting this property directly. The format of this command
-is a list: @code{ \\set Staff.keySignature =
-  #'((octave . step) . alter) } where, for each element in the list,
-octave specifies the octave (0 being the octave from middle C to the B
-above), step specifies the note within the octave (0 means C and 6
-means B), and alter is ,SHARP ,FLAT ,DOUBLE-SHARP etc. (Note the
-leading comma.) Here is an example of a possible key signature for
-generating a whole-tone scale:
+The commonly used @code{\\key} command sets the @code{keySignature}
+property, in the @code{Staff} context. However, non-standard key
+signatures can be specified by setting this property directly. The
+format of this command is a list: @code{ \\set Staff.keySignature =
+#'(((octave . step) . alter) ((octave . step) . alter) ...) } where,
+for each element in the list, octave specifies the octave (0 being the
+octave from middle C to the B above), step specifies the note within
+the octave (0 means C and 6 means B), and alter is ,SHARP ,FLAT
+,DOUBLE-SHARP etc. (Note the leading comma.)
 
+However, for each item in the list, you can also use the alternative
+format (step . alter), which specifies that the same alteration should
+hold in all octaves.
 
+
+Here is an example of a possible key signature for generating a
+whole-tone scale: 
 " }
 % begin verbatim
 \relative c' {

diff --git a/input/lsr/pitches.snippet-list b/input/lsr/pitches.snippet-list
index 56e3477a302226ff1df93e44967aeb2b85093ff9..e186d5eac5242808e2f4695d1d628eb950a92bb5 100644 (file)
--- a/input/lsr/pitches.snippet-list
+++ b/input/lsr/pitches.snippet-list
@@ -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
 transposing-pitches-with-minimum-accidentals-smart-transpose.ly
 makam.ly
 preventing-extra-naturals-from-being-automatically-added.ly
@@ -10,5 +10,5 @@ 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-music-with-scheme-music-box.ly
-creating-a-sequence-of-notes-on-various-pitches.ly
+ambiti-multiple-voices.ly
 non-traditional-key-signatures.ly

diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list
index 35ce406627c5bb4e927942c7c4727f220e008c81..2a1edde5b98697aee82366c8ea5d193ef263f5f7 100644 (file)
--- a/input/lsr/rhythms.snippet-list
+++ b/input/lsr/rhythms.snippet-list
@@ -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

diff --git a/input/lsr/spacing.snippet-list b/input/lsr/spacing.snippet-list
index a0d5352384730414624a54f53d661e0f032a43f6..d9f5825d2e1e103ad235fda9f8ecc453a051ca18 100644 (file)
--- a/input/lsr/spacing.snippet-list
+++ b/input/lsr/spacing.snippet-list
@@ -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

diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list
index 078dde22be594037f7e07b2661f1f42596155887..51b72daef63999bd3247db763553f4485765df42 100644 (file)
--- a/input/lsr/staff-notation.snippet-list
+++ b/input/lsr/staff-notation.snippet-list
@@ -1,7 +1,8 @@
 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-with-transposition.ly
@@ -9,5 +10,4 @@ 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
 non-traditional-key-signatures.ly

diff --git a/input/lsr/template.snippet-list b/input/lsr/template.snippet-list
index 59b06c613003f94fdd4a141e68e2a39f338babca..8af6644e5a99342e8f7792020acffb241f94ab88 100644 (file)
--- a/input/lsr/template.snippet-list
+++ b/input/lsr/template.snippet-list
@@ -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

diff --git a/input/lsr/text.snippet-list b/input/lsr/text.snippet-list
index 113ffc5358c490b4253ba7cadec7a4ef686ee7c2..f32630bbbfb2ed47f18949f9084c7b4563f0aaf2 100644 (file)
--- a/input/lsr/text.snippet-list
+++ b/input/lsr/text.snippet-list
@@ -5,12 +5,13 @@ center-text-below-hairpin-dynamics.ly
 piano-template-with-centered-lyrics.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
-combining-two-parts-on-the-same-staff.ly
+formatting-lyrics-syllables.ly
+how-to-put-ties-between-syllables-in-lyrics.ly
 markup-lines.ly
 adjusting-lyrics-vertical-spacing.ly
 aligning-lyrics.ly

diff --git a/input/lsr/vocal-music.snippet-list b/input/lsr/vocal-music.snippet-list
index 0e62dde99dbe065fd3b0d07d83cdb8fa5c799467..718e60759cc6d0009d644d4d0923bfc33d224ec5 100644 (file)
--- a/input/lsr/vocal-music.snippet-list
+++ b/input/lsr/vocal-music.snippet-list
@@ -1,15 +1,16 @@
 chant-or-psalms-notation.ly
 single-staff-template-with-notes-and-lyrics.ly
 skips-in-lyric-mode-2.ly
+skips-in-lyric-mode.ly
 vocal-ensemble-template-with-automatic-piano-reduction.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
-single-staff-template-with-notes,-lyrics,-and-chords.ly
-demo-midiinstruments.ly
 vertically-aligning-ossias-and-lyrics.ly
+single-staff-template-with-notes,-lyrics,-and-chords.ly
+formatting-lyrics-syllables.ly
+piano-template-with-melody-and-lyrics.ly
 aligning-lyrics.ly
 vocal-ensemble-template.ly
 adjusting-lyrics-vertical-spacing.ly
-skips-in-lyric-mode.ly
+demo-midiinstruments.ly