X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-bar.cc;h=2c0273ea72621447332253f24ca77aff9d4948f4;hb=905473989ebcecca6922afcf6161c5c24a8e0282;hp=bd10b1c671223435cf97786178e7dfe74d4b68cb;hpb=711cf44d0ab28f3159230c84d63c0b19199408b0;p=lilypond.git

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index bd10b1c671..2c0273ea72 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--2009 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. */
 	    }
@@ -184,6 +186,12 @@ Span_bar::calc_glyph_name (SCM smob)
     type = "|.";
   else if (type == ":|:")
     type = ".|.";
+  else if (type == ":|.|:")
+    type = "|.|";
+  else if (type == ":|.:")
+    type = "|.";
+  else if (type == "'")
+    type = "";
 
   return ly_string2scm (type);
 }
@@ -210,10 +218,12 @@ Span_bar::calc_bar_size (SCM smob)
 }
 
 ADD_INTERFACE (Span_bar,
-	       "A bar line that spanned between other barlines. This interface is "
-	       " used for  bar lines that connect different staves.",
+	       "A bar line that is spanned between other barlines.  This"
+	       " interface is used for bar lines that connect different"
+	       " staves.",
 
 	       /* properties */
 	       "glyph-name "
-	       "elements");
+	       "elements "
+	       );