release: 1.1.18

[lilypond.git] / lily / multi-measure-rest.cc

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 4e7e05ff4c57a26c030bd1eff2fc7ffe7722f3d1..a6144ffc0df7d15fc296b593c31eb2fcc9cc1aaf 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1998 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
@@ -11,13 +11,12 @@
 #include "debug.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "dimen.hh"
 #include "rest.hh"
 #include "script.hh"
 #include "text-def.hh"
 #include "molecule.hh"
 
-IMPLEMENT_IS_TYPE_B1 (Multi_measure_rest, Item);
+
 
 Multi_measure_rest::Multi_measure_rest ()
 {
@@ -31,7 +30,7 @@ Multi_measure_rest::do_print () const
 }
 
 Molecule*
-Multi_measure_rest::brew_molecule_p () const
+Multi_measure_rest::do_brew_molecule_p () const
 {
   /*
    [TODO]                                     3
@@ -39,7 +38,7 @@ Multi_measure_rest::brew_molecule_p () const
      * make two,four,eight-measure-rest symbols
    */
 
-  Atom s (paper ()->lookup_l ()->rest (0, 0));
+  Atom s (lookup_l ()->rest (0, 0));
   Molecule* mol_p = new Molecule ( Atom (s));
   Real interline_f = paper ()->interline_f ();
   mol_p->translate_axis (interline_f, Y_AXIS);
@@ -47,11 +46,11 @@ Multi_measure_rest::brew_molecule_p () const
   if (measures_i_ > 1)
     {
       Text_def text;
-      text.text_str_ = measures_i_;
+      text.text_str_ = to_str (measures_i_);
       text.style_str_ = "number";
       Atom s = text.get_atom (paper (), UP);
       s.translate_axis (3.0 * interline_f, Y_AXIS);
-      mol_p->add (s);
+      mol_p->add_atom (s);
     }
 
   return mol_p;