* ly/declarations-init.ly (partCombineListener): use

ignoreBarChecks. Fixes: warn-partcombine-barcheck.ly

* lily/bar-check-iterator.cc (process): ignoreBarChecks property.

diff --git a/ChangeLog b/ChangeLog
index 2cce8545b7d376acd0972946c8d741f7507308c3..505b86ba058e3ab89c30aff1ed207e12c86245b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * ly/declarations-init.ly (partCombineListener): use
+       ignoreBarChecks. Fixes: warn-partcombine-barcheck.ly
+
+       * lily/bar-check-iterator.cc (process): ignoreBarChecks property.
+
 2005-04-04  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/text-item.cc: Fix link.

diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc
index 660272cd90c12300d7e0e0932d9acd97674d9435..46479892ef67e5e8c1ae52221970db058dc1ccc6 100644 (file)
--- a/lily/bar-check-iterator.cc
+++ b/lily/bar-check-iterator.cc
@@ -36,6 +36,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");
 

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index eecf711186d88f7067b00b7383bd2a433304335b..a1379dcdf8780c21b57aba40aaa173e116abf2ed 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -99,6 +99,7 @@ partCombineListener = \layout {
     \context {
        \Score
        skipTypesetting = ##t
+       ignoreBarChecks = ##t 
     }
 }
 

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index 61ceb1f14492a14c781e2b4f2710a826af960202..8d851236b8278b5e6bcd4993e4bb8c5f38bc7d51 100644 (file)
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -216,6 +216,7 @@ get accidentals.")
 highest pitch on the instrument. This used by the automatic string
 selector for tab notation.")
 
+     (ignoreBarChecks ,boolean? "Ignore bar checks")
      (ignoreMelismata ,boolean? "Ignore melismata for this @internalsref{Lyrics} line.")
      (instr ,markup? "See @code{instrument}")