source file of the GNU LilyPond music typesetter
- (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+ (c) 1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "atom.hh"
-#include "boxes.hh"
+#include "box.hh"
#include "debug.hh"
#include "lookup.hh"
#include "molecule.hh"
#include "stem.hh"
#include "text-def.hh"
+
+/*
+ UHGUGH THIS IS BROKEN! do not derive from Bow
+ */
IMPLEMENT_IS_TYPE_B1 (Plet_spanner,Bow);
Plet_spanner::Plet_spanner ()
visibility_i_ = 3;
tdef_p_ = new Text_def;
- tdef_p_->align_i_ = CENTER;
+ tdef_p_->align_dir_ = CENTER;
tdef_p_->style_str_ = "italic";
}
w += (dx_f_drul_[RIGHT] - dx_f_drul_[LEFT]);
- Atom a = paper ()->lookup_l ()->plet (dy_f, w, dir_);
+ Atom a = lookup_l ()->plet (dy_f, w, dir_);
a.translate (Offset (dx_f_drul_[LEFT], dy_f_drul_[LEFT]));
if (visibility_i_ >= 2)
- mol_p->add (a);
+ mol_p->add_atom (a);
Real interline_f = paper ()->interline_f ();
Real numy_f = (dir_ > 0 ? 0 : -interline_f) + dir_ * interline_f / 2;
Atom num (tdef_p_->get_atom (paper (), CENTER));
- num.translate (Offset (width ().length ()/ 2 + dx_f_drul_[LEFT],
+ num.translate (Offset (width ().length () / 1.8 + dx_f_drul_[LEFT],
dy_f_drul_[LEFT] + dy_f / 2 + numy_f));
if (visibility_i_ >= 1)
- mol_p->add (num);
+ mol_p->add_atom (num);
return mol_p;
}
Plet_spanner::do_add_processing ()
{
if (! (stem_l_drul_[LEFT] && stem_l_drul_[RIGHT]))
- warning (_ ("Lonely plet.. "));
+ warning (_ ("lonely plet"));
Direction d = LEFT;
Drul_array<Stem *> new_stem_drul = stem_l_drul_;
do
{
Stem* s = stem_l_drul_[d] ? stem_l_drul_[d] : stem_l_drul_[(Direction)-d];
+
dy_f_drul_[d] = dir_ == s->get_dir () ? s->stem_end_f ()
- : s->stem_begin_f () + dir_ * nh_f / 2;
+ : s->stem_begin_f () + dir_ * nh_f / 2;
dy_f_drul_[d] *= .5 * interline_f;
dy_f_drul_[d] += dir_ * interline_f;
if (d == RIGHT)
dx_f_drul_[d] = nw_f;
}
while (flip(&d) != LEFT);
+ do {
+ if (stem_l_drul_[d]->empty_b ())
+ {
+ Direction u = d;
+ flip (&u);
+ dy_f_drul_[d] = dy_f_drul_[u]; // ughugh \[/3 r8 c8 r8 \]/1
+ }
+ }
+ while (flip(&d) != LEFT);
}
void
-Plet_spanner::do_substitute_dependency (Score_elem* o, Score_elem* n)
+Plet_spanner::do_substitute_dependency (Score_element* o, Score_element* n)
{
- Stem* new_l = n ? (Stem*)n->item () : 0;
- if (o->item () == stem_l_drul_[LEFT])
+ Stem* new_l = n ? (Stem*)dynamic_cast <Item *> (n) : 0;
+ if (dynamic_cast <Item *> (o) == stem_l_drul_[LEFT])
stem_l_drul_[LEFT] = new_l;
- else if (o->item () == stem_l_drul_[RIGHT])
+ else if (dynamic_cast <Item *> (o) == stem_l_drul_[RIGHT])
stem_l_drul_[RIGHT] = new_l;
}