protected:
virtual bool try_music (Music *);
- virtual void stop_translation_timestep ();
- virtual void process_music ();
- virtual void acknowledge_grob (Grob_info);
+ void stop_translation_timestep ();
+ void process_music ();
+
+ DECLARE_ACKNOWLEDGER ( slur);
+ DECLARE_ACKNOWLEDGER ( rhythmic_head);
+ DECLARE_ACKNOWLEDGER ( stem);
+ DECLARE_ACKNOWLEDGER ( note_column);
public:
TRANSLATOR_DECLARATIONS (Script_engraver);
/* Discard double articulations for part-combining. */
int script_count = scripts_.size ();
for (int i = 0; i < script_count; i++)
- if (ly_c_equal_p (scripts_[i].event_
- ->get_property ("articulation-type"),
- m->get_property ("articulation-type")))
+ if (ly_is_equal (scripts_[i].event_
+ ->get_property ("articulation-type"),
+ m->get_property ("articulation-type")))
return true;
Script_tuple t;
if (art == SCM_BOOL_F)
{
/* FIXME: */
- warning (_ ("Do not know how to interpret articulation: "));
- warning (_ ("Scheme encoding: "));
+ warning (_ ("don't know how to interpret articulation: "));
+ warning (_ ("scheme encoding: "));
scm_write (art_type, scm_current_error_port ());
+ message ("");
return;
}
{
SCM sym = scm_caar (s);
SCM type = scm_object_property (sym, ly_symbol2scm ("backend-type?"));
- if (!ly_c_procedure_p (type))
+ if (!ly_is_procedure (type))
continue;
SCM val = scm_cdar (s);
to the head. */
int prio = scm_to_int (val) + index;
- val = scm_int2num (prio);
+ val = scm_from_int (prio);
}
if (p->internal_get_property (sym) == SCM_EOL)
p->internal_set_property (sym, val);
if (!priority_found)
{
p->set_property ("script-priority",
- scm_int2num (index));
+ scm_from_int (index));
}
Side_position_interface::set_axis (p, Y_AXIS);
void
Script_engraver::process_music ()
{
- int script_count = scripts_.size ();
- for (int i = 0; i < script_count; i++)
- {
+ for (int i = 0; i < scripts_.size(); i++)
+ {
Music *m = scripts_[i].event_;
Grob *p = make_item ("Script", m->self_scm ());
}
}
+
void
-Script_engraver::acknowledge_grob (Grob_info info)
+Script_engraver::acknowledge_stem (Grob_info info)
{
int script_count = scripts_.size ();
- if (Stem::has_interface (info.grob_))
+ for (int i = 0; i < script_count; i++)
{
- for (int i = 0; i < script_count; i++)
- {
- Grob *e = scripts_[i].script_;
+ Grob *e = scripts_[i].script_;
- if (to_dir (e->get_property ("side-relative-direction")))
- e->set_property ("direction-source", info.grob_->self_scm ());
+ if (to_dir (e->get_property ("side-relative-direction")))
+ e->set_object ("direction-source", info.grob ()->self_scm ());
- /* FIXME: add dependency */
- e->add_dependency (info.grob_);
- Side_position_interface::add_support (e, info.grob_);
- }
+ /* FIXME: add dependency */
+ e->add_dependency (info.grob ());
+ Side_position_interface::add_support (e, info.grob ());
}
- else if (Rhythmic_head::has_interface (info.grob_)
- && info.music_cause ())
+}
+
+void
+Script_engraver::acknowledge_rhythmic_head (Grob_info info)
+{
+ if(info.music_cause ())
{
- for (int i = 0; i < script_count; i++)
- {
+ for (int i = 0; i < scripts_.size(); i++)
+ {
Grob *e = scripts_[i].script_;
if (Side_position_interface::get_axis (e) == X_AXIS
&& !e->get_parent (Y_AXIS))
{
- e->set_parent (info.grob_, Y_AXIS);
- e->add_dependency (info.grob_);
+ e->set_parent (info.grob (), Y_AXIS);
+ e->add_dependency (info.grob ());
}
- Side_position_interface::add_support (e, info.grob_);
+ Side_position_interface::add_support (e, info.grob ());
}
}
- else if (Note_column::has_interface (info.grob_))
- {
- /* Make note column the parent of the script. That is not
- correct, but due to seconds in a chord, noteheads may be
- swapped around horizontally.
+}
- As the note head to put it on is not known now, postpone this
- decision to Script_interface::before_line_breaking (). */
- for (int i = 0; i < script_count; i++)
- {
- Grob *e = scripts_[i].script_;
+void
+Script_engraver::acknowledge_note_column (Grob_info info)
+{
+ /* Make note column the parent of the script. That is not
+ correct, but due to seconds in a chord, noteheads may be
+ swapped around horizontally.
+
+ As the note head to put it on is not known now, postpone this
+ decision to Script_interface::before_line_breaking (). */
+
+ for (int i = 0; i < scripts_.size(); i++)
+ {
+ Grob *e = scripts_[i].script_;
- if (!e->get_parent (X_AXIS)
- && Side_position_interface::get_axis (e) == Y_AXIS)
- e->set_parent (info.grob_, X_AXIS);
- }
+ if (!e->get_parent (X_AXIS)
+ && Side_position_interface::get_axis (e) == Y_AXIS)
+ e->set_parent (info.grob (), X_AXIS);
}
- else if (Slur::has_interface (info.grob_))
- slur_ = dynamic_cast<Spanner *> (info.grob_);
+}
+
+void
+Script_engraver::acknowledge_slur (Grob_info info)
+{
+ slur_ = info.spanner ();
}
void
scripts_.clear ();
}
+#include "translator.icc"
+
+ADD_ACKNOWLEDGER (Script_engraver, slur);
+ADD_ACKNOWLEDGER (Script_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (Script_engraver, stem);
+ADD_ACKNOWLEDGER (Script_engraver, note_column);
+
ADD_TRANSLATOR (Script_engraver,
/* descr */ "Handles note scripted articulations.",
/* creats*/ "Script",
/* accepts */ "script-event articulation-event",
- /* acks */ "stem-interface rhythmic-head-interface "
- "slur-interface note-column-interface",
/* reads */ "scriptDefinitions",
/* write */ "");
projects / lilypond.git / blobdiff