release: 1.5.6

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 80849691beb8dd993781cecf4a1b9fde3afcba9e..9870a13a883dcfc7bf28ec01b1419c42e6616114 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -19,6 +19,8 @@
 #include "spanner.hh"
 #include "staff-symbol-referencer.hh"
 #include "text-item.hh"
+#include "percent-repeat-item.hh"
+
 
 void
 Multi_measure_rest::set_interface (Grob*me)
@@ -32,15 +34,65 @@ Multi_measure_rest::has_interface (Grob*me)
   return me->has_interface (ly_symbol2scm ("multi-measure-rest-interface"));
 }
 
+MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1);
+SCM
+Multi_measure_rest::percent (SCM smob)
+{
+  
+  Grob *me = unsmob_grob (smob);
+  Spanner *sp = dynamic_cast<Spanner*> (me);
+  
+  Molecule r = Percent_repeat_item_interface::x_percent (me, 1,  0.75, 1.6);
+
+  // ugh copy & paste.
+  
+  Interval sp_iv;
+  Direction d = LEFT;
+  do
+    {
+      Item * col = sp->get_bound (d)->column_l ();
+
+      Interval coldim = col->extent (0, X_AXIS);
+
+      sp_iv[d] = coldim[-d]  ;
+    }
+  while ((flip (&d)) != LEFT);
+  Real x_off = 0.0;
+
+  Real rx  = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS);
   /*
+    we gotta stay clear of sp_iv, so move a bit to the right if
+    needed.
+   */
+  x_off += (sp_iv[LEFT] -  rx) >? 0;
+
+  /*
+    center between stuff.
+   */
+  x_off += sp_iv.length ()/ 2;
+
+  r.translate_axis (x_off,X_AXIS);
+
+  
+  return r.smobbed_copy ();
+}
+
+
+/*
    [TODO]                                      17
- * variable-sized multi-measure rest symbol: |====| ??
+   variable-sized multi-measure rest symbol: |====| ??
 */
-MAKE_SCHEME_CALLBACK(Multi_measure_rest,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Multi_measure_rest,brew_molecule,1);
 SCM
 Multi_measure_rest::brew_molecule (SCM smob) 
 {
   Grob *me = unsmob_grob (smob);
+  if (to_boolean (me->get_grob_property ("skip-timestep")))
+    {
+      me->set_grob_property ("skip-timestep", SCM_EOL);
+      return SCM_EOL;
+    }
+  
   Spanner * sp = dynamic_cast<Spanner*> (me);
 
   SCM alist_chain = Font_interface::font_alist_chain (me);
@@ -84,7 +136,7 @@ Multi_measure_rest::brew_molecule (SCM smob)
   
   Molecule s;
 
-  int measures = 1;
+  int measures = 0;
   SCM m (me->get_grob_property ("measure-count"));
   if (gh_number_p (m))
     {
@@ -93,7 +145,19 @@ Multi_measure_rest::brew_molecule (SCM smob)
   
 
   SCM limit = me->get_grob_property ("expand-limit");
-  if (measures <= gh_scm2int (limit))
+  if (measures <= 0)
+    return SCM_EOL;
+  if (measures == 1)
+    {
+      s = musfont->find_by_name (Rest::glyph_name (me, 0, ""));
+
+      /*
+       ugh.
+       */
+      if (Staff_symbol_referencer::position_f (me) == 0.0)
+       s.translate_axis (Staff_symbol_referencer::staff_space (me), Y_AXIS);
+    }
+  else if (measures <= gh_scm2int (limit))
     {
       /*
        Build a rest from smaller parts. Distances inbetween are
@@ -134,7 +198,7 @@ Multi_measure_rest::brew_molecule (SCM smob)
     }
   else 
     {
-      String idx =  ("rests-") + to_str (-4);
+      String idx = ("rests-") + to_str (-4);
       s = musfont->find_by_name (idx);
     }
   
@@ -150,7 +214,7 @@ Multi_measure_rest::brew_molecule (SCM smob)
       mol.add_molecule (s);
     }
   mol.translate_axis (x_off, X_AXIS);
-  return mol.smobbed_copy();
+  return mol.smobbed_copy ();
 }
 
 /*
@@ -173,7 +237,7 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
   Grob*me = unsmob_grob (smob);
 
   Spanner*sp = dynamic_cast<Spanner*> (me);
-  if (!(sp->get_bound (LEFT) && sp->get_bound (RIGHT)))
+  if (! (sp->get_bound (LEFT) && sp->get_bound (RIGHT)))
     {
       programming_error ("Multi_measure_rest::get_rods (): I am not spanned!");
       return SCM_UNSPECIFIED;