Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index 697f86642b735f3bdc565ec120014dacea14fd16..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--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "span-bar.hh"
@@ -53,29 +53,29 @@ Span_bar::print (SCM smobbed_me)
   if (!scm_is_string (glyph))
     return SCM_EOL;
 
-  String glyph_string = ly_scm2string (glyph);
+  string glyph_string = ly_scm2string (glyph);
 
   /* compose span_bar_mol */
-  Array<Interval> extents;
+  vector<Interval> extents;
   Grob *model_bar = 0;
-  for (int i = elements.size (); i--;)
+  for (vsize i = elements.size (); i--;)
     {
       Grob *bar = elements[i];
       Interval ext = bar->extent (refp, Y_AXIS);
       if (ext.is_empty ())
        continue;
 
-      extents.push (ext);
+      extents.push_back (ext);
       model_bar = bar;
     }
 
   if (!model_bar)
     model_bar = me;
 
-  extents.sort (&Interval::left_comparison);
+  vector_sort (extents, Interval::left_less);
 
   Stencil span_bar;
-  for (int i = 1; i < extents.size (); i++)
+  for (vsize i = 1; i < extents.size (); i++)
     {
       Interval prev_extent = extents[i - 1];
       Interval ext = extents[i];
@@ -116,7 +116,7 @@ Span_bar::width (SCM smob)
   if (!me->is_live ())
     return ly_interval2scm (Interval ());
   
-  String gl = ly_scm2string (gn);
+  string gl = ly_scm2string (gn);
 
   /*
     urg.
@@ -132,7 +132,7 @@ Span_bar::before_line_breaking (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   extract_grob_set (me, "elements", elements);
-  if (elements.is_empty ())
+  if (elements.empty ())
     me->suicide ();
 
   return SCM_UNSPECIFIED;
@@ -167,9 +167,9 @@ Span_bar::calc_glyph_name (SCM smob)
   Grob *me = unsmob_grob (smob);
   extract_grob_set (me, "elements", elements);
   SCM gl = SCM_EOL;
-  for (int i = elements.size ();
+  for (vsize i = elements.size ();
        i-- && !scm_is_string (gl);)
-    gl = elements[i]->get_property ("glyph");
+    gl = elements[i]->get_property ("glyph-name");
 
   if (!scm_is_string (gl))
     {
@@ -177,7 +177,7 @@ Span_bar::calc_glyph_name (SCM smob)
       return SCM_UNSPECIFIED;
     }
 
-  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.to_str0 ());
+  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.",