From 8b7fe3a97a022614fe9291334b9212dd1c8876d2 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Mon, 19 Nov 2007 23:53:25 -0800 Subject: [PATCH] Inspirational headwords from Trevor B, thanks! --- Documentation/user/educational.itely | 3 + Documentation/user/repeats.itely | 3 + Documentation/user/text.itely | 16 -- Documentation/user/writing-texinfo.txt | 2 +- input/manual/editorial-headword.ly | 119 ++++++++++ input/manual/pitches-headword.ly | 9 - input/manual/repeats-headword.ly | 132 +++++++++++ input/manual/rhythms-headword.ly | 301 ++++++++++++++++--------- 8 files changed, 452 insertions(+), 133 deletions(-) create mode 100644 input/manual/editorial-headword.ly create mode 100644 input/manual/repeats-headword.ly diff --git a/Documentation/user/educational.itely b/Documentation/user/educational.itely index 7765be81bd..ac1d513dba 100644 --- a/Documentation/user/educational.itely +++ b/Documentation/user/educational.itely @@ -9,6 +9,9 @@ @node Editorial annotations @section Editorial annotations +@lilypondfile[ragged-right,line-width=16\cm,staffsize=16,quote] +{editorial-headword.ly} + @menu * Inside the staff:: * Outside the staff:: diff --git a/Documentation/user/repeats.itely b/Documentation/user/repeats.itely index 14f72365d1..31f1e87fcc 100644 --- a/Documentation/user/repeats.itely +++ b/Documentation/user/repeats.itely @@ -9,6 +9,9 @@ @node Repeats @section Repeats +@lilypondfile[ragged-right,line-width=16\cm,staffsize=16,quote] +{repeats-headword.ly} + Repetition is a central concept in music, and multiple notations exist for repetitions. diff --git a/Documentation/user/text.itely b/Documentation/user/text.itely index 17565664d9..893316a23a 100644 --- a/Documentation/user/text.itely +++ b/Documentation/user/text.itely @@ -18,22 +18,6 @@ languages), simply insert the characters directly into the lilypond file. The file must be saved as UTF-8. For more information, see @ref{Text encoding}. -@lilypond[fragment,ragged-right,staffsize=16,quote] -c'4^\markup { bla \bold bla } -@end lilypond - -@lilypond[fragment,ragged-right,staffsize=16,quote] -c'4^\markup { bla \bold bla } -@end lilypond - -@lilypond[fragment,ragged-right,staffsize=16,quote] -c'4^\markup { bla \bold bla } -@end lilypond - -@lilypond[fragment,ragged-right,staffsize=16,quote] -c'4^\markup { bla \bold bla } -@end lilypond - @menu * Writing text:: * Text markup:: diff --git a/Documentation/user/writing-texinfo.txt b/Documentation/user/writing-texinfo.txt index 6e91aa6f95..015f3cb85d 100644 --- a/Documentation/user/writing-texinfo.txt +++ b/Documentation/user/writing-texinfo.txt @@ -46,7 +46,7 @@ commands. circumstances. * Inspirational headwords are produced with - @lilypondfile[ragged-right,line-width=16\cm,staffsize=16,quote] + @lilypondfile[quote,ragged-right,line-width=16\cm,staffsize=16] {pitches-headword.ly} * Avoid long stretches of input code. Noone is going to read them diff --git a/input/manual/editorial-headword.ly b/input/manual/editorial-headword.ly new file mode 100644 index 0000000000..12d7fa86ba --- /dev/null +++ b/input/manual/editorial-headword.ly @@ -0,0 +1,119 @@ +\version "2.11.34" +\include "english.ly" + +% NR 1.7 Editorial annotations + +% Beethoven, Op. 31, No. 3 +% Piano sonata 18, Movt II, Scherzo +% Measures 9 - 14 + +\paper { + #(define dump-extents #t) + indent = 0\mm + ragged-right = ##t + line-width = 16\cm + force-assignment = #"" + line-width = #(- line-width (* mm 3.000000)) +} + +\layout { } + +\new PianoStaff << + + % RH Staff + \new Staff { + \clef treble + \key af \major + \time 2/4 + \set Staff.fingeringOrientations = #'(up up) + \set Score.currentBarNumber = #9 + \partial 8 + 8 \staccato + | + \set doubleSlurs = ##t + 4 ( + 8 \staccato ) + \noBeam + c''8-5 \staccato \pp + | + \set doubleSlurs = ##f + bf'8.. ( + af'32-1 + g'8-2 ) \staccato + f'8-3 \staccato + | + e'4-2 + r8 + \once \override Script #'script-priority = #-100 + \afterGrace + f'8 ( \trill ^ \markup { \finger "3-5-3-5" } + { e'16-2 [ f'16-3 ] } + | + g'8..-5 + f'32 + e'8-3 ) \staccato + d'8-2 \staccato + | + c'4-3 + r8 + r16. + c'32-3 \pp + | + c'8-2 + r16. + c'32 + c'8 + r16. + c'32 + | + c'8 + } + + % LH Staff + \new Staff { + \key af \major + \clef treble + \override Fingering #'direction = #down + \set Staff.fingeringOrientations = #'(down down) + \partial 8 + 8 \staccato + \set doubleSlurs = ##t + 4 ( + 8 ) \staccato + \noBeam + \clef bass + c'8-1 \staccato + | + \set doubleSlurs = ##f + bf8.. ( + af32 + g8-1 ) \staccato + f8 \staccato + | + e4-3 + r8 + \afterGrace + f8 ( \trill _ \markup { \finger "2-1" } + { e16-3 [ f16 ] } + | + g8..-1 + f32 + e8-3 ) \staccato + d8-2 \staccato + | + c4-3 + r8 + r16. + c32-3 + | + c8-2 + r16. + c32 + c8 + r16. + c32 + | + c8 + } + +>> diff --git a/input/manual/pitches-headword.ly b/input/manual/pitches-headword.ly index e4442accd3..7937eb844a 100644 --- a/input/manual/pitches-headword.ly +++ b/input/manual/pitches-headword.ly @@ -7,15 +7,6 @@ % Piano sonata 21 - Dem Grafen von Waldstein Gewidmet % chorale at measures 34 - 40+ -\paper { - #(define dump-extents #t) - indent = 0\mm - ragged-right = ##t - line-width = 16\cm - force-assignment = #"" - line-width = #(- line-width (* mm 3.000000)) -} - \layout { \context { \Score diff --git a/input/manual/repeats-headword.ly b/input/manual/repeats-headword.ly new file mode 100644 index 0000000000..3e933c8714 --- /dev/null +++ b/input/manual/repeats-headword.ly @@ -0,0 +1,132 @@ +\version "2.11.34" +\include "english.ly" + +% NR 1.7 Repeats + +% Beethoven, Op. 57 +% Piano sonata 23 - Dem Grafen Franz von Brunswick Gewidmet +% Movt II, Andante con moto +% Measures 9 - 16 + +\paper { + #(define dump-extents #t) + indent = 0\mm + ragged-right = ##t + line-width = 16\cm + force-assignment = #"" + line-width = #(- line-width (* mm 3.000000)) +} + +\layout { } + +#(set-global-staff-size 18) + +\new PianoStaff << + + \new Staff = RH { + \clef bass + \key df \major + \time 2/4 + \set Score.currentBarNumber = #9 + \bar "|:" + 4 ( + 8.. + 32 + | + 8. ) + 16 ( + 8 + 8 ) + | + 4 ( + 8.. + 32 + | + 8. ) + \slurDown + 16 ( + << + { + \voiceTwo + gf8 + f8 ) + } + \new Voice { + \voiceOne + 16 + ef'16 + 8 + } + >> + \oneVoice + | + 4 ( + 8.. + 32 + \clef treble + | + 8. ) + 16 ( + 16 + gf'16 + 8 ) + | + \slurUp + 4 + \change Staff = LH + \voiceOne + 4 + | + 4. + \change Staff = RH + \oneVoice + r8 + \clef bass + \bar ":|" + } + + \new Staff = LH { + \clef bass + \key df \major + \time 2/4 + 4 ( + 8.. + 32 + | + 8. ) + 16 ( + 8 + 8 ) + | + 4 ( + 8.. + 32 + | + 8. ) + 16 ( + 8 + ) + | + 4 ( + 8.. + 32 + | + 8. ) + 16 ( + 8 + 8 ) + | + \voiceTwo + gf,4 ( + af,4 ~ ) + | + af,16. [ ( + gf,32 + f,16. + ef,32 ] + df,8 ) + \oneVoice + r8 + } + +>> diff --git a/input/manual/rhythms-headword.ly b/input/manual/rhythms-headword.ly index f1ea438455..4c9ff368b8 100644 --- a/input/manual/rhythms-headword.ly +++ b/input/manual/rhythms-headword.ly @@ -1,113 +1,200 @@ -\version "2.11.33" +\version "2.11.34" +\include "english.ly" -\layout { - \context { \Score - \override NonMusicalPaperColumn #'line-break-system-details = - #'((alignment-offsets . (0 -14 -32 -46))) - } +% NR 1.2 Rhythms + +% Beethoven, Op. 81a +% Piano sonata 26 - Das Lebewohl +% Movt II - Abwesenheit +% Measures 31 - 34 + +\paper { + #(define dump-extents #t) + indent = 0\mm + ragged-right = ##t + line-width = 16\cm + force-assignment = #"" + line-width = #(- line-width (* mm 3.000000)) } -\new Score << - \set Score.proportionalNotationDuration = #(ly:make-moment 1 96) - \set Score.autoBeaming = ##f - \set Score.tupletFullLength = ##t - \override Score.TupletBracket #'staff-padding = #5 - \new StaffGroup << - \new RhythmicStaff { - \time 4/8 - c64 [ - c64 - c16 - c64 - c64 - c64 - c64 - c16 - c64 - c64 ] - c64 [ - \set stemLeftBeamCount = #4 - \set stemRightBeamCount = #4 - c64 - \set stemLeftBeamCount = #4 - \set stemRightBeamCount = #3 - c64 - c32. - c64 - c64 - c64 - c64 - c64 - \set stemRightBeamCount = #4 - c64 - \set stemLeftBeamCount = #4 - \set stemRightBeamCount = #3 - c64 - \set stemRightBeamCount = #2 - c32. - \time 1/8 - \set stemLeftBeamCount = #2 - c64 - c64 - c16 - c64 - c64 ] - } - \new RhythmicStaff { - \set stemLeftBeamCount = #0 - c16 [ ] - r8. - \times 2/3 { - c16 [ - c16 - c16 - c16 - c16 - c16 - } - \times 2/3 { - c32 - c32 - c32 - c32 - c32 ] - r32 - } - } - >> - \new StaffGroup << - \new RhythmicStaff { - \times 4/5 { - \set stemLeftBeamCount = #0 - c32 [ ] - r16. - \set stemLeftBeamCount = #2 - c16. [ - c32 - \set stemRightBeamCount = #3 - c32 ] - r32 - } - \times 8/11 { - c16. [ - c8 - c8 ] - } - c8 - } - \new RhythmicStaff { - \times 2/3 { - c16 [ - c8. ] - c4 - r4 +\layout { } + +#(set-global-staff-size 16) +\new PianoStaff << + + % RH Staff + \new Staff { + \clef treble + \key c \minor + \time 2/4 + \set Score.currentBarNumber = #31 + + 8 ( + 8 ) + ~ + 8 ( + 16 + 16 ) + + | + + \afterGrace + 8 ( + { + e''16 [ + f''16 + e''16 + d''16 ] } - \times 4/5 { - r16 - \set stemLeftBeamCount = #2 - \set stemRightBeamCount = #0 - c16. [ ] + 16 + 16 ) + 16 ( \staccato + 16 ) \staccato + 32 ( + 32 ) + 32 ( + 32 ) + + | + + b''32 ( + c'''32 + d'''32 + c'''32 ) + g''8 ( + ~ + g''32 [ + a''64 + g''64 ) ] + + a''64 ( [ + g''64 ) + bf''64 ( + a''64 ) ] + + bf''64 ( [ + a''64 ) + c'''64 ( + b''64 ) ] + + c'''128 ( [ + b''128 + d'''128 + c'''128 + f'''64 + f''64 ) ] + + | + + \afterGrace + 8 ( + { + e''16 [ + f''16 + e''16 + d''16 ] } - } - >> + 16 + 16 ) + 16 ( \staccato + 16 ) \staccato + 32 ( + 32 ) + 32 ( + 32 ) + } + + % LH Staff + \new Staff { + \clef bass + \key c \minor + \time 2/4 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + | + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + | + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + | + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + + 32 + c'32 + 32 + c'32 + } + >> -- 2.39.5