Run `make grand-replace'.

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

diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc
index 660272cd90c12300d7e0e0932d9acd97674d9435..5b518602ff852ffd4bb8c0cc017b2697f7903433 100644 (file)
--- a/lily/bar-check-iterator.cc
+++ b/lily/bar-check-iterator.cc
@@ -3,12 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "simple-music-iterator.hh"
-#include "event.hh"
 #include "context.hh"
+#include "input.hh"
+#include "international.hh"
+#include "music.hh"
+#include "simple-music-iterator.hh"
 
 /*
   Check bar checks. We do this outside the engravers so that you can
@@ -36,6 +38,10 @@ Bar_check_iterator::process (Moment m)
     {
       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 ("barCheckSynchronize");
 
@@ -48,7 +54,8 @@ Bar_check_iterator::process (Moment m)
          bool warn = true;
          if (to_boolean (sync))
            {
-             tr = tr->where_defined (ly_symbol2scm ("measurePosition"));
+             SCM mp;
+             tr = tr->where_defined (ly_symbol2scm ("measurePosition"), &mp);
              Moment zero;
              tr->set_property ("measurePosition", zero.smobbed_copy ());
            }