source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "warn.hh"
#include "dimensions.hh"
#include "hairpin.hh"
-#include "musical-request.hh"
+#include "event.hh"
#include "paper-column.hh"
#include "note-column.hh"
#include "item.hh"
/*
TODO:
- * direction of text-dynamic-request if not equal to direction of
+ * direction of text-dynamic-event if not equal to direction of
line-spanner
- TODO: this engraver is too complicated. We should split it into
Spanner * finished_cresc_;
Spanner * cresc_;
- Text_script_req* script_req_;
+ Music* script_ev_;
- Span_req * current_cresc_req_;
- Drul_array<Span_req*> accepted_spanreqs_drul_;
+ Music * current_cresc_ev_;
+ Drul_array<Music*> accepted_spanreqs_drul_;
Spanner* line_spanner_;
Spanner* finished_line_spanner_;
virtual bool try_music (Music *req);
virtual void stop_translation_timestep ();
virtual void process_music ();
- virtual void start_translation_timestep ();
};
finished_cresc_ = 0;
line_spanner_ = 0;
finished_line_spanner_ = 0;
- current_cresc_req_ = 0;
+ current_cresc_ev_ = 0;
cresc_ =0;
- script_req_ = 0;
- accepted_spanreqs_drul_[START] = 0;
- accepted_spanreqs_drul_[STOP] = 0;
-}
-
-void
-Dynamic_engraver::start_translation_timestep ()
-{
- script_req_ = 0;
+ script_ev_ = 0;
accepted_spanreqs_drul_[START] = 0;
accepted_spanreqs_drul_[STOP] = 0;
}
bool
Dynamic_engraver::try_music (Music * m)
{
- if (dynamic_cast <Text_script_req*> (m)
- && m->get_mus_property ("text-type") == ly_symbol2scm ("dynamic"))
+ if (m->is_mus_type ("absolute-dynamic-event"))
{
- script_req_ = dynamic_cast<Text_script_req*> (m);
+ /*
+ TODO: probably broken.
+ */
+ script_ev_ = 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_)
- cresc_->suicide ();
- cresc_ = 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;
+ if (current_cresc_ev_ && d == START)
+ accepted_spanreqs_drul_[STOP] = m;
+ return true;
}
return false;
}
void
Dynamic_engraver::process_music ()
{
- if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_)
+ if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_ev_)
{
if (!line_spanner_)
{
- line_spanner_ = new Spanner (get_property ("DynamicLineSpanner"));
+ line_spanner_ = make_spanner ("DynamicLineSpanner");
Music * rq = accepted_spanreqs_drul_[START];
- if (script_req_)
- rq = script_req_ ;
+ if (script_ev_)
+ rq = script_ev_ ;
announce_grob(line_spanner_, rq ? rq->self_scm(): SCM_EOL);
}
}
/*
- During a (de)crescendo, pending request will not be cleared,
+ During a (de)crescendo, pending event will not be cleared,
and a line-spanner will always be created, as \< \! are already
- two requests.
+ two events.
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_)
+ if (script_ev_)
{
- script_ = new Item (get_property ("DynamicText"));
+ script_ = make_item ("DynamicText");
script_->set_grob_property ("text",
- script_req_->get_mus_property ("text"));
+ script_ev_->get_mus_property ("text"));
+
- if (Direction d = script_req_->get_direction ())
- Directional_element_interface::set (line_spanner_, d);
+ if (Direction d = to_dir (script_ev_->get_mus_property ("direction")))
+ set_grob_direction (line_spanner_, d);
Axis_group_interface::add_element (line_spanner_, script_);
- announce_grob(script_, script_req_->self_scm());
+ announce_grob(script_, script_ev_->self_scm());
}
- if (accepted_spanreqs_drul_[STOP])
+ Music *stop_ev = accepted_spanreqs_drul_ [STOP] ?
+ accepted_spanreqs_drul_[STOP] : script_ev_;
+
+ if (accepted_spanreqs_drul_[STOP] || script_ev_)
{
/*
finish side position alignment if the (de)cresc ends here, and
there are no new dynamics.
*/
-
- if (!cresc_)
- {
- accepted_spanreqs_drul_[STOP]->origin ()->warning
- (_ ("can't find start of (de)crescendo"));
- accepted_spanreqs_drul_[STOP] = 0;
- }
- else
+
+
+ if (cresc_)
{
assert (!finished_cresc_ && cresc_);
finished_cresc_ = cresc_;
cresc_ = 0;
- current_cresc_req_ = 0;
+ current_cresc_ev_ = 0;
+ }
+ else if (accepted_spanreqs_drul_[STOP] )
+ {
+ accepted_spanreqs_drul_[STOP]->origin ()->warning(_ ("can't find start of (de)crescendo"));
+ stop_ev = 0;
}
+
}
if (accepted_spanreqs_drul_[START])
{
- if (current_cresc_req_)
+ if (current_cresc_ev_)
{
- String msg = current_cresc_req_->get_span_dir () == 1
+ Direction sd = to_dir (current_cresc_ev_->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"));
+ current_cresc_ev_->origin ()->warning (_("Cresc started here"));
}
else
{
- current_cresc_req_ = accepted_spanreqs_drul_[START];
+ current_cresc_ev_ = accepted_spanreqs_drul_[START];
+
+ if (Direction d = to_dir (current_cresc_ev_->get_mus_property ("direction")))
+ set_grob_direction (line_spanner_, d);
/*
TODO: Use symbols.
*/
- String start_type = ly_scm2string (accepted_spanreqs_drul_[START]->get_mus_property ("span-type"));
+ String start_type =
+ ly_symbol2string (current_cresc_ev_->get_mus_property ("name"));
/*
ugh. Use push/pop?
*/
+ 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_ = new Spanner (get_property ("Hairpin"));
+ cresc_ = make_spanner ("Hairpin");
cresc_->set_grob_property ("grow-direction",
gh_int2scm ((start_type == "crescendo")
? BIGGER : SMALLER));
}
+
+
/*
This is a convenient (and legacy) interface to TextSpanners
for use in (de)crescendi.
*/
else
{
- cresc_ = new Spanner (get_property ("TextSpanner"));
- cresc_->set_grob_property ("type", s);
+ cresc_ = make_spanner ("TextSpanner");
+ cresc_->set_grob_property ("style", s);
daddy_trans_->set_property ((start_type
- + "Spanner").to_str0 (), SCM_UNDEFINED);
+ + "Spanner").to_str0 (), SCM_EOL);
s = get_property ((start_type + "Text").to_str0 ());
/*
FIXME: use get_markup () to check type.
if (gh_string_p (s) || gh_pair_p (s))
{
cresc_->set_grob_property ("edge-text",
- gh_cons (s, ly_str02scm ("")));
+ gh_cons (s, scm_makfrom0str ("")));
daddy_trans_->set_property ((start_type + "Text").to_str0 (),
SCM_EOL);
}
Dynamic_engraver::stop_translation_timestep ()
{
typeset_all ();
- if (!current_cresc_req_)
+ if (!current_cresc_ev_)
{
finished_line_spanner_ = line_spanner_;
line_spanner_ =0;
typeset_all ();
}
+
+ script_ev_ = 0;
+ accepted_spanreqs_drul_[START] = 0;
+ accepted_spanreqs_drul_[STOP] = 0;
}
void
cresc_ = 0;
if (cresc_)
{
- current_cresc_req_->origin ()->warning (_ ("unterminated (de)crescendo"));
+ current_cresc_ev_->origin ()->warning (_ ("unterminated (de)crescendo"));
cresc_->suicide ();
cresc_ = 0;
}
}
if (finished_line_spanner_)
{
- /* To make sure that this works */
- Side_position_interface::add_staff_support (finished_line_spanner_);
-
/*
We used to have
{
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")))
{
}
}
ENTER_DESCRIPTION(Dynamic_engraver,
-/* descr */ "
-This engraver creates hairpins, dynamic texts, and their vertical
-alignments. The symbols are collected onto a DynamicLineSpanner grob
-which takes care of vertical positioning.
-",
+/* descr */
+"This engraver creates hairpins, dynamic texts, and their vertical\n"
+"alignments. The symbols are collected onto a DynamicLineSpanner grob\n"
+"which takes care of vertical positioning. "
+,
/* creats*/ "DynamicLineSpanner DynamicText Hairpin TextSpanner",
-/* acks */ "note-column-interface script-interface",
+/* accepts */ "absolute-dynamic-event crescendo-event decrescendo-event",
+/* acks */ "note-column-interface script-interface",
/* reads */ "",
/* write */ "");
projects / lilypond.git / blobdiff