* lily/midi-item.cc (name): new method.

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

diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc
index 924098c4af1c29a0216f3a6615ebddb4f5c67e22..af00fa6f2c35aad83fd56095116dbe8175f9331d 100644 (file)
--- a/lily/percent-repeat-engraver.cc
+++ b/lily/percent-repeat-engraver.cc
@@ -107,11 +107,8 @@ Percent_repeat_engraver::try_music (Music *m)
       else if (Moment (2) * meas_len == body_length_)
        repeat_sign_type_ = DOUBLE_MEASURE;
       else
-       {
-         warning (_f ("can't handle a percent repeat of length: %s",
-                      body_length_.to_string ()));
-         return false;
-       }
+       return false;
+    
 
       repeat_ = m;
 
@@ -153,7 +150,8 @@ Percent_repeat_engraver::process_music ()
          Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
          percent_->set_bound (LEFT, col);
 
-         if (total_count_ > 2)
+         if (total_count_ > 2
+             && to_boolean (get_property ("countPercentRepeats")))
            {
              percent_counter_
                = make_spanner ("PercentRepeatCounter", repeat_->self_scm ());
@@ -172,7 +170,8 @@ Percent_repeat_engraver::process_music ()
        {
          double_percent_ = make_item ("DoublePercentRepeat", repeat_->self_scm ());
 
-         if (total_count_ > 2)
+         if (total_count_ > 2
+             && to_boolean (get_property ("countPercentRepeats")))
            {
              double_percent_counter_
                = make_item ("DoublePercentRepeatCounter",
@@ -259,10 +258,21 @@ Percent_repeat_engraver::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Percent_repeat_engraver,
-               /* doc */ "Make whole bar and double bar repeats.",
+               /* doc */
+               "Make whole bar and double bar repeats.",
+               
                /* create */
-               "PercentRepeat DoublePercentRepeat "
-               "PercentRepeatCounter DoublePercentRepeatCounter",
-               /* accept */ "repeated-music",
-               /* read */ "measureLength currentCommandColumn",
+               "PercentRepeat "
+               "DoublePercentRepeat "
+               "PercentRepeatCounter "
+               "DoublePercentRepeatCounter",
+               
+               /* accept */
+               "repeated-music",
+
+               /* read */
+               "measureLength "
+               "currentCommandColumn "
+               "countPercentRepeats",
+
                /* write */ "");