release: 1.1.32

[lilypond.git] / lily / abbrev.cc

diff --git a/lily/abbrev.cc b/lily/abbrev.cc
index f9f8b89dff9b27cd47d757718ce004c039d46ef5..d476552f278e080f6792382c53ea4b89100297f6 100644 (file)
--- a/lily/abbrev.cc
+++ b/lily/abbrev.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,6 +13,7 @@
 #include "paper-def.hh"
 #include "lookup.hh"
 #include "stem.hh"
+#include "offset.hh"
 
 Abbreviation::Abbreviation ()
 {
@@ -27,7 +28,7 @@ Abbreviation::do_print () const
 }
 
 Molecule*
-Abbreviation::brew_molecule_p () const
+Abbreviation::do_brew_molecule_p () const
 {
   Real interbeam_f = paper ()->interbeam_f (stem_l_->mult_i_);
   Real w = 1.5 * lookup_l ()->ball (2).dim_.x ().length ();
@@ -44,15 +45,15 @@ Abbreviation::brew_molecule_p () const
   } 
   Real sl = slope_f * internote_f;
 
-  Atom a (lookup_l ()->beam (sl, w, beam_f));
+  Molecule a (lookup_l ()->beam (sl, w, beam_f));
   a.translate (Offset (-w/2, w / 2 * slope_f));
 
   Molecule *beams= new Molecule; 
   for (int i = 0; i < abbrev_flags_i_; i++)
     {
-      Atom b (a);
+      Molecule b (a);
       b.translate_axis (interbeam_f * i, Y_AXIS);
-      beams->add_atom (b);
+      beams->add_molecule (b);
     }
   beams->translate_axis (-beams->extent ()[Y_AXIS].center (), Y_AXIS);
 
@@ -120,7 +121,7 @@ Abbreviation::brew_molecule_p () const
 }
 
 void
-Abbreviation::do_substitute_dependent (Score_element*o, Score_element*n)
+Abbreviation::do_substitute_element_pointer (Score_element*o, Score_element*n)
 {
   if (stem_l_ == o)
     stem_l_ = dynamic_cast<Stem*> (n);