* mf/feta-schrift.mf ("Trill (`tr')"): Fix typo.

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 7adf61f5ea29d63a0b7116b4bf98829b01c6b36b..084af60a3eddb46049e911148a278ae74a6a248f 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -6,12 +6,11 @@
   (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <ctype.h>
+#include <cctype>
 
 #include "bar-line.hh"
 #include "context.hh"
 #include "engraver-group-engraver.hh"
-#include "engraver.hh"
 #include "item.hh"
 #include "warn.hh"
 #include "text-item.hh"
@@ -43,7 +42,7 @@ private:
 
 Mark_engraver::Mark_engraver ()
 {
-  text_ =0;
+  text_ = 0;
   mark_ev_ = 0;
 }
 
@@ -69,7 +68,7 @@ Mark_engraver::stop_translation_timestep ()
     {
       SCM lst = get_property ("stavesFound");
       text_->set_property ("side-support-elements" , lst);
-      text_ =0;
+      text_ = 0;
     }
   mark_ev_ = 0;
 }
@@ -110,10 +109,10 @@ Mark_engraver::process_music ()
       
       SCM m = mark_ev_->get_property ("label");
       SCM proc = get_property ("markFormatter");
-      if (!Text_item::markup_p (m) &&
+      if (!Text_interface::markup_p (m) &&
          ly_c_procedure_p (proc))
        {
-         if (!ly_c_number_p (m)) 
+         if (!scm_is_number (m)) 
            m =  get_property ("rehearsalMark");
 
          if (scm_integer_p (m) == SCM_BOOL_T
@@ -125,20 +124,20 @@ Mark_engraver::process_music ()
                                            scm_int2num (mark_count));
            }
 
-         if (ly_c_number_p (m))
+         if (scm_is_number (m))
            m = scm_call_2 (proc, m, context ()->self_scm ());
          else
            warning ("rehearsalMark does not have integer value.");
        }
 
-      if (Text_item::markup_p (m))
+      if (Text_interface::markup_p (m))
        text_->set_property ("text", m);
       else
        warning ("Mark label should be markup object.");
     }
 }
 
-ENTER_DESCRIPTION (Mark_engraver,
+ADD_TRANSLATOR (Mark_engraver,
 /* descr */       "This engraver will create RehearsalMark objects. "
                   "It puts them on top of all staves (which is taken from "
                   "the property @code{stavesFound}). If moving this engraver "