release commit

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 6457ea1b2be685960c5752e2021c942ea1db13ae..de66bca0ec3c71120a7d0b548a80b848d8403d0c 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--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <ctype.h>
@@ -61,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);
     }
@@ -86,10 +87,7 @@ 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());
 }
 
@@ -121,22 +119,19 @@ Mark_engraver::process_music ()
     {
       create_items (mark_req_);
 
-      String t;
-
       /*
        automatic marks.
        */
       
       SCM m = mark_req_->get_mus_property ("label");
-      if (new_markup_p (m))
+      if (Text_item::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_->set_grob_property ("text",m);
       else 
        {
+         String t ;
+         
          if (!gh_string_p (m) && !gh_number_p (m)) 
            m =  get_property ("rehearsalMark");
          
@@ -155,33 +150,43 @@ Mark_engraver::process_music ()
                {
                  char c = t[0];
                  c++;
-                 next = to_string (c);
+                 t = to_string (c);
                }
-             m = scm_makfrom0str (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",
-                                     scm_makfrom0str (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);
     }
 }