(get_staff_bar_size): add line thickness.

diff --git a/ChangeLog b/ChangeLog
index 511e2f38497bbd32f6c615fed9ead8f98768d2ad..2b9299cbfc4555329680cc79782b7db0c30d3436 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/bar-line.cc (get_staff_bar_size): add line thickness.
+
 2004-11-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * input/example-[1-3].ly: simplify.

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 6762b21864d217b791a374230fa1af39646541e6..54c1321ac3e2e290870e811f1f2d4b3e1faf0d9d 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -200,7 +200,9 @@ Bar_line::get_staff_bar_size (SCM smob)
        calculation. That's a nonsense value, which would collapse the
        barline so we return 0.0 in the next alternative.
       */
-      return scm_make_real ((Staff_symbol_referencer::line_count (me) -1) * ss);
+      Real ysize = (Staff_symbol_referencer::line_count (me) -1);
+      ysize = ysize * ss  + Staff_symbol_referencer::line_thickness (me);
+      return scm_make_real (ysize);
     }
   else
     return scm_int2num (0);