* scm/lily.scm (completize-formats): new function

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

diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index 337415743fd594a6ce90ee639947fb329b8ed706..b4d152153b8ff3132c4cd130f9c612b96ae99b6e 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"
@@ -81,7 +81,7 @@
       SCM incr_scm = lc->get_property ("forced-spacing");
       if (incr_scm != SCM_EOL) /* (Paper_column::is_musical (l)) */
        {
-         me->warning (_f ("gotcha: ptr=%ul", lc));//debug
+         me->warning (_f ("gotcha: ptr =%ul", lc));//debug
          ly_display_scm (lc->self_scm ());
          Real distance;
          if (incr_scm != SCM_EOL)
@@ -93,7 +93,7 @@
              me->warning ("distance undefined, assuming 0.1");
              distance = 0.1;
            }
-         me->warning (_f ("distance=%f", distance));//debug
+         me->warning (_f ("distance =%f", distance));//debug
          Real strength = 1.0;
          Spaceable_grob::add_spring (lc, rc, distance, strength);
          if (Item *rb = r->find_prebroken_piece (LEFT))
@@ -128,9 +128,9 @@ Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column)
       Grob *sl = Staff_symbol_referencer::get_staff_symbol (item);
       for (SCM tail = parent->get_property ("elements");
           scm_is_pair (tail);
-          tail = ly_cdr (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))
            {
@@ -138,7 +138,7 @@ Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column)
              Grob *sibling_parent = sibling->get_parent (X_AXIS);
              sibling_parent->warning (_f ("Coherent_ligature_engraver: "
                                           "setting `spacing-increment = "
-                                          "0.01': ptr=%ul", parent));
+                                          "0.01': ptr =%ul", parent));
              sibling_parent->set_property ("forced-spacing",
                                              scm_make_real (0.01));
 #endif
@@ -213,7 +213,7 @@ Coherent_ligature_engraver::typeset_ligature (Spanner *ligature,
   collect_accidentals (ligature, primitives);
 }
 
-ENTER_DESCRIPTION (Coherent_ligature_engraver,
+ADD_TRANSLATOR (Coherent_ligature_engraver,
 /* descr */       "This is an abstract class.  Subclasses such as Gregorian_ligature_engraver handle ligatures by glueing special ligature heads together.",
 /* creats*/       "",
 /* accepts */     "ligature-event",