Imported Upstream version 2.14.2

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

diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc
index 46479892ef67e5e8c1ae52221970db058dc1ccc6..09f06b1fc2435e900095d06ce738462f55e7ec45 100644 (file)
--- a/lily/bar-check-iterator.cc
+++ b/lily/bar-check-iterator.cc
@@ -1,14 +1,27 @@
 /*
-  bar-check-iterator.cc -- implement Bar_check_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2001--2011  Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#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
@@ -39,7 +52,7 @@ Bar_check_iterator::process (Moment m)
       SCM check = tr->get_property ("ignoreBarChecks");
       if (to_boolean (check))
        return;
-      
+
       SCM mp = tr->get_property ("measurePosition");
       SCM sync = tr->get_property ("barCheckSynchronize");
 
@@ -52,7 +65,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 ());
            }