2003 -> 2004

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 187b88b832f34099f71231dc8f00577688f3afe1..0c6292dfa23239a94b6a4504163045e727050fba 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -1,9 +1,9 @@
 /*   
-  time-signature.cc --  implement Time_signature
+  time-signature.cc -- implement Time_signature
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -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) 
 {
@@ -79,7 +87,7 @@ Time_signature::special_time_signature (Grob *me, SCM scm_style, int n, int d)
   me->set_grob_property ("font-family", ly_symbol2scm ("music"));
   Molecule out = Font_interface::get_default_font (me)
     ->find_by_name ("timesig-" + char_name);
-  if (!out.empty_b ())
+  if (!out.is_empty ())
     return out;
 
   /* If there is no such symbol, we default to the numbered style.
@@ -96,10 +104,10 @@ Time_signature::numbered_time_signature (Grob*me,int num, int den)
   me->set_grob_property ("font-family", ly_symbol2scm ("number"));
 
 SCM sn =
-    Text_item::interpret_markup (me->self_scm(), chain,
+    Text_item::interpret_markup (me->get_paper ()->self_scm(), chain,
                                 scm_makfrom0str (to_string (num).to_str0 ()));
 SCM sd =
-    Text_item::interpret_markup (me->self_scm(), chain,
+    Text_item::interpret_markup (me->get_paper ()->self_scm(), chain,
                                 scm_makfrom0str (to_string (den).to_str0 ()));
 
   Molecule n = *unsmob_molecule (sn);