Merge remote branch 'origin/release/unstable' into HEAD

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

diff --git a/Documentation/notation/keyboards.itely b/Documentation/notation/keyboards.itely
index f62b210353465010649453db1dc29bb8f33dfb7e..c693aa91ac9fd086206916993be3acedda786813 100644 (file)
--- a/Documentation/notation/keyboards.itely
+++ b/Documentation/notation/keyboards.itely
@@ -110,7 +110,7 @@ as shown in @rlearning{Other uses for tweaks}.
 @end itemize
 
 @c @snippets
-@c @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@c @lilypondfile[verbatim,quote,texidoc,doctitle]
 @c {forcing-visibility-of-systems-with-multi-bar-rests-when-using-\RemoveEmptyStaffContext.ly}
 @c http://lsr.dsi.unimi.it/LSR/Item?u=1&id=312
 
@@ -137,6 +137,7 @@ Internals Reference:
 Snippets:
 @rlsr{Keyboards}.
 
+
 @node Changing staff manually
 @unnumberedsubsubsec Changing staff manually
 
@@ -206,16 +207,19 @@ Overlapping notation can result when voices cross staves:
     \voiceOne
     % Make space for fingering in the cross-staff voice
     \once\override DynamicLineSpanner #'staff-padding = #3.4
-    e''2\p\< d''\> s1*0\!
+    e''2\p\< d''\>
+    c''1\!
   }
   \new Staff = "down" <<
     {
       \clef bass
       s4. e,8\rest g,2\rest
+      c1
     } \\ {
       c8\( g c'
       \change Staff = "up"
       e' g' b'-3 a' g'\)
+      f'1
     }
   >>
 >>
@@ -247,8 +251,7 @@ Internals Reference:
 
 @knownissues
 Beam collision avoidance does not work for automatic beams that end
-right before a change in staff. To make the latter work, use manual
-beaming.
+right before a change in staff.  In this case use manual beams.
 
 
 @node Changing staff automatically
@@ -325,7 +328,6 @@ key signature in the lower staff:
 >>
 @end lilypond
 
-
 @seealso
 Notation Reference:
 @ref{Changing staff manually}.
@@ -338,7 +340,6 @@ Internals Reference:
 
 
 @knownissues
-
 @cindex chords, splitting across staves with \autochange
 
 The staff switches may not end up in optimal places.  For high
@@ -347,6 +348,7 @@ quality output, staff switches should be specified manually.
 Chords will not be split across the staves; they will be assigned to a
 staff based on the first note named in the chord construct.
 
+
 @node Staff-change lines
 @unnumberedsubsubsec Staff-change lines
 
@@ -392,7 +394,6 @@ notes can be printed automatically:
 @code{\hideStaffSwitch}.
 @endpredefined
 
-
 @seealso
 Snippets:
 @rlsr{Keyboards}.
@@ -438,7 +439,7 @@ Chords that cross staves may be produced:
         % extend the stems to reach the other staff
         \override Stem #'length = #12
         % do not print extra flags
-        \override Stem #'flag-style = #'no-flag
+        \override Flag #'style = #'no-flag
         % prevent beaming as needed
         a8 g4 f8 f bes\noBeam g4
       }
@@ -452,10 +453,9 @@ Chords that cross staves may be produced:
 @end lilypond
 
 @snippets
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {indicating-cross-staff-chords-with-arpeggio-bracket.ly}
 
-
 @seealso
 Snippets:
 @rlsr{Keyboards}.
@@ -598,10 +598,9 @@ come into use to simplify the performance instructions.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle]
 {accordion-discant-symbols.ly}
 
-
 @seealso
 Snippets:
 @rlsr{Keyboards}.
@@ -645,6 +644,7 @@ Notation Reference:
 @ref{Arpeggio},
 @ref{Harmonics}.
 
+
 @node Harp pedals
 @unnumberedsubsubsec Harp pedals