release: 1.1.29

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

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 58adb32966a6de49a4a4b5bfb0e41cc60da9cd46..b6190fa95aa0038d53b41398bde9e54645ac9390 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--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -19,26 +19,22 @@ Time_signature::Time_signature ()
 }
 
 Molecule*
-Time_signature::brew_molecule_p () const
+Time_signature::do_brew_molecule_p () const
 {
-  Atom s;
   if (time_sig_type_str_.length_i ())
     {
       if (time_sig_type_str_[0]=='1')
        {
          Array<int> tmparr = args_;
-         tmparr[1]= 0;
-         s = lookup_l ()->time_signature (tmparr);
+         return new Molecule( lookup_l ()->time_signature (args_[0], 0));
        }
       else
        {
-         s = lookup_l ()-> special_time_signature (time_sig_type_str_ ,args_);
+         return new Molecule( lookup_l ()-> special_time_signature (time_sig_type_str_ ,args_[0], args_[1]));
        }
     }
   else
-    s = lookup_l ()->time_signature (args_);
-  s.translate_axis (-s.extent ()[Y_AXIS].center (), Y_AXIS);
-  return new Molecule (Atom (s));
+    return new Molecule(lookup_l ()->time_signature (args_[0], args_[1]));
 }