X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fglissando-engraver.cc;h=50e0386c62abe69c30dbdf263cf3c358aebcac8c;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=1f3407cd3d6d12f12464bb5596ab22ba74dc7ee0;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc index 1f3407cd3d..50e0386c62 100644 --- a/lily/glissando-engraver.cc +++ b/lily/glissando-engraver.cc @@ -1,110 +1,192 @@ /* - note-head-line-engraver.cc -- implement Note_head_line_engraver + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2015 Jan Nieuwenhuizen - (c) 2000--2005 Jan Nieuwenhuizen + 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 "warn.hh" -#include "spanner.hh" -#include "rhythmic-head.hh" #include "engraver.hh" -/** - Create line-spanner grobs for glissandi lines that connect note - heads. -*/ +#include "international.hh" +#include "pointer-group-interface.hh" +#include "rhythmic-head.hh" +#include "spanner.hh" +#include "stream-event.hh" +#include "warn.hh" +#include "item.hh" + +#include "translator.icc" + class Glissando_engraver : public Engraver { public: TRANSLATOR_DECLARATIONS (Glissando_engraver); protected: - DECLARE_ACKNOWLEDGER (rhythmic_head); + void listen_glissando (Stream_event *); + void acknowledge_note_column (Grob_info); virtual void finalize (); + void stop_translation_timestep (); - virtual bool try_music (Music *); void process_music (); + private: - Spanner *line_; - Spanner *last_line_; - Music *event_; + vector lines_; + vector kill_me_; + bool start_glissandi_; + bool stop_glissandi_; + + Stream_event *event_; + vector note_column_1; + vector note_column_2; }; -Glissando_engraver::Glissando_engraver () +Glissando_engraver::Glissando_engraver (Context *c) + : Engraver (c) { - last_line_ = line_ = 0; event_ = 0; + start_glissandi_ = false; + stop_glissandi_ = false; } -bool -Glissando_engraver::try_music (Music *m) +void +Glissando_engraver::listen_glissando (Stream_event *ev) { - if (!event_) - { - event_ = m; - return true; - } - return false; + ASSIGN_EVENT_ONCE (event_, ev); } void Glissando_engraver::process_music () { if (event_) - line_ = make_spanner ("Glissando", event_->self_scm ()); + start_glissandi_ = true; } void -Glissando_engraver::acknowledge_rhythmic_head (Grob_info info) +Glissando_engraver::acknowledge_note_column (Grob_info info) { Grob *g = info.grob (); - if (line_) - line_->set_bound (LEFT, g); + if (to_boolean (g->get_property ("glissando-skip"))) + return; + + if (stop_glissandi_) + { + extract_grob_set (g, "note-heads", note_heads); + int glissando_index = 0; + for (vsize i = 0; i < note_column_1.size (); i++) + { + if (note_column_2[i] >= note_heads.size ()) + { + kill_me_.push_back (lines_[i]); + announce_end_grob (lines_[i], SCM_EOL); + } + else + { + lines_[i]->set_bound (RIGHT, note_heads[note_column_2[i]]); + lines_[i]->set_property ("glissando-index", scm_from_int (glissando_index)); + glissando_index++; + announce_end_grob (lines_[i], note_heads[note_column_2[i]]->self_scm ()); + } + } + lines_.clear (); + note_column_1.clear (); + note_column_2.clear (); + stop_glissandi_ = false; + } - if (last_line_) - last_line_->set_bound (RIGHT, g); + if (start_glissandi_) + { + extract_grob_set (g, "note-heads", note_heads); + SCM map = get_property ("glissandoMap"); + if (scm_is_null (map)) + for (vsize i = 0; i < note_heads.size (); i++) + { + note_column_1.push_back (i); + note_column_2.push_back (i); + } + else + for (SCM m = map; scm_is_pair (m); m = scm_cdr (m)) + { + SCM candidate = scm_car (m); + if (!scm_is_pair (candidate)) + continue; + int n1 = robust_scm2int (scm_car (candidate), -1); + int n2 = robust_scm2int (scm_cdr (candidate), -1); + if ((n1 < 0) || (n2 < 0) || (size_t (n1) >= note_heads.size ())) + continue; + note_column_1.push_back (vsize (n1)); + note_column_2.push_back (vsize (n2)); + } + for (vsize i = 0; i < note_column_1.size (); i++) + { + lines_.push_back (make_spanner ("Glissando", event_->self_scm ())); + lines_.back ()->set_bound (LEFT, note_heads[note_column_1[i]]); + } + } } void Glissando_engraver::stop_translation_timestep () { - if (last_line_ && last_line_->get_bound (RIGHT)) - last_line_ = 0; - if (line_) + if (start_glissandi_) { - if (last_line_) - programming_error ("overwriting glissando"); - last_line_ = line_; + if (stop_glissandi_) + programming_error ("overwriting glissando"); + stop_glissandi_ = true; + start_glissandi_ = false; } - line_ = 0; event_ = 0; } void Glissando_engraver::finalize () { - if (line_) + if (!lines_.empty ()) { - String msg = _ ("unterminated glissando"); + string msg = _ ("unterminated glissando"); if (event_) - event_->origin ()->warning (msg); + event_->origin ()->warning (msg); else - warning (msg); + warning (msg); - line_->suicide (); - line_ = 0; + for (vsize i = 0; i < lines_.size (); i++) + lines_[i]->suicide (); } + + for (vsize i = 0; i < kill_me_.size (); i++) + kill_me_[i]->suicide (); } -#include "translator.icc" +void +Glissando_engraver::boot () +{ + ADD_LISTENER (Glissando_engraver, glissando); + ADD_ACKNOWLEDGER (Glissando_engraver, note_column); +} -ADD_ACKNOWLEDGER (Glissando_engraver, rhythmic_head); ADD_TRANSLATOR (Glissando_engraver, - /* doc */ "Engrave a glissandi", - /* create */ "Glissando", - /* accept */ "glissando-event", - /* read */ "followVoice", - /* write */ ""); + /* doc */ + "Engrave glissandi.", + + /* create */ + "Glissando ", + + /* read */ + "glissandoMap ", + + /* write */ + "" + );