X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmark-engraver.cc;h=bd79403806bad1a882f15b3f5294ff074d869146;hb=f4ff2e488239d66830ac8b3ae5771358a917b58f;hp=026e817645e77aac736e8c4a2416a854025fa8f9;hpb=90f11558943cc2381d2eae4d64029a0f8572f144;p=lilypond.git

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 026e817645..bd79403806 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -69,7 +69,6 @@ Mark_engraver::stop_translation_timestep ()
     {
       SCM lst = get_property ("stavesFound");
       text_->set_property ("side-support-elements" , lst);
-      typeset_grob (text_);
       text_ =0;
     }
   mark_ev_ = 0;
@@ -82,8 +81,7 @@ Mark_engraver::create_items (Music *ev)
   if (text_)
     return;
 
-  text_ = make_item ("RehearsalMark");
-  announce_grob (text_, ev->self_scm ());
+  text_ = make_item ("RehearsalMark", ev->self_scm ());
 }
 
 
@@ -112,28 +110,28 @@ Mark_engraver::process_music ()
       
       SCM m = mark_ev_->get_property ("label");
       SCM proc = get_property ("markFormatter");
-      if (!Text_item::markup_p (m) &&
-	  gh_procedure_p (proc))
+      if (!Text_interface::markup_p (m) &&
+	  ly_c_procedure_p (proc))
 	{
-	  if (!gh_number_p (m)) 
+	  if (!scm_is_number (m)) 
 	    m =  get_property ("rehearsalMark");
 
 	  if (scm_integer_p (m) == SCM_BOOL_T
 	      && scm_exact_p (m) == SCM_BOOL_T)
 	    {
-	      int mark_count = gh_scm2int (m);
+	      int mark_count = scm_to_int (m);
 	      mark_count ++;
-	      daddy_context_->set_property ("rehearsalMark",
-					    gh_int2scm (mark_count));
+	      context ()->set_property ("rehearsalMark",
+					    scm_int2num (mark_count));
 	    }
 
-	  if (gh_number_p (m))
-	    m = scm_call_2 (proc, m, daddy_context_->self_scm ());
+	  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.");