X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffingering-engraver.cc;h=1c4107e686294ffd345fb9c572d2342762f7366f;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6084cac0a736f5a92bf02753f79bc720e7162025;hpb=33f2e59ea0b2a1ba41e943b5afa29e5fee97ba94;p=lilypond.git diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc index 6084cac0a7..1c4107e686 100644 --- a/lily/fingering-engraver.cc +++ b/lily/fingering-engraver.cc @@ -1,122 +1,131 @@ -/* - fingering-engraver.cc -- implement Fingering_engraver - +/* + fingering-engraver.cc -- implement Fingering_engraver + source file of the GNU LilyPond music typesetter - - (c) 1998--2003 Han-Wen Nienhuys - - */ + (c) 1998--2008 Han-Wen Nienhuys +*/ #include "engraver.hh" -#include "side-position-interface.hh" -#include "item.hh" -#include "event.hh" -#include "stem.hh" +#include "pitch.hh" #include "rhythmic-head.hh" #include "self-alignment-interface.hh" +#include "side-position-interface.hh" +#include "stem.hh" +#include "stream-event.hh" +#include "item.hh" + +#include "translator.icc" class Fingering_engraver : public Engraver { - Link_array reqs_; - Link_array fingerings_; + vector events_; + vector fingerings_; public: - TRANSLATOR_DECLARATIONS(Fingering_engraver); + TRANSLATOR_DECLARATIONS (Fingering_engraver); protected: - virtual bool try_music (Music* m); - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); - virtual void process_music (); - virtual void acknowledge_grob (Grob_info); - - void make_script (Direction, Music*,Axis, int); + void stop_translation_timestep (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (fingering); + DECLARE_TRANSLATOR_LISTENER (stroke_finger); + DECLARE_ACKNOWLEDGER (rhythmic_head); + DECLARE_ACKNOWLEDGER (stem); + +private: + void make_script (Direction, Stream_event *, int); }; -bool -Fingering_engraver::try_music (Music *m) +IMPLEMENT_TRANSLATOR_LISTENER (Fingering_engraver, fingering); +void +Fingering_engraver::listen_fingering (Stream_event *ev) { - if (m->is_mus_type ("fingering-event")) - { - reqs_.push (m); - return true; - } - return false; + events_.push_back (ev); } +IMPLEMENT_TRANSLATOR_LISTENER (Fingering_engraver, stroke_finger); void -Fingering_engraver::acknowledge_grob (Grob_info inf) +Fingering_engraver::listen_stroke_finger (Stream_event *ev) { - if (Stem::has_interface (inf.grob_)) - { - for (int i=0; i < fingerings_.size (); i++) - { - Side_position_interface::add_support (fingerings_[i],inf.grob_); - } - } - else if (Rhythmic_head::has_interface (inf.grob_)) + /* + FIXME: should do something. + + This function is mainly here to shut up a warning + */ + (void)ev; +} + +void +Fingering_engraver::acknowledge_stem (Grob_info inf) +{ + for (vsize i = 0; i < fingerings_.size (); i++) + Side_position_interface::add_support (fingerings_[i], inf.grob ()); +} + +void +Fingering_engraver::acknowledge_rhythmic_head (Grob_info inf) +{ + for (vsize i = 0; i < fingerings_.size (); i++) { - for (int i=0; i < fingerings_.size (); i++) - { - Grob*t = fingerings_[i]; - Side_position_interface::add_support (t,inf.grob_); - if (!t->get_parent (X_AXIS)) - t->set_parent (inf.grob_, X_AXIS); - } + Grob *t = fingerings_[i]; + Side_position_interface::add_support (t, inf.grob ()); + if (!t->get_parent (X_AXIS)) + t->set_parent (inf.grob (), X_AXIS); } } void Fingering_engraver::process_music () { - for (int i= reqs_.size(); i--;) + for (vsize i = events_.size (); i--;) { - SCM dir = reqs_[i]->get_mus_property ("direction"); - make_script (to_dir (dir), reqs_[i], Y_AXIS, i); + SCM dir = events_[i]->get_property ("direction"); + make_script (to_dir (dir), events_[i], i); } } void -Fingering_engraver::make_script (Direction d, Music *r,Axis a, int i) +Fingering_engraver::make_script (Direction d, Stream_event *r, int i) { - Item *fingering = make_item ("Fingering"); + Item *fingering = make_item ("Fingering", r->self_scm ()); - Axis other = other_axis (a); + /* + Huh, what's this for? --hwn. - SCM pitch = r->get_mus_property ("pitch"); + junkme. + */ + SCM pitch = r->get_property ("pitch"); if (unsmob_pitch (pitch)) - fingering->set_grob_property ("pitch", pitch); - - Side_position_interface::set_axis (fingering, a); - - fingering->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, other); - fingering->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, other); + fingering->set_property ("pitch", pitch); + + /* + We can't fold these definitions into define-grobs since + fingerings for chords need different settings. + */ + Side_position_interface::set_axis (fingering, Y_AXIS); + Self_alignment_interface::set_align_self (fingering, X_AXIS); + Self_alignment_interface::set_center_parent (fingering, X_AXIS); // Hmm int priority = 200; - SCM s = fingering->get_grob_property ("script-priority"); - if (gh_number_p (s)) - priority = gh_scm2int (s); - + SCM s = fingering->get_property ("script-priority"); + if (scm_is_number (s)) + priority = scm_to_int (s); + /* See script-engraver.cc */ priority += i; - fingering->set_grob_property ("script-priority", gh_int2scm (priority)); + fingering->set_property ("script-priority", scm_from_int (priority)); - - if (!is_direction (fingering->get_grob_property ("direction"))) + if (!is_direction (fingering->get_property_data ("direction"))) { if (d) - fingering->set_grob_property ("direction", gh_int2scm (d)); + fingering->set_property ("direction", scm_from_int (d)); else - fingering->set_grob_property ("direction", gh_int2scm (RIGHT)); + fingering->set_property ("direction", scm_from_int (RIGHT)); } - SCM dig = r->get_mus_property ("digit"); - fingering->set_grob_property ("text", scm_number_to_string (dig, gh_int2scm (10))); - - announce_grob (fingering, r->self_scm()); - fingerings_.push (fingering); + fingerings_.push_back (fingering); } void @@ -124,30 +133,28 @@ Fingering_engraver::stop_translation_timestep () { if (!fingerings_.size ()) return; - - for (int i=0; i < fingerings_.size (); i++) - { - Item *ti = fingerings_[i]; - typeset_grob (ti); - } + fingerings_.clear (); + events_.clear (); } -void -Fingering_engraver::start_translation_timestep () +Fingering_engraver::Fingering_engraver () { - reqs_.clear (); } -Fingering_engraver::Fingering_engraver() -{ +ADD_ACKNOWLEDGER (Fingering_engraver, rhythmic_head); +ADD_ACKNOWLEDGER (Fingering_engraver, stem); -} +ADD_TRANSLATOR (Fingering_engraver, + /* doc */ + "Create fingering scripts.", + + /* create */ + "Fingering ", + + /* read */ + "", -ENTER_DESCRIPTION(Fingering_engraver, -/* descr */ "Create fingering-scripts", -/* creats*/ "Fingering", -/* accepts */ "fingering-event", -/* acks */ "rhythmic-head-interface stem-interface", -/* reads */ "", -/* write */ ""); + /* write */ + "" + );