X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-engraver.cc;h=eaffc2295cfca282ee94867de5597e1d093cec85;hb=98917430c66cf99c9ac706003056396b890319ff;hp=924098c4af1c29a0216f3a6615ebddb4f5c67e22;hpb=04e20f5aa950b27b9e928720e355765679e55835;p=lilypond.git

diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc
index 924098c4af..eaffc2295c 100644
--- a/lily/percent-repeat-engraver.cc
+++ b/lily/percent-repeat-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
@@ -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 */ "");