X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-engraver.cc;h=dff1f5aae4816ad1c2247522ba83eddfaac6e46e;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=a27eef826b9163f94168cec7e6ea92d630adc49e;hpb=cc676c5aadd45985251b5d60fa23eed1ed98f6e6;p=lilypond.git

diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc
index a27eef826b..dff1f5aae4 100644
--- a/lily/percent-repeat-engraver.cc
+++ b/lily/percent-repeat-engraver.cc
@@ -1,9 +1,9 @@
 /*
-  new-chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver
+  percent-repeat-engraver.cc -- implement Percent_repeat_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg <mandolaerik@gmail.com>
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg <mandolaerik@gmail.com>
 */
 
 
@@ -14,7 +14,6 @@
 #include "international.hh"
 #include "item.hh"
 #include "misc.hh"
-#include "percent-repeat-iterator.hh"
 #include "repeated-music.hh"
 #include "side-position-interface.hh"
 #include "spanner.hh"
@@ -31,6 +30,7 @@
 class Percent_repeat_engraver : public Engraver
 {
   void typeset_perc ();
+  bool check_count_visibility (SCM count);
 public:
   TRANSLATOR_DECLARATIONS (Percent_repeat_engraver);
   
@@ -52,6 +52,10 @@ protected:
   Spanner *percent_;
   Spanner *percent_counter_;
 
+  
+  Grob *first_command_column_;
+  Moment command_moment_;
+  
 protected:
   virtual void finalize ();
   DECLARE_TRANSLATOR_LISTENER (percent);
@@ -65,8 +69,28 @@ Percent_repeat_engraver::Percent_repeat_engraver ()
 {
   percent_ = 0;
   percent_counter_ = 0;
-
   percent_event_ = 0;
+
+  first_command_column_ = 0;
+  command_moment_ = Moment (-1);
+}
+
+void
+Percent_repeat_engraver::start_translation_timestep ()
+{
+  if (now_mom ().main_part_ != command_moment_.main_part_)
+    {
+      first_command_column_ = unsmob_grob (get_property ("currentCommandColumn"));
+      command_moment_ = now_mom ();
+    }
+
+  if (stop_mom_.main_part_ == now_mom ().main_part_)
+    {
+      if (percent_)
+      	typeset_perc ();
+      percent_event_ = 0;
+      repeat_sign_type_ = UNKNOWN;
+    }
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Percent_repeat_engraver, percent);
@@ -78,26 +102,34 @@ Percent_repeat_engraver::listen_percent (Stream_event *ev)
       Moment body_length = get_event_length (ev);
       Moment meas_len (robust_scm2moment (get_property ("measureLength"),
 					  Moment (1)));
-
       if (meas_len == body_length)
-      {
-	repeat_sign_type_ = MEASURE;
-      	start_mom_ = now_mom ();
-      	stop_mom_ = now_mom () + body_length;
-	get_global_context ()->add_moment_to_process (stop_mom_);
-      }
+	{
+	  repeat_sign_type_ = MEASURE;
+	  start_mom_ = now_mom ();
+	  stop_mom_ = now_mom () + body_length;
+	  get_global_context ()->add_moment_to_process (stop_mom_);
+	}
       else if (Moment (2) * meas_len == body_length)
-      {
-	repeat_sign_type_ = DOUBLE_MEASURE;
-	start_mom_ = now_mom () + meas_len;
-	stop_mom_ = now_mom () + body_length; /* never used */
-	get_global_context ()->add_moment_to_process (start_mom_);
-      }
+	{
+	  repeat_sign_type_ = DOUBLE_MEASURE;
+	  start_mom_ = now_mom () + meas_len;
+	  stop_mom_ = now_mom () + body_length; /* never used */
+	  get_global_context ()->add_moment_to_process (start_mom_);
+	}
       else
-	return;
-
+	{
+	  /*
+	    don't warn about percent repeats: slash repeats are not
+	    exactly 1 or 2 measures long.
+	  */
+	  return;
+	}
       percent_event_ = ev;
     }
+  else
+    /* print a warning: no assignment happens because
+       percent_event_ != 0 */
+    ASSIGN_EVENT_ONCE (percent_event_, ev);
 }
 
 void
@@ -109,13 +141,15 @@ Percent_repeat_engraver::process_music ()
 	{
 	  if (percent_)
 	    typeset_perc ();
+	  
 	  percent_ = make_spanner ("PercentRepeat", percent_event_->self_scm ());
 
-	  Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
+	  Grob *col = first_command_column_;
 	  percent_->set_bound (LEFT, col);
 
 	  SCM count = percent_event_->get_property ("repeat-count");
-          if (count != SCM_EOL && to_boolean (get_property ("countPercentRepeats")))
+	  if (count != SCM_EOL && to_boolean (get_property ("countPercentRepeats"))
+	      && check_count_visibility (count))
 	    {
 	      percent_counter_
 		= make_spanner ("PercentRepeatCounter", percent_event_->self_scm ());
@@ -135,11 +169,11 @@ Percent_repeat_engraver::process_music ()
 	  Item *double_percent = make_item ("DoublePercentRepeat", percent_event_->self_scm ());
 
 	  SCM count = percent_event_->get_property ("repeat-count");
-	  if (count != SCM_EOL
-	      && to_boolean (get_property ("countPercentRepeats")))
+	  if (count != SCM_EOL && to_boolean (get_property ("countPercentRepeats"))
+	      && check_count_visibility (count))
 	    {
 	      Item *double_percent_counter = make_item ("DoublePercentRepeatCounter",
-	      						percent_event_->self_scm());
+	      						percent_event_->self_scm ());
 
 	      SCM text = scm_number_to_string (count,
 					       scm_from_int (10));
@@ -167,7 +201,7 @@ Percent_repeat_engraver::finalize ()
     {
       percent_event_->origin ()->warning (_ ("unterminated percent repeat"));
       percent_->suicide ();
-      percent_counter_->suicide();
+      percent_counter_->suicide ();
     }
 }
 
@@ -176,7 +210,7 @@ Percent_repeat_engraver::typeset_perc ()
 {
   if (percent_)
     {
-      Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
+      Grob *col = first_command_column_;
 
       percent_->set_bound (RIGHT, col);
       percent_ = 0;
@@ -187,18 +221,16 @@ Percent_repeat_engraver::typeset_perc ()
     }
 }
 
-void
-Percent_repeat_engraver::start_translation_timestep ()
+bool
+Percent_repeat_engraver::check_count_visibility (SCM count)
 {
-  if (stop_mom_.main_part_ == now_mom ().main_part_)
-    {
-      if (percent_)
-      	typeset_perc ();
-      percent_event_ = 0;
-      repeat_sign_type_ = UNKNOWN;
-    }
+  SCM proc = get_property ("repeatCountVisibility");
+  return (ly_is_procedure (proc) && to_boolean (scm_call_2 (proc,
+							    count,
+							    context ()->self_scm ())));
 }
 
+
 void
 Percent_repeat_engraver::stop_translation_timestep ()
 {
@@ -213,14 +245,12 @@ ADD_TRANSLATOR (Percent_repeat_engraver,
 		"DoublePercentRepeatCounter "
 		"PercentRepeat "
 		"PercentRepeatCounter ",
-		
-		/* accept */
-		"percent-event ",
 
 		/* read */
 		"countPercentRepeats "
 		"currentCommandColumn "
-		"measureLength ",
+		"measureLength "
+		"repeatCountVisibility ",
 
 		/* write */
 		"forbidBreak "