X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitched-trill-engraver.cc;h=0ab6bc989b8e4d54267285eef772dc8b367a4519;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=3104b48ce02b1ba3ad1b0224eb5de04edf2c3d79;hpb=2eb63c6977706ba261e4ee0674c734a34b3ee904;p=lilypond.git diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc index 3104b48ce0..0ab6bc989b 100644 --- a/lily/pitched-trill-engraver.cc +++ b/lily/pitched-trill-engraver.cc @@ -1,9 +1,20 @@ /* - 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--2007 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" @@ -19,15 +30,19 @@ #include "stream-event.hh" #include "warn.hh" +#include "translator.icc" + class Pitched_trill_engraver : public Engraver { public: TRANSLATOR_DECLARATIONS (Pitched_trill_engraver); protected: - DECLARE_ACKNOWLEDGER (note_head); - DECLARE_ACKNOWLEDGER (dots); - DECLARE_ACKNOWLEDGER (trill_spanner); + void acknowledge_note_head (Grob_info); + void acknowledge_dots (Grob_info); + void acknowledge_stem (Grob_info); + void acknowledge_flag (Grob_info); + void acknowledge_trill_spanner (Grob_info); void stop_translation_timestep (); private: @@ -35,12 +50,13 @@ private: Item *trill_group_; Item *trill_accidental_; - vector heads_; + vector heads_; void make_trill (Stream_event *); }; -Pitched_trill_engraver::Pitched_trill_engraver () +Pitched_trill_engraver::Pitched_trill_engraver (Context *c) + : Engraver (c) { trill_head_ = 0; trill_group_ = 0; @@ -53,6 +69,16 @@ 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 ()); @@ -65,7 +91,7 @@ Pitched_trill_engraver::acknowledge_trill_spanner (Grob_info info) if (ev && ev->in_event_class ("trill-span-event") && to_dir (ev->get_property ("span-direction")) == START - && unsmob_pitch (ev->get_property ("pitch"))) + && unsmob (ev->get_property ("pitch"))) make_trill (ev); } @@ -73,16 +99,29 @@ void Pitched_trill_engraver::make_trill (Stream_event *ev) { SCM scm_pitch = ev->get_property ("pitch"); - Pitch *p = unsmob_pitch (scm_pitch); + Pitch *p = 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); - bool print_acc - = (handle == SCM_BOOL_F) || p->get_alteration () == Rational (0); + if (scm_is_true (handle)) + { + 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 = scm_is_false (handle) + || p->get_alteration () == Rational (0) + || to_boolean (ev->get_property ("force-accidental")); if (trill_head_) { @@ -96,8 +135,8 @@ Pitched_trill_engraver::make_trill (Stream_event *ev) 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 (unsmob (scm_pitch)->steps () + + c0)); trill_group_ = make_item ("TrillPitchGroup", ev->self_scm ()); trill_group_->set_parent (trill_head_, Y_AXIS); @@ -111,7 +150,7 @@ Pitched_trill_engraver::make_trill (Stream_event *ev) // fixme: naming -> alterations 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_); @@ -132,24 +171,28 @@ Pitched_trill_engraver::stop_translation_timestep () } -#include "translator.icc" - -ADD_ACKNOWLEDGER (Pitched_trill_engraver, note_head); -ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots); -ADD_ACKNOWLEDGER (Pitched_trill_engraver, trill_spanner); +void +Pitched_trill_engraver::boot () +{ + ADD_ACKNOWLEDGER (Pitched_trill_engraver, note_head); + ADD_ACKNOWLEDGER (Pitched_trill_engraver, dots); + 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 note head after a note head with trill.", + /* doc */ + "Print the bracketed note head after a note head with trill.", - /* create */ - "TrillPitchHead " - "TrillPitchAccidental " - "TrillPitchGroup ", + /* create */ + "TrillPitchHead " + "TrillPitchAccidental " + "TrillPitchGroup ", - /* read */ - "", + /* read */ + "", - /* write */ - "" - ); + /* write */ + "" + );