#include "note-column.hh"
#include "warn.hh"
+/*
+ Urgh. This engraver is too complex. rewrite. --hwn
+
+*/
+
struct Pedal_info
{
char const * name_;
Event for currently running pedal.
*/
Music* current_bracket_ev_;
+
/*
Event for currently starting pedal, (necessary?
Link_array<Spanner> previous_;
-
-
void create_text_grobs (Pedal_info *p, bool);
void create_bracket_grobs (Pedal_info *p, bool);
void typeset_all ();
add_bound_item (p->line_spanner_,info.grob_);
}
if (p->bracket_)
- add_bound_item (p->bracket_,info.grob_);
-
+ add_bound_item (p->bracket_,info.grob_);
+ if (p->finished_bracket_)
+ add_bound_item (p->finished_bracket_,info.grob_);
}
}
}
String name = String (p->name_) + "PedalLineSpanner";
p->line_spanner_ = new Spanner (get_property (name.to_str0 ()));
-
Music * rq = (p->event_drul_[START] ? p->event_drul_[START] : p->event_drul_[STOP]);
announce_grob (p->line_spanner_, rq->self_scm ());
}
assert (!p->finished_bracket_);
Grob *cmc = unsmob_grob (get_property ("currentMusicalColumn"));
- p->bracket_->set_bound (RIGHT, cmc);
+
+ if (!p->bracket_->get_bound (RIGHT))
+ p->bracket_->set_bound (RIGHT, cmc);
/*
Set properties so that the molecule-creating function will
/*
Hmm.
*/
- if (p->name_ != String ("Sustain"))
+ if (p->name_ != String ("Sustain") && sustain)
{
- if (sustain)
- {
- Side_position_interface::add_support (p->item_,sustain);
- }
+ Side_position_interface::add_support (p->item_,sustain);
}
typeset_grob (p->item_);
p->item_ = 0;
}
typeset_grob (p->finished_bracket_);
+
p->finished_bracket_ =0;
}