Merge with master

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

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 84fe893a0c4b0287752e78185564c8ff6efcc0ae..072b110e7a1ef1b66cb6ad468dcb26050f8cccf1 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "span-bar.hh"
@@ -72,7 +72,7 @@ Span_bar::print (SCM smobbed_me)
   if (!model_bar)
     model_bar = me;
 
-  vector_sort (extents, Interval::left_comparison);
+  vector_sort (extents, Interval::left_less);
 
   Stencil span_bar;
   for (vsize i = 1; i < extents.size (); i++)
@@ -185,7 +185,7 @@ Span_bar::calc_glyph_name (SCM smob)
   else if (type == ":|:")
     type = ".|.";
 
-  return scm_makfrom0str (type.c_str ());
+  return ly_string2scm (type);
 }
 
 Interval
@@ -209,7 +209,7 @@ Span_bar::calc_bar_size (SCM smob)
   return scm_from_double (iv.length ());
 }
 
-ADD_INTERFACE (Span_bar, "span-bar-interface",
+ADD_INTERFACE (Span_bar,
               "A bar line that spanned between other barlines. This interface is "
               " used for  bar lines that connect different staves.",