X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Faxis-group-engraver.cc;h=91a581a8605312c10bb506d98463066962836eb6;hb=b9b40f154d0dfa9c3fcd44028bd8b745b87e4873;hp=57d42f31139ac6b28104259f9499129aba885717;hpb=f1346920f64c571a1475d3ded295b9637560c6bc;p=lilypond.git

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 57d42f3113..91a581a860 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 #include "spanner.hh"
@@ -20,19 +20,18 @@ class Axis_group_engraver : public Engraver
 {
 protected:
   Spanner *staffline_p_;
-  Link_array<Score_element> elts_;
-  virtual void do_creation_processing();
-  virtual void do_removal_processing();
-  virtual void acknowledge_element (Score_element_info);
-  virtual void process_acknowledged ();
+  Link_array<Grob> elts_;
+  virtual void initialize ();
+  virtual void finalize ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual void create_grobs ();
   virtual Spanner* get_spanner_p () const;
-  virtual void add_element (Score_element*) ;
+  virtual void add_element (Grob*) ;
 public:  
-  VIRTUAL_COPY_CONS(Translator);
-  Axis_group_engraver ();
+TRANSLATOR_DECLARATIONS(Axis_group_engraver );
 };
 
-ADD_THIS_TRANSLATOR(Axis_group_engraver);
+
 
 Axis_group_engraver::Axis_group_engraver ()
 {
@@ -40,61 +39,59 @@ Axis_group_engraver::Axis_group_engraver ()
 }
 
 void
-Axis_group_engraver::do_creation_processing ()
+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);
 
-  Score_element *  it = unsmob_element (get_property ("currentCommandColumn"));
-  Pointer_group_interface (it, "bounded-by-me").add_element (staffline_p_);  
-  staffline_p_->set_bound(LEFT,it);
+  Grob *  it = unsmob_grob (get_property ("currentCommandColumn"));
+
+  staffline_p_->set_bound (LEFT,it);
 
-  announce_element (staffline_p_, 0);
+  announce_grob(staffline_p_, SCM_EOL);
 }
 
 Spanner*
 Axis_group_engraver::get_spanner_p () const
 {
-  return new Spanner (get_property ("basicVerticalAxisGroupProperties"));
+  return new Spanner (get_property ("VerticalAxisGroup"));
 }
 
 void
-Axis_group_engraver::do_removal_processing ()
+Axis_group_engraver::finalize ()
 {
   String type = daddy_grav_l ()->type_str_ ;
-  SCM dims = get_property ((type  + "VerticalExtent").ch_C());
+  SCM dims = get_property ("verticalExtent");
   
-  if (gh_pair_p (dims) && gh_number_p (gh_car (dims))
-      && gh_number_p (gh_cdr (dims)))
+  if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
+      && gh_number_p (ly_cdr (dims)))
     {
-      staffline_p_->set_extent_callback (&Score_element::preset_extent, Y_AXIS);
-      staffline_p_->set_elt_property ("extent-Y", dims);
+      staffline_p_->set_extent (Grob::preset_extent_proc, Y_AXIS);
+      staffline_p_->set_grob_property ("extent-Y", dims);
     }
 
-  dims = get_property ((type + "MinimumVerticalExtent").ch_C());
-  if (gh_pair_p (dims) && gh_number_p (gh_car (dims))
-      && gh_number_p (gh_cdr (dims)))
-    staffline_p_->set_elt_property ("minimum-extent-Y", dims);
+  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");
+  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);
 
-  dims = get_property ((type + "ExtraVerticalExtent").ch_C());
-  if (gh_pair_p (dims) && gh_number_p (gh_car (dims))
-      && gh_number_p (gh_cdr (dims)))
-    staffline_p_->set_elt_property ("extra-extent-Y", dims);
+  Grob *  it = unsmob_grob (get_property ("currentCommandColumn"));
 
-  Score_element *  it = unsmob_element (get_property ("currentCommandColumn"));
 
-  Pointer_group_interface (it, "bounded-by-me").add_element (staffline_p_);  
-  staffline_p_->set_bound(RIGHT,it);
+  staffline_p_->set_bound (RIGHT,it);
 
-  typeset_element (staffline_p_);
+  typeset_grob (staffline_p_);
   staffline_p_ = 0;
 }
 
 void
-Axis_group_engraver::acknowledge_element (Score_element_info i)
+Axis_group_engraver::acknowledge_grob (Grob_info i)
 {
-  elts_.push (i.elem_l_);
+  elts_.push (i.grob_l_);
 }
 
 /*
@@ -102,12 +99,12 @@ Axis_group_engraver::acknowledge_element (Score_element_info i)
   cyclic parent relationship if we have two Axis_group_engravers in
   the context.  */
 void
-Axis_group_engraver::process_acknowledged ()
+Axis_group_engraver::create_grobs ()
 {
   /* UGH UGH UGH */
   for (int i=0; i < elts_.size (); i++)
     {
-      Score_element *par = elts_[i]->parent_l (Y_AXIS);
+      Grob *par = elts_[i]->get_parent (Y_AXIS);
 
       if ((!par || !Axis_group_interface::has_interface (par))
 	  && ! elts_[i]->empty_b (Y_AXIS))
@@ -117,7 +114,7 @@ Axis_group_engraver::process_acknowledged ()
 }
 
 void
-Axis_group_engraver::add_element (Score_element*e)
+Axis_group_engraver::add_element (Grob*e)
 {
   Axis_group_interface::add_element (staffline_p_, e);
 }
@@ -132,14 +129,14 @@ class Hara_kiri_engraver : public Axis_group_engraver
 {
 protected:
   virtual Spanner*get_spanner_p ()const;
-  virtual void acknowledge_element (Score_element_info);
-  virtual void add_element (Score_element *e);
+  virtual void acknowledge_grob (Grob_info);
+  virtual void add_element (Grob *e);
 public:
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS(Hara_kiri_engraver);
 };
 
 void
-Hara_kiri_engraver::add_element (Score_element*e)
+Hara_kiri_engraver::add_element (Grob*e)
 {
   Hara_kiri_group_spanner::add_element (staffline_p_, e);
 }
@@ -148,18 +145,36 @@ Hara_kiri_engraver::add_element (Score_element*e)
 Spanner*
 Hara_kiri_engraver::get_spanner_p () const
 {
-  Spanner * sp = new Spanner (get_property ("basicHaraKiriVerticalGroupspannerProperties"));
-  Hara_kiri_group_spanner::set_interface (sp);
+  Spanner * sp = new Spanner (get_property ("HaraKiriVerticalGroup"));
+
   return sp;
 }
 
 void
-Hara_kiri_engraver::acknowledge_element (Score_element_info i)
+Hara_kiri_engraver::acknowledge_grob (Grob_info i)
 {
-  Axis_group_engraver::acknowledge_element (i);
-  if (Rhythmic_head::has_interface (i.elem_l_))
+  Axis_group_engraver::acknowledge_grob (i);
+  if (Rhythmic_head::has_interface (i.grob_l_)
+      || i.grob_l_->internal_has_interface (ly_symbol2scm ("lyric-syllable-interface")))
     {
-      Hara_kiri_group_spanner::add_interesting_item (staffline_p_, i.elem_l_);
+      Hara_kiri_group_spanner::add_interesting_item (staffline_p_, i.grob_l_);
     }
 }
-ADD_THIS_TRANSLATOR(Hara_kiri_engraver);
+
+Hara_kiri_engraver::Hara_kiri_engraver(){}
+
+ENTER_DESCRIPTION(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*/       "HaraKiriVerticalGroup",
+/* acks  */       "grob-interface",
+/* reads */       "",
+/* write */       "");
+
+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",
+/* write */       "");