source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "axis-group-interface.hh"
#include "self-alignment-interface.hh"
#include "pointer-group-interface.hh"
+#include "translator.icc"
+
/*
TODO:
Music *script_ev_;
Music *current_cresc_ev_;
- Drul_array<Music *> accepted_spanreqs_drul_;
+ Drul_array<Music *> accepted_spanevents_drul_;
Link_array<Note_column> pending_columns_;
Link_array<Grob> pending_elements_;
void typeset_all ();
TRANSLATOR_DECLARATIONS (Dynamic_engraver);
+ DECLARE_ACKNOWLEDGER (script);
+ DECLARE_ACKNOWLEDGER (stem_tremolo);
+ DECLARE_ACKNOWLEDGER (note_column);
+ DECLARE_ACKNOWLEDGER (slur);
protected:
virtual void finalize ();
- virtual void acknowledge_grob (Grob_info);
- virtual bool try_music (Music *req);
- PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
- PRECOMPUTED_VIRTUAL void process_music ();
+ virtual bool try_music (Music *event);
+ void stop_translation_timestep ();
+ void process_music ();
};
Dynamic_engraver::Dynamic_engraver ()
cresc_ = 0;
script_ev_ = 0;
- accepted_spanreqs_drul_[START] = 0;
- accepted_spanreqs_drul_[STOP] = 0;
+ accepted_spanevents_drul_[START] = 0;
+ accepted_spanevents_drul_[STOP] = 0;
}
bool
{
Direction d = to_dir (m->get_property ("span-direction"));
- accepted_spanreqs_drul_[d] = m;
+ accepted_spanevents_drul_[d] = m;
if (current_cresc_ev_ && d == START)
- accepted_spanreqs_drul_[STOP] = m;
+ accepted_spanevents_drul_[STOP] = m;
return true;
}
return false;
void
Dynamic_engraver::process_music ()
{
- if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_ev_)
+ if (accepted_spanevents_drul_[START] || accepted_spanevents_drul_[STOP] || script_ev_)
{
if (!line_spanner_)
{
- Music *rq = accepted_spanreqs_drul_[START];
+ Music *rq = accepted_spanevents_drul_[START];
line_spanner_ = make_spanner ("DynamicLineSpanner", rq ? rq->self_scm () : SCM_EOL);
-
if (script_ev_)
rq = script_ev_;
}
if (Direction d = to_dir (script_ev_->get_property ("direction")))
set_grob_direction (line_spanner_, d);
+ else if (Direction d = to_dir (line_spanner_->get_property ("direction")))
+ set_grob_direction (script_, d);
Axis_group_interface::add_element (line_spanner_, script_);
}
- Music *stop_ev = accepted_spanreqs_drul_ [STOP]
- ? accepted_spanreqs_drul_[STOP] : script_ev_;
+ Music *stop_ev = accepted_spanevents_drul_ [STOP]
+ ? accepted_spanevents_drul_[STOP] : script_ev_;
- if (accepted_spanreqs_drul_[STOP] || script_ev_)
+ if (accepted_spanevents_drul_[STOP] || script_ev_)
{
/*
finish side position alignment if the (de)cresc ends here, and
cresc_->set_bound (RIGHT, script_);
add_bound_item (line_spanner_, script_);
}
-
+
finished_cresc_ = cresc_;
cresc_ = 0;
current_cresc_ev_ = 0;
}
- else if (accepted_spanreqs_drul_[STOP])
+ else if (accepted_spanevents_drul_[STOP])
{
- accepted_spanreqs_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo"));
+ accepted_spanevents_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo"));
stop_ev = 0;
}
}
- if (accepted_spanreqs_drul_[START])
+ if (accepted_spanevents_drul_[START])
{
if (current_cresc_ev_)
{
if (current_cresc_ev_->is_mus_type ("decrescendo-event"))
msg = _ ("already have a crescendo");
- accepted_spanreqs_drul_[START]->origin ()->warning (msg);
+ accepted_spanevents_drul_[START]->origin ()->warning (msg);
current_cresc_ev_->origin ()->warning (_ ("cresc starts here"));
}
else
{
- current_cresc_ev_ = accepted_spanreqs_drul_[START];
+ current_cresc_ev_ = accepted_spanevents_drul_[START];
if (Direction d = to_dir (current_cresc_ev_->get_property ("direction")))
set_grob_direction (line_spanner_, d);
SCM s = get_property ((start_type + "Spanner").to_str0 ());
if (!scm_is_symbol (s) || s == ly_symbol2scm ("hairpin"))
{
- cresc_ = make_spanner ("Hairpin", accepted_spanreqs_drul_[START]->self_scm ());
+ cresc_ = make_spanner ("Hairpin", accepted_spanevents_drul_[START]->self_scm ());
if (finished_cresc_)
{
Pointer_group_interface::add_grob (finished_cresc_,
finished_cresc_);
}
cresc_->set_property ("grow-direction",
- scm_int2num ((start_type == "crescendo")
- ? BIGGER : SMALLER));
+ scm_from_int ((start_type == "crescendo")
+ ? BIGGER : SMALLER));
}
/*
*/
else
{
- cresc_ = make_spanner ("DynamicTextSpanner", accepted_spanreqs_drul_[START]->self_scm ());
+ cresc_ = make_spanner ("DynamicTextSpanner", accepted_spanevents_drul_[START]->self_scm ());
cresc_->set_property ("style", s);
context ()->set_property ((start_type
+ "Spanner").to_str0 (), SCM_EOL);
finished_line_spanner_ = line_spanner_;
line_spanner_ = 0;
}
-
+
typeset_all ();
if (cresc_ && !cresc_->get_bound (LEFT))
}
script_ev_ = 0;
- accepted_spanreqs_drul_[START] = 0;
- accepted_spanreqs_drul_[STOP] = 0;
+ accepted_spanevents_drul_[START] = 0;
+ accepted_spanevents_drul_[STOP] = 0;
}
void
}
}
+
void
-Dynamic_engraver::acknowledge_grob (Grob_info info)
+Dynamic_engraver::acknowledge_stem_tremolo (Grob_info info)
+{
+ if (line_spanner_)
+ Side_position_interface::add_support (line_spanner_, info.grob ());
+}
+
+
+void
+Dynamic_engraver::acknowledge_slur (Grob_info info)
+{
+ if (line_spanner_)
+ Side_position_interface::add_support (line_spanner_, info.grob ());
+}
+
+
+void
+Dynamic_engraver::acknowledge_note_column (Grob_info info)
{
if (!line_spanner_)
return;
- if (Note_column::has_interface (info.grob ()))
+ if (line_spanner_
+ /* Don't refill killed spanner */
+ && line_spanner_->is_live ())
{
- if (line_spanner_
- /* Don't refill killed spanner */
- && line_spanner_->is_live ())
- {
- Side_position_interface::add_support (line_spanner_, info.grob ());
- add_bound_item (line_spanner_, dynamic_cast<Item *> (info.grob ()));
- }
-
- if (script_ && !script_->get_parent (X_AXIS))
- {
- extract_grob_set (info.grob (), "note-heads", heads);
- if (heads.size())
- {
- Grob *head = heads[0];
- script_->set_parent (head, X_AXIS);
- script_->add_offset_callback (Self_alignment_interface::centered_on_parent_proc,
- X_AXIS);
-
- }
- }
+ Side_position_interface::add_support (line_spanner_, info.grob ());
+ add_bound_item (line_spanner_, dynamic_cast<Item *> (info.grob ()));
+ }
- if (cresc_)
+ if (script_ && !script_->get_parent (X_AXIS))
+ {
+ extract_grob_set (info.grob (), "note-heads", heads);
+ if (heads.size ())
{
- if (!cresc_->get_bound (LEFT))
- {
- cresc_->set_bound (LEFT, info.grob ());
- add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
- }
+ Grob *head = heads[0];
+ script_->set_parent (head, X_AXIS);
+ Self_alignment_interface::set_center_parent (script_, X_AXIS);
}
+ }
- if (finished_cresc_ && !finished_cresc_->get_bound (RIGHT))
+ if (cresc_)
+ {
+ if (!cresc_->get_bound (LEFT))
{
- finished_cresc_->set_bound (RIGHT, info.grob ());
+ cresc_->set_bound (LEFT, info.grob ());
+ add_bound_item (line_spanner_, cresc_->get_bound (LEFT));
}
}
-
- else if (Script_interface::has_interface (info.grob ()) && script_)
- {
- SCM p = info.grob ()->get_property ("script-priority");
- /*
- UGH.
+ if (finished_cresc_ && !finished_cresc_->get_bound (RIGHT))
+ finished_cresc_->set_bound (RIGHT, info.grob ());
+}
- DynamicText doesn't really have a script-priority field.
- */
- if (scm_is_number (p)
- && scm_to_int (p)
- < scm_to_int (script_->get_property ("script-priority")))
- Side_position_interface::add_support (line_spanner_, info.grob ());
- }
+void
+Dynamic_engraver::acknowledge_script (Grob_info info)
+{
+ if (!line_spanner_ || !script_)
+ return;
+
+ SCM p = info.grob ()->get_property ("script-priority");
+
+ /*
+ UGH.
+
+ DynamicText doesn't really have a script-priority field.
+ */
+ if (scm_is_number (p)
+ && scm_to_int (p)
+ < scm_to_int (script_->get_property ("script-priority")))
+ Side_position_interface::add_support (line_spanner_, info.grob ());
}
-#include "translator.icc"
+ADD_ACKNOWLEDGER (Dynamic_engraver, script);
+ADD_ACKNOWLEDGER (Dynamic_engraver, note_column);
+ADD_ACKNOWLEDGER (Dynamic_engraver, slur);
+ADD_ACKNOWLEDGER (Dynamic_engraver, stem_tremolo);
ADD_TRANSLATOR (Dynamic_engraver,
- /* descr */
+ /* doc */
"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",
- /* accepts */ "absolute-dynamic-event crescendo-event decrescendo-event",
- /* acks */ "note-column-interface script-interface",
- /* reads */ "",
+ /* create */ "DynamicLineSpanner DynamicText Hairpin TextSpanner",
+ /* accept */ "absolute-dynamic-event crescendo-event decrescendo-event",
+ /* read */ "",
/* write */ "");
projects / lilypond.git / blobdiff