* scm/define-markup-commands.scm (fill-line): use

[lilypond.git] / lily / accidental-placement.cc

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index c45947629e07484ac520ee7b6f21fb2c53b44c3f..b88e6f94cae5d5fefb000a02f6ca55cf494c8424 100644 (file)
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -7,15 +7,15 @@
 
 */
 
-#include <math.h>
+#include "accidental-placement.hh"
+
+#include <cmath>
 
 #include "libc-extension.hh"   // isinf
-#include "item.hh"
 #include "skyline.hh"
 #include "music.hh"
 #include "pitch.hh"
 #include "warn.hh"
-#include "accidental-placement.hh"
 #include "note-column.hh"
 #include "group-interface.hh"
 #include "note-collision.hh"
@@ -25,7 +25,7 @@ MAKE_SCHEME_CALLBACK (Accidental_placement,alignment_callback, 2);
 SCM
 Accidental_placement::alignment_callback (SCM s, SCM )
 {
-  Grob * me =unsmob_grob (s);
+  Grob * me = unsmob_grob (s);
 
   Grob * par = me->get_parent (X_AXIS);
   if (!to_boolean (par->get_property ("positioning-done")))
@@ -45,7 +45,7 @@ Accidental_placement::add_accidental (Grob* me, Grob* a)
   a->add_offset_callback (alignment_callback_proc, X_AXIS);
   SCM cause = a->get_parent (Y_AXIS)->get_property ("cause");
 
-  Music *mcause =unsmob_music (cause); 
+  Music *mcause = unsmob_music (cause); 
   if (!mcause)
     {
       programming_error ("Note head has no music cause!");
@@ -64,7 +64,7 @@ Accidental_placement::add_accidental (Grob* me, Grob* a)
       entry = SCM_EOL;
     }
   else
-    entry = ly_cdr (entry);
+    entry = scm_cdr (entry);
 
   entry = scm_cons (a->self_scm (), entry);
 
@@ -81,11 +81,11 @@ Accidental_placement::split_accidentals (Grob * accs,
                                         Link_array<Grob> *break_reminder,
                                         Link_array<Grob> *real_acc)
 {
-  for (SCM acs =accs->get_property ("accidental-grobs"); is_pair (acs);
-       acs =ly_cdr (acs))
-    for (SCM s = ly_cdar (acs); is_pair (s); s = ly_cdr (s))
+  for (SCM acs =accs->get_property ("accidental-grobs"); scm_is_pair (acs);
+       acs =scm_cdr (acs))
+    for (SCM s = scm_cdar (acs); scm_is_pair (s); s = scm_cdr (s))
       {
-       Grob *a = unsmob_grob (ly_car (s));
+       Grob *a = unsmob_grob (scm_car (s));
 
        if (unsmob_grob (a->get_property ("tie")))
          break_reminder->push (a);
@@ -250,7 +250,7 @@ stagger_apes (Link_array<Accidental_placement_entry> *apes)
 SCM
 Accidental_placement::position_accidentals (Grob * me)
 {
-  if (!me->live ())
+  if (!me->is_live ())
     return SCM_UNSPECIFIED;
   
   SCM accs = me->get_property ("accidental-grobs");
@@ -260,18 +260,17 @@ Accidental_placement::position_accidentals (Grob * me)
     Y-position, they share an Ape, and will be printed in overstrike.
    */
   Link_array<Accidental_placement_entry> apes;
-  for (SCM s = accs; is_pair (s); s =ly_cdr (s))
+  for (SCM s = accs; scm_is_pair (s); s =scm_cdr (s))
     {
       Accidental_placement_entry *ape = new Accidental_placement_entry;
-      ape->notename_ = ly_scm2int (ly_caar (s));
+      ape->notename_ = scm_to_int (scm_caar (s));
       
-      for (SCM t = ly_cdar (s); is_pair (t); t =ly_cdr (t))
-       ape->grobs_.push (unsmob_grob (ly_car (t)));
+      for (SCM t = scm_cdar (s); scm_is_pair (t); t =scm_cdr (t))
+       ape->grobs_.push (unsmob_grob (scm_car (t)));
 
       apes.push (ape);
     }
 
-
   Grob *common[] = {me, 0};
 
   /*
@@ -428,8 +427,6 @@ Accidental_placement::position_accidentals (Grob * me)
 
   
   left_extent[LEFT] -= robust_scm2double (me->get_property ("left-padding"), 0);
-
-  
   Interval width (left_extent[LEFT], right_extent[RIGHT]);
 
   SCM scm_width = ly_interval2scm (width);