]> git.donarmstrong.com Git - lilypond.git/commitdiff
Add other headwords.
authorGraham Percival <graham@percival-music.ca>
Sat, 24 Nov 2007 22:29:24 +0000 (14:29 -0800)
committerGraham Percival <graham@percival-music.ca>
Sat, 24 Nov 2007 22:29:24 +0000 (14:29 -0800)
Documentation/user/simultaneous.itely
Documentation/user/staff.itely
Documentation/user/text.itely
input/manual/simultaneous-headword.ly [new file with mode: 0644]
input/manual/staff-headword.ly [new file with mode: 0644]
input/manual/text-headword.ly [new file with mode: 0644]

index b550f1a240630078661478257d867fdb9fad4044..4b1b48ee5f579bd4613b616075cb1055854ee5c8 100644 (file)
@@ -9,6 +9,9 @@
 @node Simultaneous notes
 @section Simultaneous notes
 
+@lilypondfile[quote,ragged-right,line-width=16\cm,staffsize=16]
+{simultaneous-headword.ly}
+
 Polyphony in music refers to having more than one voice occurring
 in a piece of music.  Polyphony in LilyPond refers to having more
 than one voice on the same staff.
index b4312b46ab91eb0dd5db1442cf26a8080e614331..0387f06450d96b8db5ef5c027eba327584dfa591 100644 (file)
@@ -9,6 +9,9 @@
 @node Staff notation
 @section Staff notation
 
+@lilypondfile[quote,ragged-right,line-width=16\cm,staffsize=16]
+{staff-headword.ly}
+
 Notes, dynamic signs, etc., are grouped with a set of horizontal
 lines, called a staff (plural @q{staves}).  In LilyPond, these
 lines are drawn using a separate layout object called @code{staff
index 893316a23aac496ba6003d35db57e73d819d8b67..45c4fb4a28f837d492fe767829a7f14f8cea196b 100644 (file)
@@ -9,6 +9,9 @@
 @node Text
 @section Text
 
+@lilypondfile[quote,ragged-right,line-width=16\cm,staffsize=16]
+{text-headword.ly}
+
 This section explains how to include text (with various
 formatting) in your scores.
 
diff --git a/input/manual/simultaneous-headword.ly b/input/manual/simultaneous-headword.ly
new file mode 100644 (file)
index 0000000..e1826fe
--- /dev/null
@@ -0,0 +1,298 @@
+\version "2.11.34"
+\include "english.ly"
+
+% NR 1.5 Simultaneous notes
+
+% L. v. Beethoven, Op. 111
+% Piano sonata 32
+% Movt II - Arietta - Adagio molto semplice e cantabile
+% measures 108 - 118
+
+#(set-global-staff-size 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 {
+   \context {
+      \Score
+      \override SpacingSpanner #'base-shortest-duration = 
+         #(ly:make-moment 1 18) 
+      \override NonMusicalPaperColumn #'line-break-system-details =
+         #'((alignment-offsets . (0 -12)))
+   }
+}
+
+\new PianoStaff <<
+
+   % RH
+   \new Staff <<
+      \clef treble
+      \key c \major
+      \time 9/16
+      \set Score.currentBarNumber = #108
+
+      % RH voice 1
+      \new Voice {
+
+         \voiceOne
+         s4.
+         s8.
+
+         |
+
+         s4.
+         a''8 \p \> [ (
+         g''16 ] )
+
+         |
+
+         g''4.
+         af''8 [ (
+         g''16 ] )
+
+         |
+
+         g''8. [
+         g''8.
+         g''8. \pp ]
+
+         |
+
+         g''8. [
+         af''8.
+         af''8. ]
+
+         |
+
+         af''8. [
+         af''8.
+         af''8. ]
+
+         |
+
+         af''4. \startTrillSpan
+         ~
+         af''8.
+         ~
+
+         |
+
+         af''4.
+         ~
+         af''8.
+         ~
+
+         |
+
+         \oneVoice
+         <af'' d''>8. [
+         a''8. \p \<
+         bf''8. ]
+         ~
+
+         |
+
+         bf''8. [
+         b''8.
+         c'''8. ]
+         ~
+
+         \bar "||"
+
+         \key ef \major
+         c'''8. [
+         cs'''8. \f ] \stopTrillSpan 
+         
+      }
+
+      % RH voice 2
+      \new Voice {
+         \voiceTwo
+         \override Voice.TrillSpanner #'direction = #down
+         d''4. \f \startTrillSpan
+         ~
+         d''8.
+         ~
+
+         |
+
+         d''4.
+         ~
+         d''8.
+         ~
+
+         |
+
+         d''8. \stopTrillSpan
+         d''4. \startTrillSpan
+         ~
+
+         |
+
+         d''4.
+         ~
+         d''8.
+         ~
+
+         |
+
+         d''4.
+         ~
+         d''8.
+         ~
+
+         |
+
+         d''4.
+         ~
+         d''8. \stopTrillSpan
+         ~
+
+         |
+
+         d''4. \startTrillSpan
+         ~
+         d''8.
+         ~
+
+         |
+
+         d''4.
+         ~
+         d''8.
+         ~
+
+         |
+
+         \once \override NoteColumn #'ignore-collision = ##t
+         \once \override NoteHead #'transparent = ##t
+         \once \override Dots #'transparent = ##t
+         \once \override Stem #'transparent = ##t
+         d''8. \stopTrillSpan
+         s4.
+
+         |
+
+         s8.
+         s8.
+
+      }
+
+   >>
+
+   % LH staff
+   \new Staff {
+      \clef bass
+      \key c \major
+      \time 9/16
+      
+      r8.
+      r8.
+      <c! c,!>8 [ (
+      <g, g,,>16 ] )
+
+      |
+
+      <g, g,,>4.
+      \clef treble
+      c''8 [ (
+      b'16 ] )
+
+      |
+
+      b'4.
+      c''8 [ (
+      b'16 ] )
+
+      |
+
+      b'8. [
+      b'8.
+      b'8. ]
+
+      |
+
+      b'8. [
+      bf'8. ]
+      \clef bass
+      <f f,>8 [ (
+      <bf, bf,,>16 ] )
+
+      |
+
+      <bf, bf,,>4.
+      \clef treble
+      f'8 [ (
+      bf16 ] )
+
+      |
+
+      <<
+
+         \new Voice {
+            \voiceOne
+            \override Voice.TrillSpanner #'direction = #up
+            f'4. \startTrillSpan
+            ~
+            f'8.
+            ~
+
+            |
+
+            f'4.
+            ~
+            f'8.
+            ~
+
+            |
+
+            f'8. \stopTrillSpan
+         }
+
+         \new Voice {
+            \voiceTwo
+            \override Voice.TrillSpanner #'direction = #down
+            bf8. [
+            bf8.
+            bf8. ]
+
+            |
+
+            bf8. [
+            bf8.
+            bf8. ]
+
+            |
+
+            bf8.
+         }
+
+      >>
+
+      \oneVoice
+      r8.
+      r8.
+
+      |
+
+      r8.
+      r8.
+      r8.
+      \clef bass
+
+      |
+
+      \key ef \major
+      r8.
+      r8.
+         
+   }
+   
+>>
diff --git a/input/manual/staff-headword.ly b/input/manual/staff-headword.ly
new file mode 100644 (file)
index 0000000..3629624
--- /dev/null
@@ -0,0 +1,248 @@
+\version "2.11.34"
+\include "english.ly"
+
+% NR 1.6 Staff notation
+
+% L. v. Beethoven, Op. 106
+% Piano sonata 29 - Für das Hammer-Klavier
+% Movt IV
+
+#(set-global-staff-size 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 {
+   \context {
+      \Score
+      %\override SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16) 
+      \override Beam #'breakable = ##t
+      \override BarNumber #'transparent = ##t
+   }
+}
+
+\new PianoStaff <<
+
+   % RH staff
+   \new Staff {
+      \clef treble
+      \key ef \major
+      \time 3/4
+
+      <<
+
+         % RH voice 1
+         \new Voice {
+            \partial 1 * 5/8
+            \voiceOne
+            \once \override DynamicLineSpanner #'staff-padding = #4
+            c'''16 \f (
+            e'''16
+            f'''16
+            g'''16
+            af'''16
+            g'''16
+            f'''16
+            ef'''16
+            d'''16
+            c'''16 )
+
+            |
+
+            s8
+            \once \override TextScript #'staff-padding = #6
+            d''8 [
+            ^ \markup \italic { non pressare }
+            \override Voice.Script #'extra-offset = #'(0 . 1)
+            b8 ] \trill
+            r8
+            r8
+            g''8 [
+
+            |
+
+            ef'8 ] \trill
+            r8
+            r8
+            c'''8 [
+            a'8 ] \trill
+            r8
+
+            |
+
+            r8
+            d''' [
+            bf'!8 ] \trill
+            r8
+            r8
+            g'''8 [
+
+            \bar "||"
+            \break
+            \key d \minor
+
+            e''8 ] \trill
+            r8
+            r8
+
+         }
+
+         
+         % RH voice 2
+         \new Voice {
+            \voiceTwo
+            \partial 1 * 5/8
+            r8
+            c'''4.
+            fs''8 \staccato
+
+            |
+
+            <b'' g''>8 \staccato
+            r8
+            r8
+            g8 [
+            b'8 ] \trill
+            r8
+
+            |
+
+            r8
+            c'8 [
+            ef''8 ] \trill
+            r8
+            r8
+            d'8 [
+
+            |
+
+            fs''8 ] \trill
+            r8
+            r8
+            g'8 [
+            bf''!8 ] \trill
+            r8
+
+            \bar "||"
+            
+            r8
+            cs''8 [
+            e'''!8 ] \trill
+
+         }
+
+      >>
+
+      \oneVoice
+      <a''' a''>8 [
+      <f''' f''>8
+      <d''' d''>8 ]
+
+      |
+
+      <a'' a'>8 [ \sf
+      <f'' f'>8 ]
+      <d'' d'>8 [ \sf
+      <a' a> ]
+      <gs' d' gs> [ \sf
+      <gs'' d'' gs'> ]
+
+      |
+
+      \override DynamicLineSpanner #'staff-padding = #4
+      \override DynamicText #'staff-padding = #4
+      <a'' cs'' a'> \ff \staccato
+      r8
+      <a''' e''' cs''' a''>8 \ff \staccato
+      r8
+      r4
+
+      |
+
+      R1 * 3/4
+
+      \bar "||"
+      \key d \major
+   }
+
+   % LH
+   \new Staff {
+      \clef bass
+      \key ef \major
+      \time 3/4
+
+      \partial 1 * 5/8
+      r8
+      a2 \sf \startTrillSpan
+
+      |
+
+      g8 \staccato \stopTrillSpan
+      b8 [
+      g,8 ] \trill
+      r8
+      r8
+      ef'8 [
+
+      |
+
+      c8 ] \trill
+      r8
+      r8
+      \stemDown
+      a8 [
+      fs,8 ] \trill
+      r8
+
+      |
+
+      r8
+      bf!8 [
+      g,8 ] \trill
+      r8
+      r8
+      e'8 [
+
+      \bar "||"
+      \key d \minor
+
+      cs8 ] \trill
+      r8
+      r8
+      a8 [
+      f8
+      d8 ]
+
+      |
+
+      a,8 [
+      f,8 ]
+      d,8 [
+      <a, a,,>8 ]
+      <bf, bf,,>8 [
+      <bf, bf,,>8 ]
+
+      |
+
+      <a, e, cs, a,,>8 \staccato
+      r8
+      <a, e, cs, a,,>8 \staccato
+      r8
+      r4
+
+      |
+
+      R1 * 3/4
+
+      \bar "||"
+      \key d \major
+   }
+
+>>
+
diff --git a/input/manual/text-headword.ly b/input/manual/text-headword.ly
new file mode 100644 (file)
index 0000000..baad1dc
--- /dev/null
@@ -0,0 +1,235 @@
+\version "2.11.34"
+\include "english.ly"
+
+% NR 1.8 Text
+
+% L. v. Beethoven, Op. 110
+% Piano sonata 31
+% measures 1 - 
+
+#(set-global-staff-size 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 {
+   \context {
+      \Score
+      \override SpacingSpanner #'base-shortest-duration = 
+         #(ly:make-moment 1 20) 
+      %\override NonMusicalPaperColumn #'line-break-system-details =
+      %#'((alignment-offsets . (0 -12)))
+   }
+}
+
+\new PianoStaff <<
+
+   % RH staff
+   \new Staff {
+      \clef treble
+      \key af \major
+      \time 3/4
+
+      \once \override TextScript #'staff-padding = #4
+      <c'' af'>4. (
+      _ \markup { \dynamic p \italic { con amabilità } }
+      <af' ef'>8 )
+      <af' ef'>8. [
+      <af' ef'>16 ]
+
+      |
+
+      <df'' g'>4
+      <bf' g'>2
+      _ \markup { \italic { "ten." } }
+
+      |
+
+      <<
+
+         \new Voice {
+            \voiceOne
+            ef''4. (
+            df''8 [ )
+            ef'' (
+            f'' ) ]
+
+            |
+
+            \once \override TextScript #'staff-padding = #4
+            ef''8. (
+            _ \markup { \italic { "tranqu." } }
+            d''16 )
+            df''8 \trill \fermata
+            _ \markup { \italic { "ten." } }
+         }
+
+         \new Voice {
+            \voiceTwo
+            af'4.
+            af'8 [
+            af'8
+            af'8 ]
+
+            |
+
+            g'4
+            g'8
+         }
+
+      >>
+
+      \oneVoice
+      \once \override TextScript #'staff-padding = #4
+      df''32 
+      _ \markup { \italic "dolce" }
+      c''32 
+      df''32
+      ef''32
+      \acciaccatura { df''[ ef'' ] }
+      f''8
+      ef''16
+      df''16
+
+      |
+      \break
+      \overrideProperty "Score.NonMusicalPaperColumn"
+      #'line-break-system-details #'((alignment-offsets . (0 -12)))
+
+      c''4. (
+      ^ \markup \italic { cantabile, con intimissimo sentimento,
+         ma sempre molto dolce e semplice }
+      ef''4
+      af''8 )
+
+      |
+
+      af''4 (
+      g''2 )
+
+      |
+
+      bf''4. (
+      g''4
+      ef''8 )
+
+      |
+   }
+
+   % LH
+   \new Staff { 
+      \clef bass
+      \key af \major
+      \time 3/4
+
+      <ef af,>4. (
+      <ef c>8 )
+      <ef c>8. [
+      <ef c>16 ]
+
+      |
+
+      <ef bf,>4
+      <ef df>2 ^ \markup { \italic ten. }
+
+      |
+
+      <<
+
+         \new Voice {
+            \voiceOne
+            ef8 [ (
+            af8
+            c'8
+            bf8 )
+            c'8 ( \staccato
+            df'8 ]  ) \staccato
+
+            |
+
+            bf4
+            bf8 ^ \markup { \italic "ten." }
+         }
+
+         \new Voice {
+            \voiceTwo
+            c4. (
+            f8 [ )
+            ef8 ( \staccato
+            df8 ] ) \staccato
+
+            |
+
+            ef4
+            ef8 \fermata
+         }
+
+      >>
+
+      \oneVoice
+      r8
+      r4
+      \clef treble
+
+      |
+
+      \override Staff.SustainPedalLineSpanner #'outside-staff-priority = #1000
+      \override Staff.SustainPedalLineSpanner #'staff-padding = #7
+      \once \override TextScript #'padding = #2
+      af16 \sustainDown
+      ^ \markup \italic { non staccato }
+      _ \markup \italic { molto \dynamic p, sempre tranquillo
+         ed egualmente, non rubato }
+      <ef' c'>16
+      <ef' c'>16
+      <ef' c'>16
+      af16
+      <ef' c'>16
+      <ef' c'>16
+      <ef' c'>16
+      af16 \sustainDown
+      <ef' c'>16
+      <ef' c'>16
+      <ef' c'>16
+
+      |
+
+      bf16 \sustainDown
+      <ef' df'>16
+      <ef' df'>16
+      <ef' df'>16
+      bf16 \sustainDown
+      <ef' df'>16
+      <ef' df'>16
+      <ef' df'>16
+      bf16
+      <ef' df'>16
+      <ef' df'>16
+      <ef' df'>16
+
+      |
+
+      \override Staff.SustainPedalLineSpanner #'staff-padding = #4
+      df'16 \sustainDown
+      <bf' g' ef'>16
+      <bf' g' ef'>16
+      <bf' g' ef'>16
+      df'16
+      <bf' g' ef'>16
+      <bf' g' ef'>16
+      <bf' g' ef'>16
+      df'16 \sustainDown
+      <bf' g' ef'>16
+      <bf' g' ef'>16
+      <bf' g' ef'>16
+
+      |
+   }
+
+>>