* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index ebae578015a64575d12ceaaef9fe6592bf2efe30..03d8f618998f261451bd21c2dd2d4d1dabc16a28 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -17,7 +17,7 @@
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "font-interface.hh"
-#include "debug.hh"
+
 #include "all-font-metrics.hh"
 #include "item.hh"
 #include "staff-symbol-referencer.hh"
@@ -53,7 +53,7 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
   Real hair = gh_scm2double (me->get_grob_property ("hair-thickness"));
   Real fatline = gh_scm2double (me->get_grob_property ("thick-thickness"));
 
-  Real staffline = me->paper_l ()->get_var ("linethickness");
+  Real staffline = me->get_paper ()->get_var ("linethickness");
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   kern *= staffline;
@@ -146,14 +146,13 @@ Bar_line::before_line_breaking (SCM smob)
   if (gh_string_p (g) && bsd)
     {
       SCM proc = me->get_grob_property ("break-glyph-function");
-      g = gh_call2 (proc, g, gh_int2scm (bsd));
+      g = gh_call2 (proc, g, scm_int2num (bsd));
     }
-
   
   if (!gh_string_p (g))
     {
       me->set_grob_property ("molecule-callback", SCM_EOL);
-      me->set_extent_callback (SCM_EOL, X_AXIS);
+      me->set_extent (SCM_EOL, X_AXIS);
       // leave y_extent for spanbar? 
     }
 
@@ -175,7 +174,7 @@ Bar_line::get_staff_bar_size (SCM smob)
   SCM size = me->get_grob_property ("bar-size");
   if (gh_number_p (size))
     return gh_double2scm (gh_scm2double (size)*ss);
-  else if (Staff_symbol_referencer::staff_symbol_l (me))
+  else if (Staff_symbol_referencer::get_staff_symbol (me))
     {
       /*
        If there is no staff-symbol, we get -1 from the next
@@ -185,7 +184,7 @@ Bar_line::get_staff_bar_size (SCM smob)
       return gh_double2scm ((Staff_symbol_referencer::line_count (me) -1) * ss);
     }
   else
-    return gh_int2scm (0);
+    return scm_int2num (0);
 }
 
 
@@ -196,24 +195,10 @@ ADD_INTERFACE (Bar_line, "bar-line-interface",
 This is a request to print a special bar symbol. It replaces the 
 regular bar symbol with a special
 symbol.  The argument @var{bartype} is a string which specifies the
-kind of bar to print.  Options are @code{:|}
-@cindex |A@@@code{:|}
-,
-@code{|:}
-@cindex |B@@@code{|:}
-, @code{:|:}
-@cindex |C@@@code{:|:}
-,
-@code{||}
-@cindex |D@@@code{||}
-, @code{|.}
-@cindex |E@@@code{|.}
-,
-@code{.|}
-@cindex |F@@@code{.|}
-, and @code{.|.}
-@cindex |G@@@code{.|.}
-. 
+kind of bar to print.  Options are @code{:|},
+@code{|:}, @code{:|:},
+@code{||}, @code{|.},
+@code{.|}, and @code{.|.}. 
 
 These produce, respectively, a right repeat, a left repeat, a double
 repeat, a double bar, a start bar, an end bar, and a thick double bar.