(check_meshing_chords): don't wipe

stencil, merely set transparent.

diff --git a/ChangeLog b/ChangeLog
index 1d794b16805829fd0e971f535d03f5c4561a6783..0959ed04492e5aac4b6ec2b4e06fd5acef2479e1 100644 (file)
--- 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 3495c595f7b85ecc01c4e539175bd536203626ed..fc9b0ad7704e8177f8b05cf0fba239260aa257f6 100644 (file)
--- 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 132dccdcae0e423dec0efb56e05a54372bdb7edf..e80d21ff7d443fe7a8eee5ae72c600018010feb6 100644 (file)
--- 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
     {