CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/11 06:22:47
Modified files:
. : ChangeLog
lily : hara-kiri-group-spanner.cc
Log message:
(consider_suicide): only
consider break index for broken spanner.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4171&tr2=1.4172&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/hara-kiri-group-spanner.cc.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4171 lilypond/ChangeLog:1.4172
--- lilypond/ChangeLog:1.4171 Mon Oct 10 22:38:11 2005
+++ lilypond/ChangeLog Tue Oct 11 06:22:46 2005
@@ -1,5 +1,8 @@
2005-10-11 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/hara-kiri-group-spanner.cc (consider_suicide): only
+ consider break index for broken spanner.
+
* scm/define-markup-commands.scm (wordwrap-string): remove \r
characters from string before splitting.
Index: lilypond/lily/hara-kiri-group-spanner.cc
diff -u lilypond/lily/hara-kiri-group-spanner.cc:1.40
lilypond/lily/hara-kiri-group-spanner.cc:1.41
--- lilypond/lily/hara-kiri-group-spanner.cc:1.40 Sat Aug 13 21:35:23 2005
+++ lilypond/lily/hara-kiri-group-spanner.cc Tue Oct 11 06:22:47 2005
@@ -9,6 +9,7 @@
#include "hara-kiri-group-spanner.hh"
+#include "paper-column.hh"
#include "pointer-group-interface.hh"
#include "axis-group-interface.hh"
#include "spanner.hh"
@@ -36,8 +37,11 @@
if (worth.size ())
return;
- if (!to_boolean (me->get_property ("remove-first"))
- && broken_spanner_index (sp) == 0)
+ bool remove_first = to_boolean (me->get_property ("remove-first"));
+ if (!remove_first
+ && ((sp->original_ && broken_spanner_index (sp) == 0)
+ || Paper_column::get_rank (sp->get_bound (LEFT)->get_column ())
+ == 0))
return;
Link_array<Grob> childs;
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
