release: 1.5.29

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

diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc
index 28b93b81848a9ff53da0784c53ca99255bd021ec..fece9623638a366ece716b272ac0eff6fb333185 100644 (file)
--- a/lily/break-align-item.cc
+++ b/lily/break-align-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -39,7 +39,7 @@ Break_align_interface::alignment_callback (SCM element_smob, SCM axis)
   Axis a = (Axis) gh_scm2int (axis);
 
   assert (a == X_AXIS);
-  Grob *par = me->parent_l (a);
+  Grob *par = me->get_parent (a);
   if (par && !to_boolean (par->get_grob_property ("break-alignment-done")))\
     {
       par->set_grob_property ("break-alignment-done", SCM_BOOL_T);
@@ -86,7 +86,7 @@ Break_align_interface::do_alignment (Grob *me)
 
   Link_array<Grob> elems;
   Link_array<Grob> all_elems
-    = Pointer_group_interface__extract_elements (me, (Grob*)0,
+    = Pointer_group_interface__extract_grobs (me, (Grob*)0,
                                                 "elements");
   
   for (int i=0; i < all_elems.size (); i++) 
@@ -129,7 +129,7 @@ Break_align_interface::do_alignment (Grob *me)
       SCM extra_space;
       if (e != SCM_BOOL_F)
        {
-         extra_space = gh_cdr (e);
+         extra_space = ly_cdr (e);
        }
       else
        {
@@ -139,8 +139,8 @@ Break_align_interface::do_alignment (Grob *me)
          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;