* 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 f8cbc8df83f26baef56803134ea0127ca2d10608..10d4213554b4b9e365c9ab998294f74bf6602377 100644 (file)
--- 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 26c5a43c55a4d12bd419c5e09b0b97165434f11f..25d83222a1eba14af42c86c74231d0673bd2c770 100644 (file)
--- 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 a2ca3ab4171702e3669083609c5a5683e2e8d111..dff2bb87cf20f065e02be937887c326c819e6035 100644 (file)
--- 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))))