patch::: 1.1.27.jcn4: jcn4

[lilypond.git] / lily / abbrev.cc

diff --git a/lily/abbrev.cc b/lily/abbrev.cc
index 4af78938bc5c78c2ef3fee0a1ec5bc04feddaa49..04eb7dec728b6a204171349f84259336a8bf1ea9 100644 (file)
--- a/lily/abbrev.cc
+++ b/lily/abbrev.cc
@@ -27,7 +27,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 ();
@@ -40,7 +40,7 @@ Abbreviation::brew_molecule_p () const
   if (stem_l_ && stem_l_->beam_l_) {
     slope_f = stem_l_->beam_l_->slope_f_;
     // ugh, rather calc from Abbreviation_req
-    beams_i = stem_l_->beams_right_i_ >? stem_l_->beams_left_i_;
+    beams_i = stem_l_->beams_i_drul_[RIGHT] >? stem_l_->beams_i_drul_[LEFT];
   } 
   Real sl = slope_f * internote_f;
 
@@ -54,13 +54,7 @@ Abbreviation::brew_molecule_p () const
       b.translate_axis (interbeam_f * i, Y_AXIS);
       beams->add_atom (b);
     }
-#define EGCS_ICE
-#ifndef EGCS_ICE
   beams->translate_axis (-beams->extent ()[Y_AXIS].center (), Y_AXIS);
-#else
-  beams->translate_axis (-(beams->extent ()[Y_AXIS].min () + 
-    beams->extent ()[Y_AXIS].max ()) / 2 , Y_AXIS);
-#endif
 
   if (stem_l_)
     { 
@@ -129,7 +123,7 @@ void
 Abbreviation::do_substitute_dependent (Score_element*o, Score_element*n)
 {
   if (stem_l_ == o)
-    stem_l_ = n ? (Stem*)n->access_Item () : 0;
+    stem_l_ = dynamic_cast<Stem*> (n);
 }