(The Lyrics context): add note

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index c4feda16199d513220a08e0aa939e5be9a29e71c..46a21080126ab93f707199da18b3e38dcbd3afec 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 (daddy_context_, basic, glyph_sym, SCM_UNDEFINED);
-  execute_pushpop_property (daddy_context_, basic, glyph_sym, glyph);
+  execute_pushpop_property (get_parent_context (), basic, glyph_sym, SCM_UNDEFINED);
+  execute_pushpop_property (get_parent_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_)
-         && gh_string_p (get_property ("clefGlyph")))
+         && is_string (get_property ("clefGlyph")))
        create_clef ();
     } 
 }
@@ -92,21 +92,24 @@ Clef_engraver::create_clef ()
       clef_ = c;
       SCM cpos = get_property ("clefPosition");
 
-      if (gh_number_p (cpos))
-       Staff_symbol_referencer::set_position (clef_, gh_scm2int (cpos));
+      if (is_number (cpos))
+       Staff_symbol_referencer::set_position (clef_, ly_scm2int (cpos));
 
       SCM oct =  get_property ("clefOctavation");
-      if (gh_number_p (oct) && gh_scm2int (oct))
+      if (is_number (oct) && ly_scm2int (oct))
        {
          Item * g = make_item ("OctavateEight");
 
-         int abs_oct = gh_scm2int (oct) ;
+         int abs_oct = ly_scm2int (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));
+
          g->set_property ("text",
-                               scm_number_to_string (gh_int2scm (abs_oct),
-                                                     SCM_MAKINUM (10)));
+                          scm_list_n (ly_scheme_function ("vcenter-markup"),
+                                      txt,  SCM_UNDEFINED));
          Side_position_interface::add_support (g,clef_);      
 
          g->set_parent (clef_, Y_AXIS);
@@ -149,7 +152,7 @@ Clef_engraver::inspect_clef_properties ()
 
   if (to_boolean (force_clef))
     {
-      Context * w = daddy_context_->where_defined (ly_symbol2scm ("forceClef"));
+      Context * w = get_parent_context ()->where_defined (ly_symbol2scm ("forceClef"));
       w->set_property ("forceClef", SCM_EOL);
     }
 }