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>
*/
#include "paper-def.hh"
#include "lookup.hh"
#include "stem.hh"
+#include "offset.hh"
Abbreviation::Abbreviation ()
{
}
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 ();
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;
- 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);
}
-#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_)
{