release: 1.5.19

[lilypond.git] / lily / break-align-item.cc

diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc
index 06ff6bac74bd2a7a532fcaa4b4c7a9e79de4dfc8..8349ce5e632fae99716e7944a3d3e87b8b2e289a 100644 (file)
--- a/lily/break-align-item.cc
+++ b/lily/break-align-item.cc
@@ -8,7 +8,7 @@
 
 
 #include <math.h>
-#include <libc-extension.hh>
+#include <libc-extension.hh>   // isinf
 
 #include "side-position-interface.hh"
 #include "axis-group-interface.hh"
@@ -122,25 +122,25 @@ Break_align_interface::do_alignment (Grob *me)
        next_origin = ly_symbol2scm ("begin-of-note");
 
       SCM alist = me->get_grob_property ("space-alist");
-      SCM e = scm_assoc (scm_listify (current_origin,
+      SCM e = scm_assoc (scm_list_n (current_origin,
                                      next_origin,
                                      SCM_UNDEFINED), alist);
           
       SCM extra_space;
       if (e != SCM_BOOL_F)
        {
-         extra_space = gh_cdr (e);
+         extra_space = ly_cdr (e);
        }
       else
        {
          warning (_f ("unknown spacing pair `%s', `%s'",
                       ly_symbol2string (current_origin),
                       ly_symbol2string (next_origin)));
-         extra_space = scm_listify (ly_symbol2scm ("minimum-space"), gh_double2scm (0.0), SCM_UNDEFINED);
+         extra_space = scm_list_n (ly_symbol2scm ("minimum-space"), gh_double2scm (0.0), SCM_UNDEFINED);
        }
 
-      SCM symbol = gh_car (extra_space);
-      Real spc = gh_scm2double (gh_cadr (extra_space));
+      SCM symbol = ly_car (extra_space);
+      Real spc = gh_scm2double (ly_cadr (extra_space));
 
       dists.push (spc);
       symbol_list = gh_cons (symbol, symbol_list);
@@ -149,14 +149,14 @@ Break_align_interface::do_alignment (Grob *me)
 
 
   // skip the first sym.
-  symbol_list  = gh_cdr (scm_reverse (symbol_list));
+  symbol_list  = ly_cdr (scm_reverse (symbol_list));
   for (int i=0; i <elems.size ()-1; i++)
     {
-      elems[i]->set_grob_property (gh_car (symbol_list),
-                                 scm_cons (gh_double2scm (0),
+      elems[i]->internal_set_grob_property (ly_car (symbol_list),
+                                  scm_cons (gh_double2scm (0),
                                            gh_double2scm (dists[i+1])));
 
-      symbol_list = gh_cdr (symbol_list);
+      symbol_list = ly_cdr (symbol_list);
     }
 
 
@@ -198,12 +198,12 @@ Break_align_interface::do_alignment (Grob *me)
   
   Real stretch_distance =0.;
   
-  if (gh_car (symbol_list) == ly_symbol2scm ("extra-space"))
+  if (ly_car (symbol_list) == ly_symbol2scm ("extra-space"))
     {
       spring_len += dists.top ();
       stretch_distance = dists.top ();
     }
-  else if (gh_car (symbol_list) == ly_symbol2scm ("minimum-space"))
+  else if (ly_car (symbol_list) == ly_symbol2scm ("minimum-space"))
     {
       spring_len = spring_len >? dists.top ();
       stretch_distance = spring_len;