Hi John,
2008/5/24 John Mandereau <[EMAIL PROTECTED]>:
> Hi Neil,
>
> It looks like you haven't added some input/lsr/*.snippet-list or some
> input/lsr/*.ly files to commit last time you used makelsr.py. I fixed
> it in a silly way, but you may want to update LSR again (and commit all
> necessary files, i.e. input/lsr/*.ly and input/lsr/*.snippet-list) in
> case you want indicating-cross-staff-chords-with-arpeggio-bracket.ly to
> be included in Snippets with 'keyboards' tag.
That's weird; the new file is definitely in the patch I sent Graham,
and I can see it's present in gitk.
Could there be something wrong with the patch? It's attached if you
want to have a look.
Regards,
Neil
From 2fde0083d8529866d9f58326f89b33e64febe966 Mon Sep 17 00:00:00 2001
From: Neil Puttock <[EMAIL PROTECTED]>
Date: Sat, 24 May 2008 01:04:15 +0100
Subject: [PATCH] LSR update
---
input/lsr/ancient-notation.snippet-list | 4 +-
input/lsr/contexts-and-engravers.snippet-list | 6 +-
...ating-cross-staff-arpeggios-in-a-piano-staff.ly | 16 +--
input/lsr/creating-slurs-across-voices.ly | 29 +++-
input/lsr/editorial-annotations.snippet-list | 6 +-
input/lsr/expressive-marks.snippet-list | 4 +-
...ing-cross-staff-chords-with-arpeggio-bracket.ly | 42 +++++
input/lsr/keyboards.snippet-list | 7 +-
input/lsr/manually-controlling-beam-positions.ly | 2 +-
input/lsr/piano-template-with-centered-lyrics.ly | 7 +-
...inting-marks-at-the-end-of-a-line-or-a-score.ly | 6 +-
input/lsr/rhythms.snippet-list | 2 +-
input/lsr/staff-notation.snippet-list | 4 +-
input/lsr/template.snippet-list | 16 +-
input/lsr/text.snippet-list | 6 +-
input/lsr/tweaks-and-overrides.snippet-list | 4 +-
input/lsr/unfretted-strings.snippet-list | 2 +-
input/lsr/using-double-slurs-for-legato-chords.ly | 2 +-
...mble-template-with-automatic-piano-reduction.ly | 160 ++++++++++----------
input/lsr/vocal-music.snippet-list | 8 +-
input/lsr/volta-multi-staff.ly | 2 +-
21 files changed, 190 insertions(+), 145 deletions(-)
create mode 100644 input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly
diff --git a/input/lsr/ancient-notation.snippet-list b/input/lsr/ancient-notation.snippet-list
index 8593b52..5cc0149 100644
--- a/input/lsr/ancient-notation.snippet-list
+++ b/input/lsr/ancient-notation.snippet-list
@@ -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
diff --git a/input/lsr/contexts-and-engravers.snippet-list b/input/lsr/contexts-and-engravers.snippet-list
index 670a7a7..34d873e 100644
--- a/input/lsr/contexts-and-engravers.snippet-list
+++ b/input/lsr/contexts-and-engravers.snippet-list
@@ -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
diff --git a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly
index 68a4e74..9d74ca0 100644
--- a/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly
+++ b/input/lsr/creating-cross-staff-arpeggios-in-a-piano-staff.ly
@@ -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
}
}
>>
-
-}
diff --git a/input/lsr/creating-slurs-across-voices.ly b/input/lsr/creating-slurs-across-voices.ly
index bc2ec54..034926d 100644
--- a/input/lsr/creating-slurs-across-voices.ly
+++ b/input/lsr/creating-slurs-across-voices.ly
@@ -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)
+ } >>
+}
diff --git a/input/lsr/editorial-annotations.snippet-list b/input/lsr/editorial-annotations.snippet-list
index de93af3..028db73 100644
--- a/input/lsr/editorial-annotations.snippet-list
+++ b/input/lsr/editorial-annotations.snippet-list
@@ -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
diff --git a/input/lsr/expressive-marks.snippet-list b/input/lsr/expressive-marks.snippet-list
index f135061..afde7a4 100644
--- a/input/lsr/expressive-marks.snippet-list
+++ b/input/lsr/expressive-marks.snippet-list
@@ -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
diff --git a/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly
new file mode 100644
index 0000000..dc25bbd
--- /dev/null
+++ b/input/lsr/indicating-cross-staff-chords-with-arpeggio-bracket.ly
@@ -0,0 +1,42 @@
+%% 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.46"
+
+\header {
+ lsrtags = "keyboards"
+
+ texidoc = "
+An arpeggioBracket can indicate that notes on two different staves are
+to be played with the same hand. In order to do this, the PianoStaff
+must be set to accept cross-staff arpeggios and the arpeggios must be
+set to the bracket shape at the PianoStaff level.
+
+
+(Debussy, Les collines dâAnacapri, m. 65)
+
+"
+ doctitle = "Indicating cross-staff chords with arpeggio bracket"
+} % begin verbatim
+\paper { ragged-right = ##t }
+
+\new Score {
+ \new PianoStaff
+ <<
+ \set PianoStaff.connectArpeggios = ##t
+ \override PianoStaff.Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket
+ \new Staff \relative c' {
+ \key b \major
+ \time 6/8
+ b8-.(\arpeggio fis'-.\> cis-. e-. gis-. b-.)\!\fermata^\laissezVibrer
+ \bar "||"
+ }
+ \new Staff \relative c' {
+ \clef bass
+ \key b \major
+ <<
+ { <a e cis>2.\arpeggio } \\
+ { <a, e a,>2. }
+ >>
+ }
+ >>
+}
diff --git a/input/lsr/keyboards.snippet-list b/input/lsr/keyboards.snippet-list
index aac210d..76b4915 100644
--- a/input/lsr/keyboards.snippet-list
+++ b/input/lsr/keyboards.snippet-list
@@ -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
diff --git a/input/lsr/manually-controlling-beam-positions.ly b/input/lsr/manually-controlling-beam-positions.ly
index 8a3a31c..af520ba 100644
--- a/input/lsr/manually-controlling-beam-positions.ly
+++ b/input/lsr/manually-controlling-beam-positions.ly
@@ -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
}
diff --git a/input/lsr/piano-template-with-centered-lyrics.ly b/input/lsr/piano-template-with-centered-lyrics.ly
index 6043f62..ffb4d53 100644
--- a/input/lsr/piano-template-with-centered-lyrics.ly
+++ b/input/lsr/piano-template-with-centered-lyrics.ly
@@ -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
}
diff --git a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly
index b520dbf..95f3b03 100644
--- a/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly
+++ b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.ly
@@ -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"
}
diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list
index 8222963..75dddbc 100644
--- a/input/lsr/rhythms.snippet-list
+++ b/input/lsr/rhythms.snippet-list
@@ -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
diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list
index ddfb9b9..bed61d8 100644
--- a/input/lsr/staff-notation.snippet-list
+++ b/input/lsr/staff-notation.snippet-list
@@ -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
diff --git a/input/lsr/template.snippet-list b/input/lsr/template.snippet-list
index 4a2ef8b..8694484 100644
--- a/input/lsr/template.snippet-list
+++ b/input/lsr/template.snippet-list
@@ -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
diff --git a/input/lsr/text.snippet-list b/input/lsr/text.snippet-list
index c8f4874..86aa0a2 100644
--- a/input/lsr/text.snippet-list
+++ b/input/lsr/text.snippet-list
@@ -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
diff --git a/input/lsr/tweaks-and-overrides.snippet-list b/input/lsr/tweaks-and-overrides.snippet-list
index dde1542..097eeee 100644
--- a/input/lsr/tweaks-and-overrides.snippet-list
+++ b/input/lsr/tweaks-and-overrides.snippet-list
@@ -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
diff --git a/input/lsr/unfretted-strings.snippet-list b/input/lsr/unfretted-strings.snippet-list
index 5ee8033..4afa682 100644
--- a/input/lsr/unfretted-strings.snippet-list
+++ b/input/lsr/unfretted-strings.snippet-list
@@ -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
diff --git a/input/lsr/using-double-slurs-for-legato-chords.ly b/input/lsr/using-double-slurs-for-legato-chords.ly
index eab7728..922d96d 100644
--- a/input/lsr/using-double-slurs-for-legato-chords.ly
+++ b/input/lsr/using-double-slurs-for-legato-chords.ly
@@ -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"
diff --git a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly
index b23db33..32ca66e 100644
--- a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly
+++ b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly
@@ -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)
+ }
+ }
+}
diff --git a/input/lsr/vocal-music.snippet-list b/input/lsr/vocal-music.snippet-list
index ff4d5a6..adf492d 100644
--- a/input/lsr/vocal-music.snippet-list
+++ b/input/lsr/vocal-music.snippet-list
@@ -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
diff --git a/input/lsr/volta-multi-staff.ly b/input/lsr/volta-multi-staff.ly
index 229902e..e0fcd7a 100644
--- a/input/lsr/volta-multi-staff.ly
+++ b/input/lsr/volta-multi-staff.ly
@@ -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."
--
1.5.4.3
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
