2003 -> 2004

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

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 0cff96e94679064decf5d4d1f4d4e8bbf8f5bc9d..a825805d789ce2ad6d277faadf3b71600d4432c8 100644 (file)
--- 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"
@@ -11,6 +11,7 @@
 #include "axis-group-interface.hh"
 #include "engraver.hh"
 #include "engraver-group-engraver.hh"
+#include "warn.hh"
 
 /**
    Put stuff in a Spanner with an Axis_group_interface.
@@ -25,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;
@@ -41,22 +40,22 @@ Axis_group_engraver::Axis_group_engraver ()
 void
 Axis_group_engraver::process_music ()
 {
-if (!staffline_)
-  {
-    staffline_ = get_spanner ();
+  if (!staffline_)
+    {
+      staffline_ = get_spanner ();
 
-  Grob *  it = unsmob_grob (get_property ("currentCommandColumn"));
+      Grob *  it = unsmob_grob (get_property ("currentCommandColumn"));
 
-  staffline_->set_bound (LEFT,it);
+      staffline_->set_bound (LEFT,it);
 
-  announce_grob(staffline_, SCM_EOL);
-}
+      announce_grob(staffline_, SCM_EOL);
+    }
 } 
 
 Spanner*
-Axis_group_engraver::get_spanner () const
+Axis_group_engraver::get_spanner () 
 {
-  return new Spanner (get_property ("VerticalAxisGroup"));
+  return make_spanner ("VerticalAxisGroup");
 }
 
 /*
@@ -66,6 +65,9 @@ Axis_group_engraver::get_spanner () const
 void
 Axis_group_engraver::finalize ()
 {
+  if (!staffline_)
+    return ;
+  
   String type = get_daddy_grav ()->context_name ();
   SCM dims = get_property ("verticalExtent");
   
@@ -114,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
@@ -150,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:
@@ -165,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;
 }
@@ -176,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_);
     }