* input/bugs/rhytmicstaff-tie.ly: add file.

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 3382380da9b721ed7fdc7b11b810189c1ecc6c75..7f50d89f744f496695fac022aad5a7e237b67629 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -1,5 +1,5 @@
 /*   
-  time-signature.cc --  implement Time_signature
+  time-signature.cc -- implement Time_signature
   
   source file of the GNU LilyPond music typesetter
   
@@ -16,8 +16,16 @@
 #include "warn.hh"
 #include "staff-symbol-referencer.hh"
 
+
+/*
+  TODO:
+
+  this file should go ; The formatting can completely be done with
+  markups.
+  
+ */
+
 MAKE_SCHEME_CALLBACK (Time_signature, brew_molecule, 1);
-/* TODO: make different functions for special and normal timesigs. */
 SCM
 Time_signature::brew_molecule (SCM smob) 
 {
@@ -95,11 +103,16 @@ Time_signature::numbered_time_signature (Grob*me,int num, int den)
   SCM chain = Font_interface::font_alist_chain (me);
   me->set_grob_property ("font-family", ly_symbol2scm ("number"));
 
-  Molecule n =
-    Text_item::interpret_new_markup (me->self_scm(), chain,scm_makfrom0str (to_string (num).to_str0 ()));
+SCM sn =
+    Text_item::interpret_markup (me->get_paper ()->self_scm(), chain,
+                                scm_makfrom0str (to_string (num).to_str0 ()));
+SCM sd =
+    Text_item::interpret_markup (me->get_paper ()->self_scm(), chain,
+                                scm_makfrom0str (to_string (den).to_str0 ()));
+
+  Molecule n = *unsmob_molecule (sn);
+  Molecule d = *unsmob_molecule (sd);
                              
-  Molecule d =
-    Text_item::interpret_new_markup (me->self_scm(), chain,scm_makfrom0str (to_string (den).to_str0 ()));
   n.align_to (X_AXIS, CENTER);
   d.align_to (X_AXIS, CENTER);
   Molecule m;