release: 1.3.78

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 9a9b96e245d8d239732b9606ce1983ea96dcd381..0f2df8fcdf5e3b05744eb83ad47bbdfe92d6e83d 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -64,7 +64,7 @@ Mark_engraver::acknowledge_element (Score_element_info inf)
   Score_element * s = inf.elem_l_;
   if (Staff_symbol::has_interface (s))
     {
-      staffs_ = gh_cons (inf.elem_l_->self_scm_, staffs_);
+      staffs_ = gh_cons (inf.elem_l_->self_scm (), staffs_);
     }
   else if (text_p_ && Bar::has_interface (s))
     {
@@ -123,7 +123,7 @@ Mark_engraver::create_items (Request *rq)
     }
 
   
-  announce_element (Score_element_info (text_p_, rq));
+  announce_element (text_p_, rq);
 }
 
 
@@ -161,9 +161,11 @@ Mark_engraver::do_process_music ()
       /*
        automatic marks.
        */
-      SCM m = (mark_req_l_->mark_label_ == SCM_UNDEFINED)
-       ? get_property ("rehearsalMark")
-       : SCM(mark_req_l_->mark_label_);
+      
+      SCM m = mark_req_l_->get_mus_property ("label");
+      if (gh_string_p (m)) 
+       m =  get_property ("rehearsalMark");
+;
       
       if (gh_number_p (m))
        {