X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=d94518db3abc5427327a6caeb5e0cc660f40def4;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=997e76105d2a1764d8d2cdc8915375ec331b2a3d;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 997e76105d..d94518db3a 100644
--- 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--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "multi-measure-rest.hh"
@@ -16,11 +16,30 @@
 #include "misc.hh"
 #include "spanner.hh"
 #include "staff-symbol-referencer.hh"
+#include "system.hh"
 #include "text-interface.hh"
 #include "percent-repeat-item.hh"
 #include "lookup.hh"
 #include "separation-item.hh"
 
+Interval
+Multi_measure_rest::bar_width (Spanner *me)
+{
+  Interval iv;
+  Direction d = LEFT;
+  do
+    {
+      Item *col = me->get_bound (d)->get_column ();
+
+      Interval coldim = Paper_column::break_align_width (col);
+
+      iv[d] = coldim[-d];
+    }
+  while ((flip (&d)) != LEFT);
+
+  return iv;
+}
+
 MAKE_SCHEME_CALLBACK (Multi_measure_rest, percent, 1);
 SCM
 Multi_measure_rest::percent (SCM smob)
@@ -28,24 +47,16 @@ Multi_measure_rest::percent (SCM smob)
   Grob *me = unsmob_grob (smob);
   Spanner *sp = dynamic_cast<Spanner *> (me);
 
-  Stencil r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6);
+  Stencil r = Percent_repeat_item_interface::x_percent (me, 1);
 
   // ugh copy & paste.
 
-  Interval sp_iv;
-  Direction d = LEFT;
-  do
-    {
-      Item *col = sp->get_bound (d)->get_column ();
-
-      Interval coldim = col->extent (0, X_AXIS);
-
-      sp_iv[d] = coldim[-d];
-    }
-  while ((flip (&d)) != LEFT);
+  Grob *common_x = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT),
+							  X_AXIS);
+  Interval sp_iv = bar_width (sp);
   Real x_off = 0.0;
 
-  Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS);
+  Real rx = sp->get_bound (LEFT)->relative_coordinate (common_x, X_AXIS);
   /*
     we gotta stay clear of sp_iv, so move a bit to the right if
     needed.
@@ -69,22 +80,7 @@ Multi_measure_rest::print (SCM smob)
   Grob *me = unsmob_grob (smob);
   Spanner *sp = dynamic_cast<Spanner *> (me);
 
-  Interval sp_iv;
-  Direction d = LEFT;
-
-  Grob *common = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
-  do
-    {
-      Item *b = sp->get_bound (d);
-
-      Interval coldim = (Separation_item::has_interface (b))
-	? Separation_item::relative_width (b, common)
-	: b->extent (common, X_AXIS);
-
-      sp_iv[d] = coldim.is_empty () ? b->relative_coordinate (common, X_AXIS) : coldim[-d];
-    }
-  while ((flip (&d)) != LEFT);
-
+  Interval sp_iv = bar_width (sp);
   Real space = sp_iv.length ();
 
   Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS);
@@ -181,8 +177,8 @@ Multi_measure_rest::big_rest (Grob *me, Real width)
   Stencil m = Lookup::round_filled_box (b, blot);
   Stencil yb = Lookup::round_filled_box (Box (Interval (-0.5, 0.5) * ythick, Interval (-ss, ss)), blot);
 
-  m.add_at_edge (X_AXIS, RIGHT, yb, 0, 0);
-  m.add_at_edge (X_AXIS, LEFT, yb, 0, 0);
+  m.add_at_edge (X_AXIS, RIGHT, yb, 0);
+  m.add_at_edge (X_AXIS, LEFT, yb, 0);
 
   m.align_to (X_AXIS, LEFT);
 
@@ -203,11 +199,11 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures,
   int count = 0;
   Real symbols_width = 0.0;
 
-  SCM sml = me->get_property ("use-breve-rest");
+  bool use_breve = to_boolean (me->get_property ("use-breve-rest"));
 
   while (l)
     {
-      if (sml == SCM_BOOL_T)
+      if (use_breve)
 	{
 	  int k;
 	  if (l >= 2)
@@ -266,7 +262,7 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures,
   Stencil mol;
   for (SCM s = mols; scm_is_pair (s); s = scm_cdr (s))
     mol.add_at_edge (X_AXIS, LEFT, *unsmob_stencil (scm_car (s)),
-		     inner_padding, 0);
+		     inner_padding);
   mol.align_to (X_AXIS, LEFT);
   mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS);
 
@@ -311,8 +307,7 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
       rod.item_drul_[LEFT] = li;
       rod.item_drul_[RIGHT] = ri;
 
-      rod.distance_ = li->extent (li, X_AXIS)[BIGGER]
-	- ri->extent (ri, X_AXIS)[SMALLER]
+      rod.distance_ = Paper_column::minimum_distance (li, ri)
 	+ length
 	+ 2 * robust_scm2double (me->get_property ("bound-padding"), 1.0);
 
@@ -349,7 +344,7 @@ Multi_measure_rest::set_text_rods (SCM smob)
   return SCM_UNSPECIFIED;
 }
 
-ADD_INTERFACE (Multi_measure_rest, "multi-measure-rest-interface",
+ADD_INTERFACE (Multi_measure_rest,
 	       "A rest that spans a whole number of measures.",
 
 	       /* properties */
@@ -359,5 +354,6 @@ ADD_INTERFACE (Multi_measure_rest, "multi-measure-rest-interface",
 	       "thick-thickness "
 	       "use-breve-rest "
 	       "bound-padding "
-	       "minimum-length");
+	       "minimum-length "
+	       );