From: Graham Percival Date: Wed, 2 Apr 2008 15:54:18 +0000 (-0700) Subject: LSR: update. X-Git-Tag: release/2.11.44-1~50 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=64b22c2ebb52d0188fde41dc95832f2bc20c1147;p=lilypond.git LSR: update. --- diff --git a/input/lsr/adding-fingerings-to-tablatures.ly b/input/lsr/adding-fingerings-to-tablatures.ly index 64fb4d5f25..c997121e8f 100644 --- a/input/lsr/adding-fingerings-to-tablatures.ly +++ b/input/lsr/adding-fingerings-to-tablatures.ly @@ -9,15 +9,15 @@ To add fingerings to tablatures, you can use a combination of @code{\\markup} and @code{\\finger}. " } % begin verbatim -one = \markup{ \finger "1" } -two = \markup{ \finger "2" } -threetwo = \markup{ \column {\finger "3" \finger "2"} } -threefour = \markup{ \column {\finger "3" \finger "4"} } +one = \markup { \finger "1" } +two = \markup { \finger "2" } +threeTwo = \markup { \column { \finger "3" \finger "2" } } +threeFour = \markup { \column { \finger "3" \finger "4" } } \score { \context TabStaff { \stemUp - e8\4^\one b\2 < e, g\3 e'\1 >^>[ b\2 e\4] - < a\3 fis'\1 >^>^\threetwo[ b\2 e\4] + e8\4^\one b\2 ^>[ b\2 e\4] + ^>^\threeTwo[ b\2 e\4] } } diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly index 68a31e707b..1e71ef88cd 100644 --- a/input/lsr/adjusting-lyrics-vertical-spacing.ly +++ b/input/lsr/adjusting-lyrics-vertical-spacing.ly @@ -5,31 +5,22 @@ \header { lsrtags = "text, vocal-music, spacing" texidoc = " -This snippets shows you how to bring the lyrics line closer to the -Staff. +This snippet shows you how to bring the lyrics line closer to the +staff. " } % begin verbatim % Default layout: -\score{ - << - \new Staff \new Voice = m \relative c'{ c4 d e f g f e d c1} - \new Lyrics \lyricsto m {aa aa aa aa aa aa aa aa aa } - >> -} +<< + \new Staff \new Voice = melody \relative c '{ c4 d e f g f e d c1 } + \new Lyrics \lyricsto melody { aa aa aa aa aa aa aa aa aa } +>> -% Reducing the minimum space below the Staff and above the Lyrics: - -\score { - << - \new Staff \with { - \override VerticalAxisGroup #'minimum-Y-extent = #'(-1. 4)} - \new Voice = m \relative c'{ c4 d e f g f e d c1 } - \new Lyrics \with { - \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 1)} - \lyricsto m {aa aa aa aa aa aa aa aa aa } - >> - - \header { - tagline = "" - } -} +% Reducing the minimum space below the staff and above the lyrics: +<< + \new Staff \with { + \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 4) } + \new Voice = melody \relative c' { c4 d e f g f e d c1 } + \new Lyrics \with { + \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 1) } + \lyricsto melody { aa aa aa aa aa aa aa aa aa } +>> diff --git a/input/lsr/aligning-and-centering-instrument-names.ly b/input/lsr/aligning-and-centering-instrument-names.ly index 586103c4a0..becef5b1a0 100644 --- a/input/lsr/aligning-and-centering-instrument-names.ly +++ b/input/lsr/aligning-and-centering-instrument-names.ly @@ -7,49 +7,47 @@ texidoc = " Instrument names are generally printed at the left side of the staves. To align the names of several different intruments, you can put them in -a \\markup block and use one of the following possibilites: - +a @code{\\markup} block and use one of the following possibilites: * - Right-aligned instrument names: this is LilyPond's default behavior + Right-aligned instrument names: this is the default behavior * - Center-aligned instrument names: with the \\hcenter-in #n syntax, you - can place the instrument names inside a padded box (n being the width + Center-aligned instrument names: with the @code{\\hcenter-in #n} +command, you + can place the instrument names inside a padded box (@code{n} being the +width of the box) * Left-aligned instrument names: you have to print the names on top of an - empty box, using the \\combine command - with a \\hspace #n object. + empty box, using the @code{\\combine} command + with an @code{\\hspace #n} object. " } % begin verbatim -\paper{ - indent = #0 +\paper { + indent = #0 left-margin = #30 line-width = #160 } -\new StaffGroup \relative -<< +\new StaffGroup \relative << \new Staff { - \set Staff.instrumentName = "blabla" - c1^"default" c1 \break - \set Staff.instrumentName = \markup { \hcenter-in #10 "blabla" } - c1^"centered" c1 \break - \set Staff.instrumentName = \markup {\combine \hspace #8 "blabla" } - c1^"left-aligned" c1 - + \set Staff.instrumentName = "Piccolo" + c1^"default" c \break + \set Staff.instrumentName = \markup { \hcenter-in #10 "Piccolo" } + c1^"centered" c \break + \set Staff.instrumentName = \markup { \combine \hspace #8 "Piccolo" } + c1^"left-aligned" c } \new Staff { - \set Staff.instrumentName = "blo" - c1 c1 \break - \set Staff.instrumentName = \markup { \hcenter-in #10 "blo" } - c1 c1 \break - \set Staff.instrumentName = \markup {\combine \hspace #8 "blo" } - c1 c1 - } - + \set Staff.instrumentName = "Flute" + c1 c \break + \set Staff.instrumentName = \markup { \hcenter-in #10 "Flute" } + c1 c \break + \set Staff.instrumentName = \markup { \combine \hspace #8 "Flute" } + c1 c + } >> diff --git a/input/lsr/aligning-lyrics.ly b/input/lsr/aligning-lyrics.ly index fcd55166d1..677bbba440 100644 --- a/input/lsr/aligning-lyrics.ly +++ b/input/lsr/aligning-lyrics.ly @@ -6,10 +6,10 @@ lsrtags = "text, vocal-music" texidoc = " You can specify different horizontal alignment for your lyrics, by -overriding the @code{#'self-alignment-X} property of the -@code{LyricText} object. @code{#-1} is left, @code{#0} is center and -@code{#1} is right; however, you can use @code{#LEFT}, @code{#CENTER} -and @code{#RIGHT} as well. +overriding the @code{self-alignment-X} property of the @code{LyricText} +object. @code{#-1} is left, @code{#0} is center and @code{#1} is right; +however, you can use @code{#LEFT}, @code{#CENTER} and @code{#RIGHT} as +well. " } % begin verbatim \relative c'' { @@ -18,5 +18,5 @@ and @code{#RIGHT} as well. \addlyrics { \once \override LyricText #'self-alignment-X = #LEFT "This is left-aligned" \once \override LyricText #'self-alignment-X = #CENTER "This is centered" - \once \override LyricText #'self-alignment-X = #1 "this is right-aligned" + \once \override LyricText #'self-alignment-X = #1 "This is right-aligned" } diff --git a/input/lsr/aligning-marks-with-various-notation-objects.ly b/input/lsr/aligning-marks-with-various-notation-objects.ly new file mode 100644 index 0000000000..c51271cb1c --- /dev/null +++ b/input/lsr/aligning-marks-with-various-notation-objects.ly @@ -0,0 +1,71 @@ +%% 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.38" + +\header { + lsrtags = "text" + texidoc = " +If specified, text marks may be aligned with notation objects other +than bar lines. These objects include @code{ambitus}, +@code{breathing-sign}, @code{clef}, @code{custos}, @code{staff-bar}, +@code{left-edge}, @code{key-cancellation}, @code{key-signature}, and +@code{time-signature}. + + + +In such cases, text marks will be horizontally centered above the +object. However this can be changed, as demonstrated on the second line +of this example (in a score with multiple staves, this setting should +be done for all the staves). + + +" } +% begin verbatim +\relative c' { + e1 + + % the RehearsalMark will be centered above the Clef + \override Score.RehearsalMark #'break-align-symbols = #'(clef) + \key a \major + \clef treble + \mark "↓" + e + + % the RehearsalMark will be centered above the TimeSignature + \override Score.RehearsalMark #'break-align-symbols = #'(time-signature) + \key a \major + \clef treble + \time 3/4 + \mark "↓" + e2. + + % the RehearsalMark will be centered above the KeySignature + \override Score.RehearsalMark #'break-align-symbols = #'(key-signature) + \key a \major + \clef treble + \time 4/4 + \mark "↓" + e1 + + \break + e + + % the RehearsalMark will be aligned with the left edge of the KeySignature + \once \override Score.KeySignature #'break-align-anchor-alignment = #LEFT + \mark "↓" + \key a \major + e + + % the RehearsalMark will be aligned with the right edge of the KeySignature + \once \override Score.KeySignature #'break-align-anchor-alignment = #RIGHT + \key a \major + \mark "↓" + e + + % the RehearsalMark will be aligned with the left edge of the KeySignature + % and then shifted right by 1 unit. + \once \override Score.KeySignature #'break-align-anchor = #1 + \key a \major + \mark "↓" + e1 +} diff --git a/input/lsr/automatic-beam-subdivisions.ly b/input/lsr/automatic-beam-subdivisions.ly index bfe06865f3..70b9962317 100644 --- a/input/lsr/automatic-beam-subdivisions.ly +++ b/input/lsr/automatic-beam-subdivisions.ly @@ -15,7 +15,7 @@ specified in @code{beatLength}). << { \voiceOne \set subdivideBeams = ##t - b'32[ a g f c' b a g b^"subdivision enabled" a g f c' b a g] + b'32[ a g f c' b a g b^"subdivide beams" a g f c' b a g] \oneVoice } \new Voice { diff --git a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly index ae1c92d6d5..9d4c1d4c12 100644 --- a/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly +++ b/input/lsr/automatic-beams-two-per-two-in-4-4-or-2-2-time-signature.ly @@ -7,15 +7,15 @@ texidoc = " In a simple time signature of 2/2 or 4/4, 8th notes are beamed by default as two sets of four. Using a macro which overrides the -autobeaming behaviour, this snippet changes the beaming to quarter note +autobeaming behavior, this snippet changes the beaming to quarter note beats. " } % begin verbatim % Automatic beams two per two in 4/4 or 2/2 time signature -% _____ -% Default | | | | -% _ _ -% I want | | | | +% _____ +% Default | | | | +% _ _ +% Required | | | | % The good way adapted from David Bobroff @@ -33,7 +33,7 @@ qbeam= { g8^\markup { without the macro } g g g g g g g | g g g g4 g8 g g | } - %Use the macro + %Use the macro \new Staff \relative c'' { \time 4/4 \qbeam diff --git a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly index 5161cd6a5b..18feb70cc6 100644 --- a/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly +++ b/input/lsr/blanking-staff-lines-using-the--whiteout-command.ly @@ -10,7 +10,7 @@ Since staff lines are in a lower layer than most other grobs, this white box will not overlap any other grob. " } % begin verbatim -{ +\relative { \override TextScript #'extra-offset = #'(2 . 4) - c'2-\markup { \whiteout \pad-markup #0.5 foo } c + c2-\markup { \whiteout \pad-markup #0.5 "middle C" } c } diff --git a/input/lsr/center-text-below-hairpin-dynamics.ly b/input/lsr/center-text-below-hairpin-dynamics.ly index 4196d31069..a26e579de9 100644 --- a/input/lsr/center-text-below-hairpin-dynamics.ly +++ b/input/lsr/center-text-below-hairpin-dynamics.ly @@ -6,7 +6,7 @@ lsrtags = "expressive-marks, text" texidoc = " This example provides a function to typeset a hairpin (de)crescendo -with some additional text below it, such as \"molto\" or \"poco\".The +with some additional text below it, such as \"molto\" or \"poco\". The example also illustrates how to modify the way an object is normally printed, using some Scheme code. " } diff --git a/input/lsr/changing-the-tuplet-number.ly b/input/lsr/changing-the-tuplet-number.ly index a5b17af197..9f3fb3f9f9 100644 --- a/input/lsr/changing-the-tuplet-number.ly +++ b/input/lsr/changing-the-tuplet-number.ly @@ -6,7 +6,7 @@ lsrtags = "rhythms" texidoc = " By default, only the numerator of the tuplet number is printed over the -tuplet bracket, i.e. the denominator of the argument to the +tuplet bracket, i.e., the denominator of the argument to the @code{\\times} command. Alternatively, num:den of the tuplet number may be printed, or the tuplet number may be suppressed altogether. " } diff --git a/input/lsr/custodes.ly b/input/lsr/custodes.ly index a3d250f11d..b823da152a 100644 --- a/input/lsr/custodes.ly +++ b/input/lsr/custodes.ly @@ -8,31 +8,24 @@ Custodes may be engraved in various styles. " } % begin verbatim -\layout { - \context { - \Staff - \consists Custos_engraver - } - ragged-right = ##t -} - -{ - \override Staff.Custos #'neutral-position = #4 - - \override Staff.Custos #'style = #'hufnagel - c'1^"hufnagel" - \break < d' a' f''>1 +\layout { ragged-right = ##t } - \override Staff.Custos #'style = #'medicaea - c'1^"medicaea" - \break < d' a' f''>1 - - \override Staff.Custos #'style = #'vaticana - c'1^"vaticana" - \break < d' a' f''>1 - - \override Staff.Custos #'style = #'mensural - c'1^"mensural" - \break < d' a' f''>1 +\new Staff \with { \consists "Custos_engraver" } \relative c' { + \override Staff.Custos #'neutral-position = #4 + + \override Staff.Custos #'style = #'hufnagel + c1^"hufnagel" \break + + + \override Staff.Custos #'style = #'medicaea + c^"medicaea" \break + + + \override Staff.Custos #'style = #'vaticana + c^"vaticana" \break + + + \override Staff.Custos #'style = #'mensural + c^"mensural" \break + } - diff --git a/input/lsr/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly index dc2dc609c9..3444daee8d 100644 --- a/input/lsr/demo-midiinstruments.ly +++ b/input/lsr/demo-midiinstruments.ly @@ -5,166 +5,167 @@ \header { lsrtags = "vocal-music, piano-music, strings, midi" texidoc = " -Problem: How to know which MidiInstrument would be best for your -composition? Solution: A Lilypond demo file. -" } -% begin verbatim -%\version "2.11.38" +Problem: How to know which @code{midiInstrument} would be best for your +composition?Solution: A LilyPond demo file. -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 } +" } +% begin verbatim \header { title = "Demo of all midi sounds" - arranger = "Myself" + arranger = "Myself " } -\score { +basemelodie = \relative c' { + c4. \mf g c16 b' c d | + e d e f g4 g'4 r | + r1 +} +melodie = { \tempo 4 = 150 \basemelodie } + +\score { \new Staff << \new Voice { \melodie - } %Voice - >> %Staff - \layout { } -} %score + } + >> + \layout { } +} \score { \new Staff << - \tempo 4 = 180 - %\set Staff.instrumentName="S/A" + %\set Staff.instrumentName= "S/A" %\set Staff.midiMinimumVolume = #0.2 %\set Staff.midiMaximumVolume = #0.4 %\set Voice.dynamicAbsoluteVolumeFunction = #0.6 \new Voice { r \mf - \set Staff.midiInstrument="acoustic grand" \melodie - \set Staff.midiInstrument="bright acoustic" \melodie - \set Staff.midiInstrument="electric grand" \melodie - \set Staff.midiInstrument="honky-tonk" \melodie - \set Staff.midiInstrument="electric piano 1" \melodie - \set Staff.midiInstrument="electric piano 2" \melodie - \set Staff.midiInstrument="harpsichord" \melodie - \set Staff.midiInstrument="clav" \melodie - \set Staff.midiInstrument="celesta" \melodie - \set Staff.midiInstrument="glockenspiel" \melodie - \set Staff.midiInstrument="music box" \melodie - \set Staff.midiInstrument="vibraphone" \melodie - \set Staff.midiInstrument="marimba" \melodie - \set Staff.midiInstrument="xylophone" \melodie - \set Staff.midiInstrument="tubular bells" \melodie - \set Staff.midiInstrument="dulcimer" \melodie - \set Staff.midiInstrument="drawbar organ" \melodie - \set Staff.midiInstrument="percussive organ" \melodie - \set Staff.midiInstrument="rock organ" \melodie - \set Staff.midiInstrument="church organ" \melodie - \set Staff.midiInstrument="reed organ" \melodie - \set Staff.midiInstrument="accordion" \melodie - \set Staff.midiInstrument="harmonica" \melodie - \set Staff.midiInstrument="concertina" \melodie - \set Staff.midiInstrument="acoustic guitar (nylon)" \melodie - \set Staff.midiInstrument="acoustic guitar (steel)" \melodie - \set Staff.midiInstrument="electric guitar (jazz)" \melodie - \set Staff.midiInstrument="electric guitar (clean)" \melodie - \set Staff.midiInstrument="electric guitar (muted)" \melodie - \set Staff.midiInstrument="overdriven guitar" \melodie - \set Staff.midiInstrument="distorted guitar" \melodie - \set Staff.midiInstrument="acoustic bass" \melodie - \set Staff.midiInstrument="electric bass (finger)" \melodie - \set Staff.midiInstrument="electric bass (pick)" \melodie - \set Staff.midiInstrument="fretless bass" \melodie - \set Staff.midiInstrument="slap bass 1" \melodie - \set Staff.midiInstrument="slap bass 2" \melodie - \set Staff.midiInstrument="synth bass 1" \melodie - \set Staff.midiInstrument="synth bass 2" \melodie - \set Staff.midiInstrument="violin" \melodie - \set Staff.midiInstrument="viola" \melodie - \set Staff.midiInstrument="cello" \melodie - \set Staff.midiInstrument="contrabass" \melodie - \set Staff.midiInstrument="tremolo strings" \melodie - \set Staff.midiInstrument="pizzicato strings" \melodie - \set Staff.midiInstrument="orchestral strings" \melodie - \set Staff.midiInstrument="timpani" \melodie - \set Staff.midiInstrument="string ensemble 1" \melodie - \set Staff.midiInstrument="string ensemble 2" \melodie - \set Staff.midiInstrument="synthstrings 1" \melodie - \set Staff.midiInstrument="synthstrings 2" \melodie - \set Staff.midiInstrument="choir aahs" \melodie - \set Staff.midiInstrument="voice oohs" \melodie - \set Staff.midiInstrument="synth voice" \melodie - \set Staff.midiInstrument="orchestra hit" \melodie - \set Staff.midiInstrument="trumpet" \melodie - \set Staff.midiInstrument="trombone" \melodie - \set Staff.midiInstrument="tuba" \melodie - \set Staff.midiInstrument="muted trumpet" \melodie - \set Staff.midiInstrument="french horn" \melodie - \set Staff.midiInstrument="brass section" \melodie - \set Staff.midiInstrument="synthbrass 1" \melodie - \set Staff.midiInstrument="synthbrass 2" \melodie - \set Staff.midiInstrument="soprano sax" \melodie - \set Staff.midiInstrument="alto sax" \melodie - \set Staff.midiInstrument="tenor sax" \melodie - \set Staff.midiInstrument="baritone sax" \melodie - \set Staff.midiInstrument="oboe" \melodie - \set Staff.midiInstrument="english horn" \melodie - \set Staff.midiInstrument="bassoon" \melodie - \set Staff.midiInstrument="clarinet" \melodie - \set Staff.midiInstrument="piccolo" \melodie - \set Staff.midiInstrument="flute" \melodie - \set Staff.midiInstrument="recorder" \melodie - \set Staff.midiInstrument="pan flute" \melodie - \set Staff.midiInstrument="blown bottle" \melodie - \set Staff.midiInstrument="shakuhachi" \melodie - \set Staff.midiInstrument="whistle" \melodie - \set Staff.midiInstrument="ocarina" \melodie - \set Staff.midiInstrument="lead 1 (square)" \melodie - \set Staff.midiInstrument="lead 2 (sawtooth)" \melodie - \set Staff.midiInstrument="lead 3 (calliope)" \melodie - \set Staff.midiInstrument="lead 4 (chiff)" \melodie - \set Staff.midiInstrument="lead 5 (charang)" \melodie - \set Staff.midiInstrument="lead 6 (voice)" \melodie - \set Staff.midiInstrument="lead 7 (fifths)" \melodie - \set Staff.midiInstrument="lead 8 (bass+lead)" \melodie - \set Staff.midiInstrument="pad 1 (new age)" \melodie - \set Staff.midiInstrument="pad 2 (warm)" \melodie - \set Staff.midiInstrument="pad 3 (polysynth)" \melodie - \set Staff.midiInstrument="pad 4 (choir)" \melodie - \set Staff.midiInstrument="pad 5 (bowed)" \melodie - \set Staff.midiInstrument="pad 6 (metallic)" \melodie - \set Staff.midiInstrument="pad 7 (halo)" \melodie - \set Staff.midiInstrument="pad 8 (sweep)" \melodie - \set Staff.midiInstrument="fx 1 (rain)" \melodie - \set Staff.midiInstrument="fx 2 (soundtrack)" \melodie - \set Staff.midiInstrument="fx 3 (crystal)" \melodie - \set Staff.midiInstrument="fx 4 (atmosphere)" \melodie - \set Staff.midiInstrument="fx 5 (brightness)" \melodie - \set Staff.midiInstrument="fx 6 (goblins)" \melodie - \set Staff.midiInstrument="fx 7 (echoes)" \melodie - \set Staff.midiInstrument="fx 8 (sci-fi)" \melodie - \set Staff.midiInstrument="sitar" \melodie - \set Staff.midiInstrument="banjo" \melodie - \set Staff.midiInstrument="shamisen" \melodie - \set Staff.midiInstrument="koto" \melodie - \set Staff.midiInstrument="kalimba" \melodie - \set Staff.midiInstrument="bagpipe" \melodie - \set Staff.midiInstrument="fiddle" \melodie - \set Staff.midiInstrument="shanai" \melodie - \set Staff.midiInstrument="tinkle bell" \melodie - \set Staff.midiInstrument="agogo" \melodie - \set Staff.midiInstrument="steel drums" \melodie - \set Staff.midiInstrument="woodblock" \melodie - \set Staff.midiInstrument="taiko drum" \melodie - \set Staff.midiInstrument="melodic tom" \melodie - \set Staff.midiInstrument="synth drum" \melodie - \set Staff.midiInstrument="reverse cymbal" \melodie - \set Staff.midiInstrument="guitar fret noise" \melodie - \set Staff.midiInstrument="breath noise" \melodie - \set Staff.midiInstrument="seashore" \melodie - \set Staff.midiInstrument="bird tweet" \melodie - \set Staff.midiInstrument="telephone ring" \melodie - \set Staff.midiInstrument="helicopter" \melodie - \set Staff.midiInstrument="applause" \melodie - \set Staff.midiInstrument="gunshot" \melodie - } %Voice - >> %Staff + \set Staff.midiInstrument = "acoustic grand" \melodie + \set Staff.midiInstrument = "bright acoustic" \melodie + \set Staff.midiInstrument = "electric grand" \melodie + \set Staff.midiInstrument = "honky-tonk" \melodie + \set Staff.midiInstrument = "electric piano 1" \melodie + \set Staff.midiInstrument = "electric piano 2" \melodie + \set Staff.midiInstrument = "harpsichord" \melodie + \set Staff.midiInstrument = "clav" \melodie + \set Staff.midiInstrument = "celesta" \melodie + \set Staff.midiInstrument = "glockenspiel" \melodie + \set Staff.midiInstrument = "music box" \melodie + \set Staff.midiInstrument = "vibraphone" \melodie + \set Staff.midiInstrument = "marimba" \melodie + \set Staff.midiInstrument = "xylophone" \melodie + \set Staff.midiInstrument = "tubular bells" \melodie + \set Staff.midiInstrument = "dulcimer" \melodie + \set Staff.midiInstrument = "drawbar organ" \melodie + \set Staff.midiInstrument = "percussive organ" \melodie + \set Staff.midiInstrument = "rock organ" \melodie + \set Staff.midiInstrument = "church organ" \melodie + \set Staff.midiInstrument = "reed organ" \melodie + \set Staff.midiInstrument = "accordion" \melodie + \set Staff.midiInstrument = "harmonica" \melodie + \set Staff.midiInstrument = "concertina" \melodie + \set Staff.midiInstrument = "acoustic guitar (nylon)" \melodie + \set Staff.midiInstrument = "acoustic guitar (steel)" \melodie + \set Staff.midiInstrument = "electric guitar (jazz)" \melodie + \set Staff.midiInstrument = "electric guitar (clean)" \melodie + \set Staff.midiInstrument = "electric guitar (muted)" \melodie + \set Staff.midiInstrument = "overdriven guitar" \melodie + \set Staff.midiInstrument = "distorted guitar" \melodie + \set Staff.midiInstrument = "acoustic bass" \melodie + \set Staff.midiInstrument = "electric bass (finger)" \melodie + \set Staff.midiInstrument = "electric bass (pick)" \melodie + \set Staff.midiInstrument = "fretless bass" \melodie + \set Staff.midiInstrument = "slap bass 1" \melodie + \set Staff.midiInstrument = "slap bass 2" \melodie + \set Staff.midiInstrument = "synth bass 1" \melodie + \set Staff.midiInstrument = "synth bass 2" \melodie + \set Staff.midiInstrument = "violin" \melodie + \set Staff.midiInstrument = "viola" \melodie + \set Staff.midiInstrument = "cello" \melodie + \set Staff.midiInstrument = "contrabass" \melodie + \set Staff.midiInstrument = "tremolo strings" \melodie + \set Staff.midiInstrument = "pizzicato strings" \melodie + \set Staff.midiInstrument = "orchestral strings" \melodie + \set Staff.midiInstrument = "timpani" \melodie + \set Staff.midiInstrument = "string ensemble 1" \melodie + \set Staff.midiInstrument = "string ensemble 2" \melodie + \set Staff.midiInstrument = "synthstrings 1" \melodie + \set Staff.midiInstrument = "synthstrings 2" \melodie + \set Staff.midiInstrument = "choir aahs" \melodie + \set Staff.midiInstrument = "voice oohs" \melodie + \set Staff.midiInstrument = "synth voice" \melodie + \set Staff.midiInstrument = "orchestra hit" \melodie + \set Staff.midiInstrument = "trumpet" \melodie + \set Staff.midiInstrument = "trombone" \melodie + \set Staff.midiInstrument = "tuba" \melodie + \set Staff.midiInstrument = "muted trumpet" \melodie + \set Staff.midiInstrument = "french horn" \melodie + \set Staff.midiInstrument = "brass section" \melodie + \set Staff.midiInstrument = "synthbrass 1" \melodie + \set Staff.midiInstrument = "synthbrass 2" \melodie + \set Staff.midiInstrument = "soprano sax" \melodie + \set Staff.midiInstrument = "alto sax" \melodie + \set Staff.midiInstrument = "tenor sax" \melodie + \set Staff.midiInstrument = "baritone sax" \melodie + \set Staff.midiInstrument = "oboe" \melodie + \set Staff.midiInstrument = "english horn" \melodie + \set Staff.midiInstrument = "bassoon" \melodie + \set Staff.midiInstrument = "clarinet" \melodie + \set Staff.midiInstrument = "piccolo" \melodie + \set Staff.midiInstrument = "flute" \melodie + \set Staff.midiInstrument = "recorder" \melodie + \set Staff.midiInstrument = "pan flute" \melodie + \set Staff.midiInstrument = "blown bottle" \melodie + \set Staff.midiInstrument = "shakuhachi" \melodie + \set Staff.midiInstrument = "whistle" \melodie + \set Staff.midiInstrument = "ocarina" \melodie + \set Staff.midiInstrument = "lead 1 (square)" \melodie + \set Staff.midiInstrument = "lead 2 (sawtooth)" \melodie + \set Staff.midiInstrument = "lead 3 (calliope)" \melodie + \set Staff.midiInstrument = "lead 4 (chiff)" \melodie + \set Staff.midiInstrument = "lead 5 (charang)" \melodie + \set Staff.midiInstrument = "lead 6 (voice)" \melodie + \set Staff.midiInstrument = "lead 7 (fifths)" \melodie + \set Staff.midiInstrument = "lead 8 (bass+lead)" \melodie + \set Staff.midiInstrument = "pad 1 (new age)" \melodie + \set Staff.midiInstrument = "pad 2 (warm)" \melodie + \set Staff.midiInstrument = "pad 3 (polysynth)" \melodie + \set Staff.midiInstrument = "pad 4 (choir)" \melodie + \set Staff.midiInstrument = "pad 5 (bowed)" \melodie + \set Staff.midiInstrument = "pad 6 (metallic)" \melodie + \set Staff.midiInstrument = "pad 7 (halo)" \melodie + \set Staff.midiInstrument = "pad 8 (sweep)" \melodie + \set Staff.midiInstrument = "fx 1 (rain)" \melodie + \set Staff.midiInstrument = "fx 2 (soundtrack)" \melodie + \set Staff.midiInstrument = "fx 3 (crystal)" \melodie + \set Staff.midiInstrument = "fx 4 (atmosphere)" \melodie + \set Staff.midiInstrument = "fx 5 (brightness)" \melodie + \set Staff.midiInstrument = "fx 6 (goblins)" \melodie + \set Staff.midiInstrument = "fx 7 (echoes)" \melodie + \set Staff.midiInstrument = "fx 8 (sci-fi)" \melodie + \set Staff.midiInstrument = "sitar" \melodie + \set Staff.midiInstrument = "banjo" \melodie + \set Staff.midiInstrument = "shamisen" \melodie + \set Staff.midiInstrument = "koto" \melodie + \set Staff.midiInstrument = "kalimba" \melodie + \set Staff.midiInstrument = "bagpipe" \melodie + \set Staff.midiInstrument = "fiddle" \melodie + \set Staff.midiInstrument = "shanai" \melodie + \set Staff.midiInstrument = "tinkle bell" \melodie + \set Staff.midiInstrument = "agogo" \melodie + \set Staff.midiInstrument = "steel drums" \melodie + \set Staff.midiInstrument = "woodblock" \melodie + \set Staff.midiInstrument = "taiko drum" \melodie + \set Staff.midiInstrument = "melodic tom" \melodie + \set Staff.midiInstrument = "synth drum" \melodie + \set Staff.midiInstrument = "reverse cymbal" \melodie + \set Staff.midiInstrument = "guitar fret noise" \melodie + \set Staff.midiInstrument = "breath noise" \melodie + \set Staff.midiInstrument = "seashore" \melodie + \set Staff.midiInstrument = "bird tweet" \melodie + \set Staff.midiInstrument = "telephone ring" \melodie + \set Staff.midiInstrument = "helicopter" \melodie + \set Staff.midiInstrument = "applause" \melodie + \set Staff.midiInstrument = "gunshot" \melodie + } + >> \midi { } -} %score - - +} diff --git a/input/lsr/demonstrating-all-headers.ly b/input/lsr/demonstrating-all-headers.ly index 09536d4e96..c8e09c9d63 100644 --- a/input/lsr/demonstrating-all-headers.ly +++ b/input/lsr/demonstrating-all-headers.ly @@ -9,43 +9,38 @@ A demonstration of all headers. " } % begin verbatim \header { -copyright = "copyright" -title = "title" -subtitle = "subtitle" -composer = "composer" -arranger = "arranger" -instrument = "instrument" -metre = "metre" -opus = "opus" -piece = "piece" -poet = "poet" -texidoc = "All header fields with special meanings." + copyright = "copyright" + title = "title" + subtitle = "subtitle" + composer = "composer" + arranger = "arranger" + instrument = "instrument" + metre = "metre" + opus = "opus" + piece = "piece" + poet = "poet" + texidoc = "All header fields with special meanings." copyright = "public domain" enteredby = "jcn" source = "urtext" - } - \score { - \relative c'' { c1 c1 c1 c1 } + \relative c'' { c1 c c c } } \score { - \relative c'' { c1 c1 c1 c1 } - - \header { - - title = "localtitle" - subtitle = "localsubtitle" - composer = "localcomposer" - arranger = "localarranger" - instrument = "localinstrument" - metre = "localmetre" - opus = "localopus" - piece = "localpiece" - poet = "localpoet" - copyright = "localcopyright" - } + \relative c'' { c1 c c c } + \header { + title = "localtitle" + subtitle = "localsubtitle" + composer = "localcomposer" + arranger = "localarranger" + instrument = "localinstrument" + metre = "localmetre" + opus = "localopus" + piece = "localpiece" + poet = "localpoet" + copyright = "localcopyright" + } } - diff --git a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly index d6799fe1be..d0627939a6 100644 --- a/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly +++ b/input/lsr/display-bracket-with-only-one-staff-in-a-system.ly @@ -34,24 +34,24 @@ For staff contexts with @code{'SystemStartBrace}, such as ragged-right = ##t indent = 0\cm } -\book { - \score { - \new StaffGroup << - % Must be lower than your actual amount off staff lines - \override StaffGroup.SystemStartBracket #'collapse-height = #1 - \override Score.SystemStartBar #'collapse-height = #1 - \new Staff { - c'4 d' e' f' - } - >> - } - \score { - \new PianoStaff << - \override PianoStaff.SystemStartBrace #'collapse-height = #1 - \override Score.SystemStartBar #'collapse-height = #1 - \new Staff { - c'4 d' e' f' - } - >> - } + +\score { + \new StaffGroup << + % Must be lower than your actual amount off staff lines + \override StaffGroup.SystemStartBracket #'collapse-height = #1 + \override Score.SystemStartBar #'collapse-height = #1 + \new Staff { + c'4 d' e' f' + } + >> +} + +\score { + \new PianoStaff << + \override PianoStaff.SystemStartBrace #'collapse-height = #1 + \override Score.SystemStartBar #'collapse-height = #1 + \new Staff { + c'4 d' e' f' + } + >> } diff --git a/input/lsr/engraving-ties-manually.ly b/input/lsr/engraving-ties-manually.ly index 58781733e6..ea7ea694b4 100644 --- a/input/lsr/engraving-ties-manually.ly +++ b/input/lsr/engraving-ties-manually.ly @@ -12,8 +12,8 @@ number indicates the direction (1 = up, -1 = down). " } % begin verbatim \relative c' { - 2~ | + 2 ~ | \override TieColumn #'tie-configuration = #'((0.0 . 1) (-2.0 . 1) (-4.0 . 1)) - ~ | + ~ | } diff --git a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly index be11a8303a..15c23bf838 100644 --- a/input/lsr/entering-several-tuplets-using-only-one--times-command.ly +++ b/input/lsr/entering-several-tuplets-using-only-one--times-command.ly @@ -8,7 +8,7 @@ The property @code{tupletSpannerDuration} sets how long each of the tuplets contained within the brackets after @code{\\times} should last. Many consecutive tuplets can then be placed within a single -@code{\\times @{ ... @}} expression, thus saving typing. +@code{\\times} expression, thus saving typing. In the example, two triplets are shown, while @code{\\times} was entered only once. diff --git a/input/lsr/formatting-lyrics-syllables.ly b/input/lsr/formatting-lyrics-syllables.ly index b57aec0fcd..b45eaf6f1a 100644 --- a/input/lsr/formatting-lyrics-syllables.ly +++ b/input/lsr/formatting-lyrics-syllables.ly @@ -5,23 +5,23 @@ \header { lsrtags = "text, vocal-music" texidoc = " -To format single lyrics syllables, you can simply use \\markup @{ .... -@} on these lyrics! +To format individual syllables in lyrics, use @code{\\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!" + title = "Markup can be used inside lyrics!" } -melody = \relative c'' { c4 c c c } -lyr = \lyricmode { - Lyrics \markup { \italic can } \markup {\with-color #red contain } - \markup {\fontsize #8 \bold "Markup!" } +mel = \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 +<< + \context Voice = melody \mel + \context Lyrics \lyricsto melody \lyr >> diff --git a/input/lsr/piano-template-simple.ly b/input/lsr/piano-template-simple.ly index 06d260833c..b507542bdc 100644 --- a/input/lsr/piano-template-simple.ly +++ b/input/lsr/piano-template-simple.ly @@ -9,28 +9,29 @@ Here is a simple piano staff with some notes. " } % begin verbatim 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 PianoStaff << - \set PianoStaff.instrumentName = "Piano " - \new Staff = "upper" \upper - \new Staff = "lower" \lower - >> - \layout { } - \midi { } - } + \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 PianoStaff << + \set PianoStaff.instrumentName = "Piano " + \new Staff = "upper" \upper + \new Staff = "lower" \lower + >> + \layout { } + \midi { } +} diff --git a/input/lsr/piano-template-with-centered-lyrics.ly b/input/lsr/piano-template-with-centered-lyrics.ly index 9727132ff7..91b05bbc1a 100644 --- a/input/lsr/piano-template-with-centered-lyrics.ly +++ b/input/lsr/piano-template-with-centered-lyrics.ly @@ -11,38 +11,42 @@ staff). " } % begin verbatim 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 { } - } + \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 { \lower } + >> + \layout { + \context { + \GrandStaff + \accepts "Lyrics" + } + \context { + \Lyrics + \consists "Bar_engraver" + } + } + \midi { } +} diff --git a/input/lsr/piano-template-with-melody-and-lyrics.ly b/input/lsr/piano-template-with-melody-and-lyrics.ly index 3b9f4c5f29..76c7ee8955 100644 --- a/input/lsr/piano-template-with-melody-and-lyrics.ly +++ b/input/lsr/piano-template-with-melody-and-lyrics.ly @@ -10,49 +10,48 @@ with piano accompaniment underneath. " } % begin verbatim 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 { } - } + \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 { } +} 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 new file mode 100644 index 0000000000..858a304cc2 --- /dev/null +++ b/input/lsr/printing-marks-at-the-end-of-a-line-or-a-score.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. +\version "2.11.38" + +\header { + lsrtags = "text" + texidoc = " +Marks can be printed at the end of the current line, instead of the +beginning of the following line. This is particularly useful when a +mark has to be added at the end of a score -- when there is no next +line. + +In such cases, the right end of the mark has to be aligned with the +final barline, as demonstrated on the second line of this example. +" } +% begin verbatim +\relative c'' { + \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible + g2 c d, a' + \mark \default + \break + + \override Score.RehearsalMark #'self-alignment-X = #right + g b, c1 \bar "||" + \mark "D.C. al Fine" +} diff --git a/input/lsr/printing-marks-on-every-staff.ly b/input/lsr/printing-marks-on-every-staff.ly new file mode 100644 index 0000000000..e0b2bb1a3c --- /dev/null +++ b/input/lsr/printing-marks-on-every-staff.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. +\version "2.11.38" + +\header { + lsrtags = "text" + texidoc = " +Although text marks are normally only printed above the topmost staff, +they may also be printed on every staff. +" } +% begin verbatim +{ + \new Score \with { + \remove "Mark_engraver" + } + << + \new Staff \with { + \consists "Mark_engraver" + } + { c''1 \mark "molto" c'' } + \new Staff \with { + \consists "Mark_engraver" + } + { c'1 \mark "molto" c' } + >> +} diff --git a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly index 8f05237b12..0d3db03bc6 100644 --- a/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes,-lyrics,-and-chords.ly @@ -10,34 +10,31 @@ chords. " } % begin verbatim 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 { } - } + \clef treble + \key c \major + \time 4/4 + + a4 b c d +} + +text = \lyricmode { + Aaa Bee Cee Dee +} + +harmonies = \chordmode { + a2 c +} + +\score { + << + \new ChordNames { + \set chordChanges = ##t + \harmonies + } + \new Voice = "one" { \autoBeamOff \melody } + \new Lyrics \lyricsto "one" \text + >> + \layout { } + \midi { } +} diff --git a/input/lsr/text.snippet-list b/input/lsr/text.snippet-list index e724cc45ff..1c7cba9283 100644 --- a/input/lsr/text.snippet-list +++ b/input/lsr/text.snippet-list @@ -1,20 +1,23 @@ -combining-dynamics-with-markup-texts.ly creating-text-spanners.ly creating-real-parenthesized-dynamics.ly -markup-lines.ly -three-sided-box.ly center-text-below-hairpin-dynamics.ly -ottava-text.ly demonstrating-all-headers.ly -utf-8.ly +printing-marks-at-the-end-of-a-line-or-a-score.ly changing-the-default-text-font-family.ly combining-two-parts-on-the-same-staff.ly aligning-and-centering-instrument-names.ly -vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly outputting-the-version-number.ly -blanking-staff-lines-using-the--whiteout-command.ly formatting-lyrics-syllables.ly how-to-put-ties-between-syllables-in-lyrics.ly +combining-dynamics-with-markup-texts.ly +vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +aligning-marks-with-various-notation-objects.ly +markup-lines.ly +printing-marks-on-every-staff.ly +three-sided-box.ly piano-template-with-centered-lyrics.ly +utf-8.ly +blanking-staff-lines-using-the--whiteout-command.ly +ottava-text.ly adjusting-lyrics-vertical-spacing.ly aligning-lyrics.ly diff --git a/input/lsr/vertically-centered-dynamics-and-textscripts.ly b/input/lsr/vertically-centered-dynamics-and-textscripts.ly index 5d183b4fd2..6923de54c2 100644 --- a/input/lsr/vertically-centered-dynamics-and-textscripts.ly +++ b/input/lsr/vertically-centered-dynamics-and-textscripts.ly @@ -5,34 +5,25 @@ \header { lsrtags = "tweaks-and-overrides, spacing" texidoc = " -By setting the Y-extent property to a fixed value (here -1.5 . 1.5), we -force LilyPond to align every elements of the DynamicLineSpanner (text -elements and dynamics) to a common reference point, regardless to the -actual extent of these objects. This way, every element will be -vertically centered, for a nicer output (you can compare the first and -the second line in this example; the trick is only applied on the -second line). +By setting the @code{Y-extent} property to a fixed value, all +@code{DynamicLineSpanner} objects (hairpins and dynamic texts) are +aligned to a common reference point, regardless of their actual extent. +This way, every element will be vertically centered, for a nicer output +(you can compare the first and the second line in this example; the +trick is only applied on the second line). The same idea is used to align the text scripts along their baseline. " } % begin verbatim -\paper { indent = 0 line-width = 5\in } - -music = \relative c'' -{ - c2\p^\markup { "gorgeous" } c\f^\markup { "fantastic" } - c4\p c \f \> c c \! \p +music = \relative c'' { + c2\p^\markup { "gorgeous" } c\f^\markup { "fantastic" } + c4\p c\f\> c c\!\p } -\score { - { - \music \break - - \override DynamicLineSpanner #'staff-padding = #2.0 - \override DynamicLineSpanner #'Y-extent = #'(-1.5 . 1.5) - \override TextScript #'Y-extent = #'(-1.5 . 1.5) - \music - } + \music \break + \override DynamicLineSpanner #'staff-padding = #2.0 + \override DynamicLineSpanner #'Y-extent = #'(-1.5 . 1.5) + \override TextScript #'Y-extent = #'(-1.5 . 1.5) + \music } - diff --git a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly index d3042b5a49..633332bb0d 100644 --- a/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly +++ b/input/lsr/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly @@ -7,112 +7,70 @@ texidoc = " This template is basically the same as the simple \"Vocal ensemble\" template, with the exception that here all the lyrics lines are placed -using alignAboveContext and alignBelowContext. +using @code{alignAboveContext} and @code{alignBelowContext}. " } % 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 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) - } - } - } + \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) + } + } +}