X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-engraver.cc;h=a825805d789ce2ad6d277faadf3b71600d4432c8;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=ac8b637b036b54ed64d9522591a0e15efac40940;hpb=a70685607efdca6d65e073bb041c1312d3a12297;p=lilypond.git

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index ac8b637b03..a825805d78 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 #include "spanner.hh"
@@ -26,14 +26,12 @@ protected:
   virtual void finalize ();
   virtual void acknowledge_grob (Grob_info);
   virtual void process_acknowledged_grobs ();
-  virtual Spanner* get_spanner () const;
+  virtual Spanner* get_spanner () ;
   virtual void add_element (Grob*) ;
 public:  
-TRANSLATOR_DECLARATIONS(Axis_group_engraver );
+  TRANSLATOR_DECLARATIONS(Axis_group_engraver);
 };
 
-
-
 Axis_group_engraver::Axis_group_engraver ()
 {
   staffline_ = 0;
@@ -55,9 +53,9 @@ Axis_group_engraver::process_music ()
 } 
 
 Spanner*
-Axis_group_engraver::get_spanner () const
+Axis_group_engraver::get_spanner () 
 {
-  return new Spanner (get_property ("VerticalAxisGroup"));
+  return make_spanner ("VerticalAxisGroup");
 }
 
 /*
@@ -68,10 +66,7 @@ void
 Axis_group_engraver::finalize ()
 {
   if (!staffline_)
-    {
-      programming_error ("Huh? This context never lived?");
-      return ;
-    }
+    return ;
   
   String type = get_daddy_grav ()->context_name ();
   SCM dims = get_property ("verticalExtent");
@@ -121,7 +116,7 @@ Axis_group_engraver::process_acknowledged_grobs ()
       Grob *par = elts_[i]->get_parent (Y_AXIS);
 
       if (!par || !Axis_group_interface::has_interface (par))
-	if (elts_[i]->empty_b (Y_AXIS))
+	if (elts_[i]->is_empty (Y_AXIS))
 	  {
 	    /*
 	      We have to do _something_, otherwise staff objects will
@@ -157,7 +152,7 @@ Axis_group_engraver::add_element (Grob*e)
 class Hara_kiri_engraver : public Axis_group_engraver
 {
 protected:
-  virtual Spanner*get_spanner ()const;
+  virtual Spanner*get_spanner ();
   virtual void acknowledge_grob (Grob_info);
   virtual void add_element (Grob *e);
 public:
@@ -172,9 +167,9 @@ Hara_kiri_engraver::add_element (Grob*e)
 
 
 Spanner*
-Hara_kiri_engraver::get_spanner () const
+Hara_kiri_engraver::get_spanner () 
 {
-  Spanner * sp = new Spanner (get_property ("RemoveEmptyVerticalGroup"));
+  Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup");
   
   return sp;
 }
@@ -183,7 +178,9 @@ void
 Hara_kiri_engraver::acknowledge_grob (Grob_info i)
 {
   Axis_group_engraver::acknowledge_grob (i);
-  if (i.grob_->internal_has_interface (ly_symbol2scm ("rhythmic-grob-interface")))
+  if (i.grob_->internal_has_interface (ly_symbol2scm ("rhythmic-grob-interface"))
+      || i.grob_->internal_has_interface (ly_symbol2scm ("lyric-interface"))
+      )
     {
       Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob_);
     }