Merge branch 'master' of git://git.sv.gnu.org/lilypond.git into td-lily

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

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index 707655a48ba98d5bbcf0318827a8485461339a45..0b9b14c57648869eecc48f0456b5ef4db6c89c29 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -6,11 +6,12 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
+@c \version "2.11.38"
+
 @node Simultaneous notes
 @section Simultaneous notes
 
-@lilypondfile[quote,ragged-right,line-width=16\cm,staffsize=16]
-{simultaneous-headword.ly}
+@lilypondfile[quote]{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
@@ -31,66 +32,86 @@ than one voice on the same staff.
 @end menu
 
 @node Chorded notes
-@unnumberedsubsubsec Chorded notes
+@subsubsection Chorded notes
 
-@cindex Chords
+@cindex chords
+@cindex brackets, angle
+@funindex <
+@funindex >
+@funindex <...>
 
-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
+A chord is formed by a enclosing a set of pitches between @code{<} and
+@code{>}.  A chord may be followed by a duration and/or a set of
 articulations, just like simple notes:
 
 @lilypond[verbatim,ragged-right,fragment,quote,relative=1]
-<c e g>4 <c>8
+<c e g>1 <c e g>->
 @end lilypond
 
-For more information about chords, see @ref{Introducing chord
-names}.
+For more information about chords, see @ref{Modern chords}.
 
 @seealso
 
-Music Glossary: @rglos{chord}.
+Music Glossary:
+@rglos{chord}.
+
+Learning Manual:
+@rlearning{Combining notes into chords}.
 
-Notation Reference: @ref{Introducing chord names}.
+Notation Reference:
+@ref{Modern chords}.
 
-Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
+Snippets:
+@lsrdir{Simultaneous,Simultaneous-notes}.
 
-@refbugs
+@knownissues
 
 Music expressions like @code{<< @{ g8 e8 @} a4 >>} are not printed
 accurately.  Use @code{<g a>8 <e a>8} instead.
 
 
-
 @node Clusters
-@unnumberedsubsubsec Clusters
+@subsubsection Clusters
 
 @cindex cluster
+@funindex \makeClusters
 
-A cluster indicates a continuous range of pitches to be played.
-They can be denoted as the envelope of a set of notes.  They are
-entered by applying the function @code{makeClusters} to a sequence
-of chords, e.g.,
+A cluster indicates a continuous range of pitches to be played.  They
+can be denoted as the envelope of a set of notes.  They are entered by
+applying the function @code{\makeClusters} to a sequence of chords,
+e.g.,
 
 @lilypond[quote,ragged-right,relative=2,fragment,verbatim]
-\makeClusters { <c e > <b f'> }
+\makeClusters { <g b>2 <c g'> }
 @end lilypond
 
 Ordinary notes and clusters can be put together in the same staff,
 even simultaneously.  In such a case no attempt is made to
-automatically avoid collisions between ordinary notes and
-clusters.
+automatically avoid collisions between ordinary notes and clusters.
 
 @seealso
 
-Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
+Music Glossary:
+@rglos{cluster}.
 
-Internals Reference: @internalsref{ClusterSpanner},
+Snippets:
+@lsrdir{Simultaneous,Simultaneous-notes}.
+
+Internals Reference:
+@internalsref{ClusterSpanner},
 @internalsref{ClusterSpannerBeacon},
 @internalsref{Cluster_spanner_engraver}.
 
-Examples: @c @lsr{contemporary,cluster@/.ly}.
+@c Examples: @lsr{contemporary,cluster@/.ly}.
+
+@knownissues
 
+Clusters only look good if they span at least two chords; otherwise
+they appear too narrow.
 
+Clusters do not have a stem and can not indicate durations by
+themselves.  Separate clusters would need a separating rest between
+them.
 
 @node Multiple voices
 @subsection Multiple voices
@@ -102,7 +123,7 @@ Examples: @c @lsr{contemporary,cluster@/.ly}.
 @end menu
 
 @node Collision resolution
-@unnumberedsubsubsec Collision resolution
+@subsubsection Collision resolution
 
 @cindex merging notes
 @cindex note collisions
@@ -191,7 +212,7 @@ voiceFive = #(context-spec-music (make-voice-props-set 4) 'Voice)
 
 
 
-@refcommands
+@predefined
 
 @funindex \oneVoice
 @code{\oneVoice},
@@ -250,14 +271,16 @@ override typesetting decisions.
 
 @seealso
 
-Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
+Snippets:
+@lsrdir{Simultaneous,Simultaneous-notes}.
 
-Internals Reference: the objects responsible for resolving
-collisions are @internalsref{NoteCollision} and
+Internals Reference: the objects responsible for resolving collisions
+are
+@internalsref{NoteCollision} and
 @internalsref{RestCollision}.
 
 
-@refbugs
+@knownissues
 
 When using @code{merge-differently-headed} with an upstem eighth
 or a shorter note, and a downstem half note, the eighth note gets
@@ -270,7 +293,7 @@ cluster notation (see @ref{Clusters}).
 
 
 @node Automatic part combining
-@unnumberedsubsubsec Automatic part combining
+@subsubsection Automatic part combining
 @cindex automatic part combining
 @cindex part combiner
 @cindex combining parts
@@ -351,13 +374,17 @@ has no effect on the pitches of @var{musicexpr1} and
 
 @seealso
 
-Music Glossary: @rglos{a due}.
+Music Glossary:
+@rglos{a due}.
 
-Snippets: @lsrdir{Simultaneous,Simultaneous-notes}.
+Snippets:
+@lsrdir{Simultaneous,Simultaneous-notes}.
 
-Internals Reference: @internalsref{PartCombineMusic}, @internalsref{Voice}.
+Internals Reference:
+@internalsref{PartCombineMusic},
+@internalsref{Voice}.
 
-@refbugs
+@knownissues
 
 When @code{printPartCombineTexts} is set, if the two voices play
 the same notes on and off, the part combiner may typeset @code{a2}
@@ -375,7 +402,7 @@ events in those will be ignored.
 
 
 @node Writing music in parallel
-@unnumberedsubsubsec Writing music in parallel
+@subsubsection Writing music in parallel
 
 @cindex Writing music in parallel
 @cindex Interleaved music
@@ -444,5 +471,6 @@ music = {
 
 @seealso
 
-Snippets: @lsrdir{Simultaneous,Simultaneous-notes}
+Snippets:
+@lsrdir{Simultaneous,Simultaneous-notes}.