Merge commit 'b5cba4f'

[lilypond.git] / lily / span-bar.cc

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 993fafe14a70581aad7f852c4d53f2b806056d04..67d464297dbd0b189a1e1a5da265e8681c54f1ce 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -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);
-      if (ext.is_empty () || to_boolean (bar->get_property ("transparent")))
+      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. */
            }