X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fnote-spacing.cc;h=24e79cd313b8c190fc72b911f705a76190b49e37;hb=c08af381a1f23a3656d845b86895a9f2a955590b;hp=90db07a7e82ab1159a3804c4308b3f9bccc21fcb;hpb=6fb6249345ce846c8c55f843b21c6e85024a720b;p=lilypond.git

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index 90db07a7e8..24e79cd313 100644
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2001--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-spacing.hh"
@@ -23,6 +23,12 @@
 #include "output-def.hh"
 #include "pointer-group-interface.hh"
 
+static bool
+non_empty_barline (Grob *me)
+{
+  return Bar_line::has_interface (me) && !me->extent (me, X_AXIS).is_empty ();
+}
+
 /*
   TODO: detect hshifts due to collisions, and account for them in
   spacing?
@@ -80,7 +86,7 @@ Note_spacing::get_spacing (Grob *me, Item *right_col,
     {
       Grob *bar = Pointer_group_interface::find_grob (right_col,
 						      ly_symbol2scm ("elements"),
-						      Bar_line::has_interface);
+						      non_empty_barline);
 
       if (bar)
 	{