*** empty log message ***

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

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 94a873bc9cf20104148f6779dbc8f572ea88b09a..401653e69f14a3bacaf2c5b72e820b998164bd3e 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,29 +65,25 @@ 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");
   
-  if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
-      && gh_number_p (ly_cdr (dims)))
-    {
-      staffline_->set_extent (Grob::preset_extent_proc, Y_AXIS);
-      staffline_->set_grob_property ("Y-extent", dims);
-    }
+  if (is_number_pair (dims))
+    staffline_->set_extent (dims, Y_AXIS);
 
   dims = get_property ("minimumVerticalExtent");
-  if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
-      && gh_number_p (ly_cdr (dims)))
+  if (is_number_pair (dims) )
     staffline_->set_grob_property ("minimum-Y-extent", dims);
 
   dims = get_property ("extraVerticalExtent");
-  if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
-      && gh_number_p (ly_cdr (dims)))
+  if (is_number_pair (dims))
     staffline_->set_grob_property ("extra-Y-extent", dims);
 
   Grob *  it = unsmob_grob (get_property ("currentCommandColumn"));
 
-
   staffline_->set_bound (RIGHT,it);
 
   typeset_grob (staffline_);
@@ -113,9 +108,18 @@ Axis_group_engraver::process_acknowledged_grobs ()
     {
       Grob *par = elts_[i]->get_parent (Y_AXIS);
 
-      if ((!par || !Axis_group_interface::has_interface (par))
-         && ! elts_[i]->empty_b (Y_AXIS))
-       add_element (elts_[i]);
+      if (!par || !Axis_group_interface::has_interface (par))
+       if (elts_[i]->is_empty (Y_AXIS))
+         {
+           /*
+             We have to do _something_, otherwise staff objects will
+             end up with System as parent.  
+             
+            */
+           elts_[i]->set_parent (staffline_, Y_AXIS);
+         }
+       else
+         add_element (elts_[i]);
     }
   elts_.clear ();
 }
@@ -141,7 +145,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:
@@ -156,9 +160,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;
 }
@@ -167,7 +171,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_);
     }