release: 1.3.78

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 92945681de34fb18447488dc9d1975ba5faa271d..0f2df8fcdf5e3b05744eb83ad47bbdfe92d6e83d 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -8,9 +8,8 @@
 
 #include <ctype.h>
 #include "bar.hh"
-#include "clef-item.hh"
 #include "command-request.hh"
-#include "dimension-cache.hh"
+#include "staff-symbol.hh"
 #include "engraver-group-engraver.hh"
 #include "engraver.hh"
 #include "lily-guile.hh"
@@ -19,7 +18,6 @@
 #include "protected-scm.hh"
 #include "side-position-interface.hh"
 #include "staff-symbol-referencer.hh"
-#include "staff-symbol.hh"
 #include "item.hh"
 #include "group-interface.hh"
 
@@ -37,7 +35,6 @@ protected:
   Protected_scm staffs_;
   
 protected:
-  virtual void do_creation_processing ();
   virtual void do_pre_move_processing ();
   virtual void acknowledge_element (Score_element_info);
   void create_items(Request*);
@@ -59,21 +56,17 @@ Mark_engraver::Mark_engraver ()
   staffs_ = SCM_EOL;
 }
 
-void
-Mark_engraver::do_creation_processing ()
-{
-}
 
 
 void
 Mark_engraver::acknowledge_element (Score_element_info inf)
 {
   Score_element * s = inf.elem_l_;
-  if (dynamic_cast<Staff_symbol*> (s))
+  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_ && dynamic_cast<Bar*> (s))
+  else if (text_p_ && Bar::has_interface (s))
     {
       /*
        Ugh. Figure out how to do this right at beginning of line, (without
@@ -88,7 +81,7 @@ Mark_engraver::do_pre_move_processing ()
 {
   if (text_p_)
     {
-      text_p_->set_elt_pointer("side-support-elements" , staffs_);
+      text_p_->set_elt_property("side-support-elements" , staffs_);
       typeset_element (text_p_);
       text_p_ =0;
     }
@@ -104,9 +97,8 @@ Mark_engraver::create_items (Request *rq)
   SCM s = get_property ("basicMarkProperties");
   text_p_ = new Item (s);
 
-  Group_interface (text_p_, "interfaces").add_thing (ly_symbol2scm ("Mark"));
-  Side_position_interface staffside(text_p_);
-  staffside.set_axis (Y_AXIS);
+
+  Side_position::set_axis (text_p_, Y_AXIS);
 
   /*
     -> Generic props.
@@ -131,7 +123,7 @@ Mark_engraver::create_items (Request *rq)
     }
 
   
-  announce_element (Score_element_info (text_p_, rq));
+  announce_element (text_p_, rq);
 }
 
 
@@ -169,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))
        {