trem fix

[lilypond.git] / lily / axis-group-engraver.cc

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index f22d068ffaf6900310a47011fe61ffcf2d23f928..91a581a8605312c10bb506d98463066962836eb6 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -42,8 +42,6 @@ void
 Axis_group_engraver::initialize ()
 {
   staffline_p_ = get_spanner_p ();
-  Axis_group_interface::set_interface (staffline_p_);
-  Axis_group_interface::set_axes (staffline_p_, Y_AXIS, Y_AXIS);
 
   Grob *  it = unsmob_grob (get_property ("currentCommandColumn"));
 
@@ -62,21 +60,21 @@ void
 Axis_group_engraver::finalize ()
 {
   String type = daddy_grav_l ()->type_str_ ;
-  SCM dims = get_property ("VerticalExtent");
+  SCM dims = get_property ("verticalExtent");
   
   if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
       && gh_number_p (ly_cdr (dims)))
     {
-      staffline_p_->set_extent_callback (Grob::preset_extent_proc, Y_AXIS);
+      staffline_p_->set_extent (Grob::preset_extent_proc, Y_AXIS);
       staffline_p_->set_grob_property ("extent-Y", dims);
     }
 
-  dims = get_property ("MinimumVerticalExtent");
+  dims = get_property ("minimumVerticalExtent");
   if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
       && gh_number_p (ly_cdr (dims)))
     staffline_p_->set_grob_property ("minimum-extent-Y", dims);
 
-  dims = get_property ("ExtraVerticalExtent");
+  dims = get_property ("extraVerticalExtent");
   if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
       && gh_number_p (ly_cdr (dims)))
     staffline_p_->set_grob_property ("extra-extent-Y", dims);
@@ -148,7 +146,7 @@ Spanner*
 Hara_kiri_engraver::get_spanner_p () const
 {
   Spanner * sp = new Spanner (get_property ("HaraKiriVerticalGroup"));
-  Hara_kiri_group_spanner::set_interface (sp);
+
   return sp;
 }
 
@@ -157,7 +155,7 @@ Hara_kiri_engraver::acknowledge_grob (Grob_info i)
 {
   Axis_group_engraver::acknowledge_grob (i);
   if (Rhythmic_head::has_interface (i.grob_l_)
-      || i.grob_l_->has_interface (ly_symbol2scm ("lyric-syllable-interface")))
+      || i.grob_l_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     {
       Hara_kiri_group_spanner::add_interesting_item (staffline_p_, i.grob_l_);
     }
@@ -178,5 +176,5 @@ ENTER_DESCRIPTION(Axis_group_engraver,
 /* descr */       "Group all objects created in this context in a VerticalAxisGroup spanner.",
 /* creats*/       "VerticalAxisGroup",
 /* acks  */       "grob-interface",
-/* reads */       "VerticalExtent MinimumVerticalExtent ExtraVerticalExtent",
+/* reads */       "verticalExtent minimumVerticalExtent extraVerticalExtent",
 /* write */       "");