* scripts/abc2ly.py (dump_slyrics): add ord().

[lilypond.git] / lily / coherent-ligature-engraver.cc

diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index 4f1ceabbd0afcb13ed1d795b78d05aec557e1460..1fad0f9b24e6a300bd7d6c0c0aa184343ba714a2 100644 (file)
--- a/lily/coherent-ligature-engraver.cc
+++ b/lily/coherent-ligature-engraver.cc
@@ -7,7 +7,7 @@
  */
 
 #include "coherent-ligature-engraver.hh"
-#include "item.hh"
+
 #include "warn.hh"
 #include "staff-symbol-referencer.hh"
 #include "spanner.hh"
@@ -86,7 +86,7 @@
          Real distance;
          if (incr_scm != SCM_EOL)
            {
-             distance = ly_scm2double (incr_scm);
+             distance = scm_to_double (incr_scm);
            }
          else
            {
@@ -95,9 +95,9 @@
            }
          me->warning (_f ("distance=%f", distance));//debug
          Real strength = 1.0;
-         Spaceable_grob::add_spring (lc, rc, distance, strength, false);
+         Spaceable_grob::add_spring (lc, rc, distance, strength);
          if (Item *rb = r->find_prebroken_piece (LEFT))
-           Spaceable_grob::add_spring (lc, rb, distance, strength, false);
+           Spaceable_grob::add_spring (lc, rb, distance, strength);
 
          continue;
        }
@@ -127,10 +127,10 @@ Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column)
       // also for all associated grobs (NoteSpacing, SeparationItem).
       Grob *sl = Staff_symbol_referencer::get_staff_symbol (item);
       for (SCM tail = parent->get_property ("elements");
-          is_pair (tail);
-          tail = ly_cdr (tail))
+          scm_is_pair (tail);
+          tail = scm_cdr (tail))
        {
-         Item *sibling = unsmob_item (ly_car (tail));
+         Item *sibling = unsmob_item (scm_car (tail));
          if ((sibling) &&
              (Staff_symbol_referencer::get_staff_symbol (sibling) == sl))
            {
@@ -211,12 +211,6 @@ Coherent_ligature_engraver::typeset_ligature (Spanner *ligature,
   // prepare ligature for typesetting
   build_ligature (ligature, primitives);
   collect_accidentals (ligature, primitives);
-
-  // now actually typeset
-  for (int i = 0; i < primitives.size (); i++)
-    {
-      typeset_grob (primitives[i].grob_);
-    }
 }
 
 ENTER_DESCRIPTION (Coherent_ligature_engraver,