patch::: 1.5.4.jcn3

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 2d498222d4a2e055f42847a9a26dd1ae7700a5c9..faaa30c800c5922fdfab89c78afc7dfc9691163e 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
- (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <ctype.h>
@@ -28,7 +28,7 @@
 class Mark_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
+  VIRTUAL_COPY_CONS (Translator);
   Mark_engraver ();
 protected:
   Item* text_p_;
@@ -36,11 +36,11 @@ protected:
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
-  void create_items(Request*);
+  void create_items (Request*);
   virtual bool try_music (Music *req_l);
   virtual void start_translation_timestep ();
   virtual void initialize ();
-  virtual void create_grobs ();
+  virtual void process_music ();
   
 private:
   Mark_req * mark_req_l_;
@@ -59,7 +59,7 @@ Mark_engraver::Mark_engraver ()
 void
 Mark_engraver::initialize ()
 {
-  daddy_trans_l_->set_property ("staffsFound", SCM_EOL); // ugh: sharing with barnumber grav.
+  daddy_trans_l_->set_property ("stavesFound", SCM_EOL); // ugh: sharing with barnumber grav.
 }
 
 
@@ -70,10 +70,10 @@ Mark_engraver::acknowledge_grob (Grob_info inf)
   if (Staff_symbol::has_interface (s)
       || to_boolean (s->get_grob_property ("invisible-staff")))
     {
-      SCM sts = get_property ("staffsFound");
+      SCM sts = get_property ("stavesFound");
       SCM thisstaff = inf.elem_l_->self_scm ();
       if (scm_memq (thisstaff, sts) == SCM_BOOL_F)
-       daddy_trans_l_->set_property ("staffsFound", gh_cons (thisstaff, sts));
+       daddy_trans_l_->set_property ("stavesFound", gh_cons (thisstaff, sts));
     }
   else if (text_p_ && Bar::has_interface (s))
     {
@@ -90,7 +90,7 @@ Mark_engraver::stop_translation_timestep ()
 {
   if (text_p_)
     {
-      text_p_->set_grob_property("side-support-elements" , get_property ("staffsFound"));
+      text_p_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
       typeset_grob (text_p_);
       text_p_ =0;
     }
@@ -107,7 +107,7 @@ Mark_engraver::create_items (Request *rq)
   text_p_ = new Item (s);
 
 
-  Side_position::set_axis (text_p_, Y_AXIS);
+  Side_position_interface::set_axis (text_p_, Y_AXIS);
 
   announce_grob (text_p_, rq);
 }
@@ -135,8 +135,14 @@ Mark_engraver::try_music (Music* r_l)
   return false;
 }
 
+
+/*
+
+  TODO: make the increment function in Scheme.
+
+*/
 void
-Mark_engraver::create_grobs ()
+Mark_engraver::process_music ()
 {
   if (mark_req_l_)
     {
@@ -149,51 +155,56 @@ Mark_engraver::create_grobs ()
        */
       
       SCM m = mark_req_l_->get_mus_property ("label");
-      if (!gh_string_p (m)) 
-       m =  get_property ("rehearsalMark");
-;
-      
-      if (gh_number_p (m))
+      if (gh_pair_p (m)) // markup text
+       text_p_->set_grob_property ("text",m);
+      else 
        {
-         int mark_count = gh_scm2int (m);
-         t = to_str (mark_count);
-         mark_count ++;
-         m = gh_int2scm (mark_count);
-       }
-      else if (gh_string_p (m))
-       {
-         t = ly_scm2string (m);
-         String next;
-         if (t.length_i ())
+         if (!gh_string_p (m)) 
+           m =  get_property ("rehearsalMark");
+         ;
+         
+         if (gh_number_p (m))
            {
-             char c = t[0];
-             c++;
-             next = to_str (c);
+             int mark_count = gh_scm2int (m);
+             t = to_str (mark_count);
+             mark_count ++;
+             m = gh_int2scm (mark_count);
+           }
+         else if (gh_string_p (m))
+           {
+             t = ly_scm2string (m);
+             String next;
+             if (t.length_i ())
+               {
+                 char c = t[0];
+                 c++;
+                 next = to_str (c);
+               }
+             m = ly_str02scm (next.ch_C ());
+           }
+         else
+           {
+             m = gh_int2scm (1);
            }
-         m = ly_str02scm (next.ch_C());
-       }
-      else
-       {
-         m = gh_int2scm (1);
-       }
          
-      daddy_trans_l_->set_property ("rehearsalMark", m);
-
-      
-      text_p_->set_grob_property ("text",
-                                ly_str02scm ( t.ch_C()));
+         daddy_trans_l_->set_property ("rehearsalMark", m);
+         
+         text_p_->set_grob_property ("text",
+                                     ly_str02scm (t.ch_C ()));
 
-      String style = "mark";
-      for (int i=0; i < t.length_i(); i++)
-       {
-         if (!isdigit(t[i])) 
+         String style = "mark";
+         for (int i=0; i < t.length_i (); i++)
            {
-             style = "large";
-             break;
+             if (!isdigit (t[i])) 
+               {
+                 style = "large";
+                 break;
+               }
            }
+         SCM st = ly_symbol2scm (style.ch_C ());
+         text_p_->set_grob_property ("font-style",  st);
        }
-      SCM st = ly_symbol2scm (style.ch_C());
-      text_p_->set_grob_property ("style",  st);
+
     }
 }