From: hanwen <hanwen>
Date: Thu, 15 Jan 2004 18:59:09 +0000 (+0000)
Subject: * lily/beam.cc (rest_collision_callback): don't move anything if
X-Git-Tag: release/2.1.10~8
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1aa29b62561f1cbe0e7d6b0c2f2eb8067a166f5a;p=lilypond.git

* lily/beam.cc (rest_collision_callback): don't move anything if
staff-position is set.

* input/regression/rest-pitch.ly (texidoc): add rest under beam.
---

diff --git a/ChangeLog b/ChangeLog
index 66d7b6f78d..3262ef9298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-01-15  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* lily/beam.cc (rest_collision_callback): don't move anything if
+	staff-position is set.
+
+	* input/regression/rest-pitch.ly (texidoc): add rest under beam.
+
 	* lily/system.cc (typeset_grob): warn if adding twice.
 
 	* lily/sequential-iterator.cc (run_always): implement run_always().
diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly
index 00ddc14703..61f38fffc4 100644
--- a/input/regression/rest-pitch.ly
+++ b/input/regression/rest-pitch.ly
@@ -15,7 +15,10 @@ collision will leave it alone."
    a4\rest b4\rest c4\rest
 
 <<d \\  d\rest^"rest pitch" >>
-<<d \\  r>> 
+<<d \\  r>>
+  c16 [ d r e] 
+  c16 [ d e\rest^"rest pitch" e] 
+  
 }
 }
 
diff --git a/lily/beam.cc b/lily/beam.cc
index 03daef5faa..7cb3901635 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -1423,6 +1423,9 @@ Beam::rest_collision_callback (SCM element_smob, SCM axis)
 {
   Grob *rest = unsmob_grob (element_smob);
   Axis a = (Axis) gh_scm2int (axis);
+
+  if (gh_number_p (rest->get_grob_property ("staff-position")))
+    return gh_int2scm (0);
   
   assert (a == Y_AXIS);
 
diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 776d4baaa6..31a83715db 100644
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -141,7 +141,6 @@ Rest_collision::do_shift (Grob *me)
 	  for (; i > display_count; i--)
 	    {
 	      Grob* r = unsmob_grob (rests[i-1]->get_grob_property ("rest"));
-#if 1
 	      if (r)
 		{
 		  Grob * d = unsmob_grob (r->get_grob_property ("dot"));
@@ -150,16 +149,6 @@ Rest_collision::do_shift (Grob *me)
 		  r->suicide ();
 		}
 	      rests[i-1]->suicide ();
-#else
-	      if (r)
-		{
-		  
-		  r->set_grob_property ("transparent", gh_bool2scm(1));
-		  r = unsmob_grob (r->get_grob_property ("dot"));
-		  if (r)
-		    r->set_grob_property ("transparent", gh_bool2scm(1));
-		}
-#endif
 	    }
 	}
       else