* input/test/slur-shape.ly (x): remove file.

[lilypond.git] / lily / score-engraver.cc

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index 96742a87114d34fe9c393ae1860ec18b63fb8b71..a6b5018b0c74e943b0a677d78ff6a88f83248cde 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "all-font-metrics.hh"
@@ -49,13 +49,16 @@ Score_engraver::make_columns ()
       command_column_->set_grob_property ("breakable", SCM_BOOL_T);
 
 
-      Grob_info i1 (command_column_);
+      Grob_info i1;
+      i1.grob_ = command_column_;
       i1.origin_trans_ = this;
   
-      Grob_info i2 (musical_column_);
+      announce_grob (i1);
+
+      Grob_info i2;
+      i2.grob_ = musical_column_;
       i2.origin_trans_ = this;
 
-      announce_grob (i1);
       announce_grob (i2);
     }
 }
@@ -84,7 +87,7 @@ Score_engraver::finish ()
     progress_indication ("[" + to_string (breaks_) + "]");
    
   check_removal ();
-  removal_processing ();
+  finalize ();
 
 }
 
@@ -99,7 +102,7 @@ Score_engraver::initialize ()
     error (_f ("can't find `%s'", "feta20.afm")
           + "\n" +_ ("Fonts have not been installed properly.  Aborting"));
    
-  unsmob_translator_def (definition_)->apply_property_operations (this);
+  unsmob_translator_def (definition_)->apply_default_property_operations (this);
 
   assert (dynamic_cast<Paper_def *> (output_def_));
   assert (!daddy_trans_);