Merge easy parts of Keyboard.

diff --git a/Documentation/user/keyboards.itely b/Documentation/user/keyboards.itely
index 7adae697efd910af2b3bc385e28d36b644661358..767b209e83f9a279fc5d6646a2e6b6911b8b6d59 100644 (file)
--- a/Documentation/user/keyboards.itely
+++ b/Documentation/user/keyboards.itely
@@ -8,18 +8,15 @@
 
 @c \version "2.11.38"
 
-@c Andrew's TODO List
-@c references - first pass complete
-@c manual changes - first pass complete
-@c automatic changes - first pass complete
-@c staff-change lines - first pass complete
-@c cross-staff stems - first pass complete
-@c pedals - first pass complete
-@c accordian discant symbols
+@c "I have finished the first draft." -AH
 
 @node Keyboard instruments
 @section Keyboard instruments
 
+@lilypondfile[quote]{keyboard-headword.ly}
+
+FIXME add sentence
+
 @menu
 * Common notation for keyboards::
 * Piano::
@@ -29,6 +26,8 @@
 @node Common notation for keyboards
 @subsection Common notation for keyboards
 
+FIXME add sentence
+
 @menu
 * References for keyboards::
 * Changing staff manually::
@@ -176,8 +175,8 @@ Learning Manual:
 @rlearning{Fixing overlapping notation}.
 
 Notation Reference:
-@ref{Stems},
-@ref{Automatic beams}.
+@ruser{Stems},
+@ruser{Automatic beams}.
 
 Snippets:
 @rlsr{Keyboards}.
@@ -339,9 +338,8 @@ staff, or vice versa.
 @end lilypond
 
 @snippets
-@c @lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
-@c {indicating-cross-staff-chords-with-arpeggio-bracket.ly}
-
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{indicating-cross-staff-chords-with-arpeggio-bracket.ly}
 
 @seealso
 
@@ -354,6 +352,8 @@ Internals Reference:
 @node Piano
 @subsection Piano
 
+FIXME add sentence
+
 @menu
 * Piano pedals::
 @end menu
@@ -437,12 +437,34 @@ Notation Reference: @ref{Ties} (laissez vibrer).
 @node Accordion
 @subsection Accordion
 
+FIXME add sentence
+
 @menu
 * Discant symbols::
 @end menu
 
 @node Discant symbols
 @subsubsection Discant symbols
+@cindex accordion discant symbols
+@cindex discant symbols, accordion
+@cindex accordion shifts
+
+@c FIXME: use @notation, not @q.
+
+Accordions are often built with more than one set of reeds that may be
+in unison with, an octave above, or an octave below the written pitch.
+Each accordian maker has different names for the @q{shifts} that
+select the various reed combinations, such as @q{oboe}, @q{musette}, or
+@q{bandonium}, so a system of symbols has come into use to simplify
+the performance instructions.
 
-@c TODO Add text from -user and lsr 194
-TBC
+@snippets
+
+@c FIXME: invalid snippet name.  Check the GDP snippet list.
+@c @lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+@c {accordion-discant-symbols.ly}
+
+@seealso
+
+Snippets:
+@rlsr{Keyboards}.

diff --git a/input/manual/keyboard-headword.ly b/input/manual/keyboard-headword.ly
new file mode 100644 (file)
index 0000000..ac7d638
--- /dev/null
+++ b/input/manual/keyboard-headword.ly
@@ -0,0 +1,82 @@
+% Sergei Rachmaninoff, Prelude Op. 3 No. 5, mm. 44–47
+
+\version "2.11.49"
+\include "english.ly"
+
+#(set-global-staff-size 15)
+\paper{
+  ragged-right=##t
+  line-width=17\cm
+  indent=0\cm
+}
+
+rh = { \change Staff = RH \voiceFour }
+lh = { \change Staff = LH \voiceOne }
+
+\new PianoStaff <<
+  \set Score.currentBarNumber = #44
+  \new Staff = "RH" {
+    <<
+      \override Staff.NoteCollision #'merge-differently-dotted = ##t
+      \relative c''' {
+        \key g \minor
+        r8 <a fs>--( <a fs>-- <bf fs d bf>-- <c g ef c>4-- <bf bf,>8 <a
+          a,>8)
+        <g g,>8( <a a,> <bf bf,>4)-- <fs d c fs,>8(-- <g g,> <a d, c a>4)
+        r8 <bf bf,>(_\markup \italic cresc. <bf g d> <c c,>
+          <d bf af d,>4) <c c,>8( <bf bf,>)
+        <c ef, c>\mf( <d d,> <ef ef,> <f f,>) <g g,>( <a a,>4\> <bf
+          bf,>8)\!
+        <fs, fs,>8\p
+      }
+      \\
+      \relative c'' {
+        s8 a16( c d4)-- s4 <ef c>
+        <e cs>4 <e cs> s2
+        s1
+        s4 <bf' g> <d bf>2
+      }
+    >>
+  }
+  \new Staff = "LH" <<
+    \override Staff.NoteCollision #'merge-differently-dotted = ##t
+    \clef bass
+    \key g \minor
+    \new Voice \relative c' {
+      \rh <c~ fs,>2-- c8 \lh d ef f
+      g4 fs8-- \rh g^- a4.-- a16( c
+      \showStaffSwitch
+      <d bf d,>2--) r8 d-- ef-- f--
+      g4-- \lh g,~-- g8 \clef treble a-- bf-- c--
+      \rh d2*1/4
+    }
+    \new Voice \relative c, {
+      \times 4/6 {d16[( a' d fs c' d]}
+      \override TupletNumber #'transparent = ##t
+      \times 4/6 {fs d c fs, d a)}
+      \voiceTwo
+      \times 4/6 {d,[ a' g' d'( c g)]}
+      \times 4/6 {ef'( c g) f'( c g)}
+      
+      \times 4/6 {d,[( a' g' a bf cs])}
+      \times 4/6 {fs( cs bf g a, d,~)}
+      \oneVoice
+      \times 4/6 {d[( a' d d a' d]}
+      \times 4/6 {c a d, d d, d')}
+      
+      \times 4/6 {g,[( d' g bf \clef treble d g]}
+      \times 4/6 {bf g d \clef bass bf g d)}
+      \times 4/6 {f,([ d' g af bf \clef treble d]}
+      \times 4/6 {af' ef bf d \clef bass af bf,)}
+      
+      \times 4/6 {ef,([ bf' g' bf ef f])}
+      \voiceTwo
+      \times 4/6 {g( ef bf g bf, ef,)}
+      \times 4/6 {e[( g' <d' bf>) a'( g d)]}
+      \times 4/6 {bf'( g d) c'( g d)}
+      
+      \oneVoice
+      \clef bass a,,16
+    }
+  >>
+>>