Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / lily / bend-engraver.cc

diff --git a/lily/bend-engraver.cc b/lily/bend-engraver.cc
index 8427af0525e345f5d2a0d46f54c35745f66f5bc4..f9eaaa71f4bed96eb985f7f07782527dc9b7ad63 100644 (file)
--- a/lily/bend-engraver.cc
+++ b/lily/bend-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2010 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
@@ -29,16 +29,16 @@ class Bend_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Bend_engraver);
-  DECLARE_ACKNOWLEDGER (note_head);
+  void acknowledge_note_head (Grob_info);
 
 protected:
-  DECLARE_TRANSLATOR_LISTENER (bend_after);
+  void listen_bend_after (Stream_event *);
   void finalize ();
   void process_music ();
   void stop_translation_timestep ();
   void start_translation_timestep ();
   void stop_fall ();
-  
+
 private:
   Moment stop_moment_;
   Stream_event *fall_event_;
@@ -53,18 +53,17 @@ Bend_engraver::finalize ()
   // We shouldn't end a spanner on the last musical column of a piece because then
   // it would extend past the last breakable column of the piece.
   if (last_fall_)
-    last_fall_->set_bound (RIGHT, unsmob_grob (get_property ("currentCommandColumn")));
+    last_fall_->set_bound (RIGHT, unsmob<Grob> (get_property ("currentCommandColumn")));
 }
 
 void
 Bend_engraver::stop_fall ()
 {
   bool bar = scm_is_string (get_property ("whichBar"));
-  
-  
-  fall_->set_bound (RIGHT, unsmob_grob (bar
-                                       ? get_property ("currentCommandColumn")
-                                       : get_property ("currentMusicalColumn")));
+
+  fall_->set_bound (RIGHT, unsmob<Grob> (bar
+                                        ? get_property ("currentCommandColumn")
+                                        : get_property ("currentMusicalColumn")));
   last_fall_ = fall_;
   fall_ = 0;
   note_head_ = 0;
@@ -74,10 +73,10 @@ Bend_engraver::stop_fall ()
 void
 Bend_engraver::stop_translation_timestep ()
 {
-  if (fall_ && !fall_->get_bound (LEFT)) 
+  if (fall_ && !fall_->get_bound (LEFT))
     {
       fall_->set_bound (LEFT, note_head_);
-      fall_->set_parent (note_head_,  Y_AXIS);
+      fall_->set_parent (note_head_, Y_AXIS);
     }
 }
 
@@ -97,7 +96,7 @@ Bend_engraver::acknowledge_note_head (Grob_info info)
 {
   if (!fall_event_)
     return;
-  
+
   if (note_head_ && fall_)
     {
       stop_fall ();
@@ -105,10 +104,11 @@ Bend_engraver::acknowledge_note_head (Grob_info info)
 
   note_head_ = info.grob ();
   stop_moment_ = now_mom () + get_event_length (info.event_cause (),
-                                               now_mom ());
+                                                now_mom ());
 }
 
-Bend_engraver::Bend_engraver ()
+Bend_engraver::Bend_engraver (Context *c)
+  : Engraver (c)
 {
   fall_ = 0;
   last_fall_ = 0;
@@ -116,7 +116,6 @@ Bend_engraver::Bend_engraver ()
   fall_event_ = 0;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Bend_engraver, bend_after);
 void
 Bend_engraver::listen_bend_after (Stream_event *ev)
 {
@@ -130,22 +129,28 @@ Bend_engraver::process_music ()
     {
       fall_ = make_spanner ("BendAfter", fall_event_->self_scm ());
       fall_->set_property ("delta-position",
-                          scm_from_double (robust_scm2double (fall_event_->get_property ("delta-step"), 0)));
+                           scm_from_double (robust_scm2double (fall_event_->get_property ("delta-step"), 0)));
     }
 }
 
-ADD_ACKNOWLEDGER (Bend_engraver, note_head);
+
+void
+Bend_engraver::boot ()
+{
+  ADD_LISTENER (Bend_engraver, bend_after);
+  ADD_ACKNOWLEDGER (Bend_engraver, note_head);
+}
 
 ADD_TRANSLATOR (Bend_engraver,
-               /* doc */
-               "Create fall spanners.",
+                /* doc */
+                "Create fall spanners.",
 
-               /* create */
-               "BendAfter ",
+                /* create */
+                "BendAfter ",
 
-               /* read */
-               "",
+                /* read */
+                "",
 
-               /* write */
-               ""
-               );
+                /* write */
+                ""
+               );