* scm/define-grob-properties.scm (all-user-grob-properties): add

[lilypond.git] / lily / spacing-basic.cc

diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc
index 2c43f54a9e1244edc112c2b0a2805804698aab63..86dd575d1ec9ea15c53d3b84473a1b748acc840a 100644 (file)
--- a/lily/spacing-basic.cc
+++ b/lily/spacing-basic.cc
@@ -93,8 +93,7 @@ Spacing_spanner::standard_breakable_column_spacing (Grob *me, Item *l, Item *r,
     }
   while (flip (&d) != LEFT);
 
-  if ((l->is_breakable (l) || l->original ())
-      && (r->is_breakable (r) || r->original ()))
+  if (Paper_column::is_breakable (l) && Paper_column::is_breakable (r))
     {
       Moment *dt = unsmob_moment (l->get_property ("measure-length"));
       Moment mlen (1);
@@ -193,27 +192,3 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
 }
 
 /****************************************************************/
-
-void
-Spacing_options::init_from_grob (Grob *me)
-{
-  increment_ = robust_scm2double (me->get_property ("spacing-increment"), 1);
-
-  packed_ = to_boolean (me->get_property ("packed-spacing"));
-  stretch_uniformly_ = to_boolean (me->get_property ("uniform-stretching"));
-  float_nonmusical_columns_
-    = to_boolean (me->get_property ("strict-note-spacing"));
-  shortest_duration_space_ = robust_scm2double (me->get_property ("shortest-duration-space"), 1);
-}
-
-void
-Spacing_options::init ()
-{
-  increment_ = 1.2;
-  packed_ = false;
-  stretch_uniformly_ = false;
-  float_nonmusical_columns_ = false;
-  shortest_duration_space_ = 2.0;
-
-  global_shortest_ = Rational (1, 8);
-}