(LY_DEFINE): ly_kpathsea_expand_variable. New

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 46a21080126ab93f707199da18b3e38dcbd3afec..53074e6e274a6197a9b442181e6c5636246b6603 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);
 }
 
 /** 
@@ -76,7 +76,7 @@ Clef_engraver::acknowledge_grob (Grob_info info)
   if (item)
     {
       if (Bar_line::has_interface (info.grob_)
-         && is_string (get_property ("clefGlyph")))
+         && scm_is_string (get_property ("clefGlyph")))
        create_clef ();
     } 
 }
@@ -86,26 +86,26 @@ 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 (is_number (cpos))
-       Staff_symbol_referencer::set_position (clef_, ly_scm2int (cpos));
+      if (scm_is_number (cpos))
+       clef_->set_property ("staff-position", cpos);
 
       SCM oct =  get_property ("clefOctavation");
-      if (is_number (oct) && ly_scm2int (oct))
+      if (scm_is_number (oct) && scm_to_int (oct))
        {
-         Item * g = make_item ("OctavateEight");
+         Item * g = make_item ("OctavateEight", SCM_EOL);
 
-         int abs_oct = ly_scm2int (oct) ;
+         int abs_oct = scm_to_int (oct) ;
          int dir = sign (abs_oct);
          abs_oct = abs (abs_oct)  + 1;
 
          SCM txt = scm_number_to_string (scm_int2num (abs_oct),
-                                         SCM_MAKINUM (10));
+                                         scm_from_int (10));
 
          g->set_property ("text",
                           scm_list_n (ly_scheme_function ("vcenter-markup"),
@@ -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;
     }
 }
@@ -198,5 +192,5 @@ ENTER_DESCRIPTION (Clef_engraver,
 /* creats*/       "Clef OctavateEight",
 /* accepts */     "",
 /* acks  */      "bar-line-interface",
-/* reads */       "clefPosition clefGlyph middleCPosition clefOctavation explicitClefVisibility",
+/* reads */       "clefPosition clefGlyph middleCPosition clefOctavation explicitClefVisibility forceClef",
 /* write */       "");