/*
plet-engraver.cc -- implement Plet_engraver
- (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+ (c) 1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "proto.hh"
}
void
-Plet_engraver::acknowledge_element (Score_elem_info i)
+Plet_engraver::acknowledge_element (Score_element_info i)
{
if (!i.elem_l_->is_type_b (Stem::static_name ()))
return;
return;
if (!plet_spanner_p_->stem_l_drul_[LEFT])
- plet_spanner_p_->set_stem (LEFT, (Stem*)i.elem_l_->item ());
+ plet_spanner_p_->set_stem (LEFT, (Stem*)dynamic_cast <Item *> (i.elem_l_));
else
if (span_reqs_drul_[RIGHT] && !plet_spanner_p_->stem_l_drul_[RIGHT])
- plet_spanner_p_->set_stem (RIGHT, (Stem*)i.elem_l_->item());
+ plet_spanner_p_->set_stem (RIGHT, (Stem*)dynamic_cast <Item *> (i.elem_l_));
}
bool
Plet_engraver::do_try_request (Request* req_l)
{
- Musical_req* mus_l = req_l->musical ();
+ Musical_req* mus_l = dynamic_cast <Musical_req *> (req_l);
if (!mus_l)
return false;
- Beam_req* b = mus_l->beam ();
+ /*
+ UGH! This is incorrect!
+ Beam_req might not reach the Plet_engraver if ordering is wrong!
+ */
+ Beam_req* b = dynamic_cast <Beam_req *> (mus_l);
if (b)
{
if (b->spantype)
return false;
}
- Plet_req* p = mus_l->plet ();
+ Plet_req* p = dynamic_cast <Plet_req *> (mus_l);
if (!p)
return false;
{
if (plet_spanner_p_)
{
- span_reqs_drul_[LEFT]->warning (_("unterminated plet"));
+ span_reqs_drul_[LEFT]->warning (_ ("unterminated plet"));
plet_spanner_p_->unlink ();
delete plet_spanner_p_;
plet_spanner_p_ = 0;
return;
plet_spanner_p_ = new Plet_spanner;
- plet_spanner_p_->tdef_p_->text_str_ = span_reqs_drul_[LEFT]->plet_i_;
+ plet_spanner_p_->tdef_p_->text_str_ = to_str (span_reqs_drul_[LEFT]->plet_i_);
- announce_element (Score_elem_info (plet_spanner_p_, span_reqs_drul_[LEFT]));
+ announce_element (Score_element_info (plet_spanner_p_, span_reqs_drul_[LEFT]));
}
void
if (plet_spanner_p_->visibility_i_)
typeset_element (plet_spanner_p_);
else
- plet_spanner_p_->unlink ();
-
+ {
+ plet_spanner_p_->unlink ();
+ delete plet_spanner_p_;
+ }
+
plet_spanner_p_ = 0;
span_reqs_drul_[RIGHT] = span_reqs_drul_[LEFT] = 0;
}