Imported Upstream version 2.19.45

[lilypond.git] / lily / percent-repeat-engraver.cc

diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc
index a6ef072ea6ba493adc0c5a741b67ccf6add0637c..b620cdccb561d49fc684917d58116b3be5a1c534 100644 (file)
--- a/lily/percent-repeat-engraver.cc
+++ b/lily/percent-repeat-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg <mandolaerik@gmail.com>
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg <mandolaerik@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ protected:
   Moment command_moment_;
 
   virtual void finalize ();
-  DECLARE_TRANSLATOR_LISTENER (percent);
+  void listen_percent (Stream_event *);
 
   void start_translation_timestep ();
   void stop_translation_timestep ();
@@ -73,7 +73,7 @@ Percent_repeat_engraver::start_translation_timestep ()
   if (now_mom ().main_part_ != command_moment_.main_part_)
     {
       first_command_column_
-        = unsmob_grob (get_property ("currentCommandColumn"));
+        = unsmob<Grob> (get_property ("currentCommandColumn"));
       command_moment_ = now_mom ();
     }
 
@@ -85,7 +85,6 @@ Percent_repeat_engraver::start_translation_timestep ()
     }
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Percent_repeat_engraver, percent);
 void
 Percent_repeat_engraver::listen_percent (Stream_event *ev)
 {
@@ -122,7 +121,7 @@ Percent_repeat_engraver::process_music ()
       percent_->set_bound (LEFT, col);
 
       SCM count = percent_event_->get_property ("repeat-count");
-      if (count != SCM_EOL && to_boolean (get_property ("countPercentRepeats"))
+      if (!scm_is_null (count) && to_boolean (get_property ("countPercentRepeats"))
           && check_repeat_count_visibility (context (), count))
         {
           percent_counter_ = make_spanner ("PercentRepeatCounter",
@@ -133,6 +132,7 @@ Percent_repeat_engraver::process_music ()
           percent_counter_->set_bound (LEFT, col);
           Side_position_interface::add_support (percent_counter_, percent_);
           percent_counter_->set_parent (percent_, Y_AXIS);
+          percent_counter_->set_parent (percent_, X_AXIS);
         }
       else
         percent_counter_ = 0;
@@ -168,6 +168,12 @@ Percent_repeat_engraver::stop_translation_timestep ()
 {
 }
 
+void
+Percent_repeat_engraver::boot ()
+{
+  ADD_LISTENER (Percent_repeat_engraver, percent);
+}
+
 ADD_TRANSLATOR (Percent_repeat_engraver,
                 /* doc */
                 "Make whole measure repeats.",