X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnew-fingering-engraver.cc;h=9a218b6531dd869b0b8f5d894b7cee8711d7a526;hb=0a0da41d935f7744e7ffd934034f25c40d4c59be;hp=6ddd4f659534c8a8ce008a757b2297e3694b6be6;hpb=bf7b9929425e6a60cc24f1de18e5f1cdc9055703;p=lilypond.git diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc index 6ddd4f6595..9a218b6531 100644 --- a/lily/new-fingering-engraver.cc +++ b/lily/new-fingering-engraver.cc @@ -1,9 +1,20 @@ /* - fingering-engraver.cc -- implement New_fingering_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2009 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" @@ -15,6 +26,7 @@ #include "side-position-interface.hh" #include "stem.hh" #include "stream-event.hh" +#include "item.hh" #include "warn.hh" #include "translator.icc" @@ -48,7 +60,7 @@ operator< (Finger_tuple const &a, Finger_tuple const &b) class New_fingering_engraver : public Engraver { vector fingerings_; - vector string_fingerings_; + vector stroke_fingerings_; vector articulations_; vector string_numbers_; @@ -92,22 +104,22 @@ New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf) &fingerings_, ev, note_ev); else if (ev->in_event_class ("text-script-event")) - ev->origin ()->warning (_ ("can't add text scripts to individual note heads")); + 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 ("string-finger-event")) + else if (ev->in_event_class ("stroke-finger-event")) add_fingering (inf.grob (), - ly_symbol2scm ("StringFinger"), &string_fingerings_, + 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 (); } } @@ -124,10 +136,8 @@ New_fingering_engraver::acknowledge_stem (Grob_info inf) void New_fingering_engraver::add_script (Grob *head, Stream_event *event, - Stream_event *note) + Stream_event * /* note */) { - (void) note; - Finger_tuple ft; Grob *g = make_item ("Script", event->self_scm ()); @@ -248,7 +258,15 @@ 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"))); + else if (unsmob_grob (ft.head_->get_object ("dot"))) + Side_position_interface::add_support (f, + unsmob_grob (ft.head_->get_object ("dot"))); + 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); @@ -256,8 +274,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 @@ -266,6 +282,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_)); @@ -283,7 +300,7 @@ New_fingering_engraver::position_scripts (SCM orientations, void New_fingering_engraver::stop_translation_timestep () { - position_all(); + position_all (); stem_ = 0; heads_.clear (); } @@ -306,11 +323,11 @@ New_fingering_engraver::position_all () string_numbers_.clear (); } - if (string_fingerings_.size ()) + if (stroke_fingerings_.size ()) { - position_scripts (get_property ("stringFingerOrientations"), - &string_fingerings_); - string_fingerings_.clear (); + position_scripts (get_property ("strokeFingerOrientations"), + &stroke_fingerings_); + stroke_fingerings_.clear (); } for (vsize i = articulations_.size (); i--;) @@ -339,22 +356,23 @@ 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", + /* 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 " - "StringFinger " - "Script " - , - - /* accept */ "", + "StrokeFinger " + "Script ", + /* read */ - "fingeringOrientations " - "stringFingerOrientations " - "stringNumberOrientations " - , + "harmonicDots " + "strokeFingerOrientations " + "stringNumberOrientations ", - /* write */ ""); + /* write */ + "" + );