From b293d52db585ff2cf8af5504b959a44cb85d2397 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 11 Oct 2005 06:22:47 +0000 Subject: [PATCH] (consider_suicide): only consider break index for broken spanner. --- ChangeLog | 3 +++ lily/hara-kiri-group-spanner.cc | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b710c225d5..bbb56f585b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-10-11 Han-Wen Nienhuys + * 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. diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index 28043337ff..f824a2a8cb 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -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 @@ Hara_kiri_group_spanner::consider_suicide (Grob *me) 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 childs; -- 2.39.5