release commit

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index a3123f1168b796b6db8f6e734cc476c7238f8f8b..6457ea1b2be685960c5752e2021c942ea1db13ae 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -8,7 +8,7 @@
 
 #include <ctype.h>
 #include "bar-line.hh"
-#include "command-request.hh"
+
 #include "staff-symbol.hh"
 #include "engraver-group-engraver.hh"
 #include "engraver.hh"
@@ -19,6 +19,7 @@
 #include "staff-symbol-referencer.hh"
 #include "item.hh"
 #include "group-interface.hh"
+#include "text-item.hh"
 
 /**
   put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
@@ -29,18 +30,18 @@ class Mark_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS(Mark_engraver);
 protected:
-  Item* text_p_;
+  Item* text_;
   
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
-  void create_items (Request*);
-  virtual bool try_music (Music *req_l);
+  void create_items (Music*);
+  virtual bool try_music (Music *req);
   virtual void start_translation_timestep ();
   virtual void process_music ();
   
 private:
-  Mark_req * mark_req_l_;
+  Music * mark_req_;
 };
 
 
@@ -49,72 +50,62 @@ private:
 
 Mark_engraver::Mark_engraver ()
 {
-  text_p_ =0;
-  mark_req_l_ = 0;
+  text_ =0;
+  mark_req_ = 0;
 }
 
 void
 Mark_engraver::acknowledge_grob (Grob_info inf)
 {
-  Grob * s = inf.grob_l_;
- if (text_p_ && Bar_line::has_interface (s))
+  Grob * s = inf.grob_;
+  if (text_ && Bar_line::has_interface (s))
     {
       /*
        Ugh. Figure out how to do this right at beginning of line, (without
        creating class Bar_script : public Item).
       */
-      text_p_->set_parent (s, X_AXIS);
+      text_->set_parent (s, X_AXIS);
     }
 }
 
 void 
 Mark_engraver::stop_translation_timestep ()
 {
-  if (text_p_)
+  if (text_)
     {
-      text_p_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
-      typeset_grob (text_p_);
-      text_p_ =0;
+      text_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
+      typeset_grob (text_);
+      text_ =0;
     }
 }
 
 
 void
-Mark_engraver::create_items (Request *rq)
+Mark_engraver::create_items (Music *rq)
 {
-  if (text_p_)
+  if (text_)
     return;
 
   SCM s = get_property ("RehearsalMark");
-  text_p_ = new Item (s);
-
+  text_ = new Item (s);
 
-  Side_position_interface::set_axis (text_p_, Y_AXIS);
 
-  announce_grob(text_p_, rq->self_scm());
+  announce_grob(text_, rq->self_scm());
 }
 
 
 void
 Mark_engraver::start_translation_timestep ()
 {
-  mark_req_l_ = 0;
+  mark_req_ = 0;
 }
 
 
 bool
-Mark_engraver::try_music (Music* r_l)
+Mark_engraver::try_music (Music* r)
 {
-  if (Mark_req *mr = dynamic_cast <Mark_req *> (r_l))
-    {
-      if (mark_req_l_ && mr->equal_b (mark_req_l_))
-       return true;
-      if (mark_req_l_)
-       return false;
-      mark_req_l_ = mr;
-      return true;
-    }
-  return false;
+  mark_req_ = r;
+  return true;
 }
 
 
@@ -126,9 +117,9 @@ Mark_engraver::try_music (Music* r_l)
 void
 Mark_engraver::process_music ()
 {
-  if (mark_req_l_)
+  if (mark_req_)
     {
-      create_items (mark_req_l_);
+      create_items (mark_req_);
 
       String t;
 
@@ -136,19 +127,23 @@ Mark_engraver::process_music ()
        automatic marks.
        */
       
-      SCM m = mark_req_l_->get_mus_property ("label");
+      SCM m = mark_req_->get_mus_property ("label");
+      if (new_markup_p (m))
+       {
+         text_->set_grob_property ("text",m);
+         text_->set_grob_property ("molecule-callback", new_markup_brewer ());
+       }
       if (gh_pair_p (m)) // markup text
-       text_p_->set_grob_property ("text",m);
+       text_->set_grob_property ("text",m);
       else 
        {
-         if (!gh_string_p (m)) 
+         if (!gh_string_p (m) && !gh_number_p (m)) 
            m =  get_property ("rehearsalMark");
-         ;
          
          if (gh_number_p (m))
            {
              int mark_count = gh_scm2int (m);
-             t = to_str (mark_count);
+             t = to_string (mark_count);
              mark_count ++;
              m = gh_int2scm (mark_count);
            }
@@ -156,26 +151,26 @@ Mark_engraver::process_music ()
            {
              t = ly_scm2string (m);
              String next;
-             if (t.length_i ())
+             if (t.length ())
                {
                  char c = t[0];
                  c++;
-                 next = to_str (c);
+                 next = to_string (c);
                }
-             m = ly_str02scm (next.ch_C ());
+             m = scm_makfrom0str (next.to_str0 ());
            }
          else
            {
              m = gh_int2scm (1);
            }
          
-         daddy_trans_l_->set_property ("rehearsalMark", m);
+         daddy_trans_->set_property ("rehearsalMark", m);
          
-         text_p_->set_grob_property ("text",
-                                     ly_str02scm (t.ch_C ()));
+         text_->set_grob_property ("text",
+                                     scm_makfrom0str (t.to_str0 ()));
 
          String style = "mark-number";
-         for (int i=0; i < t.length_i (); i++)
+         for (int i=0; i < t.length (); i++)
            {
              if (!isdigit (t[i])) 
                {
@@ -183,8 +178,8 @@ Mark_engraver::process_music ()
                  break;
                }
            }
-         SCM st = ly_symbol2scm (style.ch_C ());
-         text_p_->set_grob_property ("font-style",  st);
+         SCM st = ly_symbol2scm (style.to_str0 ());
+         text_->set_grob_property ("font-style",  st);
        }
 
     }
@@ -193,6 +188,7 @@ Mark_engraver::process_music ()
 ENTER_DESCRIPTION(Mark_engraver,
 /* descr */       "",
 /* creats*/       "RehearsalMark",
-/* acks  */       "bar-line-interface", 
+/* accepts */     "mark-event",
+/* acks  */       "bar-line-interface",
 /* reads */       "rehearsalMark stavesFound",
 /* write */       "");