X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fballoon-engraver.cc;h=b5c96bcce111d674bfac94b7fffe150ee6d5c4e7;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=95e807339fe6de4a80a13b709c11a3b78bdc297c;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git diff --git a/lily/balloon-engraver.cc b/lily/balloon-engraver.cc index 95e807339f..b5c96bcce1 100644 --- a/lily/balloon-engraver.cc +++ b/lily/balloon-engraver.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2006--2011 Han-Wen Nienhuys + Copyright (C) 2006--2015 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 @@ -33,8 +33,8 @@ class Balloon_engraver : public Engraver vector events_; void stop_translation_timestep (); - - void balloonify (Grob *, Stream_event *); + + void balloonify (Grob *, Stream_event *); }; IMPLEMENT_TRANSLATOR_LISTENER (Balloon_engraver, annotate_output); @@ -57,7 +57,7 @@ Balloon_engraver::Balloon_engraver () void Balloon_engraver::balloonify (Grob *g, Stream_event *event) { - Grob * b = make_item ("BalloonTextItem", event->self_scm ()); + Grob *b = make_item ("BalloonTextItem", event->self_scm ()); b->set_property ("text", event->get_property ("text")); b->set_parent (g, Y_AXIS); b->set_parent (g, X_AXIS); @@ -67,38 +67,36 @@ void Balloon_engraver::acknowledge_grob (Grob_info info) { Stream_event *cause = info.event_cause (); - + SCM arts = cause ? cause->get_property ("articulations") : SCM_EOL; for (SCM s = arts; scm_is_pair (s); s = scm_cdr (s)) { - Stream_event *e = unsmob_stream_event (scm_car (s)); + Stream_event *e = Stream_event::unsmob (scm_car (s)); if (e->in_event_class ("annotate-output-event")) - { - balloonify (info.grob (), e); - } + { + balloonify (info.grob (), e); + } } for (vsize i = 0; i < events_.size (); i++) { if (info.grob ()->name () == ly_symbol2string (events_[i]->get_property ("symbol"))) - balloonify (info.grob (), events_[i]); + balloonify (info.grob (), events_[i]); } } - - ADD_ACKNOWLEDGER (Balloon_engraver, grob); - + ADD_TRANSLATOR (Balloon_engraver, - /* doc */ - "Create balloon texts.", + /* doc */ + "Create balloon texts.", - /* create */ - "BalloonTextItem ", + /* create */ + "BalloonTextItem ", - /*read*/ - "", + /*read*/ + "", - /*write*/ - "" - ); + /*write*/ + "" + );