* mf/GNUmakefile: always trace pfa fonts.

[lilypond.git] / lily / align-interface.cc

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index ef9d932842c1247efb0d0046b14162e790eca5b1..5f7306d2b1340ac8aee0099221be2a2c811ba20e 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -88,7 +88,7 @@ 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 (!ly_pair_p (elems[j]-> immutable_property_alist_))
+      if (!elems[j]-> live())
        elems.del(j);
     }
 
@@ -110,7 +110,7 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
 
 /*
   Hairy function to put elements where they should be. Can be tweaked
-  from the outside by setting minimum-space-pair and extra-space in its
+  from the outside by setting extra-space in its
   children
 
   We assume that the children the refpoints of the children are still
@@ -155,24 +155,6 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
        {
          Grob *e =dynamic_cast<Grob*> (all_grobs[i]);
 
-         // todo: fucks up if item both in Halign & Valign. 
-         SCM min_dims = e->remove_grob_property ("minimum-space-pair");
-         if (gh_pair_p (min_dims) &&
-             gh_number_p (ly_car (min_dims))
-             && gh_number_p (ly_cdr (min_dims)))
-           {
-             y.unite (ly_scm2interval (min_dims));
-           }
-         
-         SCM extra_dims = e->remove_grob_property ("extra-space");
-         if (gh_pair_p (extra_dims) &&
-             gh_number_p (ly_car (extra_dims))
-             && gh_number_p (ly_cdr (extra_dims)))
-           {
-             y[LEFT] += gh_scm2double (ly_car (extra_dims));
-             y[RIGHT] += gh_scm2double (ly_cdr (extra_dims));
-           }
-
          elems.push (e);
          dims.push (y);          
        }
@@ -185,13 +167,16 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
     prevent ugly cyclic dependencies that arise when you combine
     self-alignment on a child with alignment of children.
   */
+ static SCM  prop_syms[2];
 
-  String s ("self-alignment-");
-
-  s += (a == X_AXIS) ? "X" : "Y";
-
-  SCM align (me->get_grob_property (s.ch_C ()));
-     
+  if (!prop_syms[0])
+    {
+      prop_syms[X_AXIS] = ly_symbol2scm ("self-alignment-X");
+      prop_syms[Y_AXIS] = ly_symbol2scm ("self-alignment-Y");
+    }
+  
+  SCM align (me->internal_get_grob_property (prop_syms[a]));
+  
   Array<Real> translates ;
   Interval total;
   Real where_f=0;
@@ -248,7 +233,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
        FIXME: uncommenting freaks out the Y-alignment of
        line-of-score.
        */
-      // Real align_param = ly_dir_p (align)  ? gh_scm2double (align) : 0.0;
+      // Real align_param = is_direction (align)  ? gh_scm2double (align) : 0.0;
       
       if (gh_number_p (align))
        center_offset = total.linear_combination (gh_scm2double (align));
@@ -277,6 +262,27 @@ Align_interface::set_axis (Grob*me,Axis a)
 }
 
 
+/*
+  Find Y-axis parent of G that has a #'forced-distance property. This
+  has the effect of finding the piano-staff given an object in that
+  piano staff.
+ */
+Grob *
+find_fixed_alignment_parent  (Grob *g)
+{
+  while (g)
+    {
+      if (gh_number_p (g->get_grob_property ("forced-distance")))
+       return g;
+
+      g = g->get_parent (Y_AXIS);
+    }
+
+  return 0;
+}
+
+
+
 
 ADD_INTERFACE (Align_interface, "align-interface",
   " Order grobs top to bottom/left to right/right to left etc.",
@@ -287,6 +293,4 @@ struct Foobar
 {
   bool has_interface (Grob*);
 };
-ADD_INTERFACE (Foobar, "aligned-interface",
-  "read by align-interface",
-  "minimum-space-pair extra-space");
+