(get_indexed_char): scale metrics by

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

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 56609b231f9e7b940d5aa27310c3d1d1fb3e2766..748d3e8b745229659ca30c43f880938fd82363f5 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -6,19 +6,15 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+
 #include <math.h>
 
+#include "bar-line.hh"
 #include "lookup.hh"
 #include "paper-column.hh"
-#include "grob.hh"
-#include "bar-line.hh"
-#include "string.hh"
-#include "stencil.hh"
 #include "output-def.hh"
 #include "font-interface.hh"
-
 #include "all-font-metrics.hh"
-#include "item.hh"
 #include "staff-symbol-referencer.hh"
 
 MAKE_SCHEME_CALLBACK (Bar_line,print,1);
@@ -32,7 +28,7 @@ Bar_line::print (SCM smob)
   SCM barsiz_proc = me->get_property ("bar-size-procedure");
   if (scm_is_string (s) && ly_c_procedure_p (barsiz_proc))
     {
-      String str  =ly_scm2string (s);
+      String str  = ly_scm2string (s);
       SCM siz = scm_call_1 (barsiz_proc, me->self_scm ());
       Real sz = robust_scm2double (siz, 0);
       if (sz <= 0)
@@ -52,7 +48,7 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
   Real hair = robust_scm2double (me->get_property ("hair-thickness"), 1);
   Real fatline = robust_scm2double (me->get_property ("thick-thickness"), 1);
 
-  Real staffline = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real staffline = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   kern *= staffline;
@@ -62,9 +58,9 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
 
   Stencil thin = simple_barline (me, hair, h);
   Stencil thick = simple_barline (me, fatline, h);
-  Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot");
+  Stencil dot = Font_interface::get_default_font (me)->find_by_name ("dots.dot");
 
-  int lines =Staff_symbol_referencer::line_count (me);
+  int lines = Staff_symbol_referencer::line_count (me);
   Real dist 
     = ((lines & 1 || lines == 0)
        ? 1
@@ -150,7 +146,7 @@ Bar_line::simple_barline (Grob *me,
                          Real w,
                          Real h) 
 {
-  Real blot = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
   
   return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)), blot);
 }
@@ -160,7 +156,7 @@ MAKE_SCHEME_CALLBACK (Bar_line,before_line_breaking ,1);
 SCM
 Bar_line::before_line_breaking (SCM smob)
 {
-  Grob*me=unsmob_grob (smob);
+  Grob*me = unsmob_grob (smob);
   Item * item = dynamic_cast<Item*> (me);
   
   SCM g = me->get_property ("glyph");
@@ -195,7 +191,7 @@ Bar_line::get_staff_bar_size (SCM smob)
   Grob*me = unsmob_grob (smob);
   Real ss = Staff_symbol_referencer::staff_space (me);
   SCM size = me->get_property ("bar-size");
-  if (ly_c_number_p (size))
+  if (scm_is_number (size))
     return scm_make_real (scm_to_double (size)*ss);
   else if (Staff_symbol_referencer::get_staff_symbol (me))
     {
@@ -204,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);