* lily/grob.cc (get_stencil): simplify: use callback mechanism to

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index bacb18e3c1c517114833e5471a8d85436bef0d7c..42d0193ad1f18844e2d44b88ef8656d68dda9073 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -328,7 +328,69 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
   return SCM_UNSPECIFIED;
 }
 
+/*
+  Ugh. Cut & paste.
+ */
+MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_text_rods, 1);
+SCM
+Multi_measure_rest::set_text_rods (SCM smob)
+{
+  Grob *me = unsmob_grob (smob);
+
+  Spanner *sp = dynamic_cast<Spanner *> (me);
+  if (! (sp->get_bound (LEFT) && sp->get_bound (RIGHT)))
+    {
+      programming_error ("Multi_measure_rest::get_rods (): I am not spanned!");
+      return SCM_UNSPECIFIED;
+    }
+
+  Item *li = sp->get_bound (LEFT)->get_column ();
+  Item *ri = sp->get_bound (RIGHT)->get_column ();
+  Item *lb = li->find_prebroken_piece (RIGHT);
+  Item *rb = ri->find_prebroken_piece (LEFT);
+
+  Item *combinations[4][2] = {{li, ri},
+                             {lb, ri},
+                             {li, rb},
+                             {lb, rb}};
+
+  Stencil *stil = me->get_stencil ();
+
+  /* FIXME uncached */
+  Real len = (stil && !stil->extent (X_AXIS).is_empty ())
+    ? stil->extent (X_AXIS).length ()
+    : 0.0;
+
+  for (int i = 0; i < 4; i++)
+    {
+      Item *li = combinations[i][0];
+      Item *ri = combinations[i][1];
+
+      if (!li || !ri)
+       continue;
+
+      Rod rod;
+      rod.item_drul_[LEFT] = li;
+      rod.item_drul_[RIGHT] = ri;
+
+      rod.distance_ = len; 
+
+      Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0);
+      rod.distance_ = max (rod.distance_, minlen);
+      rod.add_to_cols ();
+    }
+  return SCM_UNSPECIFIED;
+}
+
+
 ADD_INTERFACE (Multi_measure_rest, "multi-measure-rest-interface",
               "A rest that spans a whole number of measures.",
-              "expand-limit measure-count hair-thickness thick-thickness use-breve-rest minimum-length");
+
+              /* properties */
+              "expand-limit "
+              "measure-count "
+              "hair-thickness "
+              "thick-thickness "
+              "use-breve-rest "
+              "minimum-length");