source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "debug.hh"
#include "dimensions.hh"
-#include "crescendo.hh"
+#include "hairpin.hh"
#include "musical-request.hh"
#include "paper-column.hh"
#include "note-column.hh"
* direction of text-dynamic-request if not equal to direction of
line-spanner
+
+ - TODO: this engraver is too complicated. We should split it into
+ the handling of the basic grobs and the linespanner
+
+ - TODO: the line-spanner is not killed after the (de)crescs are
+ finished.
+
*/
/**
void typeset_all ();
-public:
- VIRTUAL_COPY_CONS(Translator);
- Dynamic_engraver ();
+TRANSLATOR_DECLARATIONS(Dynamic_engraver );
protected:
- virtual void do_removal_processing ();
+ virtual void finalize ();
virtual void acknowledge_grob (Grob_info);
virtual bool try_music (Music *req_l);
virtual void stop_translation_timestep ();
- virtual void create_grobs ();
+ virtual void process_music ();
virtual void start_translation_timestep ();
};
-ADD_THIS_TRANSLATOR (Dynamic_engraver);
+
Dynamic_engraver::Dynamic_engraver ()
{
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;
}
}
}
void
-Dynamic_engraver::create_grobs ()
+Dynamic_engraver::process_music ()
{
if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_l_)
-
{
if (!line_spanner_)
{
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);
}
}
-
- /*
- finish side position alignment if the (de)cresc ends here, and
- there are no new dynamics.
-
- */
- else if (accepted_spanreqs_drul_[STOP]
- && !accepted_spanreqs_drul_[START] && !script_req_l_)
- {
- finished_line_spanner_ = line_spanner_;
- line_spanner_ = 0;
- }
-
- /*
- todo: resurrect dynamic{direction, padding,minimumspace}
- */
+
/*
During a (de)crescendo, pending request will not be cleared,
and a line-spanner will always be created, as \< \! are already
two requests.
- Maybe always creating a line-spanner for a (de)crescendo (see
- below) is not a good idea:
-
- a\< b\p \!c
-
- the \p will be centred on the line-spanner, and thus clash
- with the hairpin. When axis-group code is in place, the \p
- should move below the hairpin, which is probably better?
-
- Urg, but line-spanner must always have at least same duration
+ Note: line-spanner must always have at least same duration
as (de)crecsendo, b.o. line-breaking.
*/
script_p_ = new Item (get_property ("DynamicText"));
script_p_->set_grob_property ("text",
script_req_l_->get_mus_property ("text"));
+
+ Side_position_interface::set_direction (script_p_, DOWN);
+
if (Direction d = script_req_l_->get_direction ())
Directional_element_interface::set (line_spanner_, d);
if (accepted_spanreqs_drul_[STOP])
{
+ /*
+ finish side position alignment if the (de)cresc ends here, and
+ there are no new dynamics.
+ */
+
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
{
- assert (!finished_cresc_p_);
- Grob* cc = unsmob_element (get_property ("currentMusicalColumn"));
+ assert (!finished_cresc_p_ && cresc_p_);
+
+ cresc_p_->set_bound (RIGHT, script_p_
+ ? script_p_
+ : unsmob_grob (get_property ("currentMusicalColumn")));
+ add_bound_item (line_spanner_, cresc_p_->get_bound (RIGHT));
- cresc_p_->set_bound (RIGHT, cc);
finished_cresc_p_ = cresc_p_;
cresc_p_ = 0;
current_cresc_req_ = 0;
}
}
-
+
if (accepted_spanreqs_drul_[START])
{
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"));
}
/*
TODO: Use symbols.
- */
+ */
String start_type = ly_scm2string (accepted_spanreqs_drul_[START]->get_mus_property ("span-type"));
/*
ugh. Use push/pop?
- */
- SCM s = get_property ((start_type + "Spanner").ch_C());
- if (!gh_string_p (s) || ly_scm2string (s) == "hairpin")
+ */
+ SCM s = get_property ((start_type + "Spanner").ch_C ());
+ if (!gh_symbol_p (s) || s == ly_symbol2scm ("hairpin"))
{
- cresc_p_ = new Spanner (get_property ("Crescendo"));
+ cresc_p_ = new Spanner (get_property ("Hairpin"));
cresc_p_->set_grob_property ("grow-direction",
- gh_int2scm ((start_type == "crescendo")
- ? BIGGER : SMALLER));
+ gh_int2scm ((start_type == "crescendo")
+ ? BIGGER : SMALLER));
}
/*
This is a convenient (and legacy) interface to TextSpanners
for use in (de)crescendi.
Hmm.
- */
+ */
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))
+
+ daddy_trans_l_->set_property ((start_type
+ + "Spanner").ch_C(), SCM_UNDEFINED);
+ 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 ("")));
- daddy_trans_l_->set_property (start_type + "Text",
+ gh_cons (s, ly_str02scm ("")));
+ daddy_trans_l_->set_property ((start_type + "Text").ch_C(),
SCM_UNDEFINED);
}
}
+
cresc_p_->set_bound (LEFT, script_p_
? script_p_
- : unsmob_element (get_property ("currentMusicalColumn")));
-
+ : unsmob_grob (get_property ("currentMusicalColumn")));
+
Axis_group_interface::add_element (line_spanner_, cresc_p_);
+
+ add_bound_item (line_spanner_, cresc_p_->get_bound (LEFT));
+
announce_grob (cresc_p_, accepted_spanreqs_drul_[START]);
}
}
- script_req_l_ = 0;
- accepted_spanreqs_drul_[START] = 0;
- accepted_spanreqs_drul_[STOP] = 0;
}
void
Dynamic_engraver::stop_translation_timestep ()
{
typeset_all ();
+ if (script_req_l_ && !current_cresc_req_)
+ {
+ finished_line_spanner_ = line_spanner_;
+ line_spanner_ =0;
+ typeset_all ();
+ }
}
void
-Dynamic_engraver::do_removal_processing ()
+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_)
{
- finished_cresc_p_->set_bound (RIGHT, script_p_
- ? script_p_
- : unsmob_element (get_property ("currentMusicalColumn")));
-
+ if (!finished_cresc_p_->get_bound (RIGHT))
+ {
+ finished_cresc_p_->set_bound (RIGHT, script_p_
+ ? script_p_
+ : unsmob_grob (get_property ("currentMusicalColumn")));
+
+ if (finished_line_spanner_)
+ add_bound_item (finished_line_spanner_,
+ finished_cresc_p_->get_bound (RIGHT));
+ }
typeset_grob (finished_cresc_p_);
finished_cresc_p_ =0;
}
}
if (finished_line_spanner_)
{
- Side_position::add_staff_support (finished_line_spanner_);
- extend_spanner_over_elements (finished_line_spanner_);
+ /* To make sure that this works */
+ Side_position_interface::add_staff_support (finished_line_spanner_);
+
+ /*
+ We used to have
+
+ 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
+ entire staff.
+
+ */
+
+ 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;
}
void
Dynamic_engraver::acknowledge_grob (Grob_info i)
{
- if (Note_column::has_interface (i.elem_l_))
+ if (Note_column::has_interface (i.grob_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.grob_l_);
+ add_bound_item (line_spanner_,dynamic_cast<Item*> (i.grob_l_));
}
}
}
+ENTER_DESCRIPTION(Dynamic_engraver,
+/* descr */ "",
+/* creats*/ "DynamicLineSpanner DynamicText Hairpin TextSpanner",
+/* acks */ "note-column-interface",
+/* reads */ "",
+/* write */ "");
projects / lilypond.git / blobdiff