From: Graham Percival <graham@percival-music.ca>
Date: Fri, 9 May 2008 02:12:28 +0000 (-0700)
Subject: Update from Francisco
X-Git-Tag: release/2.11.46-1~19^2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d1125121c32af7325b4d0dd5a6a540fce59f9f14;p=lilypond.git

Update from Francisco
---

diff --git a/Documentation/user/simultaneous.itely b/Documentation/user/simultaneous.itely
index d3ced60a1c..399e86bd43 100644
--- a/Documentation/user/simultaneous.itely
+++ b/Documentation/user/simultaneous.itely
@@ -370,9 +370,6 @@ has no effect on the pitches of @var{musicexpr1} and
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,texidoc]
-{combining-two-parts-on-the-same-staff.ly}
-
 Parts may be merged without printing text:
 
 @lilypond[quote,verbatim,ragged-right]
@@ -410,6 +407,7 @@ Notation Reference:
 Snippets:
 @rlsr{Simultaneous notes}.
 
+
 Internals Reference:
 @rinternals{PartCombineMusic},
 @rinternals{Voice}.
@@ -469,13 +467,13 @@ music = {
     % Bar 1 
     a'8 b'      c'' d''   |
     d'4         e'        |
-    c16 d e f   d e f g   |
+    c16 d e fis d e fis g |
     a,4         a,4       |
 
     % Bar 2
-    e''8 f''    g'' a''   |
-    f'4         g'        |
-    e16 f g a   f g a b   |
+    e''8 fis''  g'' a''   |
+    fis'4       g'        |
+    e16 fis g a fis g a b |
     a,4         a,4       |
 
     % Bar 3 ...