From: hanwen <hanwen>
Date: Sun, 10 Oct 2004 20:09:08 +0000 (+0000)
Subject: * scm/part-combiner.scm (determine-split-list): reinstate
X-Git-Tag: release/2.3.24^2~53
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=448cb032f4bd9b7d6e39eada5e5655e4e9d92ac4;p=lilypond.git

* scm/part-combiner.scm (determine-split-list): reinstate
playing+resting case.

* lily/slur-scoring.cc (move_away_from_staffline): new function.
(get_base_attachments): move away attachment point for breaks
similar to attachment points on slurs (staffline collision, and
half a space of padding)
---

diff --git a/ChangeLog b/ChangeLog
index f8cbc8df83..10d4213554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* scm/part-combiner.scm (determine-split-list): reinstate
+	playing+resting case. 
+
 	* Documentation/user/invoking.itely (Reporting bugs): rename.
 
 	* lily/lexer.ll (Lily_lexer): bump version req to 2.3.22.
diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 26c5a43c55..25d83222a1 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -189,7 +189,7 @@ this and other documentation.
 @include introduction.itely 
 @include tutorial.itely
 @include examples.itely
-@include invoking.itely
+@include invoking.itelyi
 @include notation.itely
 @include sound-output.itexi
 @include changing-defaults.itely
diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm
index a2ca3ab417..dff2bb87cf 100644
--- a/scm/part-combiner.scm
+++ b/scm/part-combiner.scm
@@ -259,6 +259,7 @@ Only set if not set previously.
 			       ly:pitch<?)))
 	  (cond ((> (length notes1) 1) (put 'apart))
 		((> (length notes2) 1) (put 'apart))
+		((= 1 (+ (length notes2) (length notes1))) (put 'apart))
 		((and (= (length durs1) 1)
 		      (= (length durs2) 1)
 		      (not (equal? (car durs1) (car durs2))))