Docs: NR 1.6 Staff notation: Try alternative headword

 - this shows three different staves, so is more
   appropriate to the Staff notation section

diff --git a/input/manual/staff-headword.ly b/input/manual/staff-headword.ly
index f1de7cc2eef6d8510c98374f0ccb92f18b83ad40..ba9d1cb2df07e4f430bb232814a7197985314ac0 100644 (file)
--- a/input/manual/staff-headword.ly
+++ b/input/manual/staff-headword.ly
@@ -1,250 +1,119 @@
 \version "2.11.61"
-\include "english.ly"
+\include "catalan.ly"
 #(set-global-staff-size 15)
 \paper{
   ragged-right=##t
   line-width=17\cm
   indent=0\cm
 }
- 
-\layout {
-  \context { \Score
-    \override PaperColumn #'keep-inside-line = ##t
-    \override NonMusicalPaperColumn #'keep-inside-line = ##t
-  }
-}
-
-% NR 1.6 Staff notation
-
-% L. v. Beethoven, Op. 106
-% Piano sonata 29 - Für das Hammer-Klavier
-% Movt IV
 
-\layout {
-   \context {
-      \Score
-      %\override SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16) 
-      \override Beam #'breakable = ##t
-      \override BarNumber #'transparent = ##t
-   }
+\header {
+       mutopiatitle = "Napolitan Dance (Swan Lake)"
+       mutopiacomposer = "TchaikovskyPI"
+       mutopiainstrument = "Piano, Trumpet, Percussion"
+       source = "New arrangement"
+       style = "Classical"
+       copyright = "Public Domain"
+       maintainer = "Laurence Sardain"
+       lastupdated = "2006/Dec/21"
+%      title = "Le Lac des Cygnes"
+%      subtitle = "Danse Napolitaine"
+%      composer = "Piotr Ilitch Tchaïkovski"
+%      arranger = "arr. Laurence Sardain"
+%       footer = "Mutopia-2006/12/22-896"
 }
 
-\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 ]
+trompette = \relative do'' {
+  \clef treble
+  \key mib \major
+  \time 2/4
+  R2^\markup { \italic Comodo } |
+  r8 \once \override TextScript #'padding = #2.0
+  sib16-.^\markup {\dynamic p \italic grazioso} do-. mib( re)-. do-. sib-. |
+  re8-. r8 re4->( |
+  re8) do16-. re-. mib( re) do-. re-. |
+  do8-. r8 sib4-> |
+}
 
-      |
+tambourin = \relative do' {
+  \time 2/4
+  r8 do16 do do8 do |
+  r8 do16 do do8 do |
+  r8 do r do |
+  r8 do16 do do8 do |
+  r8 do r do |
+}
 
-      <a, e, cs, a,,>8 \staccato
-      r8
-      <a, e, cs, a,,>8 \staccato
-      r8
-      r4
+tambourinMidi = \drummode {
+  \time 2/4
+  r8 tamb16 tamb tamb8 tamb |
+  r8 tamb16 tamb tamb8 tamb |
+  r8 tamb r tamb |
+  r8 tamb16 tamb tamb8 tamb |
+  r8 tamb r tamb |
+}
 
-      |
+upper = \relative do' {
+  \clef treble
+  \key mib \major
+  \time 2/4
+  r8\p <sol sib mib>16-. <sol sib mib>-. <sol sib mib>8-. <sol sib mib>-. |
+  r8 <sol sib mib>16-. <sol sib mib>-. <sol sib mib>8-. <sol sib mib>-. |
+  r8 <lab sib re>16-. <lab sib re>-. <lab sib re>8-. <lab sib re>-. |
+  r8 <lab sib re>16-. <lab sib re>-. <lab sib re>8-. <lab sib re>-. |
+  r8 <sol sib mib>16-. <sol sib mib>-. <sol sib mib>8-. <sol sib mib>-. |
+}
 
-      R1 * 3/4
+lower = \relative do {
+  \clef bass
+  \key mib \major
+  \time 2/4
+  mib4-. r4 |
+  sib-. r |
+  fa'-. r |
+  sib, r |
+  mib4-. r4 |
+}
 
-      \bar "||"
-      %\key d \major
-   }
 
->>
+\score {
+  <<
+    \context Staff = "trumpet" <<
+      \set Staff.instrumentName = \markup { "Trumpet" \concat{ B \teeny \raise #0.4 \flat } }
+      \transpose sib do'
+      \trompette
+    >>
+    \context RhythmicStaff = "tambourin" <<
+      \set Staff.instrumentName = "Tambourine"
+      \tambourin
+    >>
+    \context PianoStaff = "prima" <<
+      \set PianoStaff.instrumentName = "Piano  "
+      \context Staff = "uppera" \upper
+      \context Staff = "lowera" \lower
+    >>
+  >>
+  \layout { }
+}
+\score {
+  <<
+    \context Staff = "trumpet" {
+      \set Staff.midiInstrument = "trumpet"
+      \trompette
+    }
+    \context DrumStaff = "tambourin" {
+      \tambourinMidi
+    }
+    \context Staff = "piano" <<
+      \upper
+      \lower
+    >>
+  >>
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 72 4)
+    }
+  }
+}