CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/17 15:49:37
Modified files:
. : ChangeLog THANKS
lily : note-collision.cc
Log message:
(check_meshing_chords): don't wipe
stencil, merely set transparent.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4188&tr2=1.4189&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/THANKS.diff?tr1=1.157&tr2=1.158&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/note-collision.cc.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4188 lilypond/ChangeLog:1.4189
--- lilypond/ChangeLog:1.4188 Mon Oct 17 15:34:53 2005
+++ lilypond/ChangeLog Mon Oct 17 15:49:36 2005
@@ -1,5 +1,8 @@
2005-10-17 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * 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.
Index: lilypond/THANKS
diff -u lilypond/THANKS:1.157 lilypond/THANKS:1.158
--- lilypond/THANKS:1.157 Fri Oct 14 14:02:56 2005
+++ lilypond/THANKS Mon Oct 17 15:49:36 2005
@@ -25,6 +25,7 @@
Henrik Frisk
Jay Hamilton
Jamie Bullock
+John Mandereau
D. Josiah Boothby
Kieren MacMillan
Kris Shaffer
Index: lilypond/lily/note-collision.cc
diff -u lilypond/lily/note-collision.cc:1.57
lilypond/lily/note-collision.cc:1.58
--- lilypond/lily/note-collision.cc:1.57 Sun Oct 16 01:06:19 2005
+++ lilypond/lily/note-collision.cc Mon Oct 17 15:49:37 2005
@@ -214,7 +214,6 @@
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 @@
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
{
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
