Merge easy parts of Keyboard.

[lilypond.git] / Documentation / user / keyboards.itely

diff --git a/Documentation/user/keyboards.itely b/Documentation/user/keyboards.itely
index f4eced4ada84c3ed696264e60789c2613fd39e1c..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 - started
-@c cross-staff stems
-@c pedals
-@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::
@@ -85,7 +84,7 @@ as shown in @rlearning{Other uses for tweaks}.
 
 @end itemize
 
-@snippets
+@c @snippets
 @c @lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
 @c {creating-slurs-across-voices.ly}
 
@@ -117,6 +116,7 @@ Snippets:
 Dynamics are not centered, but workarounds do exist.  See the
 @q{piano centered dynamics} template in @rlearning{Piano templates}.
 
+@c TODO Find out status of the dynamics engravers
 
 @node Changing staff manually
 @subsubsection Changing staff manually
@@ -157,7 +157,7 @@ Cross-staff notes are beamed automatically:
     \change Staff = up
   }
   \new Staff = "down" {
-    \clef "bass"
+    \clef bass
     s1 % keep staff alive
   }
 >>
@@ -239,16 +239,21 @@ necessary to place a key signature in the lower staff:
   }
   \new Staff = "down" {
     \key g \major
-    \clef "bass"
+    \clef bass
   }
 >>
 @end lilypond
 
 @seealso
 
-Notation Reference: @ref{Changing staff manually}.
+Notation Reference:
+@ref{Changing staff manually}.
+
+Snippets:
+@rlsr{Keyboards}.
 
-Internals Reference: @rinternals{AutoChangeMusic}.
+Internals Reference:
+@rinternals{AutoChangeMusic}.
 
 @knownissues
 
@@ -271,64 +276,84 @@ chosen by the first note named in the chord.
 @funindex followVoice
 
 Whenever a voice switches to another staff, a line connecting the
-notes can be printed automatically.  This is switched on by
-setting @code{followVoice} to true, or by the shorthand commands
-@code{\showStaffSwitch} and @code{\hideStaffSwitch}.
+notes can be printed automatically:
 
 @lilypond[quote,ragged-right,fragment,relative=1,verbatim]
 \new PianoStaff <<
-  \new Staff="one" {
+  \new Staff = "one" {
     \showStaffSwitch
     c1
     \change Staff=two
     b2 a
   }
-  \new Staff="two" { \clef bass s1*2 }
+  \new Staff = "two" { \clef bass s1*2 }
 >>
 @end lilypond
 
-@seealso
-
-Internals Reference: @rinternals{VoiceFollower}.
-
 @predefined
 
 @funindex \showStaffSwitch
-@code{\showStaffSwitch},
 @funindex \hideStaffSwitch
-@code{\hideStaffSwitch}.
+@code{\showStaffSwitch}, @code{\hideStaffSwitch}.
+
+@seealso
+
+Snippets:
+@rlsr{Keyboards}.
+
+Internals Reference:
+@rinternals{VoiceFollower}.
 
 
 @node Cross-staff stems
 @subsubsection Cross-staff stems
 
+@cindex cross-staff notes
+@cindex notes, cross-staff
+@cindex cross-staff stems
+@cindex stems, cross-staff
+
 Chords that cross staves may be produced by increasing the length
 of the stem in the lower staff, so it reaches the stem in the upper
 staff, or vice versa.
 
 @lilypond[ragged-right,verbatim,quote]
-stemExtend = {
-  \once \override Stem #'length = #10
-  \once \override Stem #'cross-staff = ##t
-}
-noFlag = \once \override Stem #'flag-style = #'no-flag
 \new PianoStaff <<
-  \new Staff {
-    \stemDown \stemExtend
-    f'4
-    \stemExtend \noFlag
-    f'8
+  \new Staff \relative c' {
+    f8 e4 d8 <f bes,>2
   }
-  \new Staff {
-    \clef bass
-    a4 a8
+  \new Staff \relative c' {
+    << {
+      \clef bass
+      \stemUp
+      \override Stem #'length = #12
+      \override Stem #'cross-staff = ##t
+      \override Stem #'flag-style = #'no-flag
+      a8 g4 f8
+    } \\
+    { f,2 d' }
+    >>
   }
 >>
 @end lilypond
 
+@snippets
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc]
+{indicating-cross-staff-chords-with-arpeggio-bracket.ly}
+
+@seealso
+
+Snippets:
+@rlsr{Keyboards}.
+
+Internals Reference:
+@rinternals{Stem}
+
 @node Piano
 @subsection Piano
 
+FIXME add sentence
+
 @menu
 * Piano pedals::
 @end menu
@@ -412,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}.