From: Neil Puttock Date: Wed, 28 May 2008 23:55:45 +0000 (+0100) Subject: LSR: update X-Git-Tag: release/2.11.48-1~26^2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dbba86dd7d24ea88699e233a5d3251490e8a2979;p=lilypond.git LSR: update --- diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly index acfca2cde9..e387b5b454 100644 --- a/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly +++ b/input/lsr/ancient-notation-template----modern-transcription-of-gregorian-music.ly @@ -8,7 +8,7 @@ texidoc = " This example demonstrates how to do modern transcription of Gregorian music. Gregorian music has no measure, no stems; it uses only half and -quarter noteheads, and special marks, indicating rests of different +quarter note heads, and special marks, indicating rests of different length. " @@ -16,40 +16,36 @@ length. } % begin verbatim \include "gregorian-init.ly" - chant = \relative c' { - \set Score.timing = ##f - f4 a2 \divisioMinima - g4 b a2 f2 \divisioMaior - g4( f) f( g) a2 \finalis - } - - verba = \lyricmode { - Lo -- rem ip -- sum do -- lor sit a -- met - } - - \score { - \new Staff << - \new Voice = "melody" { - \chant - } - \new Lyrics = "one" \lyricsto melody \verba - >> - - \layout { - \context { - \Staff - \remove "Time_signature_engraver" - \remove "Bar_engraver" - \override Stem #'transparent = ##t - } - \context { - \Voice - \override Stem #'length = #0 - } - \context { - \Score - barAlways = ##t - } - } - } +chant = \relative c' { + \set Score.timing = ##f + f4 a2 \divisioMinima + g4 b a2 f2 \divisioMaior + g4( f) f( g) a2 \finalis +} +verba = \lyricmode { + Lo -- rem ip -- sum do -- lor sit a -- met +} + +\score { + \new Staff << + \new Voice = "melody" \chant + \new Lyrics = "one" \lyricsto melody \verba + >> + \layout { + \context { + \Staff + \remove "Time_signature_engraver" + \remove "Bar_engraver" + \override Stem #'transparent = ##t + } + \context { + \Voice + \override Stem #'length = #0 + } + \context { + \Score + barAlways = ##t + } + } +} diff --git a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly index a83e550b63..928bb0ad09 100644 --- a/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly +++ b/input/lsr/ancient-notation-template----modern-transcription-of-mensural-music.ly @@ -65,7 +65,7 @@ global = { discantusNotes = { \transpose c' c'' { - \set Staff.instrumentName = "Discantus " + \set Staff.instrumentName = #"Discantus " % incipit \clef "neomensural-c1" @@ -101,7 +101,7 @@ discantusLyrics = \lyricmode { altusNotes = { \transpose c' c'' { - \set Staff.instrumentName = "Altus " + \set Staff.instrumentName = #"Altus " % incipit \clef "neomensural-c3" @@ -135,7 +135,7 @@ altusLyrics = \lyricmode { tenorNotes = { \transpose c' c' { - \set Staff.instrumentName = "Tenor " + \set Staff.instrumentName = #"Tenor " % incipit \clef "neomensural-c4" @@ -169,7 +169,7 @@ tenorLyrics = \lyricmode { bassusNotes = { \transpose c' c' { - \set Staff.instrumentName = "Bassus " + \set Staff.instrumentName = #"Bassus " % incipit \clef "bass" diff --git a/input/lsr/ancient-notation.snippet-list b/input/lsr/ancient-notation.snippet-list index 8593b52ab3..5cc01498c3 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 670a7a75fe..34d873ef8c 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/demo-midiinstruments.ly b/input/lsr/demo-midiinstruments.ly index 8359ddcfa2..11a013596e 100644 --- a/input/lsr/demo-midiinstruments.ly +++ b/input/lsr/demo-midiinstruments.ly @@ -7,7 +7,7 @@ texidoc = " Problem: How to know which @code{midiInstrument} would be best for your -composition?Solution: A LilyPond demo file. +composition? Solution: A LilyPond demo file. @@ -20,15 +20,15 @@ composition?Solution: A LilyPond demo file. } basemelodie = \relative c' { - c4. \mf g c16 b' c d | - e d e f g4 g'4 r | - r1 + c4. \mf g c16 b' c d + e16 d e f g4 g'4 r + R1 } melodie = { \tempo 4 = 150 \basemelodie } \score { \new Staff << - \new Voice { \melodie + \new Voice { \melodie } >> \layout { } @@ -36,138 +36,138 @@ melodie = { \tempo 4 = 150 \basemelodie } \score { \new Staff << - %\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 + \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 { } diff --git a/input/lsr/editorial-annotations.snippet-list b/input/lsr/editorial-annotations.snippet-list index de93af3949..028db73cf7 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 f13506108c..afde7a40a1 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/jazz-combo-template.ly b/input/lsr/jazz-combo-template.ly index 6ee2df96de..20d9370ac3 100644 --- a/input/lsr/jazz-combo-template.ly +++ b/input/lsr/jazz-combo-template.ly @@ -7,264 +7,268 @@ texidoc = " This is quite an advanced template, for a jazz ensemble. Note that all -instruments are notated in \\key c \\major. This refers to the key in -concert pitch; LilyPond will automatically transpose the key if the -music is within a \\transpose section. +instruments are notated in @code{\\key c \\major}. This refers to the +key in concert pitch; the key will be automatically transposed if the +music is within a @code{\\transpose} section. " doctitle = "Jazz combo template" } % begin verbatim \header { - title = "Song" - subtitle = "(tune)" - composer = "Me" - meter = "moderato" - piece = "Swing" - tagline = \markup { - \column { - "LilyPond example file by Amelie Zapf," - "Berlin 07/07/2003" - } - } - texidoc = "Jazz tune for combo - (horns, guitar, piano, bass, drums)." - } - - #(set-global-staff-size 16) - \include "english.ly" - - %%%%%%%%%%%% Some macros %%%%%%%%%%%%%%%%%%% - - sl = { - \override NoteHead #'style = #'slash - \override Stem #'transparent = ##t - } - nsl = { - \revert NoteHead #'style - \revert Stem #'transparent - } - crOn = \override NoteHead #'style = #'cross - crOff = \revert NoteHead #'style - - %% insert chord name style stuff here. - - jzchords = { } - - - %%%%%%%%%%%% Keys'n'thangs %%%%%%%%%%%%%%%%% - - global = { - \time 4/4 - } - - Key = { \key c \major } - - % ############ Horns ############ - - % ------ Trumpet ------ - trpt = \transpose c d \relative c'' { - \Key - c1 c c - } - trpharmony = \transpose c' d { - \jzchords - } - trumpet = { - \global - \set Staff.instrumentName = #"Trumpet" - \clef treble - << - \trpt - >> - } - - % ------ Alto Saxophone ------ - alto = \transpose c a \relative c' { - \Key - c1 c c - } - altoharmony = \transpose c' a { - \jzchords - } - altosax = { - \global - \set Staff.instrumentName = #"Alto Sax" - \clef treble - << - \alto - >> - } - - % ------ Baritone Saxophone ------ - bari = \transpose c a' \relative c { - \Key - c1 c \sl d4^"Solo" d d d \nsl - } - bariharmony = \transpose c' a \chordmode { - \jzchords s1 s d2:maj e:m7 - } - barisax = { - \global - \set Staff.instrumentName = #"Bari Sax" - \clef treble - << - \bari - >> - } - - % ------ Trombone ------ - tbone = \relative c { - \Key - c1 c c - } - tboneharmony = \chordmode { - \jzchords - } - trombone = { - \global - \set Staff.instrumentName = #"Trombone" - \clef bass - << - \tbone - >> - } - - % ############ Rhythm Section ############# - - % ------ Guitar ------ - gtr = \relative c'' { - \Key - c1 \sl b4 b b b \nsl c1 - } - gtrharmony = \chordmode { - \jzchords - s1 c2:min7+ d2:maj9 - } - guitar = { - \global - \set Staff.instrumentName = #"Guitar" - \clef treble - << - \gtr - >> - } - - %% ------ Piano ------ - rhUpper = \relative c'' { - \voiceOne - \Key - c1 c c - } - rhLower = \relative c' { - \voiceTwo - \Key - e1 e e - } - - lhUpper = \relative c' { - \voiceOne - \Key - g1 g g - } - lhLower = \relative c { - \voiceTwo - \Key - c1 c c - } - - PianoRH = { - \clef treble - \global - \set Staff.midiInstrument = "acoustic grand" - << - \new Voice = "one" \rhUpper - \new Voice = "two" \rhLower - >> - } - PianoLH = { - \clef bass - \global - \set Staff.midiInstrument = "acoustic grand" - << - \new Voice = "one" \lhUpper - \new Voice = "two" \lhLower - >> - } - - piano = { - << - \set PianoStaff.instrumentName = #"Piano" - \new Staff = "upper" \PianoRH - \new Staff = "lower" \PianoLH - >> - } - - % ------ Bass Guitar ------ - Bass = \relative c { - \Key - c1 c c - } - bass = { - \global - \set Staff.instrumentName = #"Bass" - \clef bass - << - \Bass - >> - } - - % ------ Drums ------ - up = \drummode { - hh4 4 hh hh 4 - hh4 4 - hh4 4 - hh4 4 - } - - down = \drummode { - bd4 s bd s bd s bd s bd s bd s - } - - drumContents = { - \global - << - \set DrumStaff.instrumentName = #"Drums" - \new DrumVoice { \voiceOne \up } - \new DrumVoice { \voiceTwo \down } - >> - } - - %%%%%%%%% It All Goes Together Here %%%%%%%%%%%%%%%%%%%%%% - - \score { - << - \new StaffGroup = "horns" << - \new Staff = "trumpet" \trumpet - \new Staff = "altosax" \altosax - \new ChordNames = "barichords" \bariharmony - \new Staff = "barisax" \barisax - \new Staff = "trombone" \trombone - >> - - \new StaffGroup = "rhythm" << - \new ChordNames = "chords" \gtrharmony - \new Staff = "guitar" \guitar - \new PianoStaff = "piano" \piano - \new Staff = "bass" \bass - \new DrumStaff { \drumContents } - >> - >> - - \layout { - \context { \RemoveEmptyStaffContext } - \context { - \Score - \override BarNumber #'padding = #3 - \override RehearsalMark #'padding = #2 - skipBars = ##t - } - } - - \midi { } - } + title = "Song" + subtitle = "(tune)" + composer = "Me" + meter = "moderato" + piece = "Swing" + tagline = \markup { + \column { + "LilyPond example file by Amelie Zapf," + "Berlin 07/07/2003" + } + } +} +%#(set-global-staff-size 16) +\include "english.ly" + +%%%%%%%%%%%% Some macros %%%%%%%%%%%%%%%%%%% + +sl = { + \override NoteHead #'style = #'slash + \override Stem #'transparent = ##t +} +nsl = { + \revert NoteHead #'style + \revert Stem #'transparent +} +crOn = \override NoteHead #'style = #'cross +crOff = \revert NoteHead #'style + +%% insert chord name style stuff here. + +jazzChords = { } + +%%%%%%%%%%%% Keys'n'thangs %%%%%%%%%%%%%%%%% + +global = { \time 4/4 } + +Key = { \key c \major } + +% ############ Horns ############ + +% ------ Trumpet ------ +trpt = \transpose c d \relative c'' { + \Key + c1 | c | c | +} +trpHarmony = \transpose c' d { + \jazzChords +} +trumpet = { + \global + \set Staff.instrumentName = #"Trumpet" + \clef treble + << + \trpt + >> +} + +% ------ Alto Saxophone ------ +alto = \transpose c a \relative c' { + \Key + c1 | c | c | +} +altoHarmony = \transpose c' a { + \jazzChords +} +altoSax = { + \global + \set Staff.instrumentName = #"Alto Sax" + \clef treble + << + \alto + >> +} + +% ------ Baritone Saxophone ------ +bari = \transpose c a' \relative c { + \Key + c1 + c1 + \sl + d4^"Solo" d d d + \nsl +} +bariHarmony = \transpose c' a \chordmode { + \jazzChords s1 s d2:maj e:m7 +} +bariSax = { + \global + \set Staff.instrumentName = #"Bari Sax" + \clef treble + << + \bari + >> +} + +% ------ Trombone ------ +tbone = \relative c { + \Key + c1 | c | c +} +tboneHarmony = \chordmode { + \jazzChords +} +trombone = { + \global + \set Staff.instrumentName = #"Trombone" + \clef bass + << + \tbone + >> +} + +% ############ Rhythm Section ############# + +% ------ Guitar ------ +gtr = \relative c'' { + \Key + c1 + \sl + b4 b b b + \nsl + c1 +} +gtrHarmony = \chordmode { + \jazzChords + s1 c2:min7+ d2:maj9 +} +guitar = { + \global + \set Staff.instrumentName = #"Guitar" + \clef treble + << + \gtr + >> +} + +%% ------ Piano ------ +rhUpper = \relative c'' { + \voiceOne + \Key + c1 | c | c +} +rhLower = \relative c' { + \voiceTwo + \Key + e1 | e | e +} + +lhUpper = \relative c' { + \voiceOne + \Key + g1 | g | g +} +lhLower = \relative c { + \voiceTwo + \Key + c1 | c | c +} + +PianoRH = { + \clef treble + \global + \set Staff.midiInstrument = #"acoustic grand" + << + \new Voice = "one" \rhUpper + \new Voice = "two" \rhLower + >> +} +PianoLH = { + \clef bass + \global + \set Staff.midiInstrument = "acoustic grand" + << + \new Voice = "one" \lhUpper + \new Voice = "two" \lhLower + >> +} + +piano = { + << + \set PianoStaff.instrumentName = #"Piano" + \new Staff = "upper" \PianoRH + \new Staff = "lower" \PianoLH + >> +} + +% ------ Bass Guitar ------ +Bass = \relative c { + \Key + c1 | c | c +} +bass = { + \global + \set Staff.instrumentName = #"Bass" + \clef bass + << + \Bass + >> +} + +% ------ Drums ------ +up = \drummode { + \voiceOne + hh4 hh + hh4 hh + hh4 hh +} +down = \drummode { + \voiceTwo + bd4 s bd s + bd4 s bd s + bd4 s bd s +} + +drumContents = { + \global + << + \set DrumStaff.instrumentName = #"Drums" + \new DrumVoice \up + \new DrumVoice \down + >> +} + +%%%%%%%%% It All Goes Together Here %%%%%%%%%%%%%%%%%%%%%% + +\score { + << + \new StaffGroup = "horns" << + \new Staff = "trumpet" \trumpet + \new Staff = "altosax" \altoSax + \new ChordNames = "barichords" \bariHarmony + \new Staff = "barisax" \bariSax + \new Staff = "trombone" \trombone + >> + + \new StaffGroup = "rhythm" << + \new ChordNames = "chords" \gtrHarmony + \new Staff = "guitar" \guitar + \new PianoStaff = "piano" \piano + \new Staff = "bass" \bass + \new DrumStaff \drumContents + >> + >> + + \layout { + \context { \RemoveEmptyStaffContext } + \context { + \Score + \override BarNumber #'padding = #3 + \override RehearsalMark #'padding = #2 + skipBars = ##t + } + } + + \midi { } +} diff --git a/input/lsr/keyboards.snippet-list b/input/lsr/keyboards.snippet-list index ce844b12ac..76b491528d 100644 --- a/input/lsr/keyboards.snippet-list +++ b/input/lsr/keyboards.snippet-list @@ -1,10 +1,11 @@ +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/piano-template-simple.ly b/input/lsr/piano-template-simple.ly index 4c84cd1b40..b4bccc8e8f 100644 --- a/input/lsr/piano-template-simple.ly +++ b/input/lsr/piano-template-simple.ly @@ -16,8 +16,7 @@ upper = \relative c'' { \key c \major \time 4/4 - a b c d - + a4 b c d } lower = \relative c { @@ -25,13 +24,12 @@ lower = \relative c { \key c \major \time 4/4 - a2 c - + a2 c } \score { \new PianoStaff << - \set PianoStaff.instrumentName = "Piano " + \set PianoStaff.instrumentName = #"Piano " \new Staff = "upper" \upper \new Staff = "lower" \lower >> diff --git a/input/lsr/piano-template-with-centered-lyrics.ly b/input/lsr/piano-template-with-centered-lyrics.ly index ffb4d53ebd..53d1fb551b 100644 --- a/input/lsr/piano-template-with-centered-lyrics.ly +++ b/input/lsr/piano-template-with-centered-lyrics.ly @@ -17,8 +17,7 @@ upper = \relative c'' { \key c \major \time 4/4 - a4 b c d - + a4 b c d } lower = \relative c { @@ -26,8 +25,7 @@ lower = \relative c { \key c \major \time 4/4 - a2 c - + a2 c } text = \lyricmode { diff --git a/input/lsr/piano-template-with-melody-and-lyrics.ly b/input/lsr/piano-template-with-melody-and-lyrics.ly index 65d4099c73..efb47ae36c 100644 --- a/input/lsr/piano-template-with-melody-and-lyrics.ly +++ b/input/lsr/piano-template-with-melody-and-lyrics.ly @@ -17,8 +17,7 @@ melody = \relative c'' { \key c \major \time 4/4 - a b c d - + a b c d } text = \lyricmode { @@ -30,8 +29,7 @@ upper = \relative c'' { \key c \major \time 4/4 - a b c d - + a4 b c d } lower = \relative c { @@ -39,15 +37,13 @@ lower = \relative c { \key c \major \time 4/4 - a2 c - + a2 c } \score { << \new Voice = "mel" { \autoBeamOff \melody } - \new Lyrics \lyricsto mel \text - + \new Lyrics \lyricsto mel \text \new PianoStaff << \new Staff = "upper" \upper \new Staff = "lower" \lower diff --git a/input/lsr/rhythms.snippet-list b/input/lsr/rhythms.snippet-list index d567c9cfbf..17f851a170 100644 --- a/input/lsr/rhythms.snippet-list +++ b/input/lsr/rhythms.snippet-list @@ -3,10 +3,10 @@ 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 +controlling-tuplet-bracket-visibility.ly +skips-in-lyric-mode-2.ly positioning-multi--measure-rests.ly using-ties-with-arpeggios.ly forcing-rehearsal-marks-to-start-from-a-given-letter-or-number.ly diff --git a/input/lsr/score-for-diatonic-accordion.ly b/input/lsr/score-for-diatonic-accordion.ly index 5978172da2..25185b6989 100644 --- a/input/lsr/score-for-diatonic-accordion.ly +++ b/input/lsr/score-for-diatonic-accordion.ly @@ -6,47 +6,51 @@ lsrtags = "template" texidoc = " -A template to write score for a diatonic accordion. +A template to write a score for a diatonic accordion. -- There is a horizontal staff indicating if the accordion   must be +- There is a horizontal staff indicating if the accordion must be pushed (thick line) or pulled (thin line) -- There is a small rhytmic staff with lyrics that describes the bass -buttons to press.   The bar-lines are made of gridlines ( Gridlines, -not a really satisfying solution, but the best I found) +- There is a small rhythmic staff with lyrics that describes the bass +buttons to press. The bar lines are made from gridlines - The tabulator staff for diatonic accordions shows the geographic -position of the buttons   and not (as for every other instrument) the -pitch of the tones.   The keys on the melody-side of the accordion are -placed in three columns and about 12 rows.   In the tabulator staff -notation the   - most outer column is described with notes between -lines   - most inner column is described with notes between lines with -a cross as accidental   - middle column is described with notes on a -line, whereby the row in the middle is represented     on the middle -line in the staff. - - - -Some words to transpose piano note to the diatonic accordion. ------------------------------------------------------------- 1. Every -diatonic accordion is built for some keys only. For example    for the -key of C-major and F-major.    So it is important to transpose a piano -melody to match one of these keys.    Transpose the source code, not -only the output because    you need this code later on to translate it -once more to the tabulator staff.    This can be done with the command -'displayLilyMusic'. - -2. You have to alternate the push and pull-direction of the accordion -regularely.    If the player has a too long part to pull the accordion -gets broken.    At the other hand some harmonies are only available in -one direction (push or pull)    Considering this decide which parts of -the melody are the push-parts and whic the  pull-parts. - -3. For each pull- / or push-part translate the piano notes to the -according tabulatur representation. +position of the buttons and not (as for every other instrument) the +pitch of the notes; the keys on the melody-side of the accordion are +placed in three columns and about 12 rows + + +In the tabulator staff notation the outermost column is described with +notes between lines, the innermost column is described with notes +between lines and a cross as accidental, and the middle column is +described with notes on a line, whereby the row in the middle is +represented on the middle line in the staff. + + +Some words to transpose piano notes to the diatonic accordion: + + +1. Every diatonic accordion is built for some keys only (for example, +for the keys of C major and F major), so it is important to transpose a +piano melody to match one of these keys. Transpose the source code, not +only the output because this code is required later on to translate it +once more to the tabulator staff. This can be done with the command +@code{displayLilyMusic}. + + +2. You have to alternate the push- and pull-direction of the accordion +regularly. If the player has a too long part to pull the accordion gets +broken. On the other hand, some harmonies are only available in one +direction. Considering this, decide which parts of the melody are the +push-parts and which the pull-parts. + + +3. For each pull- or push-part translate the piano notes to the +according tabulature representation. + This snippet comes with a useful optional macro for the jEdit text -editor. +editor. " doctitle = "Score for diatonic accordion" 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 df8dc11382..42321ef976 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 @@ -6,7 +6,7 @@ lsrtags = "vocal-music, chords, template" texidoc = " -This template allows you to prepare a song with melody, words, and +This template allows the preparation of a song with melody, words, and chords. " @@ -18,7 +18,6 @@ melody = \relative c' { \time 4/4 a4 b c d - } text = \lyricmode { diff --git a/input/lsr/single-staff-template-with-notes-and-chords.ly b/input/lsr/single-staff-template-with-notes-and-chords.ly index 92d67dba0b..c266220cb1 100644 --- a/input/lsr/single-staff-template-with-notes-and-chords.ly +++ b/input/lsr/single-staff-template-with-notes-and-chords.ly @@ -13,28 +13,27 @@ Want to prepare a lead sheet with a melody and chords? Look no further! doctitle = "Single staff template with notes and chords" } % begin verbatim melody = \relative c' { - \clef treble - \key c \major - \time 4/4 - - f4 e8[ c] d4 g | - a2 ~ a2 | - } - - harmonies = \chordmode { - c4:m f:min7 g:maj c:aug d2:dim b:sus - } - - \score { - << - \new ChordNames { - \set chordChanges = ##t - \harmonies - } - \new Staff \melody - >> - - \layout{ } - \midi { } - } + \clef treble + \key c \major + \time 4/4 + + f4 e8[ c] d4 g + a2 ~ a +} +harmonies = \chordmode { + c4:m f:min7 g:maj c:aug + d2:dim b:sus +} + +\score { + << + \new ChordNames { + \set chordChanges = ##t + \harmonies + } + \new Staff \melody + >> + \layout{ } + \midi { } +} diff --git a/input/lsr/single-staff-template-with-notes-and-lyrics.ly b/input/lsr/single-staff-template-with-notes-and-lyrics.ly index 5250472ad3..4c0c724878 100644 --- a/input/lsr/single-staff-template-with-notes-and-lyrics.ly +++ b/input/lsr/single-staff-template-with-notes-and-lyrics.ly @@ -8,34 +8,32 @@ texidoc = " This small template demonstrates a simple melody with lyrics. Cut and paste, add notes, then words for the lyrics. This example turns off -automatic beaming, which is common for vocal parts. If you want to use -automatic beaming, you'll have to change or comment out the relevant -line. +automatic beaming, which is common for vocal parts. To use automatic +beaming, change or comment out the relevant line. " doctitle = "Single staff template with notes and lyrics" } % begin verbatim melody = \relative c' { - \clef treble - \key c \major - \time 4/4 - - a4 b c d - } - - text = \lyricmode { - Aaa Bee Cee Dee - } - - \score{ - << - \new Voice = "one" { - \autoBeamOff - \melody - } - \new Lyrics \lyricsto "one" \text - >> - \layout { } - \midi { } - } + \clef treble + \key c \major + \time 4/4 + + a4 b c d +} +text = \lyricmode { + Aaa Bee Cee Dee +} + +\score{ + << + \new Voice = "one" { + \autoBeamOff + \melody + } + \new Lyrics \lyricsto "one" \text + >> + \layout { } + \midi { } +} diff --git a/input/lsr/single-staff-template-with-only-notes.ly b/input/lsr/single-staff-template-with-only-notes.ly index a8c2f2dda2..fdaabce9eb 100644 --- a/input/lsr/single-staff-template-with-only-notes.ly +++ b/input/lsr/single-staff-template-with-only-notes.ly @@ -14,16 +14,15 @@ add notes, and you're finished! doctitle = "Single staff template with only notes" } % begin verbatim melody = \relative c' { - \clef treble - \key c \major - \time 4/4 - - a4 b c d - } - - \score { - \new Staff \melody - \layout { } - \midi {} - } + \clef treble + \key c \major + \time 4/4 + + a4 b c d +} +\score { + \new Staff \melody + \layout { } + \midi { } +} diff --git a/input/lsr/staff-notation.snippet-list b/input/lsr/staff-notation.snippet-list index ddfb9b9f30..bed61d8a90 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/string-quartet-template-simple.ly b/input/lsr/string-quartet-template-simple.ly index 73c145ab15..29f2c71dcf 100644 --- a/input/lsr/string-quartet-template-simple.ly +++ b/input/lsr/string-quartet-template-simple.ly @@ -7,51 +7,61 @@ texidoc = " This template demonstrates a simple string quartet. It also uses a -\\global section for time and key signatures +@code{\\global} section for time and key signatures " doctitle = "String quartet template (simple)" } % begin verbatim global= { - \time 4/4 - \key c \major - } - - violinOne = \new Voice { \relative c''{ - \set Staff.instrumentName = "Violin 1 " - - c2 d e1 - - \bar "|." }} - violinTwo = \new Voice { \relative c''{ - \set Staff.instrumentName = "Violin 2 " - - g2 f e1 - - \bar "|." }} - viola = \new Voice { \relative c' { - \set Staff.instrumentName = "Viola " - \clef alto - - e2 d c1 - - \bar "|." }} - cello = \new Voice { \relative c' { - \set Staff.instrumentName = "Cello " - \clef bass - - c2 b a1 - - \bar "|."}} - - \score { - \new StaffGroup << - \new Staff << \global \violinOne >> - \new Staff << \global \violinTwo >> - \new Staff << \global \viola >> - \new Staff << \global \cello >> - >> - \layout { } - \midi { } - } + \time 4/4 + \key c \major +} +violinOne = \new Voice \relative c'' { + \set Staff.instrumentName = #"Violin 1 " + + c2 d + e1 + + \bar "|." +} + +violinTwo = \new Voice \relative c'' { + \set Staff.instrumentName = #"Violin 2 " + + g2 f + e1 + + \bar "|." +} + +viola = \new Voice \relative c' { + \set Staff.instrumentName = #"Viola " + \clef alto + + e2 d + c1 + + \bar "|." +} + +cello = \new Voice \relative c' { + \set Staff.instrumentName = #"Cello " + \clef bass + + c2 b + a1 + + \bar "|." +} + +\score { + \new StaffGroup << + \new Staff << \global \violinOne >> + \new Staff << \global \violinTwo >> + \new Staff << \global \viola >> + \new Staff << \global \cello >> + >> + \layout { } + \midi { } +} diff --git a/input/lsr/string-quartet-template-with-separate-parts.ly b/input/lsr/string-quartet-template-with-separate-parts.ly index 8e00d3dcdb..0091bfc2df 100644 --- a/input/lsr/string-quartet-template-with-separate-parts.ly +++ b/input/lsr/string-quartet-template-with-separate-parts.ly @@ -8,13 +8,14 @@ texidoc = " The \"String quartet template\" snippet produces a nice string quartet, but what if you needed to print parts? This new template demonstrates -how to use the \\tag feature to easily split a piece into individual -parts. +how to use the @code{\\tag} feature to easily split a piece into +individual parts. You need to split this template into separate files; the filenames are -contained in comments at the beginning of each file. piece.ly contains -all the music definitions. The other files – score.ly, vn1.ly, vn2.ly, -vla.ly, and vlc.ly – produce the appropiate part. +contained in comments at the beginning of each file. @code{piece.ly} +contains all the music definitions. The other files – @code{score.ly}, +@code{vn1.ly}, @code{vn2.ly}, @code{vla.ly}, and @code{vlc.ly} – +produce the appropriate part. Do not forget to remove specified comments when using separate files! @@ -31,26 +32,26 @@ global= { } Violinone = \new Voice { \relative c''{ - \set Staff.instrumentName = "Violin 1 " + \set Staff.instrumentName = #"Violin 1 " c2 d e1 \bar "|." }} %********************************* Violintwo = \new Voice { \relative c''{ - \set Staff.instrumentName = "Violin 2 " + \set Staff.instrumentName = #"Violin 2 " g2 f e1 \bar "|." }} %********************************* Viola = \new Voice { \relative c' { - \set Staff.instrumentName = "Viola " + \set Staff.instrumentName = #"Viola " \clef alto e2 d c1 \bar "|." }} %********************************* Cello = \new Voice { \relative c' { - \set Staff.instrumentName = "Cello " + \set Staff.instrumentName = #"Cello " \clef bass c2 b a1 diff --git a/input/lsr/template.snippet-list b/input/lsr/template.snippet-list index 4a2ef8b4e7..869448422f 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 c8f4874b1e..86aa0a24d5 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 dde15429b3..097eeee195 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 5ee803315f..4afa6824c0 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/vertically-aligning-ossias-and-lyrics.ly b/input/lsr/vertically-aligning-ossias-and-lyrics.ly index c0be939398..6a6164951c 100644 --- a/input/lsr/vertically-aligning-ossias-and-lyrics.ly +++ b/input/lsr/vertically-aligning-ossias-and-lyrics.ly @@ -6,10 +6,9 @@ lsrtags = "vocal-music, tweaks-and-overrides, spacing" texidoc = " -This snippet shows of to use the @code{alignBelowContext} and -@code{alignAboveContext} properties, which may be needed for text -elements (e.g. lyrics) positioning, but also for musical contents such -as ossias. +This snippet demonstrates the use of the @code{alignBelowContext} and +@code{alignAboveContext} properties to control the positioning of +lyrics and ossias. " doctitle = "Vertically aligning ossias and lyrics" @@ -20,8 +19,8 @@ as ossias. \relative << \new Staff = "1" { c4 c s2 } - \new Staff = "2" { c4 c s2 } - \new Staff = "3" { c4 c s2 } + \new Staff = "2" { c4 c s2 } + \new Staff = "3" { c4 c s2 } { \skip 2 << \lyrics { diff --git a/input/lsr/vertically-centered-dynamics-and-textscripts.ly b/input/lsr/vertically-centered-dynamics-and-textscripts.ly index 4175534605..63b83a8c2d 100644 --- a/input/lsr/vertically-centered-dynamics-and-textscripts.ly +++ b/input/lsr/vertically-centered-dynamics-and-textscripts.ly @@ -19,7 +19,7 @@ The same idea is used to align the text scripts along their baseline. doctitle = "Vertically centered dynamics and textscripts" } % begin verbatim music = \relative c'' { - c2\p^\markup { "gorgeous" } c\f^\markup { "fantastic" } + c2\p^\markup { gorgeous } c\f^\markup { fantastic } c4\p c\f\> c c\!\p } 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 32ca66e385..1371cf4459 100644 --- a/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly +++ b/input/lsr/vocal-ensemble-template-with-automatic-piano-reduction.ly @@ -9,8 +9,8 @@ This template adds an automatic piano reduction to the standard SATB vocal score demonstrated in \"Vocal ensemble template\". This demonstrates one of the strengths of LilyPond – you can use a music -definition more than once. If you make any changes to the vocal notes -(say, tenorMusic), then the changes will also apply to the piano +definition more than once. If any changes are made to the vocal notes +(say, @code{tenorMusic}), then the changes will also apply to the piano reduction. " diff --git a/input/lsr/vocal-ensemble-template.ly b/input/lsr/vocal-ensemble-template.ly index 8bcab05f4b..4703bd637e 100644 --- a/input/lsr/vocal-ensemble-template.ly +++ b/input/lsr/vocal-ensemble-template.ly @@ -7,80 +7,84 @@ texidoc = " Here is a standard four-part SATB vocal score. With larger ensembles, -it's often useful to include a section which is included in all parts. -For example, the time signature and key signatures are almost always -the same for all parts. Like in the \"Hymn\" template, the four voices -are regrouped on only two staves. +it is often useful to include a section which is included in all parts. +For example, the time signature and key signature are almost always the +same for all parts. Like in the \"Hymn\" template, the four voices are +regrouped on only two staves. " doctitle = "Vocal ensemble template" } % 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 - >> - - \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 + >> + \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 ff4d5a6c04..adf492d73c 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 e0fcd7a721..2f89351c25 100644 --- a/input/lsr/volta-multi-staff.ly +++ b/input/lsr/volta-multi-staff.ly @@ -1,7 +1,6 @@ %% Do not edit this file; it is auto-generated from input/new %% This file is in the public domain. \version "2.11.46" -\layout { ragged-right= ##t } \header { lsrtags = "repeats,staff-notation,fretted-strings" texidoc = "By adding the @code{Volta_engraver} to the relevant @@ -9,13 +8,15 @@ staff, volte can be put over staves other than the topmost one in a score." doctitle = "Volta multi-staff" } % begin verbatim + voltaMusic = \relative c'' { \repeat volta 2 - c1 - \alternative { - d e - } -} + c1 + \alternative { + d1 + e + } +} << \new StaffGroup <<