]> git.donarmstrong.com Git - lilypond.git/commitdiff
LSR: update (from Neil)
authorGraham Percival <graham@percival-music.ca>
Sat, 24 May 2008 00:45:21 +0000 (17:45 -0700)
committerGraham Percival <graham@percival-music.ca>
Sat, 24 May 2008 00:45:21 +0000 (17:45 -0700)
20 files changed:
input/lsr/ancient-notation.snippet-list
input/lsr/contexts-and-engravers.snippet-list
input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly
input/lsr/creating-slurs-across-voices.ly
input/lsr/editorial-annotations.snippet-list
input/lsr/expressive-marks.snippet-list
input/lsr/keyboards.snippet-list
input/lsr/manually-controlling-beam-positions.ly
input/lsr/piano-template-with-centered-lyrics.ly
input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly
input/lsr/rhythms.snippet-list
input/lsr/staff-notation.snippet-list
input/lsr/template.snippet-list
input/lsr/text.snippet-list
input/lsr/tweaks-and-overrides.snippet-list
input/lsr/unfretted-strings.snippet-list
input/lsr/using-double-slurs-for-legato-chords.ly
input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly
input/lsr/vocal-music.snippet-list
input/lsr/volta-multi-staff.ly

index 8593b52ab3a1530bd905b0798158bebbf25316e0..5cc01498c384b6768ce0fa2304d2c7c150e11b52 100644 (file)
@@ -1,9 +1,9 @@
-transcription-of-ancient-music-with-incipit.ly
+ancient-fonts.ly
 chant-or-psalms-notation.ly
 adding-a-figured-bass-above-or-below-the-notes.ly
 incipit.ly
 ancient-notation-template----modern-transcription-of-mensural-music.ly
-ancient-fonts.ly
+transcription-of-ancient-music-with-incipit.ly
 ancient-time-signatures.ly
 custodes.ly
 mensurstriche-layout-bar-lines-between-the-staves.ly
index 670a7a75febc7101cca765da73e4205fe7bbed2c..34d873ef8c00f2f0e2f0656e8feab84a0037a7d6 100644 (file)
@@ -1,11 +1,11 @@
 creating-blank-staves.ly
-chant-or-psalms-notation.ly
+vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 adding-a-figured-bass-above-or-below-the-notes.ly
 adding-an-extra-staff-at-a-line-break.ly
 adding-an-extra-staff.ly
-mensurstriche-layout-bar-lines-between-the-staves.ly
+chant-or-psalms-notation.ly
 changing-time-signatures-inside-a-polymetric-section-using--compressmusic.ly
+mensurstriche-layout-bar-lines-between-the-staves.ly
 engravers-one-by-one.ly
 use-square-bracket-at-the-start-of-a-staff-group.ly
-vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 nesting-staves.ly
index 68a4e74ab72f43f80b59db797554154fa586a92c..9d74ca01ac515ae4896fe9b6ef481a13eb510971 100644 (file)
@@ -13,22 +13,18 @@ the staves by setting the property @code{PianoStaff.connectArpeggios}.
 "
   doctitle = "Creating cross-staff arpeggios in a piano staff"
 } % begin verbatim
-\relative c'' {
-
-\new PianoStaff <<
+\new PianoStaff \relative c'' <<
   \set PianoStaff.connectArpeggios = ##t
   \new Staff {
-    <c e g c>\arpeggio
-    <g c e g>\arpeggio
-    <e g c e>\arpeggio
-    <c e g c>\arpeggio
+    <c e g c>4\arpeggio
+    <g c e g>4\arpeggio
+    <e g c e>4\arpeggio
+    <c e g c>4\arpeggio
   }
   \new Staff {
     \clef bass
     \repeat unfold 4 {
-      <c,, e g c>\arpeggio
+      <c,, e g c>4\arpeggio
     }
   }
 >>
-
-}
index bc2ec548ab2659f8bc6355907517d4615136e3c9..034926d38d8d11c5d0507357ae266ef7f47ef128 100644 (file)
@@ -6,8 +6,8 @@
   lsrtags = "expressive-marks, keyboards, unfretted-strings"
 
   texidoc = "
-In some situations, you may want to create slurs between notes from
-different voices.
+In some situations, it may be necessary to create slurs between notes
+from different voices.
 
 The solution is to add invisible notes to one of the voices, using
 @code{\\hideNotes}.
@@ -18,9 +18,22 @@ solo violin, BWV 1004.
 "
   doctitle = "Creating slurs across voices"
 } % begin verbatim
-\relative c'
-<<
-  {d16( a') s a s a[ s a] s a[ s a] } \\
-  {\slurUp bes,[ s e]( \hideNotes a) \unHideNotes f[( \hideNotes a) \unHideNotes fis]( \hideNotes a) \unHideNotes g[( \hideNotes a) \unHideNotes gis]( \hideNotes a) }
->>
-
+\relative c' {
+  << {
+    d16( a') s a s a[ s a] s a[ s a]
+  }
+  \\
+  {
+    \slurUp
+    bes,16[ s e](
+    \hideNotes a)
+    \unHideNotes f[(
+    \hideNotes a)
+    \unHideNotes fis](
+    \hideNotes a)
+    \unHideNotes g[(
+    \hideNotes a)
+    \unHideNotes gis](
+    \hideNotes a)
+  } >>
+}
index de93af3949b810beccf713999caa58ede0f0034a..028db73cf728bcf053787aa8957df11e34ec6b25 100644 (file)
@@ -1,12 +1,12 @@
 creating-blank-staves.ly
 making-some-staff-lines-thicker-than-the-others.ly
 applying-note-head-styles-depending-on-the-step-of-the-scale.ly
-changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
 embedding-native-postscript-in-a--markup-block.ly
-default-direction-of-stems-on-the-center-line-of-the-staff.ly
-changing-a-single-notes-size-in-a-chord.ly
+changing-the-appearance-of-a-slur-from-solid-to-dotted-or-dashed.ly
 grid-lines--emphasizing-rhythms-and-notes-synchronization.ly
+changing-a-single-notes-size-in-a-chord.ly
 grid-lines--changing-their-appearance.ly
 controlling-the-placement-of-chord-fingerings.ly
 allowing-fingerings-to-be-printed-inside-the-staff.ly
 blanking-staff-lines-using-the--whiteout-command.ly
+default-direction-of-stems-on-the-center-line-of-the-staff.ly
index f13506108c9042280301eb22aac251d69f1f4597..afde7a40a1028140ecafbd0d5d645760b324e76b 100644 (file)
@@ -10,14 +10,14 @@ line-arrows.ly
 hiding-the-extender-line-for-text-dynamics.ly
 vertically-aligning-dynamics-across-multiple-notes.ly
 modifying-default-values-for-articulation-shorthand-notation.ly
-setting-the-minimum-length-of-hairpins.ly
 changing-text-and-spanner-styles-for-text-dynamics.ly
 controlling-the-vertical-ordering-of-scripts.ly
 using-double-slurs-for-legato-chords.ly
-creating-text-spanners.ly
+setting-the-minimum-length-of-hairpins.ly
 creating-real-parenthesized-dynamics.ly
 center-text-below-hairpin-dynamics.ly
 printing-metronome-and-rehearsal-marks-below-the-staff.ly
+creating-text-spanners.ly
 broken-crescendo-hairpin.ly
 combining-dynamics-with-markup-texts.ly
 creating-slurs-across-voices.ly
index aac210db57e5d92ee0e4f107222be19a579fb0fc..76b491528d5890a1ccb1f5315b2d27c803f938da 100644 (file)
@@ -1,10 +1,11 @@
-piano-template-with-centered-dynamics.ly
+indicating-cross-staff-chords-with-arpeggio-bracket.ly
 clusters.ly
 creating-slurs-across-voices.ly
-jazz-combo-template.ly
+piano-template-with-centered-lyrics.ly
 vocal-ensemble-template-with-automatic-piano-reduction.ly
 piano-template-simple.ly
+piano-template-with-centered-dynamics.ly
 controlling-the-placement-of-chord-fingerings.ly
 piano-template-with-melody-and-lyrics.ly
-piano-template-with-centered-lyrics.ly
+jazz-combo-template.ly
 demo-midiinstruments.ly
index 8a3a31ca8dcb130bb05c9b9df6eb23d69cffd3e5..af520baa4e4ace6caf9ade246bf540eb938cf8d4 100644 (file)
@@ -22,6 +22,6 @@ Beam positions may be controlled manually, by overriding the
   c8 c
   % from center to one above center (position 2)
   \override Beam #'positions = #'(0 . 1)
-  c c
+  c8 c
 }
 
index 6043f6247e72d4fe74f4eedca94783ad8e047b22..ffb4d53ebddb3b24073d44a97dbb641348cef7f7 100644 (file)
@@ -6,9 +6,8 @@
   lsrtags = "text, keyboards, template"
 
   texidoc = "
-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).
+Instead of having a full staff for the melody and lyrics, lyrics can be
+centered between the staves of a piano staff.
 
 "
   doctitle = "Piano template with centered lyrics"
@@ -18,7 +17,7 @@ upper = \relative c'' {
   \key c \major
   \time 4/4
   
-  a b c d
+  a4 b c d
   
 }
 
index b520dbfd3b79d459aa59d19d3bb577db65705fdd..95f3b034a1862d866c02b6f7d1701b04be0c643f 100644 (file)
@@ -20,12 +20,12 @@ final bar line, as demonstrated on the second line of this example.
 \relative c'' {  
   \override Score.RehearsalMark  #'break-visibility = #begin-of-line-invisible
   g2 c
-  d, a'
+  d,2 a'
   \mark \default
   \break
   
-  \override Score.RehearsalMark #'self-alignment-X = #right
-  g b,
+  \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+  g2 b,
   c1 \bar "||"
   \mark "D.C. al Fine"
 }
index 8222963f95cfb6afcc0d9c808b58447fdc06b013..75dddbc55110193bc457e8171f966c08d48c9e3f 100644 (file)
@@ -3,7 +3,6 @@ beams-across-line-breaks.ly
 manually-controlling-beam-positions.ly
 adding-drum-parts.ly
 rest-styles.ly
-skips-in-lyric-mode-2.ly
 chant-or-psalms-notation.ly
 controlling-tuplet-bracket-visibility.ly
 heavily-customized-polymetric-time-signatures.ly
@@ -20,6 +19,7 @@ automatic-beam-subdivisions.ly
 changing-the-tuplet-number.ly
 entering-several-tuplets-using-only-one--times-command.ly
 conducting-signs,-measure-grouping-signs.ly
+skips-in-lyric-mode-2.ly
 changing-form-of-multi--measure-rests.ly
 rhythmic-slashes.ly
 automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly
index ddfb9b9f30db47a451ea5d82c74f00e429a13047..bed61d8a90f67209568d543ed30a09535795827e 100644 (file)
@@ -3,7 +3,7 @@ mensurstriche-layout-bar-lines-between-the-staves.ly
 changing-the-number-of-lines-in-a-staff.ly
 incipit.ly
 display-bracket-with-only-one-staff-in-a-system.ly
-adding-an-extra-staff.ly
+time-signature-in-parentheses.ly
 printing-metronome-and-rehearsal-marks-below-the-staff.ly
 tweaking-clef-properties.ly
 quoting-another-voice.ly
@@ -13,7 +13,7 @@ creating-blank-staves.ly
 adding-ambitus-per-voice.ly
 making-some-staff-lines-thicker-than-the-others.ly
 adding-an-extra-staff-at-a-line-break.ly
-time-signature-in-parentheses.ly
+adding-an-extra-staff.ly
 changing-the-staff-size.ly
 use-square-bracket-at-the-start-of-a-staff-group.ly
 quoting-another-voice-with-transposition.ly
index 4a2ef8b4e7f0cc1ead0666381de5d1093704e7e0..869448422f5991a1bd19b9a55f79b75ccd36fb36 100644 (file)
@@ -1,17 +1,17 @@
 vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 single-staff-template-with-notes-and-lyrics.ly
 single-staff-template-with-only-notes.ly
-jazz-combo-template.ly
-score-for-diatonic-accordion.ly
+piano-template-with-centered-lyrics.ly
+vocal-ensemble-template-with-automatic-piano-reduction.ly
 piano-template-simple.ly
 ancient-notation-template----modern-transcription-of-mensural-music.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
+vocal-ensemble-template.ly
 piano-template-with-melody-and-lyrics.ly
 string-quartet-template-with-separate-parts.ly
-vocal-ensemble-template.ly
+single-staff-template-with-notes,-lyrics,-and-chords.ly
+string-quartet-template-simple.ly
+single-staff-template-with-notes-and-chords.ly
 piano-template-with-centered-dynamics.ly
-piano-template-with-centered-lyrics.ly
-vocal-ensemble-template-with-automatic-piano-reduction.ly
+jazz-combo-template.ly
+score-for-diatonic-accordion.ly
index c8f4874b1ea2b97b7bf022c89933a067d0e92897..86aa0a24d5f3c1fc64b901ef125f22b65f9bbf9d 100644 (file)
@@ -14,13 +14,13 @@ creating-text-spanners.ly
 creating-real-parenthesized-dynamics.ly
 center-text-below-hairpin-dynamics.ly
 demonstrating-all-headers.ly
-combining-two-parts-on-the-same-staff.ly
 how-to-put-ties-between-syllables-in-lyrics.ly
+combining-two-parts-on-the-same-staff.ly
 combining-dynamics-with-markup-texts.ly
 aligning-marks-with-various-notation-objects.ly
-ottava-text.ly
+piano-template-with-centered-lyrics.ly
 creating-simultaneous-rehearsal-marks.ly
 three-sided-box.ly
 utf-8.ly
-piano-template-with-centered-lyrics.ly
+ottava-text.ly
 aligning-lyrics.ly
index dde15429b3928989025ef8cd2beade76031e0598..097eeee195bb87d203d96f743d9bb04e44e61af5 100644 (file)
@@ -1,5 +1,5 @@
 display-bracket-with-only-one-staff-in-a-system.ly
-rhythmic-slashes.ly
+time-signature-in-parentheses.ly
 changing-the-default-text-font-family.ly
 drawing-boxes-around-grobs.ly
 manually-controlling-beam-positions.ly
@@ -26,7 +26,7 @@ drawing-circles-around-various-objects.ly
 creating-text-spanners.ly
 caesura-railtracks-with-fermata.ly
 changing-form-of-multi--measure-rests.ly
-time-signature-in-parentheses.ly
+rhythmic-slashes.ly
 changing-a-single-notes-size-in-a-chord.ly
 creating-simultaneous-rehearsal-marks.ly
 nesting-staves.ly
index 5ee803315fbd918d46e2093cc65ad6afbba92b11..4afa6824c0c09f4915245d91b5c3c67787c4e771 100644 (file)
@@ -1,5 +1,5 @@
 string-quartet-template-with-separate-parts.ly
-string-quartet-template-simple.ly
 changing--flageolet-mark-size.ly
 creating-slurs-across-voices.ly
+string-quartet-template-simple.ly
 demo-midiinstruments.ly
index eab7728f2a0a82fc32fff7553c045c5a4c56e3a2..922d96dcdea5943c270cf6453db267a44f1a19aa 100644 (file)
@@ -7,7 +7,7 @@
 
   texidoc = "
 Some composers write two slurs when they want legato chords.  This can
-be achieved by setting @code{doubleSlurs} 
+be achieved by setting @code{doubleSlurs}. 
 
 "
   doctitle = "Using double slurs for legato chords"
index b23db33f97fa6d837625b1bb6e755e0e81b6afae..32ca66e385a6033468109342117989f74ca21bb4 100644 (file)
@@ -17,87 +17,81 @@ reduction.
   doctitle = "Vocal ensemble template with automatic piano reduction"
 } % begin verbatim
 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)
-             }
-           }
-         }
+  \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)
+    }
+  }
+}
index ff4d5a6c04057569191c8282dfcbe02443d916a0..adf492d73c0a69e0783ee1fceb4fa1fc8d99c71f 100644 (file)
@@ -1,4 +1,4 @@
-chant-or-psalms-notation.ly
+vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 single-staff-template-with-notes-and-lyrics.ly
 adding-ambitus-per-voice.ly
 skips-in-lyric-mode-2.ly
@@ -7,11 +7,11 @@ vocal-ensemble-template-with-automatic-piano-reduction.ly
 ambitus-with-multiple-voices.ly
 how-to-put-ties-between-syllables-in-lyrics.ly
 vertically-aligning-ossias-and-lyrics.ly
-vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
 single-staff-template-with-notes,-lyrics,-and-chords.ly
 formatting-lyrics-syllables.ly
 piano-template-with-melody-and-lyrics.ly
-aligning-lyrics.ly
+demo-midiinstruments.ly
+chant-or-psalms-notation.ly
 vocal-ensemble-template.ly
 adjusting-lyrics-vertical-spacing.ly
-demo-midiinstruments.ly
+aligning-lyrics.ly
index 229902e2d736cec4f7ef08e5974638bc61062b32..e0fcd7a721555546d7093d9b95e8f0d06d56b63e 100644 (file)
@@ -3,7 +3,7 @@
 \version "2.11.46"
 \layout { ragged-right= ##t }
 \header {
-  lsrtags = "repeats,staff-notation"
+  lsrtags = "repeats,staff-notation,fretted-strings"
   texidoc = "By adding the @code{Volta_engraver} to the relevant
 staff, volte can be put over staves other than the topmost
 one in a score."