]> git.donarmstrong.com Git - lilypond.git/commitdiff
Inspirational headwords from Trevor B, thanks!
authorGraham Percival <graham@percival-music.ca>
Tue, 20 Nov 2007 07:53:25 +0000 (23:53 -0800)
committerJohn Mandereau <john.mandereau@gmail.com>
Fri, 23 Nov 2007 06:02:05 +0000 (07:02 +0100)
Documentation/user/educational.itely
Documentation/user/repeats.itely
Documentation/user/text.itely
Documentation/user/writing-texinfo.txt
input/manual/editorial-headword.ly [new file with mode: 0644]
input/manual/pitches-headword.ly
input/manual/repeats-headword.ly [new file with mode: 0644]
input/manual/rhythms-headword.ly

index 7765be81bdb19f6a57e765498ce299a0c420d767..ac1d513dba9172fbf3910df6207bce2fa12d0474 100644 (file)
@@ -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::           
index 14f72365d11fbc853842e81d7edbb262364ab521..31f1e87fcc98d262ac32dd8db06e72a839236213 100644 (file)
@@ -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.
 
index 17565664d92acb5ff7a851d8c6ffc74895ea0bec..893316a23aac496ba6003d35db57e73d819d8b67 100644 (file)
@@ -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::                 
index 6e91aa6f955e375c1ac78a94689442581d0f8f83..015f3cb85d9fa761718a9db99b70b6480d009882 100644 (file)
@@ -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 (file)
index 0000000..12d7fa8
--- /dev/null
@@ -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
+      <af''-4 c''>8 \staccato
+      |
+      \set doubleSlurs = ##t
+      <bf''-5 df''-2>4 (
+      <af''-4 c''>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
+      <af' af>8 \staccato
+      \set doubleSlurs = ##t
+      <g'-2 ef'-3>4 (
+      <af' af>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
+   }
+
+>>
index e4442accd36c534dab9b0d5c6d5d78ce15e11efb..7937eb844a64ff5d49c27cd324d13051d9a1d092 100644 (file)
@@ -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 (file)
index 0000000..3e933c8
--- /dev/null
@@ -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 "|:"
+      <af ef c>4 (
+      <af g c>8..
+      <af ef c>32
+      |
+      <af f df>8. )
+      <df' af f>16 (
+      <c' af gf>8
+      <df' af f>8 )
+      |
+      <af ef c>4 (
+      <af gf c>8..
+      <af ef c>32
+      |
+      <af f df>8. )
+      \slurDown
+      <f' af f>16 (
+      <<
+         {
+            \voiceTwo
+            gf8
+            f8 )
+         }
+         \new Voice {
+            \voiceOne
+            <f' af>16
+            ef'16
+            <df' af>8
+         }
+      >>
+      \oneVoice
+      |
+      <af ef c>4 (
+      <af gf c>8..
+      <af ef c>32
+      \clef treble
+      |
+      <af' df' af>8. )
+      <af' f' df'>16 (
+      <af' ef' c'>16
+      gf'16
+      <f' df' af>8 )
+      |
+      \slurUp
+      <ef' bf gf>4
+      \change Staff = LH
+      \voiceOne
+      <af ef c>4
+      |
+      <df' f df>4.
+      \change Staff = RH
+      \oneVoice
+      r8
+      \clef bass
+      \bar ":|"
+   }
+
+   \new Staff = LH {
+      \clef bass
+      \key df \major
+      \time 2/4
+      <af, gf,>4 (
+      <af, ef,>8..
+      <af, gf,>32
+      |
+      <af, f,>8. )
+      <af, df,>16 (
+      <af, ef,>8
+      <af, df,>8 )
+      |
+      <af, gf,>4 (
+      <af, ef,>8..
+      <af, gf,>32
+      |
+      <af, f,>8. )
+      <af, df,>16 (
+      <af, c,>8
+      <af, df,> )
+      |
+      <af, gf,>4 (
+      <af, ef,>8..
+      <af, gf,>32
+      |
+      <f f,>8. )
+      <df df,>16 (
+      <ef ef,>8
+      <f f,>8 )
+      |
+      \voiceTwo
+      gf,4  (
+      af,4 ~ )
+      |
+      af,16. [ ( 
+      gf,32
+      f,16.
+      ef,32 ]
+      df,8 )
+      \oneVoice
+      r8
+   }
+   
+>>
index f1ea43845521cbef460b037fff416f7bf3105177..4c9ff368b81f29004de9cdad8ee273e859fe9184 100644 (file)
-\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
+
+      <c'' c'>8 (
+      <g'' g'>8 )
+      ~
+      <g'' g'>8 (
+      <a'' a'>16
+      <f'' f'>16 )
+
+      |
+
+      \afterGrace
+         <f'' f'>8 (
+         {
+            e''16 [
+            f''16
+            e''16
+            d''16 ]
          }
-         \times 4/5 {
-            r16
-            \set stemLeftBeamCount = #2
-            \set stemRightBeamCount = #0
-            c16. [ ]
+      <e''! e'>16
+      <f'' f'>16 )
+      <g'' g'>16 ( \staccato
+      <a'' a'>16 ) \staccato
+      <bf'' bf'>32  (
+      <b'' b'>32 )
+      <b'' b'>32 (
+      <c''' c''>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
+         <f'' f'>8 (
+         {
+            e''16 [
+            f''16
+            e''16
+            d''16 ]
          }
-      }
-   >>
+      <e''! e'>16
+      <f'' f'>16 )
+      <g'' g'>16 ( \staccato
+      <af''! af'!>16 ) \staccato
+      <bf'' bf'>32  (
+      <b'' b'>32 )
+      <b'' b'>32 (
+      <c''' c''>32 )
+   }
+
+   % LH Staff
+   \new Staff {
+      \clef bass
+      \key c \minor
+      \time 2/4
+
+      <g e>32
+      c'32
+      <g e>32
+      c'32
+
+      <g e>32
+      c'32
+      <g e>32
+      c'32
+
+      <g e>32
+      c'32
+      <g e>32
+      c'32
+
+      <a f>32
+      c'32
+      <a f>32
+      c'32
+
+      |
+      
+      <bf g>32
+      c'32
+      <bf g>32
+      c'32
+
+      <bf g>32
+      c'32
+      <bf g>32
+      c'32
+
+      <bf g>32
+      c'32
+      <a f>32
+      c'32
+
+      <g e>32
+      c'32
+      <g e>32
+      c'32
+
+      |
+
+      <g e>32
+      c'32
+      <g e>32
+      c'32
+
+      <g e>32
+      c'32
+      <g e>32
+      c'32
+
+      <g e>32
+      c'32
+      <g e>32
+      c'32
+
+      <a f>32
+      c'32
+      <a f>32
+      c'32
+
+      |
+      
+      <bf! g>32
+      c'32
+      <bf g>32
+      c'32
+
+      <bf g>32
+      c'32
+      <bf g>32
+      c'32
+
+      <bf g>32
+      c'32
+      <af! f>32
+      c'32
+
+      <g e>32
+      c'32
+      <g e>32
+      c'32
+   }
+
 >>