* lily/modified-font-metric.cc (text_dimension): try

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

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 7ae0c0bd2511f5349a70bf62cfbd7ff35080d405..6e207877b5823b8750b60f3055ff3c631ab58ad3 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -8,7 +8,7 @@
   Mats Bengtsson <matsb@s3.kth.se>
 */
 
-#include <ctype.h>
+#include <cctype>
 
 #include "context.hh"
 #include "bar-line.hh"
@@ -16,7 +16,6 @@
 #include "engraver.hh"
 #include "direction.hh"
 #include "side-position-interface.hh"
-#include "item.hh"
 
 class Clef_engraver : public  Engraver
 {
@@ -72,11 +71,11 @@ Clef_engraver::set_glyph ()
 void
 Clef_engraver::acknowledge_grob (Grob_info info)
 {
-  Item * item =dynamic_cast <Item *> (info.grob_);
+  Item * item = dynamic_cast <Item *> (info.grob_);
   if (item)
     {
       if (Bar_line::has_interface (info.grob_)
-         && ly_c_string_p (get_property ("clefGlyph")))
+         && scm_is_string (get_property ("clefGlyph")))
        create_clef ();
     } 
 }
@@ -92,15 +91,15 @@ Clef_engraver::create_clef ()
       clef_ = c;
       SCM cpos = get_property ("clefPosition");
 
-      if (ly_c_number_p (cpos))
+      if (scm_is_number (cpos))
        clef_->set_property ("staff-position", cpos);
 
       SCM oct =  get_property ("clefOctavation");
-      if (ly_c_number_p (oct) && ly_scm2int (oct))
+      if (scm_is_number (oct) && scm_to_int (oct))
        {
          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;
 
@@ -108,7 +107,7 @@ Clef_engraver::create_clef ()
                                          scm_from_int (10));
 
          g->set_property ("text",
-                          scm_list_n (ly_scheme_function ("vcenter-markup"),
+                          scm_list_n (ly_lily_module_constant ("vcenter-markup"),
                                       txt,  SCM_UNDEFINED));
          Side_position_interface::add_support (g,clef_);      
 
@@ -179,7 +178,7 @@ Clef_engraver::stop_translation_timestep ()
            }
        }
       
-      clef_ =0;
+      clef_ = 0;
 
       octavate_ = 0;
     }
@@ -187,7 +186,7 @@ Clef_engraver::stop_translation_timestep ()
 
 
 
-ENTER_DESCRIPTION (Clef_engraver,
+ADD_TRANSLATOR (Clef_engraver,
 /* descr */       "Determine and set reference point for pitches",
 /* creats*/       "Clef OctavateEight",
 /* accepts */     "",