From d8bbcd9efe6032f976f864bf04aa00f85499834d Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 10 Oct 2004 18:53:05 +0000 Subject: [PATCH] (move_away_from_staffline): new function. (get_base_attachments): move away attachment point for breaks similar to attachment points on slurs (staffline collision, and half a space of padding) --- ChangeLog | 3 +++ lily/dynamic-engraver.cc | 7 +------ lily/phrasing-slur-engraver.cc | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48fd5c8325..af20b74b35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-10-10 Han-Wen Nienhuys + * lily/phrasing-slur-engraver.cc (acknowledge_grob): do something + with normal slurs too. + * lily/slur-scoring.cc (move_away_from_staffline): new function. (get_base_attachments): move away attachment point for breaks similar to attachment points on slurs (staffline collision, and diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 7ccabdc2ac..d9bdf7e94e 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -16,7 +16,6 @@ #include "hairpin.hh" #include "interval.hh" #include "item.hh" -#include "slur.hh" #include "note-column.hh" #include "paper-column.hh" #include "script-interface.hh" @@ -45,7 +44,6 @@ class Dynamic_engraver : public Engraver { Item *script_; Spanner *line_spanner_; - Spanner *slur_; Spanner *cresc_; Spanner *finished_line_spanner_; @@ -77,7 +75,6 @@ protected: Dynamic_engraver::Dynamic_engraver () { script_ = 0; - slur_ = 0; finished_cresc_ = 0; line_spanner_ = 0; finished_line_spanner_ = 0; @@ -424,8 +421,6 @@ Dynamic_engraver::acknowledge_grob (Grob_info info) < scm_to_int (script_->get_property ("script-priority"))) Side_position_interface::add_support (line_spanner_, info.grob_); } - else if (Slur::has_interface (info.grob_)) - slur_ = dynamic_cast (info.grob_); } ENTER_DESCRIPTION (Dynamic_engraver, @@ -437,6 +432,6 @@ ENTER_DESCRIPTION (Dynamic_engraver, /* creats*/ "DynamicLineSpanner DynamicText Hairpin TextSpanner", /* accepts */ "absolute-dynamic-event crescendo-event decrescendo-event", -/* acks */ "note-column-interface script-interface slur-interface", +/* acks */ "note-column-interface script-interface", /* reads */ "", /* write */ ""); diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 5b608f1fcb..5f11aaa486 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -87,6 +87,7 @@ Phrasing_slur_engraver::acknowledge_grob (Grob_info info) */ SCM inside = e->get_property ("inside-slur"); if (Tie::has_interface (e) + || Slur::has_interface (e) || to_boolean (inside)) { for (int i = slurs_.size (); i--; ) -- 2.39.5