#include "spacing-spanner.hh"
#include "moment.hh"
#include "paper-column.hh"
+#include "misc.hh"
#include "warn.hh"
/*
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.
else
{
bool dummy;
- *space = *fixed + options->get_duration_space (dt.main_part_, &dummy);
+ *space = *fixed + options->get_duration_space (dt, &dummy);
}
}
}
Spacing_options const *options,
bool *expand_only)
{
- (void) me;
-
Moment shortest_playing_len = 0;
SCM s = lc->get_property ("shortest-playing-duration");
Real dist = 0.0;
if (delta_t.main_part_ && !lwhen.grace_part_)
{
- dist = options->get_duration_space (shortest_playing_len.main_part_,
+ dist = options->get_duration_space (shortest_playing_len,
expand_only);
dist *= double (delta_t.main_part_ / shortest_playing_len.main_part_);
}
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) / 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 = options->get_duration_space (options->global_shortest_, expand_only);
- bool bla;
- dist = grace_opts.get_duration_space (delta_t.grace_part_, &bla);
- }
-
+ Real grace_fact
+ = robust_scm2double (me->get_property ("grace-space-factor"), 1);
+
+ dist *= grace_fact;
}
return dist;
}
+/****************************************************************/
+
+void
+Spacing_options::init_from_grob (Grob *me)
+{
+ increment_ = robust_scm2double (me->get_property ("spacing-increment"), 1);
+
+ packed_ = to_boolean (me->get_property ("packed-spacing"));
+ stretch_uniformly_ = to_boolean (me->get_property ("uniform-stretching"));
+ float_nonmusical_columns_
+ = to_boolean (me->get_property ("strict-note-spacing"));
+ shortest_duration_space_ = robust_scm2double (me->get_property ("shortest-duration-space"), 1);
+}
+
+void
+Spacing_options::init ()
+{
+ increment_ = 1.2;
+ packed_ = false;
+ stretch_uniformly_ = false;
+ float_nonmusical_columns_ = false;
+ shortest_duration_space_ = 2.0;
+
+ global_shortest_ = Rational (1, 8);
+}