From 6603613b789aa6328a28b9d4f7b4ff9b1d268130 Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Thu, 9 Oct 2008 21:04:33 +0100 Subject: [PATCH] Compile fixes. --- Documentation/topdocs/NEWS.tely | 4 +- input/manual/fretted-headword.ly | 298 +++++++++++++++---------------- 2 files changed, 146 insertions(+), 156 deletions(-) diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index e7911d8c32..c60fc9b5f6 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -85,8 +85,8 @@ Two variations on the default double repeat bar line are now available. @item Four automatic accidentals rules have been added: @code{neo-modern}, -@code{neo-modern-cautionary}, @code{dodecaphonic} and @{teaching}. The following -example illustrates @code{neo-modern} rule. +@code{neo-modern-cautionary}, @code{dodecaphonic} and @code{teaching}. +The following example illustrates @code{neo-modern} rule. @lilypond[] notes = { << diff --git a/input/manual/fretted-headword.ly b/input/manual/fretted-headword.ly index b25436bc19..faefb12c8b 100644 --- a/input/manual/fretted-headword.ly +++ b/input/manual/fretted-headword.ly @@ -1,154 +1,144 @@ -% INSPIRATIONAL HEADER FOR LILYPOND DOCUMENTATION fretted-strings % -% Passage from Johann Kaspar Mertz "Opern Revue, Op. 8, no. 17" % -% on melodies from Bellini's "Norma" % -%*****************************************************************% - -\version "2.11.51" - -#(set-global-staff-size 15) -\paper{ - ragged-end=##t - line-width=17\cm - indent=0\cm -} - -\layout { - \context { \Score - \remove "Bar_number_engraver" - \override PaperColumn #'keep-inside-line = ##t - \override NonMusicalPaperColumn #'keep-inside-line = ##t - } -} - -%%%% shortcuts -% fingering orientations - sfol = \set fingeringOrientations = #'(left) - sfor = \set fingeringOrientations = #'(right) - sfod = \set fingeringOrientations = #'(down) - sfou = \set fingeringOrientations = #'(up) - -% string number orientations - ssnol = \set stringNumberOrientations = #'(left) %(down right up) - ssnou = \set stringNumberOrientations = #'(up) - ssnod = \set stringNumberOrientations = #'(down) - ssnor = \set stringNumberOrientations = #'(right) - -% define fingering offset -FO = #(define-music-function (parser location offsetX offsetY) (number? number?) - #{ - \once \override Voice.Fingering #'extra-offset = #(cons $offsetX $offsetY ) - #}) - -% markups - rit = \markup \center-align { \bold { \italic { " rit." } } } - dim = \markup \center-align { \italic { " dim." }} - andantino = \markup \left-align { \italic { \bold { \fontsize #+2.5 { "Andantino" }}}} - benmarcato = \markup { \italic { \bold { "il canto ben marcato" }}} - -%%% THE MUSIC %%% - -melody = \relative c { - \clef "treble_8" - \key d \major - \time 4/4 -% \override Staff.TimeSignature #'transparent = ##t - \voiceOne - \override Fingering #'staff-padding = #'() - \sfol - e,32 a' c e - e, a c e - e,, a' c e - e, a c e - f4\rest 4-> | % m. 1 - - e,,,32 gis' b e - e, gis b e - e,, gis' b e - e, gis b e - f4\rest \FO #'0.4 #'0.5 4 | % m. 2 - - d4\rest -> d4\rest^\rit 4-> | % m. 3 - 1 | % m. 4 - - \bar "||" - \key a \minor - \override TupletNumber #'stencil = ##f - \override TupletBracket #'bracket-visibility = ##f - R1 % m. 5 - - e'4^\benmarcato e8. d16-4 - d4-4 \times 2/3{\sfou \FO #'-0.3 #'0.6 4 b8} | % end of m. 6 - - \FO #'-0.3 #'0.3 - 4 \times 2/3{c4 b8} a4 e'8. e16 | % m. 7 - - \FO #'-0.3 #'0.3 - 4 \times 2/3{\sfol \FO #'0.3 #'0.0 4 e8} e4 % beg of m. 8 - \times 2/3{\sfou 4 c8} | % end of m. 8 - - b4 \times 2/3{d4-4 c8} \sfou \FO #'-1.7 #'-1.5 4 e | % end of m. 9 - - e4 e8. d16-4 d4 \times 2/3{c4 b8} | % m. 10 - - \times 2/3{a4 a8 b4 c8} % beg of m. 11 - \sfou \FO #'-0.3 #'0.3 - 4^\< \times 2/3{e4 8\!} | % end of m. 11 -} - -bass = \relative c { - \key d \major - \time 4/4 - \voiceTwo - \override Fingering #'staff-padding = #'() - - e,8\fp[ e'] e,[ e'] e,[ \sfol c,] | % m. 1 - - e,,8\fp[ e'] e,[ e'] e,[ \sfod \FO #'0.2 #'-0.2 % beg m. 2 - \sfol \FO #'0.3 #'0.0 b] | % end m. 2 - - e,,8 e' gis e e, e' gis_\dim e | % m. 3 - - e,1 | % m. 4 - -%% new section starts here in A minor - \override TupletNumber #'stencil = ##f - \override TupletBracket #'bracket-visibility = ##f - \set tupletSpannerDuration = #(ly:make-moment 1 4) - \once \override TextScript #'staff-padding = #1.7 - \times 2/3{a8\p[^\andantino e' a c a e ] a,[ e' a c a e ]} | % m. 5 - - \once \override DynamicText #'extra-offset = #'( -2.1 . 0.0 ) % beg m. 6 - \once \override TextScript #'staff-padding = #'() - \once \override TextScript #'extra-offset = #'( 0.0 . 2.0 ) - \times 2/3{a,8[\p_\markup {\italic { "dol." } } e' a c a e]} - \times 2/3{e,8[ \sfou c gis e]} | % end m. 6 - - \times 2/3{a,8[ a c e, b'] a,[ e' a c a e]} | % m. 7 - - \times 2/3{f,8[ f' a \sfol \FO #'0.3 #'-0.5 a f] fis,[ d' a' d a d,]} | % m. 8 - - \times 2/3{8[ d' g d' g, d] % beg m. 9 - \sfod \FO #'0.0 #'-2.0 [ \sfou b gis e]} | % end m. 9 - - \times 2/3{a,8[ e' a c a e] e,[ e' gis c gis e]} | % m. 10 - - \times 2/3{a,8[ e' a b a e] f,[ f' a d a f]} | % m. 11 -} - - -\score { - \context Staff = "guitar" << - \context Voice = "upper" { \melody } - \context Voice = "lower" { \bass } - >> - \layout { } - - \midi { - \context { - \Score - } - } -} - - - +% INSPIRATIONAL HEADER FOR LILYPOND DOCUMENTATION fretted-strings % +% Passage from Johann Kaspar Mertz "Opern Revue, Op. 8, no. 17" % +% on melodies from Bellini's "Norma" % +%*****************************************************************% + +\version "2.11.51" + +#(set-global-staff-size 15) +\paper { + line-width = 17\cm + indent = 0\cm +} + +\layout { + \context { + \Score + \remove "Bar_number_engraver" + \override PaperColumn #'keep-inside-line = ##t + \override NonMusicalPaperColumn #'keep-inside-line = ##t + } +} + +%%%% shortcuts +% fingering orientations +sfol = \set fingeringOrientations = #'(left) +sfor = \set fingeringOrientations = #'(right) +sfod = \set fingeringOrientations = #'(down) +sfou = \set fingeringOrientations = #'(up) + +% string number orientations +ssnol = \set stringNumberOrientations = #'(left) %(down right up) +ssnou = \set stringNumberOrientations = #'(up) +ssnod = \set stringNumberOrientations = #'(down) +ssnor = \set stringNumberOrientations = #'(right) + +% define fingering offset +FO = #(define-music-function (parser location offsetX offsetY) (number? number?) +#{ + \once \override Voice.Fingering #'extra-offset = #(cons $offsetX $offsetY) +#}) + +% markups +rit = \markup \center-align { \bold { \italic { " rit." } } } +dim = \markup \center-align { \italic { " dim." } } +andantino = \markup \left-align { \italic { \bold { \fontsize #2.5 { "Andantino" } } } } +benmarcato = \markup { \italic { \bold { "il canto ben marcato" } } } +pdolce = #(make-dynamic-script (markup #:line (#:dynamic "p" #:normal-text #:italic "dol."))) + +%%% THE MUSIC %%% + +melody = \relative c { + \clef "treble_8" + \key d \major + \time 4/4 + \voiceOne + \sfol + e,32 a' c e + e, a c e + e,, a' c e + e, a c e + f4\rest 4-> | % m. 1 + + e,,,32 gis' b e + e, gis b e + e,, gis' b e + e, gis b e + f4\rest \FO #'0.4 #'0.5 4 | % m. 2 + + d4\rest -> d4\rest^\rit 4-> | % m. 3 + 1 | % m. 4 + + \bar "||" + \key a \minor + R1 % m. 5 + + e'4^\benmarcato e8. d16-4 + d4-4 \times 2/3 { \sfou \FO #'-0.3 #'0.6 4 b8 } | % end of m. 6 + + \FO #'-0.3 #'0.3 + 4 \times 2/3 { c4 b8 } a4 e'8. e16 | % m. 7 + + \FO #'-0.3 #'0.3 + 4 \times 2/3 { \sfol \FO #'0.3 #'0.0 4 e8 } e4 % beg of m. 8 + \times 2/3 { \sfou 4 c8 } | % end of m. 8 + + b4 \times 2/3 { d4-4 c8 } \sfou \FO #'-1.7 #'-1.5 4 e | % end of m. 9 + + e4 e8. d16-4 d4 \times 2/3 { c4 b8 } | % m. 10 + + \times 2/3 { a4 a8 b4 c8 } % beg of m. 11 + \sfou \FO #'-0.3 #'0.3 + 4^\< \times 2/3 { e4 8\! } | % end of m. 11 +} + +bass = \relative c { + \key d \major + \time 4/4 + \voiceTwo + + e,8\fp[ e'] e,[ e'] e, \sfol c, | % m. 1 + + e,,8\fp[ e'] e,[ e'] e, \sfod \FO #'0.2 #'-0.2 % beg m. 2 + \sfol \FO #'0.3 #'0.0 b | % end m. 2 + + e,,8 e' gis e e, e' gis_\dim e | % m. 3 + + e,1 | % m. 4 + + %% new section starts here in A minor + #(revert-auto-beam-setting '(end 1 12 4 4) 1 4) + #(revert-auto-beam-setting '(end 1 12 4 4) 3 4) + \once \override TextScript #'staff-padding = #1.7 + \times 2/3 { a8\p^\andantino e' a c a e a, e' a c a e } | % m. 5 + + \times 2/3 { a,8\pdolce e' a c a e } % beg m. 6 + \times 2/3 { e,8 \sfou c gis e } | % end m. 6 + + \times 2/3 { a,8 a c e, b' a, e' a c a e } | % m. 7 + + \times 2/3 { f,8 f' a \sfol \FO #'0.3 #'-0.5 a f fis, d' a' d a d, } | % m. 8 + + \times 2/3 { 8 d' g d' g, d % beg m. 9 + \sfod \FO #'0.0 #'-2.0 \sfou b gis e } | % end m. 9 + + \times 2/3 { a,8 e' a c a e e, e' gis c gis e } | % m. 10 + + \times 2/3 { a,8 e' a b a e f, f' a d a f } | % m. 11 +} + +\score { + \new Staff = "guitar" << + \context Voice = "upper" { \melody } + \context Voice = "lower" { \bass } + >> + \layout { + \context { + \Score + \override Fingering #'staff-padding = #'() + \override TupletNumber #'stencil = ##f + \override TupletBracket #'bracket-visibility = ##f + } + } + \midi { } +} -- 2.39.2