2003 -> 2004

[lilypond.git] / lily / bar-check-iterator.cc

diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc
index 5870e7a5ef007c31772ff2e8098153f9693df13b..dc3e27feac909cc6f156f68ee32aea5a3172c3c0 100644 (file)
--- a/lily/bar-check-iterator.cc
+++ b/lily/bar-check-iterator.cc
@@ -4,7 +4,7 @@
 
      source file of the GNU LilyPond music typesetter
 
-     (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+     (c) 2001--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
 
@@ -19,13 +19,13 @@
 class Bar_check_iterator : Simple_music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS(Bar_check_iterator);
   virtual void process (Moment);
   Bar_check_iterator( );
   DECLARE_SCHEME_CALLBACK(constructor, ());
 };
 
 IMPLEMENT_CTOR_CALLBACK(Bar_check_iterator);
+
 Bar_check_iterator::Bar_check_iterator()
 {
 }
@@ -36,7 +36,7 @@ Bar_check_iterator::process (Moment m)
   Simple_music_iterator::process(m);
   if (!m.to_bool ())
     {
-      Translator_group *tr = report_to ();
+      Translator_group *tr = get_outlet ();
 
       SCM mp = tr->get_property ("measurePosition");
       SCM sync= tr->get_property ("barCheckSynchronize");
@@ -47,14 +47,26 @@ Bar_check_iterator::process (Moment m)
       
       if (where->main_part_)
        {
-         get_music ()->origin ()->warning (_f ("barcheck failed at: %s", 
-                                             where->string ()));
+         bool warn =true;
          if (to_boolean (sync))
            {
              tr = tr->where_defined (ly_symbol2scm("measurePosition"));
              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 ()));
        }
     }
 }