release: 1.3.1

[lilypond.git] / lily / time-signature.cc

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index a4960abc7ba2bc32933626d4a73c91a77b84fb87..1f6234cd9cdc72a7a4be4b721d75d7f43088cf15 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -21,16 +21,19 @@ Time_signature::Time_signature ()
 Molecule*
 Time_signature::do_brew_molecule_p () const
 {
-  if (time_sig_type_str_.length_i ())
+  SCM st = get_elt_property (style_scm_sym);
+  
+  if (st != SCM_BOOL_F)
     {
-      if (time_sig_type_str_[0]=='1')
+      String style (ly_scm2string (gh_cdr (st)));
+      if (style[0]=='1')
        {
          Array<int> tmparr = args_;
          return new Molecule( lookup_l ()->time_signature (args_[0], 0, paper_l ()));
        }
       else
        {
-         return new Molecule( lookup_l ()-> special_time_signature (time_sig_type_str_ ,args_[0], args_[1], paper_l ()));
+         return new Molecule( lookup_l ()-> special_time_signature (style, args_[0], args_[1], paper_l ()));
        }
     }
   else