summaryrefslogtreecommitdiff
path: root/lily
diff options
context:
space:
mode:
authorDavid Kastrup <dak@gnu.org>2016-06-19 16:37:43 +0200
committerDavid Kastrup <dak@gnu.org>2016-07-04 10:01:56 +0200
commit6acce8f4c900bee88c85a45b9ed1b29983891469 (patch)
treed8649762a5acdc1bfd6922da3d506765ad4b509e /lily
parent369988ff777e4cec3228ee02a77f11e154cc842b (diff)
Issue 4906/6: Use ADD_END_ACKNOWLEDGER_FOR in slur engravers
Diffstat (limited to 'lily')
-rw-r--r--lily/include/slur-engraver.hh1
-rw-r--r--lily/phrasing-slur-engraver.cc2
-rw-r--r--lily/slur-engraver.cc8
3 files changed, 2 insertions, 9 deletions
diff --git a/lily/include/slur-engraver.hh b/lily/include/slur-engraver.hh
index 705ec597e8..572e7ea023 100644
--- a/lily/include/slur-engraver.hh
+++ b/lily/include/slur-engraver.hh
@@ -50,7 +50,6 @@ protected:
void acknowledge_note_column (Grob_info);
void acknowledge_script (Grob_info);
- void acknowledge_end_tie (Grob_info);
void listen_note (Stream_event *ev);
// A slur on an in-chord note is not actually announced as an event
diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 556ef092ad..18f20f5430 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -79,7 +79,7 @@ Phrasing_slur_engraver::boot ()
ADD_ACKNOWLEDGER (Phrasing_slur_engraver, script);
ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, dots);
ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, text_script);
- ADD_END_ACKNOWLEDGER (Phrasing_slur_engraver, tie);
+ ADD_END_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, tie);
ADD_ACKNOWLEDGER_FOR (Phrasing_slur_engraver, extra_object, tuplet_number);
}
diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index f87e541ab0..1a06ca6422 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -74,7 +74,7 @@ Slur_engraver::boot ()
ADD_ACKNOWLEDGER (Slur_engraver, script);
ADD_ACKNOWLEDGER_FOR (Slur_engraver, extra_object, text_script);
ADD_ACKNOWLEDGER_FOR (Slur_engraver, extra_object, dots);
- ADD_END_ACKNOWLEDGER (Slur_engraver, tie);
+ ADD_END_ACKNOWLEDGER_FOR (Slur_engraver, extra_object, tie);
ADD_ACKNOWLEDGER_FOR (Slur_engraver, extra_object, tuplet_number);
}
@@ -178,12 +178,6 @@ Slur_engraver::acknowledge_script (Grob_info info)
}
void
-Slur_engraver::acknowledge_end_tie (Grob_info info)
-{
- acknowledge_extra_object (info);
-}
-
-void
Slur_engraver::finalize ()
{
for (vsize i = 0; i < slurs_.size (); i++)