update for the lily-wins.py script.

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

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 65d2aac84cdd67c37268216d7b1ce2cba5299c21..1bc232f4c5fc12dca618c12ba1e389eb53e465f9 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -30,7 +30,7 @@ protected:
   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 ()
@@ -48,15 +48,13 @@ Axis_group_engraver::process_music ()
       Grob *  it = unsmob_grob (get_property ("currentCommandColumn"));
 
       staffline_->set_bound (LEFT,it);
-
-      announce_grob(staffline_, SCM_EOL);
     }
 } 
 
 Spanner*
 Axis_group_engraver::get_spanner () 
 {
-  return make_spanner ("VerticalAxisGroup");
+  return make_spanner ("VerticalAxisGroup", SCM_EOL);
 }
 
 /*
@@ -69,7 +67,7 @@ Axis_group_engraver::finalize ()
   if (!staffline_)
     return ;
   
-  String type = daddy_context_->context_name ();
+  String type = context ()->context_name ();
   SCM dims = get_property ("verticalExtent");
   
   if (is_number_pair (dims))
@@ -77,11 +75,11 @@ Axis_group_engraver::finalize ()
 
   dims = get_property ("minimumVerticalExtent");
   if (is_number_pair (dims) )
-    staffline_->set_grob_property ("minimum-Y-extent", dims);
+    staffline_->set_property ("minimum-Y-extent", dims);
 
   dims = get_property ("extraVerticalExtent");
   if (is_number_pair (dims))
-    staffline_->set_grob_property ("extra-Y-extent", dims);
+    staffline_->set_property ("extra-Y-extent", dims);
 
   Grob *  it = unsmob_grob (get_property ("currentCommandColumn"));
 
@@ -150,7 +148,7 @@ protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void add_element (Grob *e);
 public:
-  TRANSLATOR_DECLARATIONS(Hara_kiri_engraver);
+  TRANSLATOR_DECLARATIONS (Hara_kiri_engraver);
 };
 
 void
@@ -163,7 +161,7 @@ Hara_kiri_engraver::add_element (Grob*e)
 Spanner*
 Hara_kiri_engraver::get_spanner () 
 {
-  Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup");
+  Spanner * sp = make_spanner ("RemoveEmptyVerticalGroup", SCM_EOL);
   
   return sp;
 }
@@ -181,11 +179,11 @@ Hara_kiri_engraver::acknowledge_grob (Grob_info i)
 }
 
 
-Hara_kiri_engraver::Hara_kiri_engraver()
+Hara_kiri_engraver::Hara_kiri_engraver ()
 {
 }
 
-ENTER_DESCRIPTION(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*/       "RemoveEmptyVerticalGroup",
@@ -194,7 +192,7 @@ ENTER_DESCRIPTION(Hara_kiri_engraver,
 /* reads */       "",
 /* write */       "");
 
-ENTER_DESCRIPTION(Axis_group_engraver,
+ENTER_DESCRIPTION (Axis_group_engraver,
 /* descr */       "Group all objects created in this context in a VerticalAxisGroup spanner.",
 /* creats*/       "VerticalAxisGroup",
 /* accepts */     "",