* lily/object-key-dumper-scheme.cc: new file.

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index 7d1c78afa54a9f2f02e90c50a1c9fd4e20344998..b597ab93b7913dd684b0777de9187bbc261253e1 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -7,6 +7,7 @@
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "slur.hh"
 
 #include <math.h>
 
@@ -15,18 +16,14 @@
 #include "directional-element-interface.hh"
 #include "font-interface.hh"
 #include "group-interface.hh"
-#include "lily-guile.hh"
 #include "lookup.hh"
 #include "main.hh"             // DEBUG_SLUR_SCORING
 #include "note-column.hh"
 #include "output-def.hh"
-#include "rod.hh"
-#include "slur.hh"
 #include "spanner.hh"
 #include "staff-symbol-referencer.hh"
 #include "staff-symbol.hh"
 #include "stem.hh"
-#include "stencil.hh"
 #include "text-item.hh"
 #include "warn.hh"
 #include "slur-scoring.hh"
@@ -81,7 +78,7 @@ Slur::print (SCM smob)
 #if DEBUG_SLUR_SCORING
   SCM quant_score = me->get_property ("quant-score");
 
-  if (to_boolean (me->get_paper ()
+  if (to_boolean (me->get_layout ()
                  ->lookup_variable (ly_symbol2scm ("debug-slur-scoring")))
       && scm_is_string (quant_score))
     {
@@ -89,7 +86,7 @@ Slur::print (SCM smob)
       SCM properties = Font_interface::text_font_alist_chain (me);
 
       Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
-                                   (me->get_paper ()->self_scm (), properties,
+                                   (me->get_layout ()->self_scm (), properties,
                                     quant_score));
       a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0, 0);
     }
@@ -165,21 +162,21 @@ Slur::outside_slur_callback (SCM grob, SCM axis)
   int k = 0;
   bool do_shift = false;
 
-  for (Direction d = LEFT ;  d <= RIGHT; d = Direction (d + 1))
+  for (int d = LEFT; d <= RIGHT; d++)
     {
-      Real x = xext.linear_combination (d);
+      Real x = xext.linear_combination ((Direction) d);
       consider[k] = bezext.contains (x);
 
       if (consider[k])
        {
-         ys[k] =
-           (fabs(bezext[LEFT] - x) < EPS)
+         ys[k]
+           = (fabs(bezext[LEFT] - x) < EPS)
            ? curve.control_[0][Y_AXIS]
            : ((fabs(bezext[RIGHT] - x) < EPS)
               ? curve.control_[3][Y_AXIS]
               : curve.get_other_coordinate (X_AXIS, x));
          consider[k] = true;
-
+         
          if (yext.contains (ys[k]))
            do_shift = true;
        }
@@ -189,11 +186,10 @@ Slur::outside_slur_callback (SCM grob, SCM axis)
     {
       k = 0;
       Direction dir = get_grob_direction (script);
-      for (Direction d = LEFT ;  d <= RIGHT; d = Direction (d + 1))
+      for (int d = LEFT; d <= RIGHT; d++)
        {
-         offset = 
-           dir * (dir * offset >? dir * (ys[k]
-                                         - yext[-dir] + dir * slur_padding));
+         offset = dir * (dir * offset >? dir
+                         * (ys[k] - yext[-dir] + dir * slur_padding));
          k++;
        }
     }
@@ -208,7 +204,7 @@ get_default_dir (Grob*me)
     = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "note-columns");
 
   Direction d = DOWN;
-  for (int i= 0; i < encompasses.size (); i ++)
+  for (int i = 0; i < encompasses.size (); i ++)
     {
       if (Note_column::dir (encompasses[i]) < 0)
        {
@@ -242,6 +238,6 @@ Slur::after_line_breaking (SCM smob)
 
 ADD_INTERFACE (Slur, "slur-interface",
               "A slur",
-              "quant-score excentricity encompass-objects control-points dashed slur-details direction height-limit note-columns ratio thickness");
+              "positions quant-score excentricity encompass-objects control-points dashed slur-details direction height-limit note-columns ratio thickness");