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"
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 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,
+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);
+ art = scm_cdr (art);
SCM follow_scm = scm_assoc (ly_symbol2scm ("follow-into-staff"),
art);
- *follow = ly_c_pair_p (follow_scm) && to_boolean (ly_cdr (follow_scm));
- bool priority_found = false ;
-
- for (SCM s = art ; ly_c_pair_p (s); s = ly_cdr (s))
+ *follow = scm_is_pair (follow_scm) && to_boolean (scm_cdr (follow_scm));
+ bool priority_found = false;
+
+ for (SCM s = art; scm_is_pair (s); s = scm_cdr (s))
{
- SCM sym = ly_caar (s);
+ SCM sym = scm_caar (s);
SCM type = scm_object_property (sym, ly_symbol2scm ("backend-type?"));
if (!ly_c_procedure_p (type))
continue;
-
- SCM val = ly_cdar (s);
+
+ SCM val = scm_cdar (s);
if (sym == ly_symbol2scm ("script-priority"))
{
/* 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 = ly_scm2int (val) + index;
-
-
+ int prio = scm_to_int (val) + index;
+
val = scm_int2num (prio);
}
if (p->internal_get_property (sym) == SCM_EOL)
p->set_property ("script-priority",
scm_int2num (index));
}
-
- Side_position_interface::set_axis (p, Y_AXIS);
+ Side_position_interface::set_axis (p, Y_AXIS);
}
void
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 (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
::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