* Documentation/user/refman.itely: Compile fix for \mark #'(music ...).

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 4130dcbfd996bced7a949465434de500777d39f7..f495cf9501ad1abc195d302edc49d595b794b704 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -57,7 +57,7 @@ void
 Mark_engraver::acknowledge_grob (Grob_info inf)
 {
   Grob * s = inf.grob_l_;
- if (text_p_ && Bar_line::has_interface (s))
+  if (text_p_ && Bar_line::has_interface (s))
     {
       /*
        Ugh. Figure out how to do this right at beginning of line, (without
@@ -89,8 +89,6 @@ Mark_engraver::create_items (Request *rq)
   text_p_ = new Item (s);
 
 
-  Side_position_interface::set_axis (text_p_, Y_AXIS);
-
   announce_grob(text_p_, rq->self_scm());
 }
 
@@ -141,9 +139,8 @@ Mark_engraver::process_music ()
        text_p_->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))
            {
@@ -174,12 +171,12 @@ Mark_engraver::process_music ()
          text_p_->set_grob_property ("text",
                                      ly_str02scm (t.ch_C ()));
 
-         String style = "mark";
+         String style = "mark-number";
          for (int i=0; i < t.length_i (); i++)
            {
              if (!isdigit (t[i])) 
                {
-                 style = "large";
+                 style = "mark-letter";
                  break;
                }
            }