Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index c880c5cf77950c64aaf46a3761e859aea51bd3b5..f630fa8bf38dbf348923cfa949ef709f2a02300f 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -9,6 +9,9 @@
 @node Simultaneous notes
 @section Simultaneous notes
 
+@lilypondfile[quote,ragged-right,line-width=16\cm,staffsize=16]
+{simultaneous-headword.ly}
+
 Polyphony in music refers to having more than one voice occurring
 in a piece of music.  Polyphony in LilyPond refers to having more
 than one voice on the same staff.
@@ -23,18 +26,18 @@ than one voice on the same staff.
 @subsection Single voice
 
 @menu
-* Chords::                      
+* Chorded notes::                      
 * Clusters::                    
 @end menu
 
-@node Chords
-@unnumberedsubsubsec Chords
+@node Chorded notes
+@unnumberedsubsubsec Chorded notes
 
 @cindex Chords
 
 A chord is formed by a enclosing a set of pitches between @code{<}
 and @code{>}.  A chord may be followed by a duration, and a set of
-articulations, just like simple notes
+articulations, just like simple notes:
 
 @lilypond[verbatim,ragged-right,fragment,quote,relative=1]
 <c e g>4 <c>8
@@ -43,6 +46,16 @@ articulations, just like simple notes
 For more information about chords, see @ref{Introducing chord
 names}.
 
+@seealso
+
+Snippets: @lsrdir{simultaneous}
+
+@refbugs
+
+Music expressions like @code{<< @{ g8 e8 @} a4 >>} are not printed
+accurately.  Use @code{<g a>8 <e a>8} instead.
+
+
 
 @node Clusters
 @unnumberedsubsubsec Clusters
@@ -65,50 +78,29 @@ clusters.
 
 @seealso
 
-Program reference: @internalsref{ClusterSpanner},
+Snippets: @lsrdir{simultaneous}
+
+Internals Reference: @internalsref{ClusterSpanner},
 @internalsref{ClusterSpannerBeacon},
 @internalsref{Cluster_spanner_engraver}.
 
 Examples: @lsr{contemporary,cluster@/.ly}.
 
-@refbugs
-
-Music expressions like @code{<< @{ g8 e8 @} a4 >>} are not printed
-accurately.  Use @code{<g a>8 <e a>8} instead.
-
 
 
 @node Multiple voices
 @subsection Multiple voices
 
 @menu
-* TODO new sec voices::         
-* Collision Resolution::        
+* Collision resolution::        
 * Automatic part combining::    
 * Writing music in parallel::   
 @end menu
 
-@node TODO new sec voices
-@unnumberedsubsubsec TODO new sec voices
-
-In some instances of complex polyphonic music, you may need
-additional voices to avoid collisions between notes.  Additional
-voices are added by defining an identifier, as shown below:
-
-@lilypond[quote,verbatim,ragged-right,relative=2]
-voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
-
-\relative c''' <<
-  { \voiceOne g4 ~  \stemDown g32[ f( es d c b a b64 )g] } \\
-  { \voiceThree  b4} \\
-  { \voiceFive d,} \\
-  { \voiceTwo g,}
->>
-@end lilypond
-
+@node Collision resolution
+@unnumberedsubsubsec Collision resolution
 
-@node Collision Resolution
-@unnumberedsubsubsec Collision Resolution
+@cindex Merging noteheads
 
 Normally, note heads with a different number of dots are not
 merged, but when the object property
@@ -171,6 +163,22 @@ move the top @code{g} out of the column, and
 >>
 @end lilypond
 
+In some instances of complex polyphonic music, you may need
+additional voices to avoid collisions between notes.  Additional
+voices are added by defining an variable, as shown below:
+
+@lilypond[quote,verbatim,ragged-right,relative=2]
+voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
+
+\relative c''' <<
+  { \voiceOne g4 ~  \stemDown g32[ f( es d c b a b64 )g] } \\
+  { \voiceThree  b4} \\
+  { \voiceFive d,} \\
+  { \voiceTwo g,}
+>>
+@end lilypond
+
+
 
 @refcommands
 
@@ -185,6 +193,19 @@ move the top @code{g} out of the column, and
 @funindex \voiceFour
 @code{\voiceFour}.
 
+@funindex \voiceNeutralStyle
+@funindex \voiceOneStyle
+@funindex \voiceTwoStyle
+@funindex \voiceThreeStyle
+@funindex \voiceFourStyle
+@example
+\voiceNeutralStyle
+\voiceOneStyle
+\voiceTwoStyle
+\voiceThreeStyle
+\voiceFourStyle
+@end example
+
 @funindex \shiftOn
 @code{\shiftOn},
 @funindex \shiftOnn
@@ -218,7 +239,9 @@ override typesetting decisions.
 
 @seealso
 
-Program reference: the objects responsible for resolving
+Snippets: @lsrdir{simultaneous}
+
+Internals Reference: the objects responsible for resolving
 collisions are @internalsref{NoteCollision} and
 @internalsref{RestCollision}.
 
@@ -316,7 +339,9 @@ has no effect on the pitches of @var{musicexpr1} and
 
 @seealso
 
-Program reference: @internalsref{PartCombineMusic}.
+Snippets: @lsrdir{simultaneous}
+
+Internals Reference: @internalsref{PartCombineMusic}.
 
 @refbugs
 
@@ -403,5 +428,7 @@ music = {
 }
 @end lilypond
 
+@seealso
 
+Snippets: @lsrdir{simultaneous}