Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 6290277358bcf80e7c5cb6902445b74aaed3e558..84fe893a0c4b0287752e78185564c8ff6efcc0ae 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;
 
-  extents.sort (&Interval::left_comparison);
+  vector_sort (extents, Interval::left_comparison);
 
   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 == ":|")