X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbar-check-iterator.cc;h=fb3ebd341f7e9a2318afa8f76dd12c82c0e1c56c;hb=76324bbc6789847e80b4bbdd4e8246d6e4eae8d1;hp=bc01898832db6b1ff8012639596640b6f39799b7;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc
index bc01898832..fb3ebd341f 100644
--- a/lily/bar-check-iterator.cc
+++ b/lily/bar-check-iterator.cc
@@ -1,70 +1,77 @@
-/*   
-
-     bar-check-iterator.cc -- implement Bar_check_iterator
-
-     source file of the GNU LilyPond music typesetter
+/*
+  bar-check-iterator.cc -- implement Bar_check_iterator
 
-     (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  source file of the GNU LilyPond music typesetter
 
- */
+  (c) 2001--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
+#include "context.hh"
+#include "input.hh"
+#include "international.hh"
+#include "music.hh"
 #include "simple-music-iterator.hh"
-#include "command-request.hh"
-#include "translator-group.hh"
 
 /*
   Check bar checks. We do this outside the engravers so that you can
   race through the score using skipTypesetting to correct durations.
- */
+*/
 class Bar_check_iterator : Simple_music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS(Bar_check_iterator);
   virtual void process (Moment);
-  Bar_check_iterator( );
-  static SCM constructor_cxx_function;
+  Bar_check_iterator ();
+  DECLARE_SCHEME_CALLBACK (constructor, ());
 };
 
 IMPLEMENT_CTOR_CALLBACK (Bar_check_iterator);
 
-Music * get_barcheck ()
-{
-  Music *bc = new Music;
-  bc->set_mus_property ("iterator-ctor", Bar_check_iterator::constructor_cxx_function);
-  return bc;
-}
-
-Bar_check_iterator::Bar_check_iterator()
+Bar_check_iterator::Bar_check_iterator ()
 {
 }
 
 void
 Bar_check_iterator::process (Moment m)
 {
-  Simple_music_iterator::process(m);
+  Simple_music_iterator::process (m);
   if (!m.to_bool ())
     {
-      Translator_group *tr = report_to_l ();
+      Context *tr = get_outlet ();
+
+      SCM check = tr->get_property ("ignoreBarChecks");
+      if (to_boolean (check))
+	return;
 
       SCM mp = tr->get_property ("measurePosition");
-      SCM sync= tr->get_property ("barCheckNoSynchronize");
+      SCM sync = tr->get_property ("barCheckSynchronize");
 
-      Moment * where =unsmob_moment (mp);
+      Moment *where = unsmob_moment (mp);
       if (!where)
 	return;
-      
+
       if (where->main_part_)
 	{
-	  music_l ()->origin ()->warning (_f ("barcheck failed at: %s", 
-					    where->str ()));
-	}
-      
-      if (!to_boolean (sync))
-	{
-	  tr = tr->where_defined (ly_symbol2scm("measurePosition"));
-	  Moment zero;
-	  tr->set_property ("measurePosition", zero.smobbed_copy ());
+	  bool warn = true;
+	  if (to_boolean (sync))
+	    {
+	      SCM mp;
+	      tr = tr->where_defined (ly_symbol2scm ("measurePosition"), &mp);
+	      Moment zero;
+	      tr->set_property ("measurePosition", zero.smobbed_copy ());
+	    }
+	  else
+	    {
+	      SCM lf = tr->get_property ("barCheckLastFail");
+	      if (unsmob_moment (lf)
+		  && *unsmob_moment (lf) == *where)
+		warn = false;
+	      else
+		tr->set_property ("barCheckLastFail", mp);
+	    }
+
+	  if (warn)
+	    get_music ()->origin ()->warning (_f ("barcheck failed at: %s",
+						  where->to_string ()));
 	}
     }
 }
-