From: hanwen <hanwen>
Date: Fri, 19 Nov 2004 23:14:28 +0000 (+0000)
Subject: (get_staff_bar_size): add line thickness.
X-Git-Tag: release/2.5.23~935
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a901e4c44f90e1948d873aaaf1a0d899d7b5228c;p=lilypond.git

(get_staff_bar_size): add line thickness.
---

diff --git a/ChangeLog b/ChangeLog
index 511e2f3849..2b9299cbfc 100644
--- 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 6762b21864..54c1321ac3 100644
--- 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);