source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.hh"
#include "dimensions.hh"
void typeset_all ();
public:
- VIRTUAL_COPY_CONS(Translator);
+ VIRTUAL_COPY_CONS (Translator);
Dynamic_engraver ();
protected:
{
accepted_spanreqs_drul_[LEFT] = 0;
accepted_spanreqs_drul_[RIGHT] = 0;
- if (line_spanner_)
- line_spanner_->suicide ();
- line_spanner_ = 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. */
+
if (cresc_p_)
cresc_p_->suicide ();
cresc_p_ = 0;
else if (t == "crescendo"
|| t == "decrescendo")
{
- accepted_spanreqs_drul_[s->get_span_dir()] = s;
+ accepted_spanreqs_drul_[s->get_span_dir ()] = s;
return true;
}
}
{
line_spanner_ = new Spanner (get_property ("DynamicLineSpanner"));
- Side_position::set_axis (line_spanner_, Y_AXIS);
+ 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);
script_p_->set_grob_property ("text",
script_req_l_->get_mus_property ("text"));
- Side_position::set_direction (script_p_, LEFT);
- Side_position::set_axis (script_p_, X_AXIS);
-
+ Side_position_interface::set_direction (script_p_, DOWN);
+
if (Direction d = script_req_l_->get_direction ())
Directional_element_interface::set (line_spanner_, d);
there are no new dynamics.
*/
- if ( !cresc_p_)
+ if (!cresc_p_)
{
accepted_spanreqs_drul_[STOP]->origin ()->warning
- (_ ("can't find start of (de)crescendo"));
+ (_ ("can't find start of (de)crescendo"));
accepted_spanreqs_drul_[STOP] = 0;
}
else
if (current_cresc_req_)
{
accepted_spanreqs_drul_[START]->origin ()->warning
- (current_cresc_req_->get_span_dir() == 1
+ (current_cresc_req_->get_span_dir () == 1
? _ ("already have a crescendo")
: _ ("already have a decrescendo"));
}
/*
ugh. Use push/pop?
*/
- SCM s = get_property ((start_type + "Spanner").ch_C());
+ SCM s = get_property ((start_type + "Spanner").ch_C ());
if (!gh_symbol_p (s) || s == ly_symbol2scm ("hairpin"))
{
cresc_p_ = new Spanner (get_property ("Hairpin"));
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", SCM_UNDEFINED);
- s = get_property ((start_type + "Text").ch_C());
- if (gh_string_p (s))
+ s = get_property ((start_type + "Text").ch_C ());
+ /*
+ FIXME: use markup_p () to check type.
+ */
+ if (gh_string_p (s) || gh_pair_p (s))
{
cresc_p_->set_grob_property ("edge-text",
gh_cons (s, ly_str02scm ("")));
Dynamic_engraver::finalize ()
{
typeset_all ();
+
+ if (line_spanner_
+ && line_spanner_->immutable_property_alist_ == SCM_EOL)
+ line_spanner_ = 0;
if (line_spanner_)
{
finished_line_spanner_ = line_spanner_;
typeset_all ();
}
+ if (cresc_p_
+ && cresc_p_->immutable_property_alist_ == SCM_EOL)
+ cresc_p_ = 0;
if (cresc_p_)
{
current_cresc_req_->origin ()->warning (_ ("unterminated (de)crescendo"));
void
Dynamic_engraver::typeset_all ()
{
+ /*
+ remove suicided spanners,
+ ugh: we'll need this for every spanner, beam, slur
+ 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_line_spanner_
+ && finished_line_spanner_->immutable_property_alist_ == SCM_EOL)
+ finished_line_spanner_ = 0;
+
if (finished_cresc_p_)
{
if (!finished_cresc_p_->get_bound (RIGHT))
}
if (finished_line_spanner_)
{
- /*
- To make sure that this works
- */
- Side_position::add_staff_support (finished_line_spanner_);
+ /* To make sure that this works */
+ Side_position_interface::add_staff_support (finished_line_spanner_);
+
/*
We used to have
*/
- if (!finished_line_spanner_->get_bound (RIGHT))
- finished_line_spanner_->set_bound (RIGHT, finished_line_spanner_->get_bound (LEFT));
-
+ Grob * l = finished_line_spanner_->get_bound (LEFT );
+ Grob * r = finished_line_spanner_->get_bound (RIGHT);
+ if (!r && l)
+ finished_line_spanner_->set_bound (RIGHT, l);
+ else if (!l && r)
+ finished_line_spanner_->set_bound (LEFT, r);
+ else if (!r && !l)
+ {
+ /*
+ This is a isolated dynamic apparently, and does not even have
+ any interesting support item.
+ */
+ Grob * cc = unsmob_grob (get_property ("currentMusicalColumn"));
+ Item * ci = dynamic_cast<Item*>(cc);
+ finished_line_spanner_->set_bound (RIGHT, ci);
+ finished_line_spanner_->set_bound (LEFT, ci);
+ }
+
typeset_grob (finished_line_spanner_);
finished_line_spanner_ = 0;
}
{
if (Note_column::has_interface (i.elem_l_))
{
- if (line_spanner_)
+ if (line_spanner_
+ /* Don't refill killed spanner */
+ && line_spanner_->immutable_property_alist_ != SCM_EOL)
{
- Side_position::add_support (line_spanner_,i.elem_l_);
- add_bound_item (line_spanner_,dynamic_cast<Item*>(i.elem_l_));
+ Side_position_interface::add_support (line_spanner_,i.elem_l_);
+ add_bound_item (line_spanner_,dynamic_cast<Item*> (i.elem_l_));
}
}
}