*/
#include "context.hh"
+#include "directional-element-interface.hh"
#include "engraver.hh"
#include "event.hh"
+#include "slur.hh"
#include "note-column.hh"
+#include "paper-column.hh"
#include "rhythmic-head.hh"
#include "script-interface.hh"
#include "side-position-interface.hh"
+#include "staff-symbol-referencer.hh"
#include "stem.hh"
#include "warn.hh"
{
Music *event_;
Grob *script_;
- SCM description_;
+ bool follow_into_staff_;
Script_tuple ()
{
+ follow_into_staff_ = false;
event_ = 0;
script_ = 0;
- description_ = SCM_EOL;
}
};
class Script_engraver : public Engraver
{
Array<Script_tuple> scripts_;
+ Spanner *slur_;
protected:
virtual bool try_music (Music*);
Script_engraver::Script_engraver ()
{
+ slur_ = 0;
}
bool
-Script_engraver::try_music (Music *r)
+Script_engraver::try_music (Music *m)
{
- if (r->is_mus_type ("articulation-event"))
+ if (m->is_mus_type ("articulation-event"))
{
/* 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"),
- r->get_property ("articulation-type")))
+ m->get_property ("articulation-type")))
return true;
Script_tuple t;
- t.event_ = r;
+ t.event_ = m;
scripts_.push (t);
return true;
}
if (g->internal_get_property (sym) == SCM_EOL)
{
SCM entry = scm_assoc (sym, alist);
- if (ly_c_pair_p (entry))
+ if (scm_is_pair (entry))
g->internal_set_property (sym, ly_cdr (entry));
}
}
-/* Add the properties, one by one for each Script. A little space
- (memory? --jcn) could be saved by tacking the props onto the Script
- grob (i.e. make ScriptStaccato , ScriptMarcato, etc. ). */
-void make_script_from_event (Grob *p, SCM *descr, Context *tg,
+/* Add the properties, one by one for each Script. A little memory
+ could be saved by tacking the props onto the Script grob (i.e. make
+ ScriptStaccato , ScriptMarcato, etc. ).
+
+*/
+void make_script_from_event (Grob *p, bool * follow, Context *tg,
SCM art_type, int index)
{
SCM alist = tg->get_property ("scriptDefinitions");
}
art = ly_cdr (art);
- *descr = art;
-
- copy_property (p, ly_symbol2scm ("script-stencil"), art);
- copy_property (p, ly_symbol2scm ("direction"), art);
- copy_property (p, ly_symbol2scm ("side-relative-direction"), art);
- int prio = 0;
- SCM sprio = scm_assoc (ly_symbol2scm ("script-priority"), art);
- if (ly_c_pair_p (sprio))
- prio = ly_scm2int (ly_cdr (sprio));
+ SCM follow_scm = scm_assoc (ly_symbol2scm ("follow-into-staff"),
+ art);
- /* Make sure they're in order of user input by adding index i.
- Don't use the direction in this priority. Smaller means closer
- to the head. */
- prio += index;
+ *follow = scm_is_pair (follow_scm) && to_boolean (ly_cdr (follow_scm));
+ bool priority_found = false ;
+
+ for (SCM s = art ; scm_is_pair (s); s = ly_cdr (s))
+ {
+ SCM sym = ly_caar (s);
+ SCM type = scm_object_property (sym, ly_symbol2scm ("backend-type?"));
+ if (!ly_c_procedure_p (type))
+ continue;
+
+ SCM val = ly_cdar (s);
+
+ if (sym == ly_symbol2scm ("script-priority"))
+ {
+ priority_found = true;
+ /* Make sure they're in order of user input by adding index i.
+ Don't use the direction in this priority. Smaller means closer
+ to the head. */
+ int prio = scm_to_int (val) + index;
+
+
+ val = scm_int2num (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));
+ }
+
Side_position_interface::set_axis (p, Y_AXIS);
- p->set_property ("script-priority", scm_int2num (prio));
+
}
void
Grob *p = make_item ("Script", m->self_scm ());
- make_script_from_event (p, &scripts_[i].description_, context (),
+ make_script_from_event (p, &scripts_[i].follow_into_staff_, context (),
m->get_property ("articulation-type"),
i);
}
void
-Script_engraver::acknowledge_grob (Grob_info inf)
+Script_engraver::acknowledge_grob (Grob_info info)
{
int script_count = scripts_.size ();
- if (Stem::has_interface (inf.grob_))
+ if (Stem::has_interface (info.grob_))
{
for (int i = 0; i < script_count; i++)
{
Grob *e = scripts_[i].script_;
if (to_dir (e->get_property ("side-relative-direction")))
- e->set_property ("direction-source", inf.grob_->self_scm ());
+ e->set_property ("direction-source", info.grob_->self_scm ());
/* FIXME: add dependency */
- e->add_dependency (inf.grob_);
- Side_position_interface::add_support (e, inf.grob_);
+ e->add_dependency (info.grob_);
+ Side_position_interface::add_support (e, info.grob_);
}
}
- else if (Rhythmic_head::has_interface (inf.grob_))
+ else if (Rhythmic_head::has_interface (info.grob_)
+ && info.music_cause ())
{
for (int i = 0; i < script_count; i++)
{
if (Side_position_interface::get_axis (e) == X_AXIS
&& !e->get_parent (Y_AXIS))
{
- e->set_parent (inf.grob_, Y_AXIS);
- e->add_dependency (inf.grob_); // ??
+ e->set_parent (info.grob_, Y_AXIS);
+ e->add_dependency (info.grob_);
}
- Side_position_interface::add_support (e,inf.grob_);
+ Side_position_interface::add_support (e,info.grob_);
}
}
- else if (Note_column::has_interface (inf.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
if (!e->get_parent (X_AXIS)
&& Side_position_interface::get_axis (e) == Y_AXIS)
- e->set_parent (inf.grob_, X_AXIS);
+ e->set_parent (info.grob_, X_AXIS);
}
}
+ else if (Slur::has_interface (info.grob_))
+ slur_ = dynamic_cast<Spanner*> (info.grob_);
}
void
{
int script_count = scripts_.size ();
for (int i = 0; i < script_count; i++)
- if (Grob *sc = scripts_[i].script_)
+ if (scripts_[i].follow_into_staff_)
{
- SCM follow = scm_assoc (ly_symbol2scm ("follow-into-staff"),
- scripts_[i].description_);
- if (ly_c_pair_p (follow) && to_boolean (ly_cdr (follow)))
- {
- sc->add_offset_callback (Side_position_interface
- ::quantised_position_proc, Y_AXIS);
- sc->set_property ("staff-padding", SCM_EOL);
- }
+ Grob *sc = scripts_[i].script_;
+ sc->add_offset_callback (Side_position_interface
+ ::quantised_position_proc, Y_AXIS);
+ sc->set_property ("staff-padding", SCM_EOL);
}
+
scripts_.clear ();
}
/* descr */ "Handles note scripted articulations.",
/* creats*/ "Script",
/* accepts */ "script-event articulation-event",
-/* acks */ "stem-interface rhythmic-head-interface note-column-interface",
+/* acks */ "stem-interface rhythmic-head-interface "
+ "slur-interface note-column-interface",
/* reads */ "scriptDefinitions",
/* write */ "");
projects / lilypond.git / blobdiff