(c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "debug.hh"
+#include "warn.hh"
#include "dimensions.hh"
#include "hairpin.hh"
#include "musical-request.hh"
#include "directional-element-interface.hh"
#include "translator-group.hh"
#include "axis-group-interface.hh"
-
+#include "script.hh"
/*
TODO:
*/
class Dynamic_engraver : public Engraver
{
- Item * script_p_;
- Spanner * finished_cresc_p_;
- Spanner * cresc_p_;
+ Item * script_;
+ Spanner * finished_cresc_;
+ Spanner * cresc_;
- Text_script_req* script_req_l_;
+ Text_script_req* script_req_;
- Span_req * current_cresc_req_;
- Drul_array<Span_req*> accepted_spanreqs_drul_;
+ Music * current_cresc_req_;
+ Drul_array<Music*> accepted_spanreqs_drul_;
Spanner* line_spanner_;
Spanner* finished_line_spanner_;
- Link_array<Note_column> pending_column_arr_;
- Link_array<Grob> pending_element_arr_;
+ Link_array<Note_column> pending_columns_;
+ Link_array<Grob> pending_elements_;
void typeset_all ();
protected:
virtual void finalize ();
virtual void acknowledge_grob (Grob_info);
- virtual bool try_music (Music *req_l);
+ virtual bool try_music (Music *req);
virtual void stop_translation_timestep ();
virtual void process_music ();
virtual void start_translation_timestep ();
Dynamic_engraver::Dynamic_engraver ()
{
- script_p_ = 0;
- finished_cresc_p_ = 0;
+ script_ = 0;
+ finished_cresc_ = 0;
line_spanner_ = 0;
finished_line_spanner_ = 0;
current_cresc_req_ = 0;
- cresc_p_ =0;
+ cresc_ =0;
- script_req_l_ = 0;
+ script_req_ = 0;
accepted_spanreqs_drul_[START] = 0;
accepted_spanreqs_drul_[STOP] = 0;
}
void
Dynamic_engraver::start_translation_timestep ()
{
- script_req_l_ = 0;
+ script_req_ = 0;
accepted_spanreqs_drul_[START] = 0;
accepted_spanreqs_drul_[STOP] = 0;
}
if (dynamic_cast <Text_script_req*> (m)
&& m->get_mus_property ("text-type") == ly_symbol2scm ("dynamic"))
{
- script_req_l_ = dynamic_cast<Text_script_req*> (m);
+ script_req_ = dynamic_cast<Text_script_req*> (m);
return true;
}
- else if (Span_req* s = dynamic_cast <Span_req*> (m))
+ else if (m->is_mus_type ("abort-event"))
{
- String t = ly_scm2string (s->get_mus_property ("span-type"));
- if (t== "abort")
- {
- accepted_spanreqs_drul_[LEFT] = 0;
- accepted_spanreqs_drul_[RIGHT] = 0;
- /*
- Let's not kill the line spanner, since that would fuck up
- earlier, not-to-be-terminated stuff.
+ accepted_spanreqs_drul_[LEFT] = 0;
+ accepted_spanreqs_drul_[RIGHT] = 0;
+ /*
+ Let's not kill the line spanner, since that would fuck up
+ earlier, not-to-be-terminated stuff.
- It will disappear by itself when stop_translation_timestep
- () finds that there is nothing to support anymore. */
+ It will disappear by itself when stop_translation_timestep
+ () finds that there is nothing to support anymore. */
- if (cresc_p_)
- cresc_p_->suicide ();
- cresc_p_ = 0;
- }
- else if (t == "crescendo"
- || t == "decrescendo")
- {
- accepted_spanreqs_drul_[s->get_span_dir ()] = s;
- return true;
- }
+ if (cresc_)
+ cresc_->suicide ();
+ cresc_ = 0;
+ }
+ else if (m->is_mus_type ("decrescendo-event")
+ || m->is_mus_type ("crescendo-event"))
+ {
+ Direction d = to_dir (m->get_mus_property ("span-direction"));
+ accepted_spanreqs_drul_[d] = m;
+ return true;
}
return false;
}
void
Dynamic_engraver::process_music ()
{
- if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_l_)
+ if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_)
{
if (!line_spanner_)
{
line_spanner_ = new Spanner (get_property ("DynamicLineSpanner"));
- Side_position_interface::set_axis (line_spanner_, Y_AXIS);
- Axis_group_interface::set_interface (line_spanner_);
- Axis_group_interface::set_axes (line_spanner_, Y_AXIS, Y_AXIS);
-
Music * rq = accepted_spanreqs_drul_[START];
- if (script_req_l_)
- rq = script_req_l_ ;
- announce_grob(line_spanner_, rq->self_scm());
-
-
+ if (script_req_)
+ rq = script_req_ ;
+ announce_grob(line_spanner_, rq ? rq->self_scm(): SCM_EOL);
}
}
- /*
- During a (de)crescendo, pending request will not be cleared,
- and a line-spanner will always be created, as \< \! are already
- two requests.
+ /*
+ During a (de)crescendo, pending request will not be cleared,
+ and a line-spanner will always be created, as \< \! are already
+ two requests.
- Note: line-spanner must always have at least same duration
- as (de)crecsendo, b.o. line-breaking.
- */
+ Note: line-spanner must always have at least same duration
+ as (de)crecsendo, b.o. line-breaking.
+ */
maybe we should leave dynamic texts to the text-engraver and
simply acknowledge them?
*/
- if (script_req_l_)
+ if (script_req_)
{
- script_p_ = new Item (get_property ("DynamicText"));
- script_p_->set_grob_property ("text",
- script_req_l_->get_mus_property ("text"));
+ script_ = new Item (get_property ("DynamicText"));
+ script_->set_grob_property ("text",
+ script_req_->get_mus_property ("text"));
- Side_position_interface::set_direction (script_p_, DOWN);
-
- if (Direction d = script_req_l_->get_direction ())
+ if (Direction d = script_req_->get_direction ())
Directional_element_interface::set (line_spanner_, d);
- Axis_group_interface::add_element (line_spanner_, script_p_);
+ Axis_group_interface::add_element (line_spanner_, script_);
- announce_grob(script_p_, script_req_l_->self_scm());
+ announce_grob(script_, script_req_->self_scm());
}
if (accepted_spanreqs_drul_[STOP])
there are no new dynamics.
*/
- if (!cresc_p_)
+ if (!cresc_)
{
accepted_spanreqs_drul_[STOP]->origin ()->warning
(_ ("can't find start of (de)crescendo"));
}
else
{
- assert (!finished_cresc_p_ && cresc_p_);
+ assert (!finished_cresc_ && cresc_);
- cresc_p_->set_bound (RIGHT, script_p_
- ? script_p_
+ cresc_->set_bound (RIGHT, script_
+ ? script_
: unsmob_grob (get_property ("currentMusicalColumn")));
- add_bound_item (line_spanner_, cresc_p_->get_bound (RIGHT));
+ add_bound_item (line_spanner_, cresc_->get_bound (RIGHT));
- finished_cresc_p_ = cresc_p_;
- cresc_p_ = 0;
+ finished_cresc_ = cresc_;
+ cresc_ = 0;
current_cresc_req_ = 0;
}
}
{
if (current_cresc_req_)
{
- accepted_spanreqs_drul_[START]->origin ()->warning
- (current_cresc_req_->get_span_dir () == 1
- ? _ ("already have a crescendo")
- : _ ("already have a decrescendo"));
+ Direction sd = to_dir (current_cresc_req_->get_mus_property ("span-direction"));
+ String msg = sd == 1
+ ? _ ("already have a crescendo")
+ : _ ("already have a decrescendo");
+
+ accepted_spanreqs_drul_[START]->origin ()->warning (msg);
+ current_cresc_req_->origin ()->warning (_("Cresc started here"));
}
else
{
TODO: Use symbols.
*/
- String start_type = ly_scm2string (accepted_spanreqs_drul_[START]->get_mus_property ("span-type"));
+ String start_type =
+ ly_symbol2string (current_cresc_req_->get_mus_property ("name"));
/*
ugh. Use push/pop?
*/
- SCM s = get_property ((start_type + "Spanner").ch_C ());
+ if (start_type == "DecrescendoEvent")
+ start_type = "decrescendo";
+ else if (start_type == "CrescendoEvent")
+ start_type = "crescendo";
+
+ SCM s = get_property ((start_type + "Spanner").to_str0 ());
if (!gh_symbol_p (s) || s == ly_symbol2scm ("hairpin"))
{
- cresc_p_ = new Spanner (get_property ("Hairpin"));
- cresc_p_->set_grob_property ("grow-direction",
+ cresc_ = new Spanner (get_property ("Hairpin"));
+ cresc_->set_grob_property ("grow-direction",
gh_int2scm ((start_type == "crescendo")
? BIGGER : SMALLER));
*/
else
{
- cresc_p_ = new Spanner (get_property ("TextSpanner"));
- cresc_p_->set_interface (ly_symbol2scm ("dynamic-interface"));
- cresc_p_->set_grob_property ("type", s);
-
- daddy_trans_l_->set_property ((start_type
- + "Spanner").ch_C(), SCM_UNDEFINED);
- s = get_property ((start_type + "Text").ch_C ());
+ cresc_ = new Spanner (get_property ("TextSpanner"));
+ cresc_->set_grob_property ("type", s);
+ daddy_trans_->set_property ((start_type
+ + "Spanner").to_str0 (), SCM_EOL);
+ s = get_property ((start_type + "Text").to_str0 ());
/*
- FIXME: use markup_p () to check type.
+ FIXME: use get_markup () to check type.
*/
if (gh_string_p (s) || gh_pair_p (s))
{
- cresc_p_->set_grob_property ("edge-text",
- gh_cons (s, ly_str02scm ("")));
- daddy_trans_l_->set_property ((start_type + "Text").ch_C(),
- SCM_UNDEFINED);
+ cresc_->set_grob_property ("edge-text",
+ gh_cons (s, scm_makfrom0str ("")));
+ daddy_trans_->set_property ((start_type + "Text").to_str0 (),
+ SCM_EOL);
}
}
- cresc_p_->set_bound (LEFT, script_p_
- ? script_p_
+ cresc_->set_bound (LEFT, script_
+ ? script_
: unsmob_grob (get_property ("currentMusicalColumn")));
- Axis_group_interface::add_element (line_spanner_, cresc_p_);
+ Axis_group_interface::add_element (line_spanner_, cresc_);
- add_bound_item (line_spanner_, cresc_p_->get_bound (LEFT));
+ add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
- announce_grob(cresc_p_, accepted_spanreqs_drul_[START]->self_scm());
+ announce_grob(cresc_, accepted_spanreqs_drul_[START]->self_scm());
}
}
}
Dynamic_engraver::stop_translation_timestep ()
{
typeset_all ();
- if (script_req_l_ && !current_cresc_req_)
+ if (!current_cresc_req_)
{
finished_line_spanner_ = line_spanner_;
line_spanner_ =0;
typeset_all ();
if (line_spanner_
- && line_spanner_->immutable_property_alist_ == SCM_EOL)
+ && !line_spanner_->live())
line_spanner_ = 0;
if (line_spanner_)
{
typeset_all ();
}
- if (cresc_p_
- && cresc_p_->immutable_property_alist_ == SCM_EOL)
- cresc_p_ = 0;
- if (cresc_p_)
+ if (cresc_
+ && !cresc_->live())
+ cresc_ = 0;
+ if (cresc_)
{
current_cresc_req_->origin ()->warning (_ ("unterminated (de)crescendo"));
- cresc_p_->suicide ();
- cresc_p_ = 0;
+ cresc_->suicide ();
+ cresc_ = 0;
}
}
Hmm, how to do this, cleanly?
Maybe just check at typeset_grob ()?
*/
- if (finished_cresc_p_
- && finished_cresc_p_->immutable_property_alist_ == SCM_EOL)
- finished_cresc_p_ = 0;
+ if (finished_cresc_
+ && !finished_cresc_->live())
+ finished_cresc_ = 0;
if (finished_line_spanner_
- && finished_line_spanner_->immutable_property_alist_ == SCM_EOL)
+ && !finished_line_spanner_->live())
finished_line_spanner_ = 0;
- if (finished_cresc_p_)
+ if (finished_cresc_)
{
- if (!finished_cresc_p_->get_bound (RIGHT))
+ if (!finished_cresc_->get_bound (RIGHT))
{
- finished_cresc_p_->set_bound (RIGHT, script_p_
- ? script_p_
+ finished_cresc_->set_bound (RIGHT, script_
+ ? script_
: unsmob_grob (get_property ("currentMusicalColumn")));
if (finished_line_spanner_)
add_bound_item (finished_line_spanner_,
- finished_cresc_p_->get_bound (RIGHT));
+ finished_cresc_->get_bound (RIGHT));
}
- typeset_grob (finished_cresc_p_);
- finished_cresc_p_ =0;
+ typeset_grob (finished_cresc_);
+ finished_cresc_ =0;
}
- if (script_p_)
+ if (script_)
{
- typeset_grob (script_p_);
- script_p_ = 0;
+ typeset_grob (script_);
+ script_ = 0;
}
if (finished_line_spanner_)
{
/*
We used to have
- extend_spanner_over_elements (finished_line_spanner_);
+ extend-spanner-over-elements (finished_line_spanner_);
but this is rather kludgy, since finished_line_spanner_
typically has a staff-symbol field set , extending it over the
void
Dynamic_engraver::acknowledge_grob (Grob_info i)
{
- if (Note_column::has_interface (i.grob_l_))
+ if (!line_spanner_)
+ return ;
+
+ if (Note_column::has_interface (i.grob_))
{
if (line_spanner_
/* Don't refill killed spanner */
- && line_spanner_->immutable_property_alist_ != SCM_EOL)
+ && line_spanner_->live())
+ {
+ Side_position_interface::add_support (line_spanner_,i.grob_);
+ add_bound_item (line_spanner_,dynamic_cast<Item*> (i.grob_));
+ }
+
+ if (script_ && !script_->get_parent (X_AXIS))
{
- Side_position_interface::add_support (line_spanner_,i.grob_l_);
- add_bound_item (line_spanner_,dynamic_cast<Item*> (i.grob_l_));
+ script_->set_parent (i.grob_, X_AXIS);
}
+
+ }
+ else if (Script_interface::has_interface (i.grob_) && script_)
+ {
+ SCM p = i.grob_->get_grob_property ("script-priority");
+
+ /*
+ UGH.
+
+ DynamicText doesn't really have a script-priority field.
+ */
+ if (gh_number_p (p)
+ && gh_scm2int (p) < gh_scm2int (script_->get_grob_property ("script-priority")))
+ {
+ Side_position_interface::add_support (line_spanner_, i.grob_);
+
+ }
}
}
ENTER_DESCRIPTION(Dynamic_engraver,
",
/* creats*/ "DynamicLineSpanner DynamicText Hairpin TextSpanner",
-/* acks */ "note-column-interface",
+/* accepts */ "text-script-event crescendo-event decrescendo-event",
+/* acks */ "note-column-interface script-interface",
/* reads */ "",
/* write */ "");
projects / lilypond.git / blobdiff