*** empty log message ***

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 670dd39b4df21e5618921e0df9db18e969fc05ed..c22408b300f96ebaf8fa1aa20f3dacf1eb9772b4 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -61,8 +61,8 @@ Clef_engraver::set_glyph ()
 
   SCM basic = ly_symbol2scm ("Clef");
   
-  execute_pushpop_property (get_parent_context (), basic, glyph_sym, SCM_UNDEFINED);
-  execute_pushpop_property (get_parent_context (), basic, glyph_sym, glyph);
+  execute_pushpop_property (context (), basic, glyph_sym, SCM_UNDEFINED);
+  execute_pushpop_property (context (), basic, glyph_sym, glyph);
 }
 
 /** 
@@ -86,19 +86,19 @@ Clef_engraver::create_clef ()
 {
   if (!clef_)
     {
-      Item *c= make_item ("Clef");
-      announce_grob (c, SCM_EOL);
+      Item *c = make_item ("Clef", SCM_EOL);
+      
 
       clef_ = c;
       SCM cpos = get_property ("clefPosition");
 
       if (ly_c_number_p (cpos))
-       Staff_symbol_referencer::set_position (clef_, ly_scm2int (cpos));
+       clef_->set_property ("staff-position", cpos);
 
       SCM oct =  get_property ("clefOctavation");
       if (ly_c_number_p (oct) && ly_scm2int (oct))
        {
-         Item * g = make_item ("OctavateEight");
+         Item * g = make_item ("OctavateEight", SCM_EOL);
 
          int abs_oct = ly_scm2int (oct) ;
          int dir = sign (abs_oct);
@@ -116,7 +116,7 @@ Clef_engraver::create_clef ()
          g->set_parent (clef_, X_AXIS);
          g->set_property ("direction", scm_int2num (dir));
          octavate_ = g;
-         announce_grob (octavate_, SCM_EOL);
+         
        }
     }
 }
@@ -152,7 +152,7 @@ Clef_engraver::inspect_clef_properties ()
 
   if (to_boolean (force_clef))
     {
-      Context * w = get_parent_context ()->where_defined (ly_symbol2scm ("forceClef"));
+      Context * w = context ()->where_defined (ly_symbol2scm ("forceClef"));
       w->set_property ("forceClef", SCM_EOL);
     }
 }
@@ -179,14 +179,8 @@ Clef_engraver::stop_translation_timestep ()
            }
        }
       
-      typeset_grob (clef_);
       clef_ =0;
 
-      if (octavate_)
-       {
-         typeset_grob (octavate_);
-       }
-
       octavate_ = 0;
     }
 }