Merge branch 'master' of ssh://jneem@git.sv.gnu.org/srv/git/lilypond into tmp

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

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index f224fa479ec01e2559aa1b1b94ffc47be099d927..387de711a2e833cacc3dc5503d08a31381ea6444 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -63,8 +63,8 @@ pitch is the @emph{first} pitch of the preceding chord.
 
 For more information about chords, see @ref{Chord notation}.
 
-@seealso
 
+@seealso
 Music Glossary:
 @rglos{chord}.
 
@@ -77,6 +77,7 @@ Notation Reference:
 Snippets:
 @rlsr{Simultaneous notes}.
 
+
 @node Simultaneous expressions
 @unnumberedsubsubsec Simultaneous expressions
 
@@ -137,8 +138,8 @@ 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.
 
-@seealso
 
+@seealso
 Music Glossary:
 @rglos{cluster}.
 
@@ -150,6 +151,7 @@ Internals Reference:
 @rinternals{ClusterSpannerBeacon},
 @rinternals{Cluster_spanner_engraver}.
 
+
 @knownissues
 
 Clusters look good only if they span at least two chords; otherwise
@@ -322,16 +324,17 @@ them in a simple simultaneous music construct within an explicit voice:
 This method leads to strange beamings and warnings if the pieces of
 music do not have the same rhythm.
 
-@predefined
 
+@predefined
 @code{\voiceOne},
 @code{\voiceTwo},
 @code{\voiceThree},
 @code{\voiceFour},
 @code{\oneVoice}.
+@endpredefined
 
-@seealso
 
+@seealso
 Learning Manual:
 @rlearning{Voices contain music},
 @rlearning{Explicitly instantiating voices}.
@@ -374,18 +377,17 @@ easily identified:
 The @code{\voiceNeutralstyle} command is used to revert to the
 standard presentation.
 
-@predefined
-
 
+@predefined
 @code{\voiceOneStyle},
-
 @code{\voiceTwoStyle},
 @code{\voiceThreeStyle},
 @code{\voiceFourStyle},
 @code{\voiceNeutralStyle}.
+@endpredefined
 
-@seealso
 
+@seealso
 Learning Manual:
 @rlearning{I'm hearing Voices},
 @rlearning{Other sources of information}.
@@ -528,7 +530,6 @@ Notes are only merged if they have opposing stem directions (e.g. in
 
 
 @predefined
-
 @code{\mergeDifferentlyDottedOn},
 @code{\mergeDifferentlyDottedOff},
 @code{\mergeDifferentlyHeadedOn},
@@ -538,6 +539,8 @@ Notes are only merged if they have opposing stem directions (e.g. in
 @code{\shiftOnn},
 @code{\shiftOnnn},
 @code{\shiftOff}.
+@endpredefined
+
 
 @snippets
 
@@ -547,8 +550,8 @@ Notes are only merged if they have opposing stem directions (e.g. in
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {forcing-horizontal-shift-of-notes.ly}
 
-@seealso
 
+@seealso
 Music Glossary:
 @rglos{polyphony}.
 
@@ -565,6 +568,7 @@ Internals Reference:
 @rinternals{NoteCollision},
 @rinternals{RestCollision}.
 
+
 @knownissues
 
 When using @code{\mergeDifferentlyHeadedOn} with an upstem eighth
@@ -671,8 +675,8 @@ has no effect on the pitches of @var{musicexpr1} and
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {changing-partcombine-texts.ly}
 
-@seealso
 
+@seealso
 Music Glossary:
 @rglos{a due},
 @rglos{part}.
@@ -687,9 +691,10 @@ Internals Reference:
 @rinternals{PartCombineMusic},
 @rinternals{Voice}.
 
+
 @knownissues
 
-@code{\partcombine} can only accept two voices. 
+@code{\partcombine} can only accept two voices.
 
 When @code{printPartCombineTexts} is set, if the two voices play
 the same notes on and off, the part combiner may typeset @code{a2}
@@ -823,8 +828,8 @@ global = {
 }
 @end lilypond
 
-@seealso
 
+@seealso
 Learning Manual:
 @rlearning{Organizing pieces with variables}.