source file of the GNU LilyPond music typesetter
- (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
{
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_grob_property ("style", ly_symbol2scm ("harmonic"));
+ }
}
heads_.push (inf.grob_);
}
}
-extern Grob *make_script_from_event (SCM * descr, Translator_group*tg, Music * event,
- int index);
void
New_fingering_engraver::add_script (Grob * head,
Music * event,
- Music * head_event)
+ Music * )
{
Finger_tuple ft ;
- ft.script_ =make_script_from_event (&ft.description_, daddy_trans_, event, 0);
-
- articulations_.push (ft);
- announce_grob (ft.script_, event->self_scm ());
-
+ Grob * g= make_item ("Script");
+ make_script_from_event (g, &ft.description_, daddy_trans_,
+ event->get_mus_property ("articulation-type"), 0);
+ if (g)
+ {
+ ft.script_ =g ;
+
+ articulations_.push (ft);
+ announce_grob (g, event->self_scm ());
- ft.script_->set_parent (head, X_AXIS);
-}
-
+ ft.script_->set_parent (head, X_AXIS);
+ }
+}
void
{
Finger_tuple ft;
- ft.script_ = new Item (get_property ("Fingering"));
+ ft.script_ = make_item ("Fingering");
announce_grob (ft.script_, event->self_scm());
Side_position_interface::add_support (ft.script_, head);
- int d = gh_scm2int ( event->get_mus_property ("digit"));
+ int d = gh_scm2int (event->get_mus_property ("digit"));
/*
TODO:
the thumb lives in a different font. Maybe it should be moved?
*/
-
if (d > 5)
{
/*
{
fingerings_[i].position_ = gh_scm2int (fingerings_[i].head_ -> get_grob_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]);
+
Array<Finger_tuple> up, down, horiz;
for (int i = fingerings_.size(); i--;)
{
SCM d = fingerings_[i].finger_event_->get_mus_property ("direction");
if (to_dir (d))
{
- if (to_dir (d) == UP)
- {
- up.push (fingerings_[i]);
- }
- else
- down.push (fingerings_[i]);
+ ((to_dir (d) == UP) ? up : down ).push (fingerings_[i]);
fingerings_.del (i);
}
}
fingerings_.sort (&Finger_tuple::compare);
- SCM fhd = get_property ("fingerHorizontalDirection");
-
- if (ly_dir_p (fhd))
+ SCM orientations = get_property ("fingeringOrientations");
+
+ bool up_p = scm_memq (ly_symbol2scm ("up"), orientations) != SCM_BOOL_F;
+ bool down_p = scm_memq (ly_symbol2scm ("down"), orientations) != SCM_BOOL_F;
+ bool left_p = scm_memq (ly_symbol2scm ("left"), orientations) != SCM_BOOL_F;
+ bool right_p = scm_memq (ly_symbol2scm ("right"), orientations) != SCM_BOOL_F;
+ Direction hordir = (right_p) ? RIGHT : LEFT;
+ if (left_p || right_p)
{
- up.push (fingerings_.pop());
- down.push (fingerings_[0]);
- fingerings_.del(0);
+ if (up_p && !up.size () && fingerings_.size ())
+ up.push (fingerings_.pop());
+
+ if (down_p && !down.size () && fingerings_.size())
+ {
+ down.push (fingerings_[0]);
+ fingerings_.del(0);
+ }
- horiz = fingerings_;
+ horiz.concat (fingerings_);
}
- else
+ else if (up_p && down_p)
{
int center = fingerings_.size() / 2;
down.concat (fingerings_.slice (0,center));
up.concat (fingerings_.slice (center, fingerings_.size()));
}
-
+ else if (up_p)
+ {
+ up.concat (fingerings_);
+ fingerings_ .clear ();
+ }
+ else
+ {
+ if (!down_p)
+ warning(_ ("Fingerings are also not down?! Putting them down anyway."));
+ down.concat (fingerings_);
+ fingerings_.clear();
+ }
+
for (int i = 0; i < horiz.size(); i++)
{
Finger_tuple ft = horiz[i];
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_grob_property( "direction", fhd);
+ f->set_grob_property ("direction", gh_int2scm (hordir));
typeset_grob (f);
}
f->set_grob_property ("direction", gh_int2scm (UP));
- Side_position_interface::add_staff_support (f);
typeset_grob (f);
}
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_grob_property ("direction", gh_int2scm (DOWN));
- Side_position_interface::add_staff_support (f);
typeset_grob (f);
}
}
SCM follow = scm_assoc (ly_symbol2scm ("follow-into-staff"), articulations_[i].description_);
if (gh_pair_p (follow) && to_boolean (gh_cdr (follow)))
- sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS);
- else
- Side_position_interface::add_staff_support (sc);
+ {
+ sc->add_offset_callback (Side_position_interface::quantised_position_proc, Y_AXIS);
+ sc->set_grob_property ("staff-padding" , SCM_EOL);
+ }
typeset_grob (sc);
}
}
ENTER_DESCRIPTION(New_fingering_engraver,
-/* descr */ "Create fingering-scripts for notes in a New Chord.",
+/* descr */ "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 */ "text-script-event",
+/* accepts */ "",
/* acks */ "rhythmic-head-interface stem-interface",
-/* reads */ "fingerHorizontalDirection",
+/* reads */ "fingeringOrientations",
/* write */ "");
projects / lilypond.git / blobdiff