the great dash-replace.

[lilypond.git] / lily / slur-scoring.cc

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 19ce9ee47c6c15dc11f514aecf1275c9c58961e5..5f978cc483507c0537812e72f3ad5ab0cbdc6caa 100644 (file)
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -127,7 +127,7 @@ broken_trend_y (Slur_score_state const &state, Direction hdir)
   Real by = 0.0;
   if (Spanner *mother = dynamic_cast<Spanner *> (state.slur_->original ()))
     {
-      int k = broken_spanner_index (state.slur_);
+      vsize k = broken_spanner_index (state.slur_);
       int j = k + hdir;
       if (j < 0 || j >= mother->broken_intos_.size ())
        return by;
@@ -163,7 +163,7 @@ Slur_score_state::set_next_direction ()
 
   if (Spanner *mother = dynamic_cast<Spanner *> (slur_->original ()))
     {
-      int k = broken_spanner_index (slur_);
+      vsize k = broken_spanner_index (slur_);
       int j = k + 1;
       if (j < 0 || j >= mother->broken_intos_.size ())
        return;
@@ -292,7 +292,7 @@ Slur_score_state::fill (Grob *me)
     }
 
   staff_space_ = Staff_symbol_referencer::staff_space (me);
-  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   thickness_ = robust_scm2double (me->get_property ("thickness"), 1.0) * lt;
 
   dir_ = get_grob_direction (me);
@@ -635,7 +635,7 @@ std::vector<Offset>
 Slur_score_state::generate_avoid_offsets () const
 {
   std::vector<Offset> avoid;
-  Link_array<Grob> encompasses = columns_;
+  Link_array__Grob_ encompasses = columns_;
 
   for (vsize i = 0; i < encompasses.size (); i++)
     {
@@ -689,10 +689,10 @@ Slur_score_state::generate_curves () const
     configurations_[i]->generate_curve (*this, r_0, h_inf, avoid);
 }
 
-Link_array<Slur_configuration>
+Link_array__Slur_configuration_
 Slur_score_state::enumerate_attachments (Drul_array<Real> end_ys) const
 {
-  Link_array<Slur_configuration> scores;
+  Link_array__Slur_configuration_ scores;
 
   Drul_array<Offset> os;
   os[LEFT] = base_attachments_[LEFT];