X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffingering-engraver.cc;h=d5b4102d8bf844bd3ef8cbb28aa71a357bb673aa;hb=0398fdb9df24ac2e22a8cbff1b3c18ca04e9f221;hp=117ead2c81e3dca90ccb8d026993af90d4bbe059;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc index 117ead2c81..d5b4102d8b 100644 --- a/lily/fingering-engraver.cc +++ b/lily/fingering-engraver.cc @@ -1,70 +1,89 @@ /* - fingering-engraver.cc -- implement Fingering_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2015 Han-Wen Nienhuys - (c) 1998--2006 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "engraver.hh" -#include "side-position-interface.hh" -#include "stem.hh" +#include "pitch.hh" #include "rhythmic-head.hh" #include "self-alignment-interface.hh" -#include "pitch.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 events_; - Link_array fingerings_; + vector events_; + vector fingerings_; public: TRANSLATOR_DECLARATIONS (Fingering_engraver); protected: - virtual bool try_music (Music *m); void stop_translation_timestep (); void process_music (); + DECLARE_TRANSLATOR_LISTENER (fingering); DECLARE_ACKNOWLEDGER (rhythmic_head); DECLARE_ACKNOWLEDGER (stem); + DECLARE_ACKNOWLEDGER (flag); private: - void make_script (Direction, Music *, int); + 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")) - { - events_.push (m); - return true; - } - return false; + events_.push_back (ev); } void Fingering_engraver::acknowledge_stem (Grob_info inf) { - for (int i = 0; i < fingerings_.size (); i++) + for (vsize i = 0; i < fingerings_.size (); i++) + Side_position_interface::add_support (fingerings_[i], inf.grob ()); +} + +void +Fingering_engraver::acknowledge_flag (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 (int i = 0; i < fingerings_.size (); i++) + for (vsize 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); + t->set_parent (inf.grob (), X_AXIS); } } void Fingering_engraver::process_music () { - for (int i = events_.size (); i--;) + for (vsize i = events_.size (); i--;) { SCM dir = events_[i]->get_property ("direction"); make_script (to_dir (dir), events_[i], i); @@ -72,7 +91,7 @@ Fingering_engraver::process_music () } void -Fingering_engraver::make_script (Direction d, Music *r, int i) +Fingering_engraver::make_script (Direction d, Stream_event *r, int i) { Item *fingering = make_item ("Fingering", r->self_scm ()); @@ -82,7 +101,7 @@ Fingering_engraver::make_script (Direction d, Music *r, int i) junkme. */ SCM pitch = r->get_property ("pitch"); - if (unsmob_pitch (pitch)) + if (unsmob (pitch)) fingering->set_property ("pitch", pitch); /* @@ -90,8 +109,7 @@ Fingering_engraver::make_script (Direction d, Music *r, int i) 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); + Self_alignment_interface::set_aligned_on_parent (fingering, X_AXIS); // Hmm int priority = 200; @@ -104,26 +122,17 @@ Fingering_engraver::make_script (Direction d, Music *r, int i) fingering->set_property ("script-priority", scm_from_int (priority)); - if (!is_direction (fingering->get_property_data (ly_symbol2scm ("direction")))) - { - if (d) - fingering->set_property ("direction", scm_from_int (d)); - else - fingering->set_property ("direction", scm_from_int (RIGHT)); - } - - SCM dig = r->get_property ("digit"); - fingering->set_property ("text", scm_number_to_string (dig, scm_from_int (10))); + if (d) + fingering->set_property ("direction", scm_from_int (d)); + else if (!is_direction (fingering->get_property_data ("direction"))) + fingering->set_property ("direction", scm_from_int (UP)); - fingerings_.push (fingering); + fingerings_.push_back (fingering); } void Fingering_engraver::stop_translation_timestep () { - if (!fingerings_.size ()) - return; - fingerings_.clear (); events_.clear (); } @@ -132,13 +141,20 @@ Fingering_engraver::Fingering_engraver () { } -#include "translator.icc" - ADD_ACKNOWLEDGER (Fingering_engraver, rhythmic_head); ADD_ACKNOWLEDGER (Fingering_engraver, stem); +ADD_ACKNOWLEDGER (Fingering_engraver, flag); + ADD_TRANSLATOR (Fingering_engraver, - /* doc */ "Create fingering-scripts", - /* create */ "Fingering", - /* accept */ "fingering-event", - /* read */ "", - /* write */ ""); + /* doc */ + "Create fingering scripts.", + + /* create */ + "Fingering ", + + /* read */ + "", + + /* write */ + "" + );