X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitched-trill-engraver.cc;h=b30d984edca68b17d5de89ca8f190b714f30b357;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=b514dfd10158e553744f12fff41e64123db25e4d;hpb=6d0ba72792e43cb3d5986137b4065e9b1e64dc7e;p=lilypond.git diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc index b514dfd101..b30d984edc 100644 --- a/lily/pitched-trill-engraver.cc +++ b/lily/pitched-trill-engraver.cc @@ -1,21 +1,33 @@ /* - pitched-trill-engraver.cc -- implement Pitched_trill_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2005--2015 Han-Wen Nienhuys - (c) 2005--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 "dots.hh" -#include "pointer-group-interface.hh" #include "axis-group-interface.hh" #include "context.hh" -#include "note-head.hh" +#include "dots.hh" #include "item.hh" -#include "side-position-interface.hh" +#include "note-head.hh" #include "pitch.hh" +#include "pointer-group-interface.hh" +#include "side-position-interface.hh" +#include "stream-event.hh" #include "warn.hh" class Pitched_trill_engraver : public Engraver @@ -26,8 +38,9 @@ public: protected: DECLARE_ACKNOWLEDGER (note_head); DECLARE_ACKNOWLEDGER (dots); - DECLARE_ACKNOWLEDGER (text_spanner); - void process_music (); + DECLARE_ACKNOWLEDGER (stem); + DECLARE_ACKNOWLEDGER (flag); + DECLARE_ACKNOWLEDGER (trill_spanner); void stop_translation_timestep (); private: @@ -35,9 +48,9 @@ private: Item *trill_group_; Item *trill_accidental_; - vector heads_; + vector heads_; - void make_trill (Music *); + void make_trill (Stream_event *); }; Pitched_trill_engraver::Pitched_trill_engraver () @@ -53,36 +66,59 @@ Pitched_trill_engraver::acknowledge_dots (Grob_info info) heads_.push_back (info.grob ()); } void +Pitched_trill_engraver::acknowledge_stem (Grob_info info) +{ + heads_.push_back (info.grob ()); +} +void +Pitched_trill_engraver::acknowledge_flag (Grob_info info) +{ + heads_.push_back (info.grob ()); +} +void Pitched_trill_engraver::acknowledge_note_head (Grob_info info) { heads_.push_back (info.grob ()); } void -Pitched_trill_engraver::acknowledge_text_spanner (Grob_info info) +Pitched_trill_engraver::acknowledge_trill_spanner (Grob_info info) { - Music *mus = info.music_cause (); - if (mus - && mus->is_mus_type ("trill-span-event") - && to_dir (mus->get_property ("span-direction")) == START - && unsmob_pitch (mus->get_property ("pitch"))) - make_trill (mus); + Stream_event *ev = info.event_cause (); + if (ev + && ev->in_event_class ("trill-span-event") + && to_dir (ev->get_property ("span-direction")) == START + && Pitch::is_smob (ev->get_property ("pitch"))) + make_trill (ev); } void -Pitched_trill_engraver::make_trill (Music *mus) +Pitched_trill_engraver::make_trill (Stream_event *ev) { - SCM scm_pitch = mus->get_property ("pitch"); - Pitch *p = unsmob_pitch (scm_pitch); + SCM scm_pitch = ev->get_property ("pitch"); + Pitch *p = Pitch::unsmob (scm_pitch); - SCM keysig = get_property ("localKeySignature"); + SCM keysig = get_property ("localAlterations"); SCM key = scm_cons (scm_from_int (p->get_octave ()), - scm_from_int (p->get_notename ())); + scm_from_int (p->get_notename ())); + + int bn = measure_number (context ()); SCM handle = scm_assoc (key, keysig); + if (handle != SCM_BOOL_F) + { + bool same_bar = (bn == robust_scm2int (scm_caddr (handle), 0)); + bool same_alt + = (p->get_alteration () == robust_scm2rational (scm_cadr (handle), 0)); + + if (!same_bar || (same_bar && !same_alt)) + handle = SCM_BOOL_F; + } + bool print_acc - = (handle == SCM_BOOL_F) || p->get_alteration () == 0; + = (handle == SCM_BOOL_F) || p->get_alteration () == Rational (0) + || (ev->get_property ("force-accidental") == SCM_BOOL_T); if (trill_head_) { @@ -90,27 +126,28 @@ Pitched_trill_engraver::make_trill (Music *mus) trill_head_ = 0; } - trill_head_ = make_item ("TrillPitchHead", mus->self_scm ()); + trill_head_ = make_item ("TrillPitchHead", ev->self_scm ()); SCM c0scm = get_property ("middleCPosition"); int c0 = scm_is_number (c0scm) ? scm_to_int (c0scm) : 0; trill_head_->set_property ("staff-position", - scm_from_int (unsmob_pitch (scm_pitch)->steps () - + c0)); + scm_from_int (Pitch::unsmob (scm_pitch)->steps () + + c0)); - trill_group_ = make_item ("TrillPitchGroup", mus->self_scm ()); + trill_group_ = make_item ("TrillPitchGroup", ev->self_scm ()); trill_group_->set_parent (trill_head_, Y_AXIS); Axis_group_interface::add_element (trill_group_, trill_head_); if (print_acc) { - trill_accidental_ = make_item ("TrillPitchAccidental", mus->self_scm ()); + trill_accidental_ = make_item ("TrillPitchAccidental", ev->self_scm ()); // fixme: naming -> alterations - trill_accidental_->set_property ("accidentals", scm_list_1 (scm_from_int (p->get_alteration ()))); + trill_accidental_->set_property ("alteration", ly_rational2scm (p->get_alteration ())); Side_position_interface::add_support (trill_accidental_, trill_head_); + trill_head_->set_object ("accidental-grob", trill_accidental_->self_scm ()); trill_accidental_->set_parent (trill_head_, Y_AXIS); Axis_group_interface::add_element (trill_group_, trill_accidental_); @@ -130,24 +167,26 @@ Pitched_trill_engraver::stop_translation_timestep () trill_accidental_ = 0; } -void -Pitched_trill_engraver::process_music () -{ -} - - #include "translator.icc" ADD_ACKNOWLEDGER (Pitched_trill_engraver, note_head); ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots); -ADD_ACKNOWLEDGER (Pitched_trill_engraver, text_spanner); +ADD_ACKNOWLEDGER (Pitched_trill_engraver, stem); +ADD_ACKNOWLEDGER (Pitched_trill_engraver, flag); +ADD_ACKNOWLEDGER (Pitched_trill_engraver, trill_spanner); ADD_TRANSLATOR (Pitched_trill_engraver, - /* doc */ "Print the bracketed notehead after a notehead with trill.", - /* create */ - "TrillPitchHead " - "TrillPitchAccidental " - "TrillPitchGroup", - /* accept */ "", - /* read */ "", - /* write */ ""); + /* doc */ + "Print the bracketed note head after a note head with trill.", + + /* create */ + "TrillPitchHead " + "TrillPitchAccidental " + "TrillPitchGroup ", + + /* read */ + "", + + /* write */ + "" + );