(do_shift): handle (0-down, 2-up) case

too.

diff --git a/ChangeLog b/ChangeLog
index da56d0fe14469afaf0c032affed741e7926f4b50..91680825d51bca455aa06afeff18348f125808b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
+2004-05-19  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/rest-collision.cc (do_shift): handle (0-down, 2-up) case
+       too.
+
 2004-05-04  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/ottava-bracket.cc (print): fix ottava on rests.
 
 2004-05-03  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * VERSION: release 2.2.1
+       
        * scm/music-functions.scm (set-accidental-style): use GrandStaff
        iso. PianoStaff.
 

diff --git a/lily/identifier-smob.cc b/lily/identifier-smob.cc
index 678cc4a8d076183efeb835a68d3215a62f0a9604..49a33024004827b2b17f90f21064a6157c74e179 100644 (file)
--- a/lily/identifier-smob.cc
+++ b/lily/identifier-smob.cc
@@ -31,7 +31,7 @@ print_box (SCM b, SCM port, scm_print_state *)
 
 /* This defines the primitve `make-box', which returns a new smob of
    type `box', initialized to `#f'.  */
-LY_DEFINE (package_identifier, "ly:export", 1,0,0, (SCM arg),
+LY_DEFINE (package_identifier, "ly:export", 1, 0, 0, (SCM arg),
          "Export a Scheme object to the parser, so it is treated as an identifier.")
 {
   /* This macro creates the new objects, stores the value `#f' into it

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index c815db634efbd875f3576f7969c4a969f54b4d76..f97150bcc0c3724d28191900879be3eda12e23fa 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);