Updates.

[lilypond.git] / lily / multi-measure-rest.cc

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index e0a44196a0053e772222289682acd9fa92239150..194a23780fe8c8767cdd1ac2c60c83a1a67d7536 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
@@ -189,8 +189,8 @@ Multi_measure_rest::big_rest (Grob *me, Real width)
   Molecule m =  Lookup::filledbox (b);
   Molecule yb = Lookup::filledbox (Box (Interval (-0.5, 0.5)* ythick, Interval (-ss, ss)));
 
-  m.add_at_edge (X_AXIS, RIGHT, yb, 0);
-  m.add_at_edge (X_AXIS, LEFT, yb, 0);
+  m.add_at_edge (X_AXIS, RIGHT, yb, 0, 0);
+  m.add_at_edge (X_AXIS, LEFT, yb, 0, 0);
 
   m.align_to (X_AXIS, LEFT);
   
@@ -278,7 +278,7 @@ Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures,
   Molecule mol; 
   for (SCM  s = mols; gh_pair_p (s); s = gh_cdr(s))
     {
-      mol.add_at_edge (X_AXIS, LEFT, *unsmob_molecule (gh_car (s)), inner_padding);
+      mol.add_at_edge (X_AXIS, LEFT, *unsmob_molecule (gh_car (s)), inner_padding, 0);
     }
   mol.align_to (X_AXIS, LEFT);
   mol.translate_axis (outer_padding_factor *  inner_padding, X_AXIS);
@@ -294,12 +294,9 @@ Multi_measure_rest::add_column (Grob*me,Item* c)
 
 
 MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods,1);
-
 SCM
 Multi_measure_rest::set_spacing_rods (SCM smob)
 {
-  return SCM_UNSPECIFIED;
-
   Grob*me = unsmob_grob (smob);
 
   Spanner*sp = dynamic_cast<Spanner*> (me);
@@ -334,6 +331,11 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
       rod.distance_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER]
        + sym_width  + 2.0;                     // 2.0 = magic!
   
+      Real minlen  =0.0;
+      SCM ml  =me->get_grob_property ("minimum-length");
+      if (gh_number_p (ml)) minlen = gh_scm2double (ml);
+      rod.distance_ = max(rod.distance_,
+                         minlen);
       rod.add_to_cols ();
     }
   return SCM_UNSPECIFIED;
@@ -343,6 +345,6 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
 
 
 ADD_INTERFACE (Multi_measure_rest,"multi-measure-rest-interface",
-              "A rest that spans a whole number of measures.\n",
-              "expand-limit measure-count hair-thickness thick-thickness use-breve-rest");
+              "A rest that spans a whole number of measures.",
+              "expand-limit measure-count hair-thickness thick-thickness use-breve-rest minimum-length");