patch::: 1.5.22.jcn4

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index aa65da6e20a7a9528f53279115f9a1df66ce4bd7..2f96d04f7e0012069b73eb7db115de8f916cbe80 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,7 +14,7 @@
 #include "paper-def.hh"
 #include "font-interface.hh"
 
-MAKE_SCHEME_CALLBACK(Time_signature,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Time_signature,brew_molecule,1);
 /*
   TODO: make different functions for special and normal timesigs.
  */
@@ -28,8 +28,8 @@ Time_signature::brew_molecule (SCM smob)
   int d = 4;
   if (gh_pair_p (frac))
     {
-      n = gh_scm2int (gh_car (frac));
-      d = gh_scm2int (gh_cdr (frac));
+      n = gh_scm2int (ly_car (frac));
+      d = gh_scm2int (ly_cdr (frac));
     }
 
   
@@ -70,7 +70,7 @@ Time_signature::special_time_signature (Grob*me, String s, int n, int d)
   String symbolname = "timesig-" + s + to_str (n) + "/" + to_str (d);
   
   Molecule m = feta->find_by_name (symbolname);
-  if (!m.empty_b()) 
+  if (!m.empty_b ()) 
     return m;
 
   /*