X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnew-fingering-engraver.cc;h=5078e2d2db9f1bcd11139528f93c469703c80c33;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=75e893c351e585e056970becf1a28d9c65b641bb;hpb=621e5fb6a5c3cb67c46082e561cffad691ead30c;p=lilypond.git diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index 75e893c351..5078e2d2db 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2006 Han-Wen Nienhuys + (c) 1998--2008 Han-Wen Nienhuys */ #include "engraver.hh" @@ -14,17 +14,20 @@ #include "self-alignment-interface.hh" #include "side-position-interface.hh" #include "stem.hh" -#include "stem.hh" +#include "stream-event.hh" +#include "item.hh" #include "warn.hh" #include "translator.icc" + + struct Finger_tuple { Grob *head_; Grob *script_; - Music *note_event_; - Music *finger_event_; + Stream_event *note_event_; + Stream_event *finger_event_; bool follow_into_staff_; int position_; @@ -46,28 +49,32 @@ operator< (Finger_tuple const &a, Finger_tuple const &b) class New_fingering_engraver : public Engraver { vector fingerings_; + vector stroke_fingerings_; vector articulations_; vector string_numbers_; vector heads_; Grob *stem_; + void position_all (); public: TRANSLATOR_DECLARATIONS (New_fingering_engraver); protected: void stop_translation_timestep (); DECLARE_ACKNOWLEDGER (rhythmic_head); DECLARE_ACKNOWLEDGER (stem); - void add_fingering (Grob *, Music *, Music *); - void add_script (Grob *, Music *, Music *); - void add_string (Grob *, Music *, Music *); + void add_fingering (Grob *, SCM, + vector *, + Stream_event *, Stream_event *); + void add_script (Grob *, Stream_event *, Stream_event *); + void add_string (Grob *, Stream_event *, Stream_event *); void position_scripts (SCM orientations, vector *); }; void New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf) { - Music *note_ev = inf.music_cause (); + Stream_event *note_ev = inf.event_cause (); if (!note_ev) return; @@ -75,24 +82,33 @@ New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf) for (SCM s = arts; scm_is_pair (s); s = scm_cdr (s)) { - Music *m = unsmob_music (scm_car (s)); + Stream_event *ev = unsmob_stream_event (scm_car (s)); - if (!m) + if (!ev) 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")) + if (ev->in_event_class ("fingering-event")) + add_fingering (inf.grob (), + ly_symbol2scm ("Fingering"), + &fingerings_, + ev, note_ev); + else if (ev->in_event_class ("text-script-event")) + ev->origin ()->warning (_ ("cannot add text scripts to individual note heads")); + else if (ev->in_event_class ("script-event")) + add_script (inf.grob (), ev, note_ev); + else if (ev->in_event_class ("string-number-event")) + add_fingering (inf.grob (), + ly_symbol2scm ("StringNumber"), &string_numbers_, + ev, note_ev); + else if (ev->in_event_class ("stroke-finger-event")) + add_fingering (inf.grob (), + ly_symbol2scm ("StrokeFinger"), &stroke_fingerings_, + ev, note_ev); + else if (ev->in_event_class ("harmonic-event")) { inf.grob ()->set_property ("style", ly_symbol2scm ("harmonic")); Grob *d = unsmob_grob (inf.grob ()->get_object ("dot")); - if (d) + if (d && !to_boolean (get_property ("harmonicDots"))) d->suicide (); } } @@ -108,83 +124,43 @@ New_fingering_engraver::acknowledge_stem (Grob_info inf) void New_fingering_engraver::add_script (Grob *head, - Music *event, - Music *note) + Stream_event *event, + Stream_event *note) { (void) note; Finger_tuple ft; Grob *g = make_item ("Script", event->self_scm ()); - make_script_from_event (g, context (), event->get_property ("articulation-type"), 0); - if (g) - { - ft.script_ = g; - - articulations_.push_back (ft); - - ft.script_->set_parent (head, X_AXIS); - } + make_script_from_event (g, context (), + event->get_property ("articulation-type"), 0); + ft.script_ = g; + ft.script_->set_parent (head, X_AXIS); + + articulations_.push_back (ft); } void New_fingering_engraver::add_fingering (Grob *head, - Music *event, - Music *hevent) -{ - Finger_tuple ft; - - ft.script_ = make_item ("Fingering", event->self_scm ()); - - Side_position_interface::add_support (ft.script_, head); - - int d = scm_to_int (event->get_property ("digit")); - - /* - TODO: - - Should add support for thumb. It's a little involved, since - the thumb lives in a different font. Maybe it should be moved? - - */ - if (d > 5) - { - /* - music for the softenon children? - */ - event->origin ()->warning (_ ("music for the martians.")); - } - 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) + SCM grob_sym, + vector *tuple_vector, + Stream_event *event, + Stream_event *hevent) { Finger_tuple ft; - ft.script_ = make_item ("StringNumber", event->self_scm ()); + ft.script_ = internal_make_item (grob_sym, event->self_scm (), + ly_symbol2string (grob_sym).c_str (), + __FILE__, __LINE__, __FUNCTION__ + ); 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; - string_numbers_.push_back (ft); + tuple_vector->push_back (ft); } void @@ -273,7 +249,12 @@ New_fingering_engraver::position_scripts (SCM orientations, Grob *f = ft.script_; f->set_parent (ft.head_, X_AXIS); f->set_parent (ft.head_, Y_AXIS); - + f->set_property ("avoid-slur", SCM_BOOL_F); + if (hordir == LEFT + && unsmob_grob (ft.head_->get_object ("accidental-grob"))) + Side_position_interface::add_support (f, + unsmob_grob (ft.head_->get_object ("accidental-grob"))); + 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); @@ -281,8 +262,6 @@ New_fingering_engraver::position_scripts (SCM orientations, f->set_property ("direction", scm_from_int (hordir)); } - int finger_prio = 200; - Direction d = DOWN; Drul_array< vector > vertical (down, up); do @@ -291,6 +270,7 @@ New_fingering_engraver::position_scripts (SCM orientations, { Finger_tuple ft = vertical[d][i]; Grob *f = ft.script_; + int finger_prio = robust_scm2int (f->get_property ("script-priority"), 200); f->set_parent (ft.head_, X_AXIS); f->set_property ("script-priority", scm_from_int (finger_prio + d * ft.position_)); @@ -307,6 +287,15 @@ New_fingering_engraver::position_scripts (SCM orientations, void New_fingering_engraver::stop_translation_timestep () +{ + position_all (); + stem_ = 0; + heads_.clear (); +} + + +void +New_fingering_engraver::position_all () { if (fingerings_.size ()) { @@ -322,6 +311,13 @@ New_fingering_engraver::stop_translation_timestep () string_numbers_.clear (); } + if (stroke_fingerings_.size ()) + { + position_scripts (get_property ("strokeFingerOrientations"), + &stroke_fingerings_); + stroke_fingerings_.clear (); + } + for (vsize i = articulations_.size (); i--;) { Grob *script = articulations_[i].script_; @@ -334,12 +330,7 @@ New_fingering_engraver::stop_translation_timestep () if (stem_ && to_boolean (script->get_property ("add-stem-support"))) Side_position_interface::add_support (script, stem_); - - } - - stem_ = 0; - heads_.clear (); articulations_.clear (); } @@ -347,14 +338,29 @@ New_fingering_engraver::New_fingering_engraver () { stem_ = 0; } + + ADD_ACKNOWLEDGER (New_fingering_engraver, rhythmic_head); ADD_ACKNOWLEDGER (New_fingering_engraver, stem); ADD_TRANSLATOR (New_fingering_engraver, - /* 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", - /* create */ "Fingering", - /* accept */ "", - /* read */ "fingeringOrientations", - /* write */ ""); + /* 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.", + + /* create */ + "Fingering " + "StringNumber " + "StrokeFinger " + "Script ", + + /* read */ + "fingeringOrientations " + "harmonicDots " + "strokeFingerOrientations " + "stringNumberOrientations ", + + /* write */ + "" + );