From: Neil Puttock <n.puttock@gmail.com>
Date: Tue, 27 Jul 2010 21:37:57 +0000 (+0100)
Subject: Clean out some more obsolete properties.
X-Git-Tag: release/2.13.29-1~19
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=626658181e8fbcdbac2e5d32534f75c23a11dc38;p=lilypond.git

Clean out some more obsolete properties.

(keep-fixed-while-stretching & forced-distance)
---

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 6d7c34d621..2385b035fd 100644
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -264,34 +264,16 @@ Real
 Align_interface::get_pure_child_y_translation (Grob *me, Grob *ch, int start, int end)
 {
   extract_grob_set (me, "elements", all_grobs);
-  SCM dy_scm = me->get_property ("forced-distance");
+  vector<Real> translates = get_minimum_translations (me, all_grobs, Y_AXIS, true, start, end);
 
-  if (scm_is_number (dy_scm))
+  if (translates.size ())
     {
-      Real dy = scm_to_double (dy_scm) * robust_scm2dir (me->get_property ("stacking-dir"), DOWN);
-      Real pos = 0;
       for (vsize i = 0; i < all_grobs.size (); i++)
-	{
-	  if (all_grobs[i] == ch)
-	    return pos;
-	  if (!Hara_kiri_group_spanner::has_interface (all_grobs[i])
-	      || !Hara_kiri_group_spanner::request_suicide (all_grobs[i], start, end))
-	    pos += dy;
-	}
+	if (all_grobs[i] == ch)
+	  return translates[i];
     }
   else
-    {
-      vector<Real> translates = get_minimum_translations (me, all_grobs, Y_AXIS, true, start, end);
-
-      if (translates.size ())
-	{
-	  for (vsize i = 0; i < all_grobs.size (); i++)
-	    if (all_grobs[i] == ch)
-	      return translates[i];
-	}
-      else
-	return 0;
-    }
+    return 0;
 
   programming_error ("tried to get a translation for something that is no child of mine");
   return 0;
diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 18994f19fd..f4b652c6e2 100644
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -810,7 +810,6 @@ ADD_INTERFACE (Axis_group_interface,
 	       "elements "
 	       "inter-loose-line-spacing "
 	       "inter-staff-spacing "
-	       "keep-fixed-while-stretching "
 	       "max-stretch "
 	       "non-affinity-spacing "
 	       "next-staff-spacing "
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 8c23fb6c9c..b4952e2a49 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -485,9 +485,6 @@ has affinity.  See @var{next-staff-spacing} for the format of this list.")
 ;;
 ;; k
 ;;
-     (keep-fixed-while-stretching ,boolean? "A grob with this property
-set to true is fixed relative to the staff above it when systems are
-stretched.")
      (keep-inside-line ,boolean? "If set, this column cannot have
 objects sticking into the margin.")
      (kern ,ly:dimension? "Amount of extra white space to add.  For