Tomas Sauer's fix for alternatives in abc2ly.

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

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 14debf7c9852f9d8fa19da708d4a1eae57b63f26..bd10b1c671223435cf97786178e7dfe74d4b68cb 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -53,10 +53,10 @@ Span_bar::print (SCM smobbed_me)
   if (!scm_is_string (glyph))
     return SCM_EOL;
 
-  std::string glyph_string = ly_scm2string (glyph);
+  string glyph_string = ly_scm2string (glyph);
 
   /* compose span_bar_mol */
-  std::vector<Interval> extents;
+  vector<Interval> extents;
   Grob *model_bar = 0;
   for (vsize i = elements.size (); i--;)
     {
@@ -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++)
@@ -116,7 +116,7 @@ Span_bar::width (SCM smob)
   if (!me->is_live ())
     return ly_interval2scm (Interval ());
   
-  std::string gl = ly_scm2string (gn);
+  string gl = ly_scm2string (gn);
 
   /*
     urg.
@@ -177,7 +177,7 @@ Span_bar::calc_glyph_name (SCM smob)
       return SCM_UNSPECIFIED;
     }
 
-  std::string type = ly_scm2string (gl);
+  string type = ly_scm2string (gl);
   if (type == "|:")
     type = ".|";
   else if (type == ":|")
@@ -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.",