/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2012 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
#include "multi-measure-rest.hh"
#include "directional-element-interface.hh"
-#include "duration.hh"
#include "font-interface.hh"
#include "international.hh"
#include "lookup.hh"
SCM
Multi_measure_rest::percent (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob<Grob> (smob);
Spanner *sp = dynamic_cast<Spanner *> (me);
Stencil r = Percent_repeat_item_interface::x_percent (me, 1);
SCM
Multi_measure_rest::print (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob<Grob> (smob);
Spanner *sp = dynamic_cast<Spanner *> (me);
Interval sp_iv = bar_width (sp);
SCM
Multi_measure_rest::height (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob<Grob> (smob);
Real space = 1000000; // something very large...
}
int
-calc_closest_duration_log (Grob *me, double duration, bool force_round_up, bool paranoid)
+calc_closest_duration_log (Grob *me, double duration, bool force_round_up)
{
bool round_up = force_round_up
|| to_boolean (me->get_property ("round-up-to-longer-rest"));
int maximum_usable_duration_log = 15;
SCM duration_logs_list = me->get_property ("usable-duration-logs");
- if (paranoid
- && (to_boolean (scm_null_p (duration_logs_list))
- || !to_boolean (scm_list_p (duration_logs_list))))
+ if (to_boolean (scm_null_p (duration_logs_list))
+ || !to_boolean (scm_list_p (duration_logs_list)))
{
warning (_ ("usable-duration-logs must be a non-empty list."
" Falling back to whole rests."));
}
int
-calc_measure_duration_log (Grob *me, bool paranoid)
+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 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, paranoid);
+ return calc_closest_duration_log (me, measure_duration, force_round_up);
}
Stencil
}
Font_metric *musfont = Font_interface::get_default_font (me);
- int mdl = calc_measure_duration_log (me, true);
+ int mdl = calc_measure_duration_log (me);
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);
SCM mols = SCM_EOL;
int symbol_count = 0;
Real symbols_width = 0.0;
- double total_duration = measure_count * pow (2.0, -calc_measure_duration_log (me, true));
+ double total_duration = measure_count * pow (2.0, -calc_measure_duration_log (me));
SCM staff_position = me->get_property ("staff-position");
while (total_duration > 0)
{
- int dl = calc_closest_duration_log (me, total_duration, false, true);
+ int dl = calc_closest_duration_log (me, total_duration, false);
double duration = pow (2.0, -dl);
total_duration -= duration;
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, *unsmob_stencil (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;
}
Item *ri = sp->get_bound (RIGHT)->get_column ();
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"));
+
+ Grob *spacing = unsmob<Grob> (li->get_object ("spacing"));
if (!spacing)
- me->warning (_ ("Using naive multi measure rest spacing."));
- else
+ spacing = unsmob<Grob> (ri->get_object ("spacing"));
+ if (spacing)
{
Spacing_options options;
options.init_from_grob (me);
- int dl = calc_measure_duration_log (me, false);
- Duration dur = Duration (dl, 0);
- Rational rat = dur.get_length ();
- length = max (length, options.get_duration_space (rat));
+ 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},
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 ();
}
}
SCM
Multi_measure_rest::set_spacing_rods (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob<Grob> (smob);
Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length ();
calculate_spacing_rods (me, sym_width);
SCM
Multi_measure_rest::set_text_rods (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob<Grob> (smob);
Stencil *stil = me->get_stencil ();
/* FIXME uncached */
"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 "
projects / lilypond.git / blobdiff