X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=38dd598ee95d329be323342eeddb4da4817b946b;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=c0f26f5c857c394f1db2de658594919de77e5414;hpb=233fb6a8b3b6e31de1841641dbbd4c4f43423151;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index c0f26f5c85..38dd598ee9 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1998--2012 Jan Nieuwenhuizen + Copyright (C) 1998--2015 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #include "multi-measure-rest.hh" -#include "duration.hh" +#include "directional-element-interface.hh" #include "font-interface.hh" #include "international.hh" #include "lookup.hh" @@ -32,6 +32,7 @@ #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" @@ -61,7 +62,7 @@ MAKE_SCHEME_CALLBACK (Multi_measure_rest, percent, 1); SCM Multi_measure_rest::percent (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Spanner *sp = dynamic_cast (me); Stencil r = Percent_repeat_item_interface::x_percent (me, 1); @@ -95,7 +96,7 @@ MAKE_SCHEME_CALLBACK (Multi_measure_rest, print, 1); SCM Multi_measure_rest::print (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Spanner *sp = dynamic_cast (me); Interval sp_iv = bar_width (sp); @@ -115,8 +116,22 @@ Multi_measure_rest::print (SCM smob) return mol.smobbed_copy (); } +MAKE_SCHEME_CALLBACK (Multi_measure_rest, height, 1); +SCM +Multi_measure_rest::height (SCM smob) +{ + Grob *me = unsmob (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, 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")); @@ -131,11 +146,11 @@ calc_closest_duration_log (Grob *me, double duration, bool force_round_up, bool 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.")); + warning (_ ("usable-duration-logs must be a non-empty list." + " Falling back to whole rests.")); closest_usable_duration_log = 0; } else @@ -170,18 +185,17 @@ calc_closest_duration_log (Grob *me, double duration, bool force_round_up, bool } int -calc_measure_duration_log (Grob *me, bool paranoid) +calc_measure_duration_log (Grob *me) { SCM sml = dynamic_cast (me)->get_bound (LEFT) ->get_property ("measure-length"); - Rational ml = (unsmob_moment (sml)) ? unsmob_moment (sml)->main_part_ + Rational ml = (unsmob (sml)) ? unsmob (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 @@ -204,19 +218,18 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) } 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 (mdl == 0 && me->get_property ("staff-position") == SCM_EOL) + if (scm_is_null (me->get_property ("staff-position"))) { - if (Staff_symbol_referencer::on_staff_line (me, 2)) - me->set_property ("staff-position", scm_from_int (2)); - else if (Staff_symbol_referencer::on_staff_line (me, 3)) - me->set_property ("staff-position", scm_from_int (3)); + 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)); + 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; @@ -263,39 +276,71 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measure_cou 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"); + + 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, true); + int dl = calc_closest_duration_log (me, total_duration, false); 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++; } - /* 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 (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; } @@ -320,21 +365,26 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length) 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 (li->get_object ("spacing")); if (!spacing) - me->warning ("Using naive multi measure rest spacing."); - else + spacing = unsmob (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}, @@ -353,12 +403,8 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length) 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 (); } } @@ -367,7 +413,7 @@ MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods, 1); SCM Multi_measure_rest::set_spacing_rods (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length (); calculate_spacing_rods (me, sym_width); @@ -378,7 +424,7 @@ MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_text_rods, 1); SCM Multi_measure_rest::set_text_rods (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); Stencil *stil = me->get_stencil (); /* FIXME uncached */ @@ -397,10 +443,12 @@ ADD_INTERFACE (Multi_measure_rest, "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 "