(no commit message)

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index f53cfd6f269075b54109c39e6eebac3d27dbc48d..84ba60c83f60d0187f7b3a000a09423d7a3be1d5 100644 (file)
--- 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 8df7f8fccc0b39e840c38f7ccbcdf58c2c6daca2..2104235387883f64c54380d22a63c7d9b1a797eb 100644 (file)
--- 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 4cc75a6ba5c017d7ba2330feb240e263edec28fd..cc69660a42727f03137c3ad99c09f232cbf7d6cc 100644 (file)
--- 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 984eb687a096a58bd3902234c952d587704ada98..1f4a0c3f728dc174e451b5f26390955fbe06cd49 100644 (file)
--- 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 a663e573515cf5dbf7f6d0e5fe895b2f079d3f59..897948d88b652a8de29aea4fb368212692ab2a45 100644 (file)
--- 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 c53cf3e4fd2cc6143bca02b6d9c1f6f4dee2eda4..14f519ec85434ad69c8a8234ba7645846ea37cb1 100644 (file)
--- 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 2ab6dd8d481dd9539da5e479debcf632f7cb73d5..0b9f3e4a67db4463eb7cf372cd525f91d0871839 100644 (file)
--- 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 072f96623f48866e833ee8ddcd69d52793d2dfe0..8e56784812c6369e692011c0d69ae33c20a6272f 100644 (file)
--- 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 49018d8adb1692f4a3913bde223974ad6813a73f..fb3cb12fc604341342dfe847e77189fbb08bf07e 100644 (file)
--- 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<Spanner *> (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 604c53c573493721796b068f66db084b4ae0c5ba..d7611535a7bb9d9e0d9a5b5a062c5e17ddc0a29e 100644 (file)
--- 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.",