Merge branch 'lilypond/translation' of /home/jcharles/GIT/Lily/ into lilypond/translation

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

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 4c9142139f37ee687a5a4d5ea75091578ea2b148..76e1b60280970bb5eeadbdb9d77ed85f0d6283df 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -57,6 +57,7 @@ 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--;)
     {
@@ -66,6 +67,7 @@ Span_bar::print (SCM smobbed_me)
        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. */
            }
@@ -210,10 +212,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 "
+              );