Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / spacing-basic.cc

diff --git a/lily/spacing-basic.cc b/lily/spacing-basic.cc
index 86dd575d1ec9ea15c53d3b84473a1b748acc840a..2e81fdf416237d2569dcedd1f94960cb91e02bba 100644 (file)
--- a/lily/spacing-basic.cc
+++ b/lily/spacing-basic.cc
@@ -7,64 +7,19 @@
 */
 
 #include "spacing-spanner.hh"
+
+#include "spacing-options.hh"
 #include "moment.hh"
 #include "paper-column.hh"
-#include "misc.hh"
 #include "warn.hh"
+#include "pointer-group-interface.hh"
+#include "system.hh"
 
 /*
   LilyPond spaces by taking a simple-minded spacing algorithm, and
   adding subtle adjustments to that. This file does the simple-minded
   spacing routines.
 */
-
-/*
-  Get the measure wide ant for arithmetic spacing.
-*/
-Real
-Spacing_options::get_duration_space (Moment d,
-                                    bool *expand_only) const
-{
-  Real k = shortest_duration_space_;
-
-  if (d < global_shortest_)
-    {
-      /*
-       We don't space really short notes using the log of the
-       duration, since it would disproportionally stretches the long
-       notes in a piece. In stead, we use geometric spacing with constant 0.5
-       (i.e. linear.)
-
-       This should probably be tunable, to use other base numbers.
-
-       In Mozart hrn3 by EB., we have 8th note = 3.9 mm (total), 16th note =
-       3.6 mm (total).  head-width = 2.4, so we 1.2mm for 16th, 1.5
-       mm for 8th. (white space), suggesting that we use
-
-       (1.2 / 1.5)^{-log2(duration ratio)}
-
-
-      */
-      Rational ratio = d.main_part_ / global_shortest_;
-
-      return ((k - 1) + double (ratio)) * increment_;
-    }
-  else
-    {
-      /*
-       John S. Gourlay. ``Spacing a Line of Music, '' Technical
-       Report OSU-CISRC-10/87-TR35, Department of Computer and
-       Information Science, The Ohio State University, 1987.
-      */
-      Real log = log_2 (global_shortest_);
-      k -= log;
-      Rational compdur = d.main_part_ + d.grace_part_ / Rational (3);
-      *expand_only = false;
-
-      return (log_2 (compdur) + k) * increment_;
-    }
-}
-
 /*
   The one-size-fits all spacing. It doesn't take into account
   different spacing wishes from one to the next column.
@@ -119,9 +74,37 @@ Spacing_spanner::standard_breakable_column_spacing (Grob *me, Item *l, Item *r,
       else
        {
          bool dummy;
-         *space = *fixed + options->get_duration_space (dt, &dummy);
+         *space = *fixed + options->get_duration_space (dt.main_part_, &dummy);
+       }
+    }
+}
+
+Moment *
+get_measure_length (Grob *column)
+{
+  Grob * sys = column->get_parent (X_AXIS);
+
+  extract_grob_set (sys, "columns", cols);
+
+  vsize col_idx = binary_search (cols, column,
+                                Paper_column::less_than);
+
+  if (col_idx == VPOS)
+    {
+      programming_error ( __FUNCTION__ + string (": Unknown column"));
+      return 0;
+    }
+  
+  do
+    {
+      if (Moment *len = unsmob_moment (cols[col_idx]->get_property ("measure-length")))
+       {
+         return len;
        }
     }
+  while (col_idx-- != 0);
+  
+  return 0;
 }
 
 Real
@@ -129,6 +112,8 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
                               Spacing_options const *options,
                               bool *expand_only)
 {
+  (void) me;
+  
   Moment shortest_playing_len = 0;
   SCM s = lc->get_property ("shortest-playing-duration");
 
@@ -153,7 +138,7 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
        several measures.
       */
 
-      Moment *dt = unsmob_moment (rc->get_property ("measure-length"));
+      Moment *dt = get_measure_length (lc);
       if (dt)
        {
          delta_t = min (delta_t, *dt);
@@ -169,7 +154,7 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
   Real dist = 0.0;
   if (delta_t.main_part_ && !lwhen.grace_part_)
     {
-      dist = options->get_duration_space (shortest_playing_len,
+      dist = options->get_duration_space (shortest_playing_len.main_part_,
                                          expand_only);
       dist *= double (delta_t.main_part_ / shortest_playing_len.main_part_);
     }
@@ -180,15 +165,19 @@ Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
        available (namely the space for the global shortest note), and
        multiply that by grace-space-factor
       */
-      dist = options->get_duration_space (options->global_shortest_, expand_only);
-
-      Real grace_fact
-       = robust_scm2double (me->get_property ("grace-space-factor"), 1);
+      dist = options->get_duration_space (options->global_shortest_, expand_only) / 2.0;
+      Grob *grace_spacing = unsmob_grob (lc->get_object ("grace-spacing"));
+      if (grace_spacing)
+       {
+         Spacing_options grace_opts;
+         grace_opts.init_from_grob (grace_spacing);
 
-      dist *= grace_fact;
+         bool bla;
+         dist = grace_opts.get_duration_space (delta_t.grace_part_, &bla);
+       }
+      
     }
 
   return dist;
 }
 
-/****************************************************************/