]> git.donarmstrong.com Git - lilypond.git/commitdiff
Clean out some more obsolete properties.
authorNeil Puttock <n.puttock@gmail.com>
Tue, 27 Jul 2010 21:37:57 +0000 (22:37 +0100)
committerNeil Puttock <n.puttock@gmail.com>
Tue, 27 Jul 2010 21:37:57 +0000 (22:37 +0100)
(keep-fixed-while-stretching & forced-distance)

lily/align-interface.cc
lily/axis-group-interface.cc
scm/define-grob-properties.scm

index 6d7c34d62143037569b2025881219aae99793575..2385b035fdb058eb3e7c228712c4f3adac586c43 100644 (file)
@@ -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;
index 18994f19fd94ae575f8cd090cc5c6c1518b0704b..f4b652c6e2affb7e5bc0b7befa3e5a480dc97bae 100644 (file)
@@ -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 "
index 8c23fb6c9c4a0336e9272c356c4e59e87fd1fc42..b4952e2a498a78bff07dda94c8bd59ac85e99ec8 100644 (file)
@@ -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