From 5a9b380cf51c1898688fdcad673ddf76bea79b33 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Sat, 20 Jan 2007 12:34:47 +0200 Subject: [PATCH] --- lily/bar-number-engraver.cc | 7 +----- lily/dynamic-engraver.cc | 27 ----------------------- lily/include/volta-bracket.hh | 1 - lily/mark-engraver.cc | 7 +----- lily/metronome-engraver.cc | 3 --- lily/text-engraver.cc | 40 ---------------------------------- lily/text-spanner-engraver.cc | 16 -------------- lily/trill-spanner-engraver.cc | 16 -------------- lily/volta-bracket.cc | 6 ----- lily/volta-engraver.cc | 9 -------- 10 files changed, 2 insertions(+), 130 deletions(-) diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index f53cfd6f26..84ba60c83f 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -100,12 +100,7 @@ Bar_number_engraver::acknowledge_break_alignment (Grob_info inf) void Bar_number_engraver::stop_translation_timestep () { - if (text_) - { - text_->set_object ("side-support-elements", - grob_list_to_grob_array (get_property ("stavesFound"))); - text_ = 0; - } + text_ = 0; } void diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 8df7f8fccc..2104235387 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -63,10 +63,7 @@ class Dynamic_engraver : public Engraver void typeset_all (); TRANSLATOR_DECLARATIONS (Dynamic_engraver); - DECLARE_ACKNOWLEDGER (accidental); - DECLARE_ACKNOWLEDGER (stem_tremolo); DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (slur); DECLARE_TRANSLATOR_LISTENER (absolute_dynamic); DECLARE_TRANSLATOR_LISTENER (span_dynamic); @@ -390,27 +387,6 @@ Dynamic_engraver::typeset_all () } } -void -Dynamic_engraver::acknowledge_accidental (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - -void -Dynamic_engraver::acknowledge_stem_tremolo (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - -void -Dynamic_engraver::acknowledge_slur (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - void Dynamic_engraver::acknowledge_note_column (Grob_info info) { @@ -449,10 +425,7 @@ Dynamic_engraver::acknowledge_note_column (Grob_info info) finished_cresc_->set_bound (RIGHT, info.grob ()); } -ADD_ACKNOWLEDGER (Dynamic_engraver, accidental); ADD_ACKNOWLEDGER (Dynamic_engraver, note_column); -ADD_ACKNOWLEDGER (Dynamic_engraver, slur); -ADD_ACKNOWLEDGER (Dynamic_engraver, stem_tremolo); ADD_TRANSLATOR (Dynamic_engraver, /* doc */ diff --git a/lily/include/volta-bracket.hh b/lily/include/volta-bracket.hh index 4cc75a6ba5..cc69660a42 100644 --- a/lily/include/volta-bracket.hh +++ b/lily/include/volta-bracket.hh @@ -16,7 +16,6 @@ public: DECLARE_GROB_INTERFACE(); DECLARE_SCHEME_CALLBACK (print, (SCM)); static void modify_edge_height (Spanner *); - static void add_column (Grob *, Grob *col); static void add_bar (Grob *me, Item *bar); }; diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 984eb687a0..1f4a0c3f72 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -91,12 +91,7 @@ Mark_engraver::acknowledge_break_alignment (Grob_info inf) void Mark_engraver::stop_translation_timestep () { - if (text_) - { - text_->set_object ("side-support-elements", - grob_list_to_grob_array (get_property ("stavesFound"))); - text_ = 0; - } + text_ = 0; mark_ev_ = 0; } diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index a663e57351..897948d88b 100644 --- a/lily/metronome-engraver.cc +++ b/lily/metronome-engraver.cc @@ -61,9 +61,6 @@ Metronome_mark_engraver::stop_translation_timestep () { Grob *mc = unsmob_grob (get_property ("currentMusicalColumn")); text_->set_parent (mc, X_AXIS); - text_->set_object ("side-support-elements", - grob_list_to_grob_array (get_property ("stavesFound"))); - text_ = 0; } } diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index c53cf3e4fd..14f519ec85 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -31,9 +31,6 @@ protected: void process_acknowledged (); DECLARE_TRANSLATOR_LISTENER (text_script); - DECLARE_ACKNOWLEDGER (stem_tremolo); - DECLARE_ACKNOWLEDGER (stem); - DECLARE_ACKNOWLEDGER (rhythmic_head); }; IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script); @@ -43,40 +40,6 @@ Text_engraver::listen_text_script (Stream_event *ev) evs_.push_back (ev); } -void -Text_engraver::acknowledge_rhythmic_head (Grob_info inf) -{ - for (vsize i = 0; i < texts_.size (); i++) - { - Grob *t = texts_[i]; - Side_position_interface::add_support (t, inf.grob ()); - - /* - ugh. - */ - if (Side_position_interface::get_axis (t) == X_AXIS - && !t->get_parent (Y_AXIS)) - t->set_parent (inf.grob (), Y_AXIS); - else if (Side_position_interface::get_axis (t) == Y_AXIS - && !t->get_parent (X_AXIS)) - t->set_parent (inf.grob (), X_AXIS); - } -} - -void -Text_engraver::acknowledge_stem (Grob_info inf) -{ - for (vsize i = 0; i < texts_.size (); i++) - Side_position_interface::add_support (texts_[i], inf.grob ()); -} - -void -Text_engraver::acknowledge_stem_tremolo (Grob_info info) -{ - for (vsize i = 0; i < texts_.size (); i++) - Side_position_interface::add_support (texts_[i], info.grob ()); -} - void Text_engraver::process_acknowledged () { @@ -119,9 +82,6 @@ Text_engraver::Text_engraver () { } -ADD_ACKNOWLEDGER (Text_engraver, stem); -ADD_ACKNOWLEDGER (Text_engraver, stem_tremolo); -ADD_ACKNOWLEDGER (Text_engraver, rhythmic_head); ADD_TRANSLATOR (Text_engraver, /* doc */ "Create text-scripts", /* create */ "TextScript", diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index 2ab6dd8d48..0b9f3e4a67 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -22,7 +22,6 @@ public: TRANSLATOR_DECLARATIONS (Text_spanner_engraver); protected: virtual void finalize (); - DECLARE_ACKNOWLEDGER (note_column); DECLARE_TRANSLATOR_LISTENER (text_span); void stop_translation_timestep (); void process_music (); @@ -82,20 +81,6 @@ Text_spanner_engraver::process_music () } } -void -Text_spanner_engraver::acknowledge_note_column (Grob_info info) -{ - Spanner *spans[2] ={span_, finished_}; - for (int i = 0; i < 2; i++) - { - if (spans[i]) - { - Side_position_interface::add_support (spans[i], info.grob ()); - add_bound_item (spans[i], info.grob ()); - } - } -} - void Text_spanner_engraver::typeset_all () { @@ -136,7 +121,6 @@ Text_spanner_engraver::finalize () } } -ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column); ADD_TRANSLATOR (Text_spanner_engraver, /* doc */ "Create text spanner from an event.", /* create */ "TextSpanner", diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc index 072f96623f..8e56784812 100644 --- a/lily/trill-spanner-engraver.cc +++ b/lily/trill-spanner-engraver.cc @@ -29,7 +29,6 @@ public: TRANSLATOR_DECLARATIONS (Trill_spanner_engraver); protected: virtual void finalize (); - DECLARE_ACKNOWLEDGER (note_column); DECLARE_TRANSLATOR_LISTENER (trill_span); void stop_translation_timestep (); void process_music (); @@ -88,20 +87,6 @@ Trill_spanner_engraver::process_music () } } -void -Trill_spanner_engraver::acknowledge_note_column (Grob_info info) -{ - Spanner *spans[2] ={span_, finished_}; - for (int i = 0; i < 2; i++) - { - if (spans[i]) - { - Side_position_interface::add_support (spans[i], info.grob ()); - add_bound_item (spans[i], info.grob ()); - } - } -} - void Trill_spanner_engraver::typeset_all () { @@ -141,7 +126,6 @@ Trill_spanner_engraver::finalize () } } -ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column); ADD_TRANSLATOR (Trill_spanner_engraver, /* doc */ "Create trill spanner from an event.", /* create */ "TrillSpanner", diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc index 49018d8adb..fb3cb12fc6 100644 --- a/lily/volta-bracket.cc +++ b/lily/volta-bracket.cc @@ -160,12 +160,6 @@ Volta_bracket_interface::add_bar (Grob *me, Item *b) add_bound_item (dynamic_cast (me), b); } -void -Volta_bracket_interface::add_column (Grob *me, Grob *c) -{ - Side_position_interface::add_support (me, c); -} - ADD_INTERFACE (Volta_bracket_interface, "Volta bracket with number", diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index 604c53c573..d7611535a7 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -33,7 +33,6 @@ protected: DECLARE_END_ACKNOWLEDGER (staff_symbol); DECLARE_ACKNOWLEDGER (staff_symbol); - DECLARE_ACKNOWLEDGER (note_column); DECLARE_ACKNOWLEDGER (bar_line); virtual void finalize (); @@ -175,13 +174,6 @@ Volta_engraver::process_music () } } -void -Volta_engraver::acknowledge_note_column (Grob_info i) -{ - if (volta_span_) - Volta_bracket_interface::add_column (volta_span_, i.grob ()); -} - void Volta_engraver::acknowledge_bar_line (Grob_info i) { @@ -255,7 +247,6 @@ Volta_engraver::stop_translation_timestep () */ ADD_ACKNOWLEDGER (Volta_engraver, staff_symbol); ADD_END_ACKNOWLEDGER (Volta_engraver, staff_symbol); -ADD_ACKNOWLEDGER (Volta_engraver, note_column); ADD_ACKNOWLEDGER (Volta_engraver, bar_line); ADD_TRANSLATOR (Volta_engraver, /* doc */ "Make volta brackets.", -- 2.39.5