Split WWW target in two stages WWW-1 and WWW-2

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

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index c1eb057773ec321edc6c3e3e88377fd2d46a6039..a9f4d88ed9c65fb7720caab326a248dafbea3938 100644 (file)
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -104,8 +104,6 @@ Internals Reference:
 @rinternals{ClusterSpannerBeacon},
 @rinternals{Cluster_spanner_engraver}.
 
-@c Examples: @rlsr{contemporary,cluster@/.ly}.
-
 @knownissues
 
 Clusters only look good if they span at least two chords; otherwise
@@ -140,24 +138,14 @@ Note heads with equal durations are automatically merged, while
 note heads with unequal durations are not merged.  Rests opposite
 a stem are shifted vertically.
 
-@c   old material to delete, I think.  -gp
-@c Normally, equal note heads with the same number of dots and the same
-@c note head are automatically merged, while note heads with different note
-@c heads and/or a different number of dots are not.
-@c The following example
-@c has two cases of this, plus an undesired merging (the half-note head
-@c @code{e} is solid):
-@c Note that LilyPond has vertically shifted the rest, which is opposite
-@c of a stem.
-
 @lilypond[quote,verbatim,relative=2]
 <<
   {
-    c8 d e d c d e4
-    g2 fis
+    c8 d e d c d c4
+    g'2 fis
   } \\ {
-    c2 c8. b16 a4
-    e2 r
+    c2 c8. b16 c4
+    e,2 r
   } \\ {
     \oneVoice
     s1
@@ -166,20 +154,18 @@ a stem are shifted vertically.
 >>
 @end lilypond
 
-Note heads with different note heads may be merged:
-@c First we will merge the initial half note head with the eighth
-@c note by setting the @code{merge-differently-headed} property of the
-@c @code{NoteCollision} object:
+Note heads with different note heads may be merged, with the exception
+of half-note heads and quarter-note heads:
 
 @lilypond[quote,verbatim,relative=2]
 <<
   {
     \override Staff.NoteCollision #'merge-differently-headed = ##t
-    c8 d e d c d e4
-    g2 fis
+    c8 d e d c d c4
+    g'2 fis
   } \\ {
-    c2 c8. b16 a4
-    e2 r
+    c2 c8. b16 c4
+    e,2 r
   } \\ {
     \oneVoice
     s1
@@ -189,18 +175,17 @@ Note heads with different note heads may be merged:
 @end lilypond
 
 Note heads with different dots may be merged:
-@c Similarly, you can merge differently dotted note heads:
 
 @lilypond[quote,relative=2,verbatim]
 <<
   {
     \override Staff.NoteCollision #'merge-differently-headed = ##t
     \override Staff.NoteCollision #'merge-differently-dotted = ##t     
-    c8 d e d c d e4
-    g2 fis
+    c8 d e d c d c4
+    g'2 fis
   } \\ {
-    c2 c8. b16 a4
-    e2 r
+    c2 c8. b16 c4
+    e,2 r
   } \\ {
     \oneVoice
     s1
@@ -224,23 +209,23 @@ column, and @code{merge-differently-headed} works properly.
   {
     \override Staff.NoteCollision #'merge-differently-headed = ##t
     \override Staff.NoteCollision #'merge-differently-dotted = ##t     
-    c8 d e d c d e4
+    c8 d e d c d c4
     \shiftOn
-    g2 fis
+    g'2 fis
   } \\ {
-    c2 c8. b16 a4
-    e2 r
+    c2 c8. b16 c4
+    e,2 r
   } \\ {
     \oneVoice
     s1
     e8 a b c d2
   }
+
 >>
 @end lilypond
 
-Merging notes by setting @code{merge-differently-headed} and
-@code{merge-differently-dotted} only works for opposing stem
-directions (i.e., to @code{Voice}s 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