Improve recent MultiMeasureRest changes.

diff --git a/input/regression/multi-measure-rest-tweaks.ly b/input/regression/multi-measure-rest-tweaks.ly
index 5a70e23f50a3fb611dad51d1e66fddc8e6dfe613..f1c95bfedbca6d85c6ea996d7ccd797c62ff6bd8 100644 (file)
--- a/input/regression/multi-measure-rest-tweaks.ly
+++ b/input/regression/multi-measure-rest-tweaks.ly
@@ -2,13 +2,24 @@
   texidoc = "Multi-measure rests standard values can be tweaked."
 }
 
-\version "2.15.2"
+\version "2.15.6"
+
+\markup "Use non-standard multi-measure rests:"
 \new Staff {
-  \override MultiMeasureRest #'usable-duration-logs = #'(2 1)
-  \time 1/4 R4-"Use non-standard multi-measure rests."
+  \override MultiMeasureRest #'usable-duration-logs = #(iota 2 1)
+  \time 1/4 R4
   \time 2/4 R2
 }
+\markup "Round up to the longer rest:"
+\new Staff {
+  \override MultiMeasureRest #'round-up-to-longer-rest = ##t
+  \time 3/2 R1.
+  \time 7/2 R\breve..
+}
+\markup "Round up to the longer rest only in specified time signatures:"
 \new Staff {
-  \override MultiMeasureRest #'round-to-longer-rest = ##t
-  \time 3/2 R1.-"Round to the longer rest." \time 7/2 R\breve..
+  \override MultiMeasureRest #'round-up-exceptions = #'((3 . 2))
+  \time 3/2 R1.
+  \time 7/2 R\breve..
+  \time 3/2 R1.
 }

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 09f92b58a35df5f39a56c13b6b0ccfdf944d8d53..17a7a4277a7cb41e188a466616e48176cd11e48f 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -20,6 +20,7 @@
 #include "multi-measure-rest.hh"
 
 #include "font-interface.hh"
+#include "international.hh"
 #include "lookup.hh"
 #include "misc.hh"
 #include "moment.hh"
@@ -110,55 +111,97 @@ Multi_measure_rest::print (SCM smob)
   Stencil mol;
   mol.add_stencil (symbol_stencil (me, space));
 
-  int measures = 0;
+  int measure_count = 0;
   SCM m (me->get_property ("measure-count"));
   if (scm_is_number (m))
-    measures = scm_to_int (m);
+    measure_count = scm_to_int (m);
 
   mol.translate_axis (x_off, X_AXIS);
   return mol.smobbed_copy ();
 }
 
 int
-measure_duration_log (Grob *me)
+calc_closest_duration_log (Grob *me, double duration, bool force_round_up)
 {
-  SCM sml = dynamic_cast<Spanner *> (me)->get_bound (LEFT)
-            ->get_property ("measure-length");
-  bool round = to_boolean (me->get_property ("round-to-longer-rest"));
-  Rational ml = (unsmob_moment (sml)) ? unsmob_moment (sml)->main_part_ : Rational (1);
+  bool round_up = force_round_up
+                  || to_boolean (me->get_property ("round-up-to-longer-rest"));
+  int closest_usable_duration_log;
 
-  double duration_log = -log_2 (ml.Rational::to_double ());
-  int measure_duration_log = int (ceil (duration_log));
-  if (round && duration_log - measure_duration_log < 0)
-    measure_duration_log--;
+  // Out of range initial values.
+  if (round_up)
+    closest_usable_duration_log = -15; // high value
+  else
+    closest_usable_duration_log = 15; // low value
+  int minimum_usable_duration_log = -15;
+  int maximum_usable_duration_log = 15;
 
   SCM duration_logs_list = me->get_property ("usable-duration-logs");
-  int closest_list_elt = -15; // -15 is out of range.
-
-  for (int i = 0; i < scm_to_int (scm_length (duration_logs_list)); i++)
+  if (to_boolean (scm_null_p (duration_logs_list))
+                    || !to_boolean (scm_list_p (duration_logs_list)))
     {
-      int list_elt = scm_to_int (scm_list_ref (duration_logs_list, scm_from_int (i)));
-      int shortest_distance = abs (measure_duration_log - closest_list_elt);
-      int distance = abs (measure_duration_log - list_elt);
-      if (distance < shortest_distance)
-        closest_list_elt = list_elt;
+      warning (_ ("usable-duration-logs must be a non-empty list.  Falling back to whole rests."));
+      closest_usable_duration_log = 0;
     }
+  else
+    {
+      for (SCM s = duration_logs_list; scm_is_pair (s); s = scm_cdr (s))
+        {
+          int dur_log = scm_to_int (scm_car (s));
+          if (dur_log > minimum_usable_duration_log)
+            minimum_usable_duration_log = dur_log;
+          if (dur_log < maximum_usable_duration_log)
+            maximum_usable_duration_log = dur_log;
+          double dur = pow (2.0, -dur_log);
+          if (round_up)
+            {
+              if (duration <= dur && dur_log > closest_usable_duration_log)
+                closest_usable_duration_log = dur_log;
+            }
+          else
+            {
+              if (duration >= dur && dur_log < closest_usable_duration_log)
+                closest_usable_duration_log = dur_log;
+            }
+        }
+    }
+
+  if (closest_usable_duration_log == 15)
+    closest_usable_duration_log = minimum_usable_duration_log;
+  if (closest_usable_duration_log == -15)
+    closest_usable_duration_log = maximum_usable_duration_log;
 
-  return closest_list_elt;
+  return closest_usable_duration_log;
+}
+
+int
+calc_measure_duration_log (Grob *me)
+{
+  SCM sml = dynamic_cast<Spanner *> (me)->get_bound (LEFT)
+                                          ->get_property ("measure-length");
+  Rational ml = (unsmob_moment (sml)) ? unsmob_moment (sml)->main_part_
+                                      : Rational (1);
+  double measure_duration = ml.Rational::to_double ();
+  bool force_round_up = to_boolean (
+                          scm_list_p (
+                            scm_member (
+                              scm_cons (scm_from_int64 (ml.numerator ()),
+                                        scm_from_int64 (ml.denominator ())),
+                              me->get_property ("round-up-exceptions"))));
+  return calc_closest_duration_log (me, measure_duration, force_round_up);
 }
 
 Stencil
 Multi_measure_rest::symbol_stencil (Grob *me, Real space)
 {
-  int measures = 0;
+  int measure_count = 0;
   SCM m (me->get_property ("measure-count"));
   if (scm_is_number (m))
-    measures = scm_to_int (m);
-  if (measures <= 0)
+    measure_count = scm_to_int (m);
+  if (measure_count <= 0)
     return Stencil ();
 
   SCM limit = me->get_property ("expand-limit");
-  if (measures > scm_to_int (limit))
+  if (measure_count > scm_to_int (limit))
     {
       Real padding = 0.15;
       Stencil s = big_rest (me, (1.0 - 2 * padding) * space);
@@ -169,9 +212,9 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space)
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   Font_metric *musfont = Font_interface::get_default_font (me);
-  int mdl = measure_duration_log (me);
+  int mdl = calc_measure_duration_log (me);
 
-  if (measures == 1)
+  if (measure_count == 1)
     {
       Stencil s = musfont->find_by_name (Rest::glyph_name (me, mdl, "", true));
       if (mdl == 0 && Staff_symbol_referencer::get_position (me) == 0.0)
@@ -181,7 +224,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space)
       return s;
     }
   else
-    return church_rest (me, musfont, measures, space);
+    return church_rest (me, musfont, measure_count, space);
 }
 
 /*
@@ -216,56 +259,36 @@ Multi_measure_rest::big_rest (Grob *me, Real width)
   Kirchenpause (?)
 */
 Stencil
-Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures,
+Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measure_count,
                                  Real space)
 {
   SCM mols = SCM_EOL;
-
-  int l = measures;
-  int count = 0;
+  int symbol_count = 0;
   Real symbols_width = 0.0;
-  SCM duration_logs_list = me->get_property ("usable-duration-logs");
-  int longest_church_rest = 10; // 10 is out of range.
-  for (int i = 0; i < scm_to_int (scm_length (duration_logs_list)); i++)
-    {
-      longest_church_rest = min (longest_church_rest,
-                                 scm_to_int (scm_list_ref (duration_logs_list,
-                                                           scm_from_int (i))));
-    }
+  double total_duration = measure_count * pow (2.0, -calc_measure_duration_log (me));
 
-  while (l)
+  while (total_duration > 0)
     {
-      int k;
-      int i = longest_church_rest - 1;
-      int length;
-      int mdl = measure_duration_log (me);
-
-      do
-        {
-          i++;
-          length = int (pow (2.0, -i));
-        }
-      while (i <= 0
-             && !(l >= length && mdl >= longest_church_rest - i));
+      int dl = calc_closest_duration_log (me, total_duration, false);
+      double duration = pow (2.0, -dl);
 
-      l -= length;
-      k = mdl + i;
+      total_duration -= duration;
 
-      Stencil r (musfont->find_by_name ("rests." + to_string (k)));
-      if (k == 0)
+      Stencil r = musfont->find_by_name (Rest::glyph_name (me, dl, "", true));
+      if (dl == 0)
         {
           Real staff_space = Staff_symbol_referencer::staff_space (me);
           r.translate_axis (staff_space, Y_AXIS);
         }
       symbols_width += r.extent (X_AXIS).length ();
       mols = scm_cons (r.smobbed_copy (), mols);
-      count++;
+      symbol_count++;
     }
 
   /* Make outer padding this much bigger.  */
   Real outer_padding_factor = 1.5;
   Real inner_padding = (space - symbols_width)
-                       / (2 * outer_padding_factor + (count - 1));
+                       / (2 * outer_padding_factor + (symbol_count - 1));
   if (inner_padding < 0)
     inner_padding = 1.0;
 
@@ -364,7 +387,8 @@ ADD_INTERFACE (Multi_measure_rest,
                "hair-thickness "
                "measure-count "
                "minimum-length "
-               "round-to-longer-rest "
+               "round-up-exceptions "
+               "round-up-to-longer-rest "
                "spacing-pair "
                "thick-thickness "
                "usable-duration-logs "

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 3f9da21f6d0c7e71b4aa172f3f30677b4d7b72bd..1b318deaf268d820dd4fdeb498de6f5cbdf0a801 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -240,6 +240,10 @@ Positive means move the center to the right.")
 the vertical edges: @code{(@var{left-height} . @var{right-height})}.")
      (edge-text ,pair? "A pair specifying the texts to be set at the
 edges: @code{(@var{left-text} . @var{right-text})}.")
+     (round-up-exceptions ,list? "A list of pairs where car is the numerator
+and cdr the denominator of a moment.  Each pair in this list means that
+the multi-measure rests of the corresponding length will be rounded up to
+the longer rest.  See @var{round-up-to-longer-rest}.")
      (expand-limit ,integer? "Maximum number of measures expanded in
 church rests.")
      ;; remove me?
@@ -696,7 +700,7 @@ of an object (e.g., between note and its accidentals).")
      (rotation ,list? "Number of degrees to rotate this object, and
 what point to rotate around.  For example, @code{#'(45 0 0)} rotates
 by 45 degrees around the center of this object.")
-     (round-to-longer-rest ,boolean? "Displays the longer multi-measure
+     (round-up-to-longer-rest ,boolean? "Displays the longer multi-measure
 rest when the length of a measure is between two values of
 @code{usable-duration-logs}.  For example, displays a breve instead of a whole
 in a 3/2 measure.")

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 4545e5bd9f6f7c130267397d3947812e31c82881..2cfc11ab5210d37cceff15aa4cc62168df7017ca 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1305,6 +1305,7 @@
      . (
        (expand-limit . 10)
        (hair-thickness . 2.0)
+       (round-up-exceptions . ())
        (padding . 1)
        (spacing-pair . (break-alignment . break-alignment))
        (springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
@@ -1312,7 +1313,7 @@
        (stencil . ,ly:multi-measure-rest::print)
        (thick-thickness . 6.6)
        ;; See Wanske pp. 125
-       (usable-duration-logs . (0 -1 -2 -3))
+       (usable-duration-logs . ,(iota 4 -3))
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Spanner)
                 (interfaces . (font-interface