Doc-fr: NR-1.5.2 merging rests

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

diff --git a/Documentation/notation/keyboards.itely b/Documentation/notation/keyboards.itely
index d9213d98f9dbeac3170e535820d0f58fbf94cb7b..db8057b67f97687824f8cf4d272fe8c7d4dea890 100644 (file)
--- a/Documentation/notation/keyboards.itely
+++ b/Documentation/notation/keyboards.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
     Guide, node Updating translation committishes..
 @end ignore
 

-@c \version "2.17.6"
+@c \version "2.19.25"

 
 @node Keyboard and other multi-staff instruments
 @section Keyboard and other multi-staff instruments
 
 @node Keyboard and other multi-staff instruments
 @section Keyboard and other multi-staff instruments


@@ -150,7 +150,6 @@ Snippets:
 @cindex beams, cross-staff
 
 @funindex \change
 @cindex beams, cross-staff
 
 @funindex \change

-@funindex change

 
 Voices can be switched between staves manually, using the command
 
 
 Voices can be switched between staves manually, using the command
 


@@ -262,7 +261,6 @@ right before a change in staff.  In this case use manual beams.
 @cindex staff changes, automatic
 
 @funindex \autochange
 @cindex staff changes, automatic
 
 @funindex \autochange

-@funindex autochange

 @funindex PianoStaff
 
 Voices can be made to switch automatically between the top and the
 @funindex PianoStaff
 
 Voices can be made to switch automatically between the top and the


@@ -289,11 +287,25 @@ in advance.
 }
 @end lilypond
 
 }
 @end lilypond
 

+@noindent
+It is possible to specify other pitches for the turning point.
+If the staves are not instantiated explicitly, other clefs may be used.
+
+@lilypond[quote,verbatim]
+music = {
+  g8 b a c' b8 d' c'8 e'
+  d'8 r f' g' a'2
+}
+
+\autochange d' \music
+\autochange b \with { \clef soprano } \music
+\autochange d' \with { \clef alto } \with { \clef tenor } \music
+@end lilypond
+

 @cindex relative music and autochange
 @cindex autochange and relative music
 
 @funindex \relative
 @cindex relative music and autochange
 @cindex autochange and relative music
 
 @funindex \relative

-@funindex relative

 
 A @code{\relative} section that is outside of @code{\autochange}
 has no effect on the pitches of the music, so if necessary, put
 
 A @code{\relative} section that is outside of @code{\autochange}
 has no effect on the pitches of the music, so if necessary, put


@@ -315,7 +327,7 @@ key signature in the lower staff:
   \new Staff = "up" {
     \new Voice = "melOne" {
       \key g \major
   \new Staff = "up" {
     \new Voice = "melOne" {
       \key g \major

-      \autochange \relative c' {
+      \autochange \relative {

         g8 b a c b d c e
         d8 r fis, g a2
       }
         g8 b a c b d c e
         d8 r fis, g a2
       }


@@ -366,18 +378,16 @@ staff based on the first note named in the chord construct.
 
 @funindex followVoice
 @funindex \showStaffSwitch
 
 @funindex followVoice
 @funindex \showStaffSwitch

-@funindex showStaffSwitch

 @funindex \hideStaffSwitch
 @funindex \hideStaffSwitch

-@funindex hideStaffSwitch

 
 Whenever a voice switches to another staff, a line connecting the
 notes can be printed automatically:
 
 
 Whenever a voice switches to another staff, a line connecting the
 notes can be printed automatically:
 

-@lilypond[quote,verbatim,relative=1]
+@lilypond[quote,verbatim]

 \new PianoStaff <<
   \new Staff = "one" {
     \showStaffSwitch
 \new PianoStaff <<
   \new Staff = "one" {
     \showStaffSwitch

-    c1
+    c'1

     \change Staff = "two"
     b2 a
   }
     \change Staff = "two"
     b2 a
   }


@@ -470,30 +480,26 @@ piano.
 @cindex U.C.
 
 @funindex \sustainOn
 @cindex U.C.
 
 @funindex \sustainOn

-@funindex sustainOn

 @funindex \sustainOff
 @funindex \sustainOff

-@funindex sustainOff

 @funindex \sostenutoOn
 @funindex \sostenutoOn

-@funindex sostenutoOn

 @funindex \sostenutoOff
 @funindex \sostenutoOff

-@funindex sostenutoOff

 @funindex \unaCorda
 @funindex \unaCorda

-@funindex unaCorda

 @funindex \treCorde
 @funindex \treCorde

-@funindex treCorde

 
 Pianos generally have three pedals that alter the way sound is
 produced: @notation{sustain}, @notation{sostenuto}
 (@notation{sos.}), and @notation{una corda} (@notation{U.C.}).
 Sustain pedals are also found on vibraphones and celestas.
 
 
 Pianos generally have three pedals that alter the way sound is
 produced: @notation{sustain}, @notation{sostenuto}
 (@notation{sos.}), and @notation{una corda} (@notation{U.C.}).
 Sustain pedals are also found on vibraphones and celestas.
 

-@lilypond[quote,verbatim,relative=2]
-c4\sustainOn d e g
-<c, f a>1\sustainOff
-c4\sostenutoOn e g c,
-<bes d f>1\sostenutoOff
-c4\unaCorda d e g
-<d fis a>1\treCorde
+@lilypond[quote,verbatim]
+\relative {
+  c''4\sustainOn d e g
+  <c, f a>1\sustainOff
+  c4\sostenutoOn e g c,
+  <bes d f>1\sostenutoOff
+  c4\unaCorda d e g
+  <d fis a>1\treCorde
+}

 @end lilypond
 
 @cindex pedal indication styles
 @end lilypond
 
 @cindex pedal indication styles


@@ -512,15 +518,17 @@ There are three styles of pedal indications: text, bracket, and mixed.
 The sustain pedal and the una corda pedal use the text style by default
 while the sostenuto pedal uses mixed by default.
 
 The sustain pedal and the una corda pedal use the text style by default
 while the sostenuto pedal uses mixed by default.
 

-@lilypond[quote,verbatim,relative=2]
-c4\sustainOn g c2\sustainOff
-\set Staff.pedalSustainStyle = #'mixed
-c4\sustainOn g c d
-d\sustainOff\sustainOn g, c2\sustainOff
-\set Staff.pedalSustainStyle = #'bracket
-c4\sustainOn g c d
-d\sustainOff\sustainOn g, c2
-\bar "|."
+@lilypond[quote,verbatim]
+\relative {
+  c''4\sustainOn g c2\sustainOff
+  \set Staff.pedalSustainStyle = #'mixed
+  c4\sustainOn g c d
+  d\sustainOff\sustainOn g, c2\sustainOff
+  \set Staff.pedalSustainStyle = #'bracket
+  c4\sustainOn g c d
+  d\sustainOff\sustainOn g, c2
+  \bar "|."
+}

 @end lilypond
 
 The placement of the pedal commands matches the physical movement of the
 @end lilypond
 
 The placement of the pedal commands matches the physical movement of the


@@ -641,20 +649,20 @@ is controlled by a single pedal.  From the player's left to right, the
 pedals are D, C, and B on the left and E, F, G, and A on the right.
 The position of the pedals may be indicated with text marks:
 
 pedals are D, C, and B on the left and E, F, G, and A on the right.
 The position of the pedals may be indicated with text marks:
 

-@lilypond[quote,verbatim,relative=2]
+@lilypond[quote,verbatim,fragment]

 \textLengthOn
 \textLengthOn

-cis1_\markup \concat \vcenter {
+cis''1_\markup \concat \vcenter {

   [D \flat C \sharp B|E \sharp F \sharp G A \flat] }
   [D \flat C \sharp B|E \sharp F \sharp G A \flat] }

-c!1_\markup \concat \vcenter {
+c''!1_\markup \concat \vcenter {

   [ C \natural ] }
 @end lilypond
 
 or pedal diagrams:
 
   [ C \natural ] }
 @end lilypond
 
 or pedal diagrams:
 

-@lilypond[quote,verbatim,relative=2]
+@lilypond[quote,verbatim,fragment]

 \textLengthOn
 \textLengthOn

-cis1_\markup { \harp-pedal #"^v-|vv-^" }
-c!1_\markup { \harp-pedal #"^o--|vv-^" }
+cis''1_\markup { \harp-pedal #"^v-|vv-^" }
+c''!1_\markup { \harp-pedal #"^o--|vv-^" }

 @end lilypond
 
 The @code{\harp-pedal} command accepts a string of characters, where
 @end lilypond
 
 The @code{\harp-pedal} command accepts a string of characters, where