From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 17 Oct 2005 15:49:37 +0000 (+0000)
Subject: (check_meshing_chords): don't wipe
X-Git-Tag: release/2.7.13~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=11816bfa82647652f10acefb44ea53f793c4cc50;p=lilypond.git

(check_meshing_chords): don't wipe
stencil, merely set transparent.
---

diff --git a/ChangeLog b/ChangeLog
index 1d794b1680..0959ed0449 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* lily/note-collision.cc (check_meshing_chords): don't wipe
+	stencil, merely set transparent.
+
 	* Documentation/topdocs/NEWS.tely (Top): mention John Mandereau. 
 	(Top): document #'callbacks.
 	(Top): document nested \override.
diff --git a/THANKS b/THANKS
index 3495c595f7..fc9b0ad770 100644
--- a/THANKS
+++ b/THANKS
@@ -25,6 +25,7 @@ Aaron Mehl
 Henrik Frisk
 Jay Hamilton
 Jamie Bullock
+John Mandereau
 D. Josiah Boothby
 Kieren MacMillan
 Kris Shaffer
diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 132dccdcae..e80d21ff7d 100644
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -214,7 +214,6 @@ check_meshing_chords (Grob *me,
       if (wipe_ball && wipe_ball->is_live ())
 	{
 	  wipe_ball->set_property ("transparent", SCM_BOOL_T);
-	  wipe_ball->set_property ("stencil", SCM_EOL);
 	}
     }
   /* TODO: these numbers are magic; should devise a set of grob props
@@ -275,10 +274,22 @@ Note_collision_interface::calc_positioning_done (SCM smob)
   Grob *me = unsmob_grob (smob);  
   Drul_array<Link_array<Grob> > cg = get_clash_groups (me);
 
+  Direction d = UP;
+  do
+    {
+      for (int i = cg[d].size(); i--; )
+	{
+	  /*
+	    Trigger positioning
+	   */
+	  cg[d][i]->extent (me, X_AXIS);
+	}
+    }
+  while (flip (&d) != UP);
+
   SCM autos (automatic_shift (me, cg));
   SCM hand (forced_shift (me));
 
-  Direction d = UP;
   Real wid = 0.0;
   do
     {