X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faccidental-placement.cc;h=2c508ac9f7de1c88d0786f1a0bea4b39f7f35bd5;hb=6dcc906d0eab776bddec84fe6d95fa53ed06b607;hp=48308142fd4abb10a66b611427c6149e7a6becb5;hpb=9c31b0d42a407a412a324a6586cfb0437de4bfd8;p=lilypond.git

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index 48308142fd..2c508ac9f7 100644
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -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,9 +64,9 @@ Accidental_placement::add_accidental (Grob* me, Grob* a)
       entry = SCM_EOL;
     }
   else
-    entry = gh_cdr (entry);
+    entry = scm_cdr (entry);
 
-  entry = gh_cons (a->self_scm (), entry);
+  entry = scm_cons (a->self_scm (), entry);
 
   accs = scm_assq_set_x (accs,  key, 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"); gh_pair_p (acs);
-       acs =gh_cdr (acs))
-    for (SCM s = gh_cdar (acs); gh_pair_p (s); s = gh_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 (gh_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; gh_pair_p (s); s =gh_cdr (s))
+  for (SCM s = accs; scm_is_pair (s); s =scm_cdr (s))
     {
       Accidental_placement_entry *ape = new Accidental_placement_entry;
-      ape->notename_ = gh_scm2int (gh_caar (s));
+      ape->notename_ = scm_to_int (scm_caar (s));
       
-      for (SCM t = gh_cdar (s); gh_pair_p (t); t =gh_cdr (t))
-	ape->grobs_.push (unsmob_grob (gh_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);