*/
#include "engraver.hh"
-#include "musical-request.hh"
+#include "request.hh"
#include "grob.hh"
#include "item.hh"
#include "lily-guile.hh"
struct Pedal_info
{
char const * name_;
- Span_req* start_req_l_;
- Drul_array<Span_req*> req_l_drul_;
- Item* item_p_;
- Spanner* bracket_p_; // A single portion of a pedal bracket
- Spanner* finished_bracket_p_;
+ Music* start_req_;
+ Drul_array<Music*> req_l_drul_;
+ Item* item_;
+ Spanner* bracket_; // A single portion of a pedal bracket
+ Spanner* finished_bracket_;
/*
This grob contains all the pedals of the same type on the same staff
*/
Spanner* line_spanner_;
Spanner* finished_line_spanner_;
- Span_req* current_bracket_req_;
+ Music* current_bracket_req_;
};
Why 4, why not 3. Why not 3423 ? ---hwn.
*/
- Spanner *previous_p_ [4];
+ Spanner *previous_ [4];
int spanner_count_;
spanner_count_ = 0;
for (int i = 0; i < 3; ++i)
- previous_p_[i] = 0;
+ previous_[i] = 0;
char * names [] = { "Sostenuto", "Sustain", "UnaCorda", 0 };
do
{
p->name_ = *np;
- p->item_p_ = 0;
- p->bracket_p_ = 0;
- p->finished_bracket_p_ = 0;
+ p->item_ = 0;
+ p->bracket_ = 0;
+ p->finished_bracket_ = 0;
p->line_spanner_ = 0;
p->finished_line_spanner_ = 0;
p->current_bracket_req_ = 0;
p->req_l_drul_[START] = 0;
p->req_l_drul_[STOP] = 0;
- p->start_req_l_ = 0;
+ p->start_req_ = 0;
p++;
}
{
for (Pedal_info*p = info_list_; p && p->name_; p ++)
{
- if (Note_column::has_interface (info.grob_l_))
+ if (Note_column::has_interface (info.grob_))
{
if (p->line_spanner_)
{
- Side_position_interface::add_support (p->line_spanner_, info.grob_l_);
+ Side_position_interface::add_support (p->line_spanner_, info.grob_);
- add_bound_item (p->line_spanner_,info.grob_l_);
+ add_bound_item (p->line_spanner_,info.grob_);
}
- if (p->bracket_p_)
- add_bound_item (p->bracket_p_,info.grob_l_);
+ if (p->bracket_)
+ add_bound_item (p->bracket_,info.grob_);
}
}
bool
Piano_pedal_engraver::try_music (Music *m)
{
- if (Span_req * s = dynamic_cast<Span_req*> (m))
+ if (m->is_mus_type ("abort-event"))
{
for (Pedal_info*p = info_list_; p->name_; p ++)
{
- if (ly_scm2string (s->get_mus_property ("span-type")) == "abort")
- {
- p->req_l_drul_[START] = 0;
- p->req_l_drul_[STOP] = 0;
-
- if (p->bracket_p_)
- p->bracket_p_->suicide (); /* as in dynamic-engraver.cc */
- p->bracket_p_ = 0;
- }
- if (scm_equal_p (s->get_mus_property ("span-type"),
- ly_str02scm (p->name_))==SCM_BOOL_T)
+ p->req_l_drul_[START] = 0;
+ p->req_l_drul_[STOP] = 0;
+
+ if (p->bracket_)
+ p->bracket_->suicide (); /* as in dynamic-engraver.cc */
+ p->bracket_ = 0;
+ }
+ }
+ else if (m->is_mus_type ("pedal-event"))
+ {
+ for (Pedal_info*p = info_list_; p->name_; p ++)
+ {
+ String nm = p->name_ + String ("Event");
+ if (gh_equal_p (m->get_mus_property ("name") ,
+ scm_makfrom0str (nm.to_str0())))
{
- p->req_l_drul_[s->get_span_dir ()] = s;
+ Direction d = to_dir (m->get_mus_property ("span-direction"));
+ p->req_l_drul_[d] = m;
return true;
}
}
if (!p->line_spanner_)
{
String name = String (p->name_) + "PedalLineSpanner";
- p->line_spanner_ = new Spanner (get_property (name.ch_C ()));
- Side_position_interface::set_axis (p->line_spanner_, Y_AXIS);
+ p->line_spanner_ = new Spanner (get_property (name.to_str0 ()));
+
+
Music * rq = (p->req_l_drul_[START] ? p->req_l_drul_[START] : p->req_l_drul_[STOP]);
announce_grob (p->line_spanner_, rq->self_scm ());
}
These can be text items or text-spanners
*/
SCM type = ly_cdr (scm_assoc (ly_symbol2scm ("pedal-type"),
- get_property ( (String (p->name_) + "Pedal").ch_C ())));
+ get_property ( (String (p->name_) + "Pedal").to_str0 ())));
if (type == ly_symbol2scm ("text") || // Ped. *Ped. *
type == ly_symbol2scm ("mixed") ) // Ped. _____/\____|
{
- if (! p->item_p_)
+ if (! p->item_)
create_text_grobs (p, type);
}
if (type == ly_symbol2scm ("bracket") || // |_________/\____|
{
SCM b;
SCM s = SCM_EOL;
- SCM strings = get_property ( ("pedal" + String (p->name_) + "Strings").ch_C ());
+ SCM strings = get_property ( ("pedal" + String (p->name_) + "Strings").to_str0 ());
if (scm_ilength (strings) >= 3)
{
{
if (pedaltype == ly_symbol2scm ("text"))
{
- if (!p->start_req_l_)
+ if (!p->start_req_)
{
p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->name_));
}
{
s = ly_cadr (strings);
}
- p->start_req_l_ = p->req_l_drul_[START];
+ p->start_req_ = p->req_l_drul_[START];
}
}
else if (p->req_l_drul_[STOP])
{
if (pedaltype == ly_symbol2scm ("text"))
{
- if (!p->start_req_l_)
+ if (!p->start_req_)
{
p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->name_));
}
s = ly_caddr (strings);
spanner_count_ --;
}
- p->start_req_l_ = 0;
+ p->start_req_ = 0;
}
}
else if (p->req_l_drul_[START])
{
- p->start_req_l_ = p->req_l_drul_[START];
+ p->start_req_ = p->req_l_drul_[START];
s = ly_car (strings);
if (pedaltype == ly_symbol2scm ("text"))
{
spanner_count_ ++;
- previous_p_[spanner_count_] = p->line_spanner_;
+ previous_[spanner_count_] = p->line_spanner_;
if (spanner_count_ > 1)
// add extra space below the previous already-occuring pedal
Side_position_interface::add_support (p->line_spanner_,
- previous_p_[spanner_count_ - 1]);
+ previous_[spanner_count_ - 1]);
}
}
if (gh_string_p (s))
{
String propname = String (p->name_) + "Pedal";
- b = get_property (propname.ch_C ());
- p->item_p_ = new Item (b);
- p->item_p_->set_grob_property ("text", s);
- Axis_group_interface::add_element (p->line_spanner_, p->item_p_);
+ b = get_property (propname.to_str0 ());
+ p->item_ = new Item (b);
+ p->item_->set_grob_property ("text", s);
+ Axis_group_interface::add_element (p->line_spanner_, p->item_);
- announce_grob (p->item_p_,
+ announce_grob (p->item_,
(p->req_l_drul_[START]
? p->req_l_drul_[START]
: p->req_l_drul_[STOP])->self_scm ());
if (p->req_l_drul_[STOP])
{
- if (!p->start_req_l_)
+ if (!p->start_req_)
{
p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", p->name_));
}
else if (!p->req_l_drul_[START])
spanner_count_ -- ;
- assert (!p->finished_bracket_p_ && p->bracket_p_);
+ assert (!p->finished_bracket_ && p->bracket_);
Grob *cmc = unsmob_grob (get_property ("currentMusicalColumn"));
- p->bracket_p_->set_bound (RIGHT, cmc);
+ p->bracket_->set_bound (RIGHT, cmc);
/*
Set properties so that the molecule-creating function will
know whether the right edge should be flared ___/
*/
- SCM eleft = ly_car (p->bracket_p_->get_grob_property ("edge-widen"));
+ SCM eleft = ly_car (p->bracket_->get_grob_property ("edge-widen"));
SCM eright = (p->req_l_drul_[START] ? edge_width_drul_[RIGHT] : gh_double2scm (0));
- p->bracket_p_->set_grob_property ("edge-widen", gh_cons (eleft, eright));
+ p->bracket_->set_grob_property ("edge-widen", gh_cons (eleft, eright));
- p->finished_bracket_p_ = p->bracket_p_;
- p->bracket_p_ = 0;
+ p->finished_bracket_ = p->bracket_;
+ p->bracket_ = 0;
p->current_bracket_req_ = 0;
- p->start_req_l_ = p->req_l_drul_[START];
+ p->start_req_ = p->req_l_drul_[START];
}
if (p->req_l_drul_[START])
{
- p->start_req_l_ = p->req_l_drul_[START];
+ p->start_req_ = p->req_l_drul_[START];
p->current_bracket_req_ = p->req_l_drul_[START];
- p->bracket_p_ = new Spanner (get_property ("PianoPedalBracket"));
+ p->bracket_ = new Spanner (get_property ("PianoPedalBracket"));
/*
Set properties so that the molecule-creating function will
know whether the left edge should be flared \___
*/
- SCM ew = p->bracket_p_->get_grob_property ("edge-widen");
+ SCM ew = p->bracket_->get_grob_property ("edge-widen");
edge_width_drul_[LEFT] = ly_car (ew);
edge_width_drul_[RIGHT] = ly_cdr (ew);
edge_width_drul_[LEFT] :
gh_double2scm (0));
SCM eright = gh_double2scm (0);
- p->bracket_p_->set_grob_property ("edge-widen", gh_cons (eleft, eright));
+ p->bracket_->set_grob_property ("edge-widen", gh_cons (eleft, eright));
/* Set this property for 'mixed style' pedals, Ped._______/\ ,
so the molecule function will shorten the ____ line by the length of the Ped. text.
*/
- p->bracket_p_->set_grob_property ("text-start",
+ p->bracket_->set_grob_property ("text-start",
pedaltype == ly_symbol2scm ("mixed") ?
gh_bool2scm ( (bool) ! p->req_l_drul_[STOP]) :
gh_bool2scm (false));
/*
- Warning: we can't hang the bracket on an item in Y-direction:
- it will cause problems when the bracket is broken, because the
- item can be on another line.
+ Mixed style: Store a pointer to the preceding text for use in
+ calculating the length of the line
*/
- p->bracket_p_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn")));
- Axis_group_interface::add_element (p->line_spanner_, p->bracket_p_);
+ if (p->item_)
+ p->bracket_->set_grob_property ("pedal-text", p->item_->self_scm ());
+
+ p->bracket_->set_bound (LEFT, unsmob_grob (get_property ("currentMusicalColumn")));
+ Axis_group_interface::add_element (p->line_spanner_, p->bracket_);
- add_bound_item (p->line_spanner_, p->bracket_p_->get_bound (LEFT));
- announce_grob (p->bracket_p_, p->req_l_drul_[START]->self_scm ());
+ add_bound_item (p->line_spanner_, p->bracket_->get_bound (LEFT));
+ announce_grob (p->bracket_, p->req_l_drul_[START]->self_scm ());
if (!p->req_l_drul_[STOP])
{
spanner_count_ ++;
- previous_p_[spanner_count_] = p->line_spanner_;
+ previous_[spanner_count_] = p->line_spanner_;
if (spanner_count_ > 1)
// position new pedal spanner below the current one
- Side_position_interface::add_support (p->line_spanner_, previous_p_[spanner_count_ - 1]);
+ Side_position_interface::add_support (p->line_spanner_, previous_[spanner_count_ - 1]);
}
}
suicide?
*/
if (p->line_spanner_
- && p->line_spanner_->immutable_property_alist_ == SCM_EOL)
+ && !p->line_spanner_->live())
p->line_spanner_ = 0;
if (p->line_spanner_)
p->finished_line_spanner_ = p->line_spanner_;
typeset_all ();
}
- if (p->bracket_p_
- && p->bracket_p_->immutable_property_alist_ == SCM_EOL)
- p->bracket_p_ = 0;
- if (p->bracket_p_)
+ if (p->bracket_
+ && !p->bracket_->live())
+ p->bracket_ = 0;
+ if (p->bracket_)
{
p->current_bracket_req_->origin ()->warning (_ ("unterminated pedal bracket"));
- p->bracket_p_->suicide ();
- p->bracket_p_ = 0;
+ p->bracket_->suicide ();
+ p->bracket_ = 0;
}
}
}
{
for (Pedal_info*p = info_list_; p && p->name_; p ++)
{
- if (!p->bracket_p_)
+ if (!p->bracket_)
{
p->finished_line_spanner_ = p->line_spanner_;
p->line_spanner_ = 0;
Handle suicide.
*/
if (p->finished_line_spanner_
- && p->finished_line_spanner_->immutable_property_alist_ == SCM_EOL)
+ && !p->finished_line_spanner_->live ())
p->finished_line_spanner_ = 0;
- if (p->finished_bracket_p_
- && p->finished_bracket_p_->immutable_property_alist_ == SCM_EOL)
- p->finished_bracket_p_ = 0;
+ if (p->finished_bracket_
+ && !p->finished_bracket_->live())
+ p->finished_bracket_ = 0;
if (p->name_ == String ("Sustain"))
- sustain = p->item_p_;
+ sustain = p->item_;
- if (p->item_p_)
+ if (p->item_)
{
/*
Hmm.
{
if (sustain)
{
- Side_position_interface::add_support (p->item_p_,sustain);
+ Side_position_interface::add_support (p->item_,sustain);
}
}
- typeset_grob (p->item_p_);
- p->item_p_ = 0;
+ typeset_grob (p->item_);
+ p->item_ = 0;
}
- if (p->finished_bracket_p_)
+ if (p->finished_bracket_)
{
-
- Grob * l = p->finished_bracket_p_->get_bound (LEFT);
- Grob * r = p->finished_bracket_p_->get_bound (RIGHT);
+ Grob * l = p->finished_bracket_->get_bound (LEFT);
+ Grob * r = p->finished_bracket_->get_bound (RIGHT);
if (!r)
{
- p->finished_bracket_p_->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn")));
+ p->finished_bracket_->set_bound (RIGHT, unsmob_grob (get_property ("currentMusicalColumn")));
}
- typeset_grob (p->finished_bracket_p_);
- p->finished_bracket_p_ =0;
+ typeset_grob (p->finished_bracket_);
+ p->finished_bracket_ =0;
}
if (p->finished_line_spanner_)
ENTER_DESCRIPTION (Piano_pedal_engraver,
/* descr */ "Engrave piano pedal symbols and brackets.",
/* creats*/ "SostenutoPedal SustainPedal UnaCordaPedal SostenutoPedalLineSpanner SustainPedalLineSpanner UnaCordaPedalLineSpanner",
-/* acks */ "note-column-interface",
+/* accepts */ "pedal-event abort-event",
+/* acks */ "note-column-interface",
/* reads */ "pedalSostenutoStrings pedalSustainStrings pedalUnaCordaStrings",
/* write */ "");
projects / lilypond.git / blobdiff