source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "context.hh"
#include "directional-element-interface.hh"
#include "engraver.hh"
-#include "event.hh"
-#include "new-slur.hh"
+#include "slur.hh"
#include "note-column.hh"
#include "paper-column.hh"
#include "rhythmic-head.hh"
{
Music *event_;
Grob *script_;
- SCM description_;
+ bool follow_into_staff_;
Script_tuple ()
{
+ follow_into_staff_ = false;
event_ = 0;
script_ = 0;
- description_ = SCM_EOL;
}
};
Spanner *slur_;
protected:
- virtual bool try_music (Music*);
+ virtual bool try_music (Music *);
virtual void stop_translation_timestep ();
virtual void process_music ();
virtual void acknowledge_grob (Grob_info);
if (g->internal_get_property (sym) == SCM_EOL)
{
SCM entry = scm_assoc (sym, alist);
- if (ly_c_pair_p (entry))
- g->internal_set_property (sym, ly_cdr (entry));
+ if (scm_is_pair (entry))
+ g->internal_set_property (sym, scm_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");
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;
}
- art = ly_cdr (art);
- *descr = art;
+ art = scm_cdr (art);
+
+ SCM follow_scm = scm_assoc (ly_symbol2scm ("follow-into-staff"),
+ 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);
+ *follow = scm_is_pair (follow_scm) && to_boolean (scm_cdr (follow_scm));
+ bool priority_found = false;
- int prio = 0;
- SCM sprio = scm_assoc (ly_symbol2scm ("script-priority"), art);
- if (ly_c_pair_p (sprio))
- prio = ly_scm2int (ly_cdr (sprio));
+ for (SCM s = art; scm_is_pair (s); s = scm_cdr (s))
+ {
+ SCM sym = scm_caar (s);
+ SCM type = scm_object_property (sym, ly_symbol2scm ("backend-type?"));
+ if (!ly_c_procedure_p (type))
+ continue;
- /* 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;
+ SCM val = scm_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);
Script_engraver::acknowledge_grob (Grob_info info)
{
int script_count = scripts_.size ();
- if (Stem::has_interface (info.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", info.grob_->self_scm ());
+ e->set_property ("direction-source", info.grob ()->self_scm ());
/* FIXME: add dependency */
- e->add_dependency (info.grob_);
- Side_position_interface::add_support (e, info.grob_);
+ e->add_dependency (info.grob ());
+ Side_position_interface::add_support (e, info.grob ());
}
}
- else if (Rhythmic_head::has_interface (info.grob_)
+ else if (Rhythmic_head::has_interface (info.grob ())
&& info.music_cause ())
{
for (int i = 0; i < script_count; 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_))
+ 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.
+ 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 (). */
+ 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_;
if (!e->get_parent (X_AXIS)
&& Side_position_interface::get_axis (e) == Y_AXIS)
- e->set_parent (info.grob_, X_AXIS);
+ e->set_parent (info.grob (), X_AXIS);
}
}
- else if (New_slur::has_interface (info.grob_))
- slur_ = dynamic_cast<Spanner*> (info.grob_);
+ 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 ();
}
-ENTER_DESCRIPTION (Script_engraver,
-/* descr */ "Handles note scripted articulations.",
-/* creats*/ "Script",
-/* accepts */ "script-event articulation-event",
-/* acks */ "stem-interface rhythmic-head-interface\
- new-slur-interface note-column-interface",
-/* reads */ "scriptDefinitions",
-/* write */ "");
+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