X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=47718a2fec86d906e0b3ce0adb7211c17f07237b;hb=2628c3c9950b6abbb7bd74747726f8c01340e032;hp=09f92b58a35df5f39a56c13b6b0ccfdf944d8d53;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 09f92b58a3..47718a2fec 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--2011 Jan Nieuwenhuizen + Copyright (C) 1998--2012 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,9 @@ #include "multi-measure-rest.hh" +#include "duration.hh" #include "font-interface.hh" +#include "international.hh" #include "lookup.hh" #include "misc.hh" #include "moment.hh" @@ -28,6 +30,7 @@ #include "percent-repeat-item.hh" #include "rest.hh" #include "separation-item.hh" +#include "spacing-options.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "system.hh" @@ -39,8 +42,7 @@ Multi_measure_rest::bar_width (Spanner *me) { 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 @@ -51,7 +53,6 @@ Multi_measure_rest::bar_width (Spanner *me) iv[d] = coldim[-d]; } - while (flip (&d) != LEFT); return iv; } @@ -110,55 +111,92 @@ Multi_measure_rest::print (SCM smob) Stencil mol; mol.add_stencil (symbol_stencil (me, space)); - int measures = 0; - SCM m (me->get_property ("measure-count")); - if (scm_is_number (m)) - measures = scm_to_int (m); - mol.translate_axis (x_off, X_AXIS); return mol.smobbed_copy (); } int -measure_duration_log (Grob *me) +calc_closest_duration_log (Grob *me, double duration, bool force_round_up, bool paranoid) { - SCM sml = dynamic_cast (me)->get_bound (LEFT) - ->get_property ("measure-length"); - bool round = to_boolean (me->get_property ("round-to-longer-rest")); - Rational ml = (unsmob_moment (sml)) ? unsmob_moment (sml)->main_part_ : Rational (1); + bool round_up = force_round_up + || to_boolean (me->get_property ("round-up-to-longer-rest")); + int closest_usable_duration_log; - double duration_log = -log_2 (ml.Rational::to_double ()); - int measure_duration_log = int (ceil (duration_log)); - if (round && duration_log - measure_duration_log < 0) - measure_duration_log--; + // Out of range initial values. + if (round_up) + closest_usable_duration_log = -15; // high value + else + closest_usable_duration_log = 15; // low value + int minimum_usable_duration_log = -15; + int maximum_usable_duration_log = 15; SCM duration_logs_list = me->get_property ("usable-duration-logs"); - int closest_list_elt = -15; // -15 is out of range. - - for (int i = 0; i < scm_to_int (scm_length (duration_logs_list)); i++) + if (paranoid + && (to_boolean (scm_null_p (duration_logs_list)) + || !to_boolean (scm_list_p (duration_logs_list)))) { - int list_elt = scm_to_int (scm_list_ref (duration_logs_list, scm_from_int (i))); - int shortest_distance = abs (measure_duration_log - closest_list_elt); - int distance = abs (measure_duration_log - list_elt); - if (distance < shortest_distance) - closest_list_elt = list_elt; + warning (_ ("usable-duration-logs must be a non-empty list." + " Falling back to whole rests.")); + closest_usable_duration_log = 0; } + else + { + for (SCM s = duration_logs_list; scm_is_pair (s); s = scm_cdr (s)) + { + int dur_log = scm_to_int (scm_car (s)); + if (dur_log > minimum_usable_duration_log) + minimum_usable_duration_log = dur_log; + if (dur_log < maximum_usable_duration_log) + maximum_usable_duration_log = dur_log; + double dur = pow (2.0, -dur_log); + if (round_up) + { + if (duration <= dur && dur_log > closest_usable_duration_log) + closest_usable_duration_log = dur_log; + } + else + { + if (duration >= dur && dur_log < closest_usable_duration_log) + closest_usable_duration_log = dur_log; + } + } + } + + if (closest_usable_duration_log == 15) + closest_usable_duration_log = minimum_usable_duration_log; + if (closest_usable_duration_log == -15) + closest_usable_duration_log = maximum_usable_duration_log; - return closest_list_elt; + return closest_usable_duration_log; +} + +int +calc_measure_duration_log (Grob *me, bool paranoid) +{ + SCM sml = dynamic_cast (me)->get_bound (LEFT) + ->get_property ("measure-length"); + 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); } Stencil Multi_measure_rest::symbol_stencil (Grob *me, Real space) { - int measures = 0; + int measure_count = 0; SCM m (me->get_property ("measure-count")); if (scm_is_number (m)) - measures = scm_to_int (m); - if (measures <= 0) + measure_count = scm_to_int (m); + if (measure_count <= 0) return Stencil (); SCM limit = me->get_property ("expand-limit"); - if (measures > scm_to_int (limit)) + if (measure_count > scm_to_int (limit)) { Real padding = 0.15; Stencil s = big_rest (me, (1.0 - 2 * padding) * space); @@ -166,22 +204,26 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) return s; } - Real staff_space = Staff_symbol_referencer::staff_space (me); - Font_metric *musfont = Font_interface::get_default_font (me); - int mdl = measure_duration_log (me); + int mdl = calc_measure_duration_log (me, true); - if (measures == 1) + if (measure_count == 1) { + if (mdl == 0 && me->get_property ("staff-position") == SCM_EOL) + { + 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)); + } + Stencil s = musfont->find_by_name (Rest::glyph_name (me, mdl, "", true)); - if (mdl == 0 && Staff_symbol_referencer::get_position (me) == 0.0) - s.translate_axis (staff_space, Y_AXIS); s.translate_axis ((space - s.extent (X_AXIS).length ()) / 2, X_AXIS); return s; } else - return church_rest (me, musfont, measures, space); + return church_rest (me, musfont, measure_count, space); } /* @@ -216,56 +258,36 @@ Multi_measure_rest::big_rest (Grob *me, Real width) Kirchenpause (?) */ Stencil -Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures, +Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measure_count, Real space) { SCM mols = SCM_EOL; - - int l = measures; - int count = 0; + int symbol_count = 0; Real symbols_width = 0.0; - SCM duration_logs_list = me->get_property ("usable-duration-logs"); - int longest_church_rest = 10; // 10 is out of range. - for (int i = 0; i < scm_to_int (scm_length (duration_logs_list)); i++) - { - longest_church_rest = min (longest_church_rest, - scm_to_int (scm_list_ref (duration_logs_list, - scm_from_int (i)))); - } + double total_duration = measure_count * pow (2.0, -calc_measure_duration_log (me, true)); - while (l) + while (total_duration > 0) { - int k; - int i = longest_church_rest - 1; - int length; - int mdl = measure_duration_log (me); - - do - { - i++; - length = int (pow (2.0, -i)); - } - while (i <= 0 - && !(l >= length && mdl >= longest_church_rest - i)); + int dl = calc_closest_duration_log (me, total_duration, false, true); + double duration = pow (2.0, -dl); - l -= length; - k = mdl + i; + total_duration -= duration; - Stencil r (musfont->find_by_name ("rests." + to_string (k))); - if (k == 0) + Stencil r = musfont->find_by_name (Rest::glyph_name (me, dl, "", true)); + if (dl == 0) { Real staff_space = Staff_symbol_referencer::staff_space (me); r.translate_axis (staff_space, Y_AXIS); } symbols_width += r.extent (X_AXIS).length (); mols = scm_cons (r.smobbed_copy (), mols); - count++; + symbol_count++; } /* Make outer padding this much bigger. */ Real outer_padding_factor = 1.5; Real inner_padding = (space - symbols_width) - / (2 * outer_padding_factor + (count - 1)); + / (2 * outer_padding_factor + (symbol_count - 1)); if (inner_padding < 0) inner_padding = 1.0; @@ -299,6 +321,20 @@ 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")); + 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}, @@ -364,7 +400,8 @@ ADD_INTERFACE (Multi_measure_rest, "hair-thickness " "measure-count " "minimum-length " - "round-to-longer-rest " + "round-up-exceptions " + "round-up-to-longer-rest " "spacing-pair " "thick-thickness " "usable-duration-logs "