From: Graham Percival Date: Thu, 29 May 2008 06:54:13 +0000 (-0700) Subject: Update from Francisco. X-Git-Tag: release/2.11.48-1~23 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b2e838f8a778e03c9a130d121acd534207513b36;p=lilypond.git Update from Francisco. --- diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely index c1eb057773..6f8b2c5557 100644 --- a/Documentation/user/simultaneous.itely +++ b/Documentation/user/simultaneous.itely @@ -153,11 +153,11 @@ a stem are shifted vertically. @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 @@ -175,11 +175,11 @@ Note heads with different note heads may be merged: << { \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 @@ -196,11 +196,11 @@ Note heads with different dots may be merged: { \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,17 +224,18 @@ 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