source file of the GNU LilyPond music typesetter
- (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-#include "warn.hh"
#include "engraver.hh"
-#include "side-position-interface.hh"
-#include "stem.hh"
+
+#include "international.hh"
#include "rhythmic-head.hh"
-#include "self-alignment-interface.hh"
#include "script-interface.hh"
+#include "self-alignment-interface.hh"
+#include "side-position-interface.hh"
+#include "stem.hh"
#include "stem.hh"
+#include "warn.hh"
+
+#include "translator.icc"
struct Finger_tuple
{
class New_fingering_engraver : public Engraver
{
- Array<Finger_tuple> fingerings_;
- Array<Finger_tuple> articulations_;
- Link_array<Grob> heads_;
+ vector<Finger_tuple> fingerings_;
+ vector<Finger_tuple> articulations_;
+ vector<Finger_tuple> string_numbers_;
+
+ vector<Grob*> heads_;
Grob *stem_;
public:
TRANSLATOR_DECLARATIONS (New_fingering_engraver);
protected:
- virtual void stop_translation_timestep ();
- virtual void acknowledge_grob (Grob_info);
+ void stop_translation_timestep ();
+ DECLARE_ACKNOWLEDGER (rhythmic_head);
+ DECLARE_ACKNOWLEDGER (stem);
void add_fingering (Grob *, Music *, Music *);
void add_script (Grob *, Music *, Music *);
- void position_scripts ();
+ void add_string (Grob *, Music *, Music *);
+ void position_scripts (SCM orientations, vector<Finger_tuple> *);
};
void
-New_fingering_engraver::acknowledge_grob (Grob_info inf)
+New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
{
- if (Rhythmic_head::has_interface (inf.grob_))
- {
- Music *note_ev = inf.music_cause ();
- if (!note_ev)
- return;
+ Music *note_ev = inf.music_cause ();
+ if (!note_ev)
+ return;
- SCM arts = note_ev->get_property ("articulations");
+ SCM arts = note_ev->get_property ("articulations");
- for (SCM s = arts; scm_is_pair (s); s = scm_cdr (s))
+ for (SCM s = arts; scm_is_pair (s); s = scm_cdr (s))
+ {
+ Music *m = unsmob_music (scm_car (s));
+
+ if (!m)
+ continue;
+
+ if (m->is_mus_type ("fingering-event"))
+ add_fingering (inf.grob (), m, note_ev);
+ else if (m->is_mus_type ("text-script-event"))
+ m->origin ()->warning (_ ("can't add text scripts to individual note heads"));
+ else if (m->is_mus_type ("script-event"))
+ add_script (inf.grob (), m, note_ev);
+ else if (m->is_mus_type ("string-number-event"))
+ add_string (inf.grob (), m, note_ev);
+ else if (m->is_mus_type ("harmonic-event"))
{
- Music *m = unsmob_music (scm_car (s));
-
- if (!m)
- continue;
-
- if (m->is_mus_type ("fingering-event"))
- {
- add_fingering (inf.grob_, m, note_ev);
- }
- else if (m->is_mus_type ("text-script-event"))
- {
- m->origin ()->warning ("Can not add text scripts to individual note heads");
- }
- else if (m->is_mus_type ("script-event"))
- {
- add_script (inf.grob_, m, note_ev);
- }
- else if (m->is_mus_type ("harmonic-event"))
- {
- inf.grob_->set_property ("style", ly_symbol2scm ("harmonic"));
- Grob *d = unsmob_grob (inf.grob_->get_property ("dot"));
- if (d)
- d->suicide ();
- }
+ inf.grob ()->set_property ("style", ly_symbol2scm ("harmonic"));
+ Grob *d = unsmob_grob (inf.grob ()->get_object ("dot"));
+ if (d)
+ d->suicide ();
}
-
- heads_.push (inf.grob_);
- }
- else if (Stem::has_interface (inf.grob_))
- {
- stem_ = inf.grob_;
}
+
+ heads_.push_back (inf.grob ());
+}
+
+void
+New_fingering_engraver::acknowledge_stem (Grob_info inf)
+{
+ stem_ = inf.grob ();
}
void
New_fingering_engraver::add_script (Grob *head,
Music *event,
- Music *)
+ Music *note)
{
+ (void) note;
+
Finger_tuple ft;
Grob *g = make_item ("Script", event->self_scm ());
- make_script_from_event (g, &ft.follow_into_staff_, context (),
- event->get_property ("articulation-type"), 0);
+ make_script_from_event (g, context (), event->get_property ("articulation-type"), 0);
if (g)
{
ft.script_ = g;
- articulations_.push (ft);
+ articulations_.push_back (ft);
ft.script_->set_parent (head, X_AXIS);
}
*/
event->origin ()->warning (_ ("music for the martians."));
}
- SCM sstr = scm_number_to_string (scm_int2num (d), scm_int2num (10));
+ SCM sstr = scm_number_to_string (scm_from_int (d), scm_from_int (10));
+ ft.script_->set_property ("text", sstr);
+
+ ft.finger_event_ = event;
+ ft.note_event_ = hevent;
+ ft.head_ = head;
+
+ fingerings_.push_back (ft);
+}
+
+void
+New_fingering_engraver::add_string (Grob *head,
+ Music *event,
+ Music *hevent)
+{
+ Finger_tuple ft;
+
+ ft.script_ = make_item ("StringNumber", event->self_scm ());
+
+ Side_position_interface::add_support (ft.script_, head);
+
+ int d = scm_to_int (event->get_property ("string-number"));
+
+ SCM sstr = scm_number_to_string (scm_from_int (d), scm_from_int (10));
ft.script_->set_property ("text", sstr);
ft.finger_event_ = event;
ft.note_event_ = hevent;
ft.head_ = head;
- fingerings_.push (ft);
+ string_numbers_.push_back (ft);
}
void
-New_fingering_engraver::position_scripts ()
+New_fingering_engraver::position_scripts (SCM orientations,
+ vector<Finger_tuple> *scripts)
{
+ for (vsize i = 0; i < scripts->size (); i++)
+ if (stem_ && to_boolean (scripts->at (i).script_->get_property ("add-stem-support")))
+ Side_position_interface::add_support (scripts->at (i).script_, stem_);
/*
This is not extremely elegant, but we have to do a little
to the note head, and write a more flexible function for
positioning the fingerings, setting both X and Y coordinates.
*/
- for (int i = 0; i < fingerings_.size (); i++)
- {
- fingerings_[i].position_ = scm_to_int (fingerings_[i].head_->get_property ("staff-position"));
- }
+ for (vsize i = 0; i < scripts->size (); i++)
+ (*scripts)[i].position_ = scm_to_int ((*scripts)[i].head_->get_property ("staff-position"));
- for (int i = fingerings_.size (); i--;)
- for (int j = heads_.size (); j--;)
- Side_position_interface::add_support (fingerings_[i].script_, heads_[j]);
+ for (vsize i = scripts->size (); i--;)
+ for (vsize j = heads_.size (); j--;)
+ Side_position_interface::add_support ((*scripts)[i].script_, heads_[j]);
- Array<Finger_tuple> up, down, horiz;
- for (int i = fingerings_.size (); i--;)
+ vector<Finger_tuple> up, down, horiz;
+ for (vsize i = scripts->size (); i--;)
{
- SCM d = fingerings_[i].finger_event_->get_property ("direction");
+ SCM d = (*scripts)[i].finger_event_->get_property ("direction");
if (to_dir (d))
{
- ((to_dir (d) == UP) ? up : down).push (fingerings_[i]);
- fingerings_.del (i);
+ ((to_dir (d) == UP) ? up : down).push_back ((*scripts)[i]);
+ scripts->erase (scripts->begin () + i);
}
}
- fingerings_.sort (&Finger_tuple::compare);
- SCM orientations = get_property ("fingeringOrientations");
+ vector_sort (*scripts, Finger_tuple::compare);
bool up_p = scm_c_memq (ly_symbol2scm ("up"), orientations) != SCM_BOOL_F;
bool down_p = scm_c_memq (ly_symbol2scm ("down"), orientations) != SCM_BOOL_F;
Direction hordir = (right_p) ? RIGHT : LEFT;
if (left_p || right_p)
{
- if (up_p && !up.size () && fingerings_.size ())
- up.push (fingerings_.pop ());
+ if (up_p && !up.size () && scripts->size ())
+ {
+ up.push_back (scripts->back ());
+ scripts->pop_back ();
+ }
- if (down_p && !down.size () && fingerings_.size ())
+ if (down_p && !down.size () && scripts->size ())
{
- down.push (fingerings_[0]);
- fingerings_.del (0);
+ down.push_back ((*scripts)[0]);
+ scripts->erase (scripts->begin ());
}
- horiz.concat (fingerings_);
+ horiz.insert (horiz.end (), scripts->begin (), scripts->end ());
}
else if (up_p && down_p)
{
- int center = fingerings_.size () / 2;
- down.concat (fingerings_.slice (0, center));
- up.concat (fingerings_.slice (center, fingerings_.size ()));
+ int center = scripts->size () / 2;
+ down.insert (down.end (), scripts->begin (), scripts->begin () + center);
+ up.insert (up.end (), scripts->begin () + center, scripts->end ());
}
else if (up_p)
{
- up.concat (fingerings_);
- fingerings_.clear ();
+ up.insert (up.end (), scripts->begin (), scripts->end ());
+ scripts->clear ();
}
else
{
if (!down_p)
- warning (_ ("Fingerings are also not down?! Putting them down anyway."));
- down.concat (fingerings_);
- fingerings_.clear ();
+ {
+ warning (_ ("no placement found for fingerings"));
+ warning (_ ("placing below"));
+ }
+ down.insert (down.end (), scripts->begin (), scripts->end ());
+ scripts->clear ();
}
- for (int i = 0; i < horiz.size (); i++)
+ for (vsize i = 0; i < horiz.size (); i++)
{
Finger_tuple ft = horiz[i];
Grob *f = ft.script_;
f->set_parent (ft.head_, X_AXIS);
f->set_parent (ft.head_, Y_AXIS);
- f->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, Y_AXIS);
- f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, Y_AXIS);
- f->add_offset_callback (Side_position_interface::aligned_side_proc, X_AXIS);
- f->set_property ("direction", scm_int2num (hordir));
+ Self_alignment_interface::set_align_self (f, Y_AXIS);
+ Self_alignment_interface::set_center_parent (f, Y_AXIS);
+ Side_position_interface::set_axis (f, X_AXIS);
+
+ f->set_property ("direction", scm_from_int (hordir));
}
int finger_prio = 200;
- for (int i = 0; i < up.size (); i++)
- {
- Finger_tuple ft = up[i];
- Grob *f = ft.script_;
- f->set_parent (ft.head_, X_AXIS);
- f->set_property ("script-priority",
- scm_int2num (finger_prio + ft.position_));
- f->add_offset_callback (Side_position_interface::aligned_side_proc, Y_AXIS);
- f->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, X_AXIS);
- f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, X_AXIS);
-
- f->set_property ("direction", scm_int2num (UP));
- }
- for (int i = 0; i < down.size (); i++)
+ Direction d = DOWN;
+ Drul_array< vector<Finger_tuple> > vertical (down, up);
+ do
{
- Finger_tuple ft = down[i];
- Grob *f = ft.script_;
- f->set_parent (ft.head_, X_AXIS);
- f->set_property ("script-priority",
- scm_int2num (finger_prio + down.size () - ft.position_));
-
- f->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, X_AXIS);
- f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, X_AXIS);
- f->add_offset_callback (Side_position_interface::aligned_side_proc, Y_AXIS);
- f->set_property ("direction", scm_int2num (DOWN));
+ for (vsize i = 0; i < vertical[d].size (); i++)
+ {
+ Finger_tuple ft = vertical[d][i];
+ Grob *f = ft.script_;
+ f->set_parent (ft.head_, X_AXIS);
+ f->set_property ("script-priority",
+ scm_from_int (finger_prio + d * ft.position_));
+
+ Self_alignment_interface::set_align_self (f, X_AXIS);
+ Self_alignment_interface::set_center_parent (f, X_AXIS);
+ Side_position_interface::set_axis (f, Y_AXIS);
+
+ f->set_property ("direction", scm_from_int (d));
+ }
}
+ while (flip (&d) != DOWN);
}
void
{
if (fingerings_.size ())
{
- for (int i = 0; i < fingerings_.size (); i++)
- if (stem_ && to_boolean (fingerings_[i].script_->get_property ("add-stem-support")))
- Side_position_interface::add_support (fingerings_[i].script_, stem_);
- position_scripts ();
+ position_scripts (get_property ("fingeringOrientations"),
+ &fingerings_);
fingerings_.clear ();
}
- for (int i = articulations_.size (); i--;)
+ if (string_numbers_.size ())
+ {
+ position_scripts (get_property ("stringNumberOrientations"),
+ &string_numbers_);
+ string_numbers_.clear ();
+ }
+
+ for (vsize i = articulations_.size (); i--;)
{
Grob *script = articulations_[i].script_;
- for (int j = heads_.size (); j--;)
+ for (vsize j = heads_.size (); j--;)
Side_position_interface::add_support (script, heads_[j]);
if (stem_ && to_dir (script->get_property ("side-relative-direction")))
- script->set_property ("direction-source", stem_->self_scm ());
+ script->set_object ("direction-source", stem_->self_scm ());
if (stem_ && to_boolean (script->get_property ("add-stem-support")))
Side_position_interface::add_support (script, stem_);
- if (articulations_[i].follow_into_staff_)
- {
- script->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS);
- script->set_property ("staff-padding", SCM_EOL);
- }
+
}
stem_ = 0;
{
stem_ = 0;
}
+ADD_ACKNOWLEDGER (New_fingering_engraver, rhythmic_head);
+ADD_ACKNOWLEDGER (New_fingering_engraver, stem);
ADD_TRANSLATOR (New_fingering_engraver,
- /* descr */ "Create fingering-scripts for notes in a new chord. "
+ /* doc */ "Create fingering-scripts for notes in a new chord. "
"This engraver is ill-named, since it "
"also takes care of articulations and harmonic note heads",
- /* creats*/ "Fingering",
- /* accepts */ "",
- /* acks */ "rhythmic-head-interface stem-interface",
- /* reads */ "fingeringOrientations",
+ /* create */ "Fingering",
+ /* accept */ "",
+ /* read */ "fingeringOrientations",
/* write */ "");
projects / lilypond.git / blobdiff