X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpitched-trill-engraver.cc;h=0ab6bc989b8e4d54267285eef772dc8b367a4519;hb=dea413b36a5c2ba9b01dcab3fa764fa5ab9f8418;hp=c29adc745d0271ad3e0e8d7385a4e0b4c979166c;hpb=83ed05cef3bfcbd69f4148e8ee0669ca0664e214;p=lilypond.git diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc index c29adc745d..0ab6bc989b 100644 --- a/lily/pitched-trill-engraver.cc +++ b/lily/pitched-trill-engraver.cc @@ -1,50 +1,62 @@ /* - 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 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 "note-head.hh" +#include "pitch.hh" +#include "pointer-group-interface.hh" #include "side-position-interface.hh" -#include "pitch.hh" +#include "stream-event.hh" #include "warn.hh" +#include "translator.icc" + class Pitched_trill_engraver : public Engraver { - public: - TRANSLATOR_DECLARATIONS(Pitched_trill_engraver); - + TRANSLATOR_DECLARATIONS (Pitched_trill_engraver); + protected: - - DECLARE_ACKNOWLEDGER( note_head); - DECLARE_ACKNOWLEDGER( dots); - DECLARE_ACKNOWLEDGER( text_spanner); - PRECOMPUTED_VIRTUAL void process_music (); - virtual bool try_music (Music*); - PRECOMPUTED_VIRTUAL void stop_translation_timestep (); + 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: Item *trill_head_; Item *trill_group_; Item *trill_accidental_; - Link_array heads_; + vector heads_; - void make_trill (Music *); + 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; @@ -54,73 +66,94 @@ Pitched_trill_engraver::Pitched_trill_engraver () void Pitched_trill_engraver::acknowledge_dots (Grob_info info) { - heads_.push (info.grob ()); + 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 (info.grob ()); + 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 ("trill-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 + && unsmob (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 ("trill-pitch"); - Pitch * p = unsmob_pitch (scm_pitch); + SCM scm_pitch = ev->get_property ("pitch"); + Pitch *p = unsmob (scm_pitch); + + SCM keysig = get_property ("localAlterations"); - SCM keysig = get_property ("localKeySignature"); + SCM key = scm_cons (scm_from_int (p->get_octave ()), + scm_from_int (p->get_notename ())); - SCM key = scm_cons (scm_int2num (p->get_octave ()), - scm_int2num (p->get_notename ())); + int bn = measure_number (context ()); SCM handle = scm_assoc (key, keysig); - bool print_acc = - (handle == SCM_BOOL_F) - || p->get_alteration () == 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_) { programming_error ("already have a trill head."); - trill_head_ = 0; + 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)); - - trill_group_ = make_item ("TrillPitchGroup", mus->self_scm()); + scm_from_int (unsmob (scm_pitch)->steps () + + c0)); + + 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_); + 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_group_->set_parent (trill_head_, Y_AXIS); - Axis_group_interface::add_element (trill_group_, trill_accidental_); trill_accidental_->set_parent (trill_head_, Y_AXIS); + Axis_group_interface::add_element (trill_group_, trill_accidental_); } } @@ -128,36 +161,38 @@ void Pitched_trill_engraver::stop_translation_timestep () { if (trill_group_) - for (int i = 0; i < heads_.size (); i++) - { - Side_position_interface::add_support (trill_group_, heads_[i]); - } - + for (vsize i = 0; i < heads_.size (); i++) + Side_position_interface::add_support (trill_group_, heads_[i]); + heads_.clear (); trill_head_ = 0; trill_group_ = 0; trill_accidental_ = 0; } -void -Pitched_trill_engraver::process_music () -{ -} -bool -Pitched_trill_engraver::try_music (Music *) +void +Pitched_trill_engraver::boot () { - return false; + 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); } -#include "translator.icc" -ADD_ACKNOWLEDGER(Pitched_trill_engraver, note_head); -ADD_ACKNOWLEDGER(Pitched_trill_engraver, dots); -ADD_ACKNOWLEDGER(Pitched_trill_engraver, text_spanner); ADD_TRANSLATOR (Pitched_trill_engraver, - /* descr */ "Print the bracketed notehead after a notehead with trill.", - /* creats*/ "TrillPitchHead TrillPitchAccidental TrillPitchGroup", - /* accepts */ "", - /* acks */ "", - /* reads */ "", - /* write */ ""); + /* doc */ + "Print the bracketed note head after a note head with trill.", + + /* create */ + "TrillPitchHead " + "TrillPitchAccidental " + "TrillPitchGroup ", + + /* read */ + "", + + /* write */ + "" + );