/*
spacing-basic.cc -- implement Spacing_spanner, simplistic spacing routines
-
- source file of the GNU LilyPond music typesetter
- (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ source file of the GNU LilyPond music typesetter
+ (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#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.
+ 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.
}
while (flip (&d) != LEFT);
- if (l->is_breakable (l) && r->is_breakable (r))
+ if (Paper_column::is_breakable (l) && Paper_column::is_breakable (r))
{
Moment *dt = unsmob_moment (l->get_property ("measure-length"));
Moment mlen (1);
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
Spacing_spanner::note_spacing (Grob *me, Grob *lc, Grob *rc,
- Spacing_options const *options ,
+ Spacing_options const *options,
bool *expand_only)
{
+ (void) me;
+
Moment shortest_playing_len = 0;
SCM s = lc->get_property ("shortest-playing-duration");
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);
Real dist = 0.0;
if (delta_t.main_part_ && !lwhen.grace_part_)
{
- dist = options->get_duration_space (shortest_playing_len,
- expand_only);
+ dist = options->get_duration_space (shortest_playing_len.main_part_,
+ expand_only);
dist *= double (delta_t.main_part_ / shortest_playing_len.main_part_);
}
else if (delta_t.grace_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);
-
- 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;
}
-
-/****************************************************************/
-
-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);
-}