release commit

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 4bbda428240109ac6f86c5e0c8387a81cab4bcf8..de66bca0ec3c71120a7d0b548a80b848d8403d0c 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #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,
@@ -34,13 +35,13 @@ protected:
 protected:
   virtual void stop_translation_timestep ();
   virtual void acknowledge_grob (Grob_info);
-  void create_items (Request*);
+  void create_items (Music*);
   virtual bool try_music (Music *req);
   virtual void start_translation_timestep ();
   virtual void process_music ();
   
 private:
-  Mark_req * mark_req_;
+  Music * mark_req_;
 };
 
 
@@ -60,8 +61,9 @@ Mark_engraver::acknowledge_grob (Grob_info inf)
   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).
+      TODO: make this configurable. RehearsalMark cannot be
+      break-aligned, since the width of the object should not be taken
+      into alignment considerations.
       */
       text_->set_parent (s, X_AXIS);
     }
@@ -80,15 +82,12 @@ Mark_engraver::stop_translation_timestep ()
 
 
 void
-Mark_engraver::create_items (Request *rq)
+Mark_engraver::create_items (Music *rq)
 {
   if (text_)
     return;
 
-  SCM s = get_property ("RehearsalMark");
-  text_ = new Item (s);
-
-
+  text_ = new Item (get_property ("RehearsalMark"));
   announce_grob(text_, rq->self_scm());
 }
 
@@ -103,16 +102,8 @@ Mark_engraver::start_translation_timestep ()
 bool
 Mark_engraver::try_music (Music* r)
 {
-  if (Mark_req *mr = dynamic_cast <Mark_req *> (r))
-    {
-      if (mark_req_ && mr->equal_b (mark_req_))
-       return true;
-      if (mark_req_)
-       return false;
-      mark_req_ = mr;
-      return true;
-    }
-  return false;
+  mark_req_ = r;
+  return true;
 }
 
 
@@ -128,17 +119,19 @@ Mark_engraver::process_music ()
     {
       create_items (mark_req_);
 
-      String t;
-
       /*
        automatic marks.
        */
       
       SCM m = mark_req_->get_mus_property ("label");
-      if (gh_pair_p (m)) // markup text
-       text_->set_grob_property ("text",m);
+      if (Text_item::markup_p (m))
+       {
+         text_->set_grob_property ("text",m);
+       }
       else 
        {
+         String t ;
+         
          if (!gh_string_p (m) && !gh_number_p (m)) 
            m =  get_property ("rehearsalMark");
          
@@ -157,39 +150,50 @@ Mark_engraver::process_music ()
                {
                  char c = t[0];
                  c++;
-                 next = to_string (c);
+                 t = to_string (c);
                }
-             m = ly_str02scm (next.to_str0 ());
+             m = scm_makfrom0str (t.to_str0 ());
            }
          else
            {
              m = gh_int2scm (1);
+             t = to_string (1);
            }
          
-         daddy_trans_->set_property ("rehearsalMark", m);
-         
          text_->set_grob_property ("text",
-                                     ly_str02scm (t.to_str0 ()));
+                                   scm_makfrom0str (t.to_str0 ()));
 
-         String style = "mark-number";
+         SCM series = SCM_EOL;
+         SCM family = ly_symbol2scm ("number");
          for (int i=0; i < t.length (); i++)
            {
              if (!isdigit (t[i])) 
                {
-                 style = "mark-letter";
+                 /*
+                   This looks strange, since \mark "A"
+                   isn't printed in bold.
+                   
+                  */
+                 
+                 // series = ly_symbol2scm ("bold");
+                 family = ly_symbol2scm ("roman");
                  break;
                }
            }
-         SCM st = ly_symbol2scm (style.to_str0 ());
-         text_->set_grob_property ("font-style",  st);
+         if (gh_symbol_p (series))
+           text_->set_grob_property ("font-series",  series);
+         if (gh_symbol_p (family))
+           text_->set_grob_property ("font-family",  family);
        }
 
+      daddy_trans_->set_property ("rehearsalMark", m);
     }
 }
 
 ENTER_DESCRIPTION(Mark_engraver,
 /* descr */       "",
 /* creats*/       "RehearsalMark",
-/* acks  */       "bar-line-interface", 
+/* accepts */     "mark-event",
+/* acks  */       "bar-line-interface",
 /* reads */       "rehearsalMark stavesFound",
 /* write */       "");