* buildscripts/guile-gnome.sh: Build without gcc libtool version

[lilypond.git] / lily / script-column-engraver.cc

diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index f5d70c5f0bfe868989ba41bc199fda815ea90bb0..0975c0a4ddd94b5fcf45b8bb877eaf96cff37281 100644 (file)
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -21,12 +21,11 @@ class Script_column_engraver : public Engraver
   Link_array<Item> scripts_;
 
 public:
-  TRANSLATOR_DECLARATIONS(Script_column_engraver);
+  TRANSLATOR_DECLARATIONS (Script_column_engraver);
 protected:
   virtual void acknowledge_grob (Grob_info);
   virtual void process_acknowledged_grobs ();
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
 };
 
 
@@ -38,18 +37,8 @@ Script_column_engraver::Script_column_engraver ()
 void
 Script_column_engraver::stop_translation_timestep ()
 {
-  if (scol_)
-    {
-      typeset_grob (scol_);
-      scol_ =0;
-    }
-}
-
-void
-Script_column_engraver::start_translation_timestep ()
-{
+  scol_ =0;
   scripts_.clear ();
-
 }
 
 void
@@ -58,7 +47,7 @@ Script_column_engraver::acknowledge_grob (Grob_info inf)
   Item *thing = dynamic_cast<Item*> (inf.grob_);
   if (thing && Side_position_interface::has_interface (inf.grob_)) // ugh FIXME
     {
-      if (!Item::breakable_b (thing)
+      if (!Item::is_breakable (thing)
          && Side_position_interface::get_axis (inf.grob_) == Y_AXIS)
        {
          scripts_.push (thing);
@@ -71,8 +60,8 @@ Script_column_engraver::process_acknowledged_grobs ()
 {
   if (!scol_ && scripts_.size () > 1)
     {
-      scol_ = new Item (get_property ("ScriptColumn"));
-      announce_grob(scol_, SCM_EOL);
+      scol_ = make_item ("ScriptColumn", SCM_EOL);
+      
     }
 
   if (scol_)
@@ -84,7 +73,7 @@ Script_column_engraver::process_acknowledged_grobs ()
 
 }
 
-ENTER_DESCRIPTION(Script_column_engraver,
+ENTER_DESCRIPTION (Script_column_engraver,
 /* descr */       "",
 /* creats*/       "ScriptColumn",
 /* accepts */     "",