* input/regression/tie-chord.ly: use generateTiePattern to

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index d560b8d226ccd426fde05f2b1ad9889d9c6a94ee..a0f26e6c859201fe8431434b7776808f24161b73 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "time-signature.hh"
 
-#include "text-item.hh"
+#include "text-interface.hh"
 #include "output-def.hh"
 #include "font-interface.hh"
 #include "warn.hh"
@@ -66,9 +66,7 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
       if /* neither C2/2 nor C4/4 */
        (((n != 2) || (d != 2))
         && ((n != 4) || (d != 4)))
-       {
-         return numbered_time_signature (me, n, d);
-       }
+       return numbered_time_signature (me, n, d);
     }
 
   String char_name = style + to_string (n) + to_string (d);
@@ -93,9 +91,9 @@ Time_signature::numbered_time_signature (Grob *me, int num, int den)
                                          ly_symbol2scm ("fetaNumber"))),
                    chain);
 
-  SCM sn = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain,
+  SCM sn = Text_interface::interpret_markup (me->layout ()->self_scm (), chain,
                                             scm_makfrom0str (to_string (num).to_str0 ()));
-  SCM sd = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain,
+  SCM sd = Text_interface::interpret_markup (me->layout ()->self_scm (), chain,
                                             scm_makfrom0str (to_string (den).to_str0 ()));
 
   Stencil n = *unsmob_stencil (sn);