/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2000--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
TRANSLATOR_DECLARATIONS (Glissando_engraver);
protected:
- DECLARE_TRANSLATOR_LISTENER (glissando);
- DECLARE_ACKNOWLEDGER (note_column);
+ void listen_glissando (Stream_event *);
+ void acknowledge_note_column (Grob_info);
virtual void finalize ();
void stop_translation_timestep ();
private:
vector<Spanner *> lines_;
vector<Spanner *> kill_me_;
- bool start_glissandi;
- bool stop_glissandi;
+ bool start_glissandi_;
+ bool stop_glissandi_;
Stream_event *event_;
vector<vsize> note_column_1;
vector<vsize> note_column_2;
};
-Glissando_engraver::Glissando_engraver ()
+Glissando_engraver::Glissando_engraver (Context *c)
+ : Engraver (c)
{
event_ = 0;
- start_glissandi = false;
- stop_glissandi = false;
+ start_glissandi_ = false;
+ stop_glissandi_ = false;
}
-IMPLEMENT_TRANSLATOR_LISTENER (Glissando_engraver, glissando);
void
Glissando_engraver::listen_glissando (Stream_event *ev)
{
Glissando_engraver::process_music ()
{
if (event_)
- start_glissandi = true;
+ start_glissandi_ = true;
}
void
Glissando_engraver::acknowledge_note_column (Grob_info info)
{
Grob *g = info.grob ();
- if (stop_glissandi)
+ if (to_boolean (g->get_property ("glissando-skip")))
+ return;
+
+ if (stop_glissandi_)
{
extract_grob_set (g, "note-heads", note_heads);
int glissando_index = 0;
lines_.clear ();
note_column_1.clear ();
note_column_2.clear ();
- stop_glissandi = false;
+ stop_glissandi_ = false;
}
- if (start_glissandi)
+ if (start_glissandi_)
{
extract_grob_set (g, "note-heads", note_heads);
SCM map = get_property ("glissandoMap");
- if (map == SCM_EOL)
+ if (scm_is_null (map))
for (vsize i = 0; i < note_heads.size (); i++)
{
note_column_1.push_back (i);
continue;
int n1 = robust_scm2int (scm_car (candidate), -1);
int n2 = robust_scm2int (scm_cdr (candidate), -1);
- if (n1 < 0 || n2 < 0 || n1 >= note_heads.size ())
+ 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));
void
Glissando_engraver::stop_translation_timestep ()
{
-
- if (start_glissandi)
+ if (start_glissandi_)
{
- if (stop_glissandi)
+ if (stop_glissandi_)
programming_error ("overwriting glissando");
- stop_glissandi = true;
- start_glissandi = false;
+ stop_glissandi_ = true;
+ start_glissandi_ = false;
}
event_ = 0;
}
kill_me_[i]->suicide ();
}
-ADD_ACKNOWLEDGER (Glissando_engraver, note_column);
+void
+Glissando_engraver::boot ()
+{
+ ADD_LISTENER (Glissando_engraver, glissando);
+ ADD_ACKNOWLEDGER (Glissando_engraver, note_column);
+}
+
ADD_TRANSLATOR (Glissando_engraver,
/* doc */
"Engrave glissandi.",