* input/test/time-signature-double.ly: use markups for double time

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index bdd968df6093b318de155154cd377a8e42938f9e..0d875ba8c11a30ecc8a048770ae239e635ee62a6 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -128,7 +128,7 @@ Mark_engraver::process_music ()
        */
       
       SCM m = mark_req_->get_mus_property ("label");
-      if (gh_pair_p (m) || new_markup_p (m))
+      if (Text_item::markup_p (m))
        {
          text_->set_grob_property ("text",m);
        }
@@ -166,19 +166,22 @@ Mark_engraver::process_music ()
          text_->set_grob_property ("text",
                                      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";
+                 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);
        }
-
     }
 }