* scm/lily.scm (completize-formats): new function

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

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index c28584909f16745e782a86819e1a623b6971ccdd..258abb2925fa9f1d486fa5155f9bc88d5d106e5e 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -9,7 +9,6 @@
 #include "spanner.hh"
 #include "paper-column.hh"
 #include "axis-group-interface.hh"
-#include "engraver.hh"
 #include "engraver-group-engraver.hh"
 #include "warn.hh"
 #include "context.hh"
@@ -45,9 +44,7 @@ Axis_group_engraver::process_music ()
   if (!staffline_)
     {
       staffline_ = get_spanner ();
-
       Grob *  it = unsmob_grob (get_property ("currentCommandColumn"));
-
       staffline_->set_bound (LEFT,it);
     }
 } 
@@ -105,11 +102,9 @@ Axis_group_engraver::process_acknowledged_grobs ()
   if (!staffline_) 
     return ;
   
-  for (int i=0; i < elts_.size (); i++)
+  for (int i = 0; i < elts_.size (); i++)
     {
-      Grob *par = elts_[i]->get_parent (Y_AXIS);
-
-      if (!par || !Axis_group_interface::has_interface (par))
+      if  (!unsmob_grob (elts_[i]->get_property ("axis-group-parent-Y")))
        {
          if (staffline_->get_parent (Y_AXIS)
              && staffline_->get_parent (Y_AXIS) == elts_[i])
@@ -199,7 +194,7 @@ Hara_kiri_engraver::Hara_kiri_engraver ()
 {
 }
 
-ENTER_DESCRIPTION (Hara_kiri_engraver,
+ADD_TRANSLATOR (Hara_kiri_engraver,
 /* descr */       "Like Axis_group_engraver, but make a hara-kiri spanner, and add "
 "interesting items (ie. note heads, lyric syllables and normal rests) ",
 /* creats*/       "RemoveEmptyVerticalGroup",
@@ -208,7 +203,7 @@ ENTER_DESCRIPTION (Hara_kiri_engraver,
 /* reads */       "",
 /* write */       "");
 
-ENTER_DESCRIPTION (Axis_group_engraver,
+ADD_TRANSLATOR (Axis_group_engraver,
 /* descr */       "Group all objects created in this context in a VerticalAxisGroup spanner.",
 /* creats*/       "VerticalAxisGroup",
 /* accepts */     "",