*** empty log message ***

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

diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index b015a6255e28f6ec3464e0c2f0aa25a88d7f6c85..1bc75b847a8a85663aab3346866c26fe46784fa0 100644 (file)
--- a/lily/coherent-ligature-engraver.cc
+++ b/lily/coherent-ligature-engraver.cc
@@ -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;
        }
@@ -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,