Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index ad11af929d2c60a34404fd027253b3e7a7cb79a2..38dd598ee95d329be323342eeddb4da4817b946b 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 #include "percent-repeat-item.hh"
 #include "rest.hh"
 #include "separation-item.hh"
+#include "spacing-options.hh"
 #include "spanner.hh"
 #include "staff-symbol.hh"
 #include "staff-symbol-referencer.hh"
@@ -61,7 +62,7 @@ MAKE_SCHEME_CALLBACK (Multi_measure_rest, percent, 1);
 SCM
 Multi_measure_rest::percent (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
   Spanner *sp = dynamic_cast<Spanner *> (me);
 
   Stencil r = Percent_repeat_item_interface::x_percent (me, 1);
@@ -95,7 +96,7 @@ MAKE_SCHEME_CALLBACK (Multi_measure_rest, print, 1);
 SCM
 Multi_measure_rest::print (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
   Spanner *sp = dynamic_cast<Spanner *> (me);
 
   Interval sp_iv = bar_width (sp);
@@ -119,7 +120,7 @@ MAKE_SCHEME_CALLBACK (Multi_measure_rest, height, 1);
 SCM
 Multi_measure_rest::height (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
 
   Real space = 1000000; // something very large...
 
@@ -188,7 +189,7 @@ calc_measure_duration_log (Grob *me)
 {
   SCM sml = dynamic_cast<Spanner *> (me)->get_bound (LEFT)
             ->get_property ("measure-length");
-  Rational ml = (Moment::is_smob (sml)) ? Moment::unsmob (sml)->main_part_
+  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 ()),
@@ -221,13 +222,13 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space)
 
   if (measure_count == 1)
     {
-      if (me->get_property ("staff-position") == SCM_EOL)
+      if (scm_is_null (me->get_property ("staff-position")))
         {
           int dir = get_grob_direction (me);
           Real pos = Rest::staff_position_internal (me, mdl, dir);
           me->set_property ("staff-position", scm_from_double (pos));
         }
- 
+
       Stencil s = musfont->find_by_name (Rest::glyph_name (me, mdl, "", true, 0.0));
 
       s.translate_axis ((space - s.extent (X_AXIS).length ()) / 2, X_AXIS);
@@ -316,19 +317,30 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measure_cou
       symbol_count++;
     }
 
-  /* Make outer padding this much bigger.  */
+  /*
+    When symbols spread to fullest extent, outer padding is this much
+    bigger.
+  */
   Real outer_padding_factor = 1.5;
+  /* Widest gap between symbols; to be limited by max-symbol-separation */
   Real inner_padding = (space - symbols_width)
                        / (2 * outer_padding_factor + (symbol_count - 1));
   if (inner_padding < 0)
     inner_padding = 1.0;
 
+  Real max_separation = max (robust_scm2double (me->get_property ("max-symbol-separation"), 8.0),
+                             1.0);
+
+  inner_padding = min (inner_padding, max_separation);
+  Real left_offset = (space - symbols_width - (inner_padding * (symbol_count - 1)))
+                     / 2;
+
   Stencil mol;
   for (SCM s = mols; scm_is_pair (s); s = scm_cdr (s))
-    mol.add_at_edge (X_AXIS, LEFT, *Stencil::unsmob (scm_car (s)),
+    mol.add_at_edge (X_AXIS, LEFT, *unsmob<Stencil> (scm_car (s)),
                      inner_padding);
   mol.align_to (X_AXIS, LEFT);
-  mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS);
+  mol.translate_axis (left_offset, X_AXIS);
 
   return mol;
 }
@@ -354,6 +366,25 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
   Item *lb = li->find_prebroken_piece (RIGHT);
   Item *rb = ri->find_prebroken_piece (LEFT);
 
+  Grob *spacing = unsmob<Grob> (li->get_object ("spacing"));
+  if (!spacing)
+    spacing = unsmob<Grob> (ri->get_object ("spacing"));
+  if (spacing)
+    {
+      Spacing_options options;
+      options.init_from_grob (me);
+      Moment mlen = robust_scm2moment (li->get_property ("measure-length"),
+                                       Moment (1));
+      length += robust_scm2double (li->get_property ("full-measure-extra-space"), 0.0)
+                + options.get_duration_space (mlen.main_part_)
+                + (robust_scm2double (me->get_property ("space-increment"), 0.0)
+                   * log_2 (robust_scm2int (me->get_property ("measure-count"), 1)));
+    }
+
+  length += 2 * robust_scm2double (me->get_property ("bound-padding"), 0.0);
+
+  Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0.0);
+
   Item *combinations[4][2] = {{li, ri},
     {lb, ri},
     {li, rb},
@@ -372,12 +403,8 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
       rod.item_drul_[LEFT] = li;
       rod.item_drul_[RIGHT] = ri;
 
-      rod.distance_ = Paper_column::minimum_distance (li, ri)
-                      + length
-                      + 2 * robust_scm2double (me->get_property ("bound-padding"), 1.0);
-
-      Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0);
-      rod.distance_ = max (rod.distance_, minlen);
+      rod.distance_ = max (Paper_column::minimum_distance (li, ri) + length,
+                           minlen);
       rod.add_to_cols ();
     }
 }
@@ -386,7 +413,7 @@ MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods, 1);
 SCM
 Multi_measure_rest::set_spacing_rods (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
   Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length ();
   calculate_spacing_rods (me, sym_width);
 
@@ -397,7 +424,7 @@ MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_text_rods, 1);
 SCM
 Multi_measure_rest::set_text_rods (SCM smob)
 {
-  Grob *me = Grob::unsmob (smob);
+  Grob *me = unsmob<Grob> (smob);
   Stencil *stil = me->get_stencil ();
 
   /* FIXME uncached */
@@ -416,10 +443,12 @@ ADD_INTERFACE (Multi_measure_rest,
                "bound-padding "
                "expand-limit "
                "hair-thickness "
+               "max-symbol-separation "
                "measure-count "
                "minimum-length "
                "round-up-exceptions "
                "round-up-to-longer-rest "
+               "space-increment "
                "spacing-pair "
                "thick-thickness "
                "usable-duration-logs "