(do_shift): also do nothing for the (0,2)

case.

diff --git a/ChangeLog b/ChangeLog
index 96c808f64997f58d594f49cac165b2500e47d499..b9a2b11b81fa574517dc60bd5c593aa6d43f2955 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-19  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/rest-collision.cc (do_shift): also do nothing for the (0,2)
+       case.
+
 2004-05-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * scm/stencil.scm (fontify-text): reinstate function

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 490f17fbc6c90ac3a4f1a2ec716bbb8ba62dbe3d..98151137c36894baa568dfc7f045cb09118d08ae 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -150,7 +150,8 @@ Rest_collision::do_shift (Grob *me)
        ordered_rests[d].sort (Note_column::shift_compare);
       } while (flip (&d) != LEFT);
       
-      if (ordered_rests[UP].size () + ordered_rests[DOWN].size () < 2)
+      if (ordered_rests[UP].size () < 1
+         || ordered_rests[DOWN].size () < 1)
        return SCM_UNSPECIFIED;
 
       Grob *common = common_refpoint_of_array (ordered_rests[DOWN], me, Y_AXIS);