Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 555a5c2566cb01e06ea8913dfdcc7037e39a02c8..4922a84d37b29921d1e5a79d29c4ccd1508f1f0d 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "bar-line.hh"
@@ -16,19 +16,18 @@
 #include "staff-symbol-referencer.hh"
 
 MAKE_SCHEME_CALLBACK (Bar_line, print, 1);
-
 SCM
 Bar_line::print (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
-  SCM s = me->get_property ("glyph");
-  SCM barsiz_proc = me->get_property ("bar-size-procedure");
-  if (scm_is_string (s) && ly_is_procedure (barsiz_proc))
+  SCM s = me->get_property ("glyph-name");
+  SCM barsize = me->get_property ("bar-size");
+  
+  if (scm_is_string (s) && scm_is_number (barsize))
     {
-      String str = ly_scm2string (s);
-      SCM siz = scm_call_1 (barsiz_proc, me->self_scm ());
-      Real sz = robust_scm2double (siz, 0);
+      string str = ly_scm2string (s);
+      Real sz = robust_scm2double (barsize, 0);
       if (sz <= 0)
        return SCM_EOL;
 
@@ -38,7 +37,7 @@ Bar_line::print (SCM smob)
 }
 
 Stencil
-Bar_line::compound_barline (Grob *me, String str, Real h,
+Bar_line::compound_barline (Grob *me, string str, Real h,
                            bool rounded)
 {
   Real kern = robust_scm2double (me->get_property ("kern"), 1);
@@ -46,7 +45,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_layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real staffline = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   kern *= staffline;
@@ -132,6 +131,10 @@ Bar_line::compound_barline (Grob *me, String str, Real h,
          m.add_stencil (d);
        }
     }
+  else if (str == ".")
+    {
+      m = dot;
+    }
   return m;
 }
 
@@ -143,67 +146,30 @@ Bar_line::simple_barline (Grob *me,
 {
   Real blot
     = rounded
-    ? me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"))
+    ? me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"))
     : 0.0;
 
   return Lookup::round_filled_box (Box (Interval (0, w),
                                        Interval (-h / 2, h / 2)), blot);
 }
 
-MAKE_SCHEME_CALLBACK (Bar_line, before_line_breaking, 1);
-
+MAKE_SCHEME_CALLBACK (Bar_line, calc_bar_size, 1);
 SCM
-Bar_line::before_line_breaking (SCM smob)
+Bar_line::calc_bar_size (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  Item *item = dynamic_cast<Item *> (me);
-
-  SCM g = me->get_property ("glyph");
-  SCM orig = g;
-  Direction bsd = item->break_status_dir ();
-  if (scm_is_string (g) && bsd)
-    {
-      SCM proc = me->get_property ("break-glyph-function");
-      g = scm_call_2 (proc, g, scm_from_int (bsd));
-    }
-
-  if (!scm_is_string (g))
+  if (Grob *staff = Staff_symbol_referencer::get_staff_symbol (me))
     {
-      me->set_property ("print-function", SCM_EOL);
-      me->set_extent (SCM_EOL, X_AXIS);
-      // leave y_extent for spanbar? 
-    }
-
-  if (! ly_is_equal (g, orig))
-    me->set_property ("glyph", g);
-
-  return SCM_UNSPECIFIED;
-}
-
-MAKE_SCHEME_CALLBACK (Bar_line, get_staff_bar_size, 1);
-SCM
-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 (scm_is_number (size))
-    return scm_from_double (scm_to_double (size) * ss);
-  else if (Staff_symbol_referencer::get_staff_symbol (me))
-    {
-      /*
-       If there is no staff-symbol, we get -1 from the next
-       calculation. That's a nonsense value, which would collapse the
-       barline so we return 0.0 in the next alternative.
-      */
-      Real ysize = (Staff_symbol_referencer::line_count (me) -1);
-      ysize = ysize * ss + Staff_symbol_referencer::line_thickness (me);
-      return scm_from_double (ysize);
+      Interval staff_y = staff->extent (staff, Y_AXIS);
+      return scm_from_double (staff_y.is_empty () ? 0.0 : staff_y.length ());
     }
   return scm_from_int (0);
 }
 
-ADD_INTERFACE (Bar_line, "bar-line-interface",
+
+ADD_INTERFACE (Bar_line,
+              "bar-line-interface",
+
               "Bar line.\n"
               "\n"
               "Print a special bar symbol. It replaces the \n"
@@ -218,4 +184,14 @@ ADD_INTERFACE (Bar_line, "bar-line-interface",
               "repeat, a double bar, a start bar, an end bar, and a thick double bar.\n"
               "If @var{bartype} is set to @code{empty} then nothing is printed,\n"
               "but a line break is allowed at that spot.\n",
-              "bar-size-procedure kern thin-kern hair-thickness thick-thickness glyph bar-size break-glyph-function");
+
+
+              /* properties */ 
+              "kern "
+              "thin-kern "
+              "hair-thickness "
+              "thick-thickness "
+              "glyph "
+              "glyph-name "
+              "bar-size "
+              );