Update from Francisco.

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index b0cca0000cd2af0f88813879df79c407c865c259..0de5874d02f7a87337c0f32337db9679496b83e0 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -8,6 +8,7 @@
 
 @c \version "2.11.51"
 
 
 @c \version "2.11.51"
 

+

 @node Simultaneous notes
 @section Simultaneous notes
 
 @node Simultaneous notes
 @section Simultaneous notes
 


@@ -18,8 +19,8 @@ in a piece of music.  Polyphony in LilyPond refers to having more
 than one voice on the same staff.
 
 @menu
 than one voice on the same staff.
 
 @menu

-* Single voice::                
-* Multiple voices::             
+* Single voice::
+* Multiple voices::

 @end menu
 
 
 @end menu
 
 


@@ -29,10 +30,11 @@ than one voice on the same staff.
 This section discusses simultaneous notes inside the same voice.
 
 @menu
 This section discusses simultaneous notes inside the same voice.
 
 @menu

-* Chorded notes::               
-* Clusters::                    
+* Chorded notes::
+* Clusters::

 @end menu
 
 @end menu
 

+

 @node Chorded notes
 @unnumberedsubsubsec Chorded notes
 
 @node Chorded notes
 @unnumberedsubsubsec Chorded notes
 


@@ -75,6 +77,7 @@ staves.  To avoid this, use explicit chords instead as in
 @code{<g a>8 <e a>8}.
 @end ignore
 
 @code{<g a>8 <e a>8}.
 @end ignore
 

+

 @node Clusters
 @unnumberedsubsubsec Clusters
 
 @node Clusters
 @unnumberedsubsubsec Clusters
 


@@ -116,6 +119,7 @@ Clusters do not have a stem and cannot indicate durations by
 themselves.  Separate clusters would need a separating rest between
 them.
 
 themselves.  Separate clusters would need a separating rest between
 them.
 

+

 @node Multiple voices
 @subsection Multiple voices
 
 @node Multiple voices
 @subsection Multiple voices
 


@@ -123,13 +127,14 @@ This section discusses simultaneous notes in multiple voices or
 multiple staves.
 
 @menu
 multiple staves.
 
 @menu

-* Single-staff polyphony::      
-* Voice styles::                
-* Collision resolution::        
-* Automatic part combining::    
-* Writing music in parallel::   
+* Single-staff polyphony::
+* Voice styles::
+* Collision resolution::
+* Automatic part combining::
+* Writing music in parallel::

 @end menu
 
 @end menu
 

+

 @node Single-staff polyphony
 @unnumberedsubsubsec Single-staff polyphony
 
 @node Single-staff polyphony
 @unnumberedsubsubsec Single-staff polyphony
 


@@ -161,12 +166,12 @@ separated by double backslashes.
 
 First and third voices get stems up, second and fourth voices get
 stems down, third and fourth voice noteheads are horizontally shifted,
 
 First and third voices get stems up, second and fourth voices get
 stems down, third and fourth voice noteheads are horizontally shifted,

-and rests move to avoid collisions.  
+and rests move to avoid collisions.

 
 @lilypond[quote,relative=3,verbatim]
 <<
   { r8 g g  g g f16 es f8 d }
 
 @lilypond[quote,relative=3,verbatim]
 <<
   { r8 g g  g g f16 es f8 d }

-  \\  
+  \\

   { es,8 r es r d r d r }
   \\
   { d'8 s c s bes s a s }
   { es,8 r es r d r d r }
   \\
   { d'8 s c s bes s a s }


@@ -188,7 +193,6 @@ too many rests, as seen in the example avobe.
 @funindex \voiceFour
 @code{\voiceFour}.
 
 @funindex \voiceFour
 @code{\voiceFour}.
 

-

 @seealso
 
 Learning Manual:
 @seealso
 
 Learning Manual:


@@ -223,19 +227,6 @@ easily identified:
 To revert the standard presentation, the @code{\voiceNeutralstyle}
 command is used.
 
 To revert the standard presentation, the @code{\voiceNeutralstyle}
 command is used.
 

-These styles are arbitrarily defined but can be changed. For example,
-the initial definition for @code{\voiceOneStyle} is as follows:
-
-@example
-voiceOneStyle = @{
-  \override NoteHead #'style = #'diamond
-  \override NoteHead #'color = #red
-  \override Stem #'color = #red
-  \override Beam #'color = #red
-@}
-@end example
-
-

 @predefined
 
 @funindex \voiceOneStyle
 @predefined
 
 @funindex \voiceOneStyle


@@ -258,6 +249,7 @@ Learning Manual:
 Snippets:
 @rlsr{Simultaneous notes}.
 
 Snippets:
 @rlsr{Simultaneous notes}.
 

+

 @node Collision resolution
 @unnumberedsubsubsec Collision resolution
 
 @node Collision resolution
 @unnumberedsubsubsec Collision resolution
 


@@ -371,7 +363,6 @@ four) have @code{\shiftOn}.  @code{\shiftOnn} and
 Notes are only merged if they have opposing stem directions (i.e., in
 @code{Voice} 1 and 2).
 
 Notes are only merged if they have opposing stem directions (i.e., in
 @code{Voice} 1 and 2).
 

-

 @cindex multiple voices
 @cindex polyphonic music
 @cindex shifting voices
 @cindex multiple voices
 @cindex polyphonic music
 @cindex shifting voices


@@ -390,7 +381,6 @@ Notes are only merged if they have opposing stem directions (i.e., in
 @funindex \oneVoice
 @code{\oneVoice}.
 
 @funindex \oneVoice
 @code{\oneVoice}.
 

-

 @funindex \shiftOn
 @code{\shiftOn},
 @funindex \shiftOnn
 @funindex \shiftOn
 @code{\shiftOn},
 @funindex \shiftOnn


@@ -426,7 +416,6 @@ Internals Reference:
 @rinternals{NoteCollision},
 @rinternals{RestCollision}.
 
 @rinternals{NoteCollision},
 @rinternals{RestCollision}.
 

-

 @knownissues
 
 When using @code{merge-differently-headed} with an upstem eighth
 @knownissues
 
 When using @code{merge-differently-headed} with an upstem eighth


@@ -522,30 +511,11 @@ has no effect on the pitches of @var{musicexpr1} and
 
 @snippets
 
 
 @snippets
 

-Parts may be merged without printing text:
-
-@lilypond[quote,verbatim]
-\new Staff <<
-  \set Staff.printPartCombineTexts = ##f
-  \partcombine
-    \relative g' { g a( b) r }
-    \relative g' { g r4 r f }
->>
-@end lilypond
-
-The printed text may be changed:
-
-@lilypond[quote,verbatim]
-\new Staff <<
-  \set Score.soloText = #"girl"
-  \set Score.soloIIText = #"boy"
-  \set Score.aDueText = #"together"
-  \partcombine
-    \relative g' { g4 g r r a2 g }
-    \relative g' { r4 r a( b) a2 g }
->>
-@end lilypond
+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{combining-two-parts-on-the-same-staff.ly}

 
 

+@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
+{changing-partcombine-texts.ly}

 
 @seealso
 
 
 @seealso
 


@@ -559,7 +529,6 @@ Notation Reference:
 Snippets:
 @rlsr{Simultaneous notes}.
 
 Snippets:
 @rlsr{Simultaneous notes}.
 

-

 Internals Reference:
 @rinternals{PartCombineMusic},
 @rinternals{Voice}.
 Internals Reference:
 @rinternals{PartCombineMusic},
 @rinternals{Voice}.


@@ -582,6 +551,7 @@ events in those will be ignored.
 
 @c IIRC in users list someone pointed out more issues. TODO: lookup FV
 
 
 @c IIRC in users list someone pointed out more issues. TODO: lookup FV
 

+

 @node Writing music in parallel
 @unnumberedsubsubsec Writing music in parallel
 
 @node Writing music in parallel
 @unnumberedsubsubsec Writing music in parallel
 


@@ -600,19 +570,21 @@ print the music.
 be of the same length.}
 
 @lilypond[quote,verbatim]
 be of the same length.}
 
 @lilypond[quote,verbatim]

-\parallelMusic #'(voiceA voiceB  voiceC) {
+\parallelMusic #'(voiceA voiceB voiceC) {

   % Bar 1
   % Bar 1

-  r8 g'16[ c''] e''[ g' c'' e''] r8 g'16[ c''] e''[ g' c'' e''] |
-  c'2                               c'2                         |
-  r16 e'8.~     e'4                 r16 e'8.~  e'4              |
+  r8 g'16 c'' e'' g' c'' e'' r8 g'16 c'' e'' g' c'' e'' |
+  r16 e'8.~   e'4            r16 e'8.~   e'4            |
+  c'2                        c'2                        |
+

   % Bar 2
   % Bar 2

-  r8 a'16[ d''] f''[ a' d'' f''] r8 a'16[ d''] f''[ a' d'' f''] |
-  c'2                               c'2                         |
-  r16 d'8.~     d'4                 r16 d'8.~  d'4              |
+  r8 a'16 d'' f'' a' d'' f'' r8 a'16 d'' f'' a' d'' f'' |
+  r16 d'8.~   d'4            r16 d'8.~   d'4            |
+  c'2                        c'2                        |
+

 }
 \new StaffGroup <<
 }
 \new StaffGroup <<

-  \new Staff << \voiceA \\ \voiceC >>
-  \new Staff { \clef bass \voiceB }
+  \new Staff << \voiceA \\ \voiceB >>
+  \new Staff { \clef bass \voiceC }

 >>
 @end lilypond
 
 >>
 @end lilypond
 


@@ -626,17 +598,18 @@ note in the input -- in other words, relative notes for
 \parallelMusic #'(voiceA voiceB voiceC) {
   % Bar 1
   r8 g16 c e g, c e r8 g,16 c e g, c e  |
 \parallelMusic #'(voiceA voiceB voiceC) {
   % Bar 1
   r8 g16 c e g, c e r8 g,16 c e g, c e  |

-  c2                c                   |

   r16 e8.~ e4       r16 e8.~  e4        |
   r16 e8.~ e4       r16 e8.~  e4        |

+  c2                c                   |

 
   % Bar 2
   r8 a,16 d f a, d f r8 a,16 d f a, d f |
 
   % Bar 2
   r8 a,16 d f a, d f r8 a,16 d f a, d f |

-  c2                 c                  |

   r16 d8.~  d4       r16 d8.~  d4       |
   r16 d8.~  d4       r16 d8.~  d4       |

+  c2                 c                  |
+

  }
 \new StaffGroup <<
  }
 \new StaffGroup <<

-  \new Staff << \relative c'' \voiceA \\ \relative c' \voiceC >>
-  \new Staff \relative c' { \clef bass \voiceB }
+  \new Staff << \relative c'' \voiceA \\ \relative c' \voiceB >>
+  \new Staff \relative c' { \clef bass \voiceC }

 >>
 @end lilypond
 
 >>
 @end lilypond