X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=67d464297dbd0b189a1e1a5da265e8681c54f1ce;hb=aa0d40a1c751626db12bedb806e32bf1d4270876;hp=4566d73f77080e486530436499324cc48f67b630;hpb=2c8c61b3a5cddbb155786a1ca027528701c91ac9;p=lilypond.git

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 4566d73f77..67d464297d 100644
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "span-bar.hh"
@@ -57,15 +57,17 @@ Span_bar::print (SCM smobbed_me)
 
   /* compose span_bar_mol */
   vector<Interval> extents;
+  vector<bool> make_span_bar;
   Grob *model_bar = 0;
   for (vsize i = elements.size (); i--;)
     {
       Grob *bar = elements[i];
-      Interval ext = bar->extent (refp, Y_AXIS);
+      Interval ext = Bar_line::bar_y_extent (bar, refp);
       if (ext.is_empty ())
 	continue;
 
       extents.push_back (ext);
+      make_span_bar.push_back (to_boolean (bar->get_property ("allow-span-bar")));
       model_bar = bar;
     }
 
@@ -84,7 +86,7 @@ Span_bar::print (SCM smobbed_me)
 	  Interval l (prev_extent [UP],
 		      ext[DOWN]);
 
-	  if (l.is_empty ())
+	  if (l.is_empty () || !make_span_bar[i])
 	    {
 	      /* There is overlap between the bar lines.  Do nothing. */
 	    }
@@ -185,7 +187,7 @@ Span_bar::calc_glyph_name (SCM smob)
   else if (type == ":|:")
     type = ".|.";
 
-  return scm_makfrom0str (type.c_str ());
+  return ly_string2scm (type);
 }
 
 Interval