X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Falign-interface.cc;h=b3bbf6a07c4f74ee25ec5fbaebadbb6477a0751c;hb=3c9561d788078f7ee4a6e1d973cf549d8f258935;hp=b7459781914d219e418e78a99c2e769d8e2dac1b;hpb=49be49dd2e86c0d654e2032a57fd5072d0ad7dcb;p=lilypond.git

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index b745978191..b3bbf6a07c 100644
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -12,20 +12,20 @@
 #include "group-interface.hh"
 #include "axis-group-interface.hh"
 #include "hara-kiri-group-spanner.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 
 MAKE_SCHEME_CALLBACK (Align_interface,alignment_callback,2);
 SCM
 Align_interface::alignment_callback (SCM element_smob, SCM axis)
 {
   Grob * me = unsmob_grob (element_smob);
-  Axis ax = (Axis)gh_scm2int (axis);
+  Axis ax = (Axis)ly_scm2int (axis);
   Grob * par = me->get_parent (ax);
-  if (par && !to_boolean (par->get_grob_property ("positioning-done")))
+  if (par && !to_boolean (par->get_property ("positioning-done")))
     {
       Align_interface::align_elements_to_extents (par, ax);
     }
-  return gh_double2scm (0.0);
+  return scm_make_real (0.0);
 }
 
 MAKE_SCHEME_CALLBACK (Align_interface,fixed_distance_alignment_callback,2);
@@ -33,13 +33,13 @@ SCM
 Align_interface::fixed_distance_alignment_callback (SCM element_smob, SCM axis)
 {
   Grob * me = unsmob_grob (element_smob);
-  Axis ax = (Axis)gh_scm2int (axis);
+  Axis ax = (Axis)ly_scm2int (axis);
   Grob * par = me->get_parent (ax);
-  if (par && !to_boolean (par->get_grob_property ("positioning-done")))
+  if (par && !to_boolean (par->get_property ("positioning-done")))
     {
       Align_interface::align_to_fixed_distance (par, ax);
     }
-  return gh_double2scm (0.0);
+  return scm_make_real (0.0);
 }
 
 /*
@@ -48,15 +48,15 @@ Align_interface::fixed_distance_alignment_callback (SCM element_smob, SCM axis)
 void
 Align_interface::align_to_fixed_distance (Grob *me , Axis a)
 {
-  me->set_grob_property ("positioning-done", SCM_BOOL_T);
+  me->set_property ("positioning-done", SCM_BOOL_T);
   
-  SCM d =   me->get_grob_property ("stacking-dir");
+  SCM d =   me->get_property ("stacking-dir");
   
-  Direction stacking_dir = gh_number_p (d) ? to_dir (d) : CENTER;
+  Direction stacking_dir = ly_c_number_p (d) ? to_dir (d) : CENTER;
   if (!stacking_dir)
     stacking_dir = DOWN;
 
-  Real dy = robust_scm2double (me->get_grob_property ("forced-distance"),0.0);
+  Real dy = robust_scm2double (me->get_property ("forced-distance"),0.0);
   
   Link_array<Grob> elems
     = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
@@ -73,8 +73,8 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
 	This is not very elegant, in that we need special support for
 	hara-kiri. Unfortunately, the generic wiring of
 	force_hara_kiri_callback () (extent and offset callback) is
-	such that we might get into a loop if we call extent() or
-	offset() the elements.
+	such that we might get into a loop if we call extent () or
+	offset () the elements.
 	
 	 
        */
@@ -82,8 +82,8 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
 	  && Hara_kiri_group_spanner::has_interface (elems[j]))
 	Hara_kiri_group_spanner::consider_suicide (elems[j]);
 
-      if (!elems[j]-> live())
-	elems.del(j);
+      if (!elems[j]->is_live ())
+	elems.del (j);
     }
 
   for (int j =0; j < elems.size (); j++)
@@ -115,20 +115,20 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
 
   TODO: maybe we should rethink and throw out thresholding altogether.
   The original function has been taken over by
-  align_to_fixed_distance().
+  align_to_fixed_distance ().
 */
 void
 Align_interface::align_elements_to_extents (Grob * me, Axis a)
 {
-  me->set_grob_property ("positioning-done", SCM_BOOL_T);
+  me->set_property ("positioning-done", SCM_BOOL_T);
   
-  SCM d =   me->get_grob_property ("stacking-dir");
+  SCM d =   me->get_property ("stacking-dir");
   
-  Direction stacking_dir = gh_number_p (d) ? to_dir (d) : CENTER;
+  Direction stacking_dir = ly_c_number_p (d) ? to_dir (d) : CENTER;
   if (!stacking_dir)
     stacking_dir = DOWN;
   
-  Interval threshold  = robust_scm2interval ( me->get_grob_property ("threshold"), Interval (0, Interval::infinity ()));
+  Interval threshold = robust_scm2interval (me->get_property ("threshold"), Interval (0, Interval::infinity ()));
   
   Array<Interval> dims;
 
@@ -162,7 +162,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
       prop_syms[Y_AXIS] = ly_symbol2scm ("self-alignment-Y");
     }
   
-  SCM align (me->internal_get_grob_property (prop_syms[a]));
+  SCM align (me->internal_get_property (prop_syms[a]));
   
   Array<Real> translates ;
   Interval total;
@@ -216,8 +216,8 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
 	FIXME: uncommenting freaks out the Y-alignment of
 	line-of-score.
        */
-      if (gh_number_p (align))
-	center_offset = total.linear_combination (gh_scm2double (align));
+      if (ly_c_number_p (align))
+	center_offset = total.linear_combination (ly_scm2double (align));
 
       for (int j = 0 ;  j < all_grobs.size (); j++)
 	all_grobs[j]->translate_axis (all_translates[j] - center_offset, a);
@@ -226,7 +226,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
 Axis
 Align_interface::axis (Grob*me)
 {
-  return  Axis (gh_scm2int (ly_car (me->get_grob_property ("axes"))));
+  return  Axis (ly_scm2int (ly_car (me->get_property ("axes"))));
 }
 
 void
@@ -253,7 +253,7 @@ find_fixed_alignment_parent  (Grob *g)
 {
   while (g)
     {
-      if (gh_number_p (g->get_grob_property ("forced-distance")))
+      if (ly_c_number_p (g->get_property ("forced-distance")))
 	return g;
 
       g = g->get_parent (Y_AXIS);