From 28d625823361e2fe5ed8cbf927f5fa1ae61f714d Mon Sep 17 00:00:00 2001 From: hanwen Date: Tue, 11 Oct 2005 09:15:02 +0000 Subject: [PATCH] (consider_suicide): backport: only consider break_index for broken spanner. --- ChangeLog | 5 +++++ lily/hara-kiri-group-spanner.cc | 13 ++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 358885b6ed..d4b8f5aacb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-11 Han-Wen Nienhuys + + * lily/hara-kiri-group-spanner.cc (consider_suicide): backport: + only consider break_index for broken spanner. + 2005-10-10 Han-Wen Nienhuys * stepmake/stepmake/python-module-rules.make diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index 22975589cb..909cff6a6d 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -13,6 +13,7 @@ #include "spanner.hh" #include "warn.hh" #include "item.hh" +#include "paper-column.hh" MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, y_extent, 2); SCM @@ -34,11 +35,13 @@ Hara_kiri_group_spanner::consider_suicide (Grob *me) if (scm_is_pair (worth)) return; - if (!to_boolean (me->get_property ("remove-first")) - && broken_spanner_index (sp) == 0) - { - return; - } + + 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 childs = Axis_group_interface::get_children (me); for (int i = 0; i < childs.size (); i++) -- 2.39.5