patch::: 1.1.39.jcn1: jcn1

[lilypond.git] / lily / abbreviation-beam.cc

diff --git a/lily/abbreviation-beam.cc b/lily/abbreviation-beam.cc
index 91f4ff21f978921ff24b646382613fd829292095..3bf92b841b0c5d6cd99e62c9bddd74974fb8da08 100644 (file)
--- a/lily/abbreviation-beam.cc
+++ b/lily/abbreviation-beam.cc
@@ -3,18 +3,17 @@
 
   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>
           Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "p-col.hh"
 #include "array.hh"
 #include "proto.hh"
-#include "dimension.hh"
 #include "abbreviation-beam.hh"
 #include "misc.hh"
 #include "debug.hh"
-#include "atom.hh"
+
 #include "molecule.hh"
 #include "leastsquares.hh"
 #include "stem.hh"
@@ -23,7 +22,7 @@
 #include "stem-info.hh"
 
 
-IMPLEMENT_IS_TYPE_B1 (Abbreviation_beam, Spanner);
+
 
 Abbreviation_beam::Abbreviation_beam ()
   : Beam ()
@@ -31,32 +30,9 @@ Abbreviation_beam::Abbreviation_beam ()
 }
 
 Molecule*
-Abbreviation_beam::brew_molecule_p () const 
+Abbreviation_beam::do_brew_molecule_p () const 
 {
-  /* 
-   todo
-   */
-  return Beam::brew_molecule_p ();
-#if 0
-  Molecule *mol_p = new Molecule;
-  // huh? inter-what
-  //    Real inter_f = paper ()->interbeam_f ();
-  Real inter_f = paper ()->internote_f ();
-  Real x0 = stems[0]->hpos_f ();
-  for (int j=0; j <stems.size (); j++) 
-    {
-      Stem *i = stems[j];
-      Stem * prev = (j > 0)? stems[j-1] : 0;
-      Stem * next = (j < stems.size ()-1) ? stems[j+1] :0;
-
-      Molecule sb = stem_beams (i, next, prev);
-      Real  x = i->hpos_f ()-x0;
-      sb.translate (Offset (x, (x * slope_f  + left_y)* inter_f));
-      mol_p->add (sb);
-    }
-  mol_p->translate_axis (x0 - spanned_drul_[LEFT]->absolute_coordinate (X_AXIS), X_AXIS);
-  return mol_p;
-#endif
+  return Beam::do_brew_molecule_p ();
 }
 
 void