/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1998--2014 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"
#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"
#include "system.hh"
#include "text-interface.hh"
{
SCM spacing_pair = me->get_property ("spacing-pair");
Interval iv;
- Direction d = LEFT;
- do
+ for (LEFT_and_RIGHT (d))
{
Item *col = me->get_bound (d)->get_column ();
SCM align_sym
iv[d] = coldim[-d];
}
- while (flip (&d) != LEFT);
return iv;
}
return mol.smobbed_copy ();
}
+MAKE_SCHEME_CALLBACK (Multi_measure_rest, height, 1);
+SCM
+Multi_measure_rest::height (SCM smob)
+{
+ Grob *me = unsmob_grob (smob);
+
+ Real space = 1000000; // something very large...
+
+ Stencil mol;
+ mol.add_stencil (symbol_stencil (me, space));
+
+ return ly_interval2scm (mol.extent (Y_AXIS));
+}
+
int
-calc_closest_duration_log (Grob *me, double duration, bool force_round_up)
+calc_closest_duration_log (Grob *me, double duration, bool force_round_up, bool paranoid)
{
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 (to_boolean (scm_null_p (duration_logs_list))
- || !to_boolean (scm_list_p (duration_logs_list)))
+ if (paranoid
+ && (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."));
+ warning (_ ("usable-duration-logs must be a non-empty list."
+ " Falling back to whole rests."));
closest_usable_duration_log = 0;
}
else
}
int
-calc_measure_duration_log (Grob *me)
+calc_measure_duration_log (Grob *me, bool paranoid)
{
SCM sml = dynamic_cast<Spanner *> (me)->get_bound (LEFT)
- ->get_property ("measure-length");
+ ->get_property ("measure-length");
Rational ml = (unsmob_moment (sml)) ? unsmob_moment (sml)->main_part_
- : Rational (1);
+ : 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);
+ 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);
}
Stencil
return s;
}
- Real staff_space = Staff_symbol_referencer::staff_space (me);
-
Font_metric *musfont = Font_interface::get_default_font (me);
- int mdl = calc_measure_duration_log (me);
+ int mdl = calc_measure_duration_log (me, true);
if (measure_count == 1)
{
- Stencil s = musfont->find_by_name (Rest::glyph_name (me, mdl, "", true));
- if (mdl == 0 && me->get_property ("staff-position") == SCM_EOL)
- s.translate_axis (staff_space, Y_AXIS);
+ if (me->get_property ("staff-position") == SCM_EOL)
+ {
+ 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);
return s;
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));
+ double total_duration = measure_count * pow (2.0, -calc_measure_duration_log (me, true));
+
+ SCM staff_position = me->get_property ("staff-position");
+
+ if (!scm_is_number (staff_position))
+ {
+ // Staff position is somewhat icky regarding its definition for
+ // compatibility reasons. It is intended to be the baseline of
+ // a breve rest. However, when the staff space is more than
+ // single space (like with tablature), it looks better if all
+ // rests are actually hanging. So staff position, in reality,
+ // is the semi-breve position - 2. Everything else is
+ // calculated from there.
+ int dir = get_grob_direction (me);
+ Real pos = Rest::staff_position_internal (me, 0, dir);
+ me->set_property ("staff-position", scm_from_double (pos - 2));
+ }
while (total_duration > 0)
{
- int dl = calc_closest_duration_log (me, total_duration, false);
+ int dl = calc_closest_duration_log (me, total_duration, false, true);
double duration = pow (2.0, -dl);
total_duration -= duration;
- Stencil r = musfont->find_by_name (Rest::glyph_name (me, dl, "", true));
+ Stencil r = musfont->find_by_name (Rest::glyph_name (me, dl, "", true, 2));
+
+ Real staff_space = Staff_symbol_referencer::staff_space (me);
if (dl == 0)
{
- Real staff_space = Staff_symbol_referencer::staff_space (me);
r.translate_axis (staff_space, Y_AXIS);
}
+ else
+ {
+ r.translate_axis (staff_space-r.extent (Y_AXIS).at (UP), Y_AXIS);
+ }
symbols_width += r.extent (X_AXIS).length ();
mols = scm_cons (r.smobbed_copy (), mols);
symbol_count++;
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"));
+ if (!spacing)
+ me->warning (_ ("Using naive multi measure rest spacing."));
+ else
+ {
+ 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));
+ }
Item *combinations[4][2] = {{li, ri},
{lb, ri},
projects / lilypond.git / blobdiff