Imported sources

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 6ffa8a9fe7f937667ef4fc5e31032fed1ab32ad7..76c814444f48f23c19e0689ff0d43bef56f18525 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
 
   Mats Bengtsson <matsb@s3.kth.se>
 */
@@ -61,8 +61,8 @@ Clef_engraver::set_glyph ()
 
   SCM basic = ly_symbol2scm ("Clef");
   
-  daddy_trans_->execute_pushpop_property (basic, glyph_sym, SCM_UNDEFINED);
-  daddy_trans_->execute_pushpop_property (basic, glyph_sym, glyph);
+  execute_pushpop_property (daddy_trans_, basic, glyph_sym, SCM_UNDEFINED);
+  execute_pushpop_property (daddy_trans_, basic, glyph_sym, glyph);
 }
 
 /** 
@@ -86,7 +86,7 @@ Clef_engraver::create_clef ()
 {
   if (!clef_)
     {
-      Item *c= new Item (get_property ("Clef"));
+      Item *c= make_item ("Clef");
       announce_grob(c, SCM_EOL);
 
       clef_ = c;
@@ -98,7 +98,7 @@ Clef_engraver::create_clef ()
       SCM oct =  get_property ("clefOctavation");
       if (gh_number_p (oct) && gh_scm2int (oct))
        {
-         Item * g = new Item (get_property ("OctavateEight"));
+         Item * g = make_item ("OctavateEight");
 
          int abs_oct = gh_scm2int (oct) ;
          int dir = sign (abs_oct);
@@ -181,7 +181,6 @@ Clef_engraver::stop_translation_timestep ()
 
       if (octavate_)
        {
-         Side_position_interface::add_staff_support (octavate_);         
          typeset_grob (octavate_);
        }