Updates. Add targets: tar, dist, release.

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 18733b052704131d222173623231dcb8b94c48ed..fc09cde8baa4c0b5d2c88fc5426172ba6a37b8d8 100644 (file)
--- 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 ());
 }
 
 
@@ -115,7 +113,7 @@ Mark_engraver::process_music ()
       if (!Text_item::markup_p (m) &&
          ly_c_procedure_p (proc))
        {
-         if (!is_number (m)) 
+         if (!ly_c_number_p (m)) 
            m =  get_property ("rehearsalMark");
 
          if (scm_integer_p (m) == SCM_BOOL_T
@@ -123,12 +121,12 @@ Mark_engraver::process_music ()
            {
              int mark_count = ly_scm2int (m);
              mark_count ++;
-             get_parent_context ()->set_property ("rehearsalMark",
+             context ()->set_property ("rehearsalMark",
                                            scm_int2num (mark_count));
            }
 
-         if (is_number (m))
-           m = scm_call_2 (proc, m, get_parent_context ()->self_scm ());
+         if (ly_c_number_p (m))
+           m = scm_call_2 (proc, m, context ()->self_scm ());
          else
            warning ("rehearsalMark does not have integer value.");
        }