diff --git a/Documentation/included/authors.itexi b/Documentation/included/authors.itexi index 187ddbc..e1dc730 100644 --- a/Documentation/included/authors.itexi +++ b/Documentation/included/authors.itexi @@ -109,6 +109,9 @@ Translation Meister @item Valentin Villenave: LSR editor and Bug squad member +@item Jan Warchoł: +happy nitpicker + @end itemize @end macro @@ -157,8 +160,7 @@ Core developer, Schemer extraordinaire @c use commas not colons -Karin Hoethker, -Jan Warchoł +Karin Hoethker @c no comma for last entry diff --git a/input/regression/beam-rest-extreme.ly b/input/regression/beam-rest-extreme.ly new file mode 100644 index 0000000..770bd78 --- /dev/null +++ b/input/regression/beam-rest-extreme.ly @@ -0,0 +1,14 @@ +\version "2.15.9" + +\header { + texidoc = "Beamed rests are given a pure height approximation +that gets their spacing correct in the majority of circumstances. +" +} + +\relative c'' { + 16[ r ] + 16[ r ] + 16[ r ] + 16[ r ] +} diff --git a/input/regression/spacing-bar-accidental.ly b/input/regression/spacing-bar-accidental.ly index b3087d4..75db12a 100644 --- a/input/regression/spacing-bar-accidental.ly +++ b/input/regression/spacing-bar-accidental.ly @@ -1,7 +1,7 @@ \header { texidoc = "An accidental following a bar gets space so - the left edge of the acc is at 0.3 - 0.6 staff space of the bar line" + the left edge of the acc is at 0.3 staff space from the bar line" } diff --git a/input/regression/tablature-full-notation.ly b/input/regression/tablature-full-notation.ly index 8e31540..0b7e064 100644 --- a/input/regression/tablature-full-notation.ly +++ b/input/regression/tablature-full-notation.ly @@ -13,9 +13,8 @@ tabstuff = { f4\f g a^\fermata | R2.*3 | c8\<\( c16 c ~ c2\! | - c'2.\) | \mark \default - R2. | + c'2.\) | \ottava #1 r4 d'4 r8 e | \ottava #0 diff --git a/lily/beam.cc b/lily/beam.cc index 2d97324..9fd5347 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -54,6 +54,7 @@ #include "pointer-group-interface.hh" #include "rhythmic-head.hh" #include "spanner.hh" +#include "staff-symbol.hh" #include "staff-symbol-referencer.hh" #include "stem.hh" #include "warn.hh" @@ -1731,6 +1732,77 @@ Beam::rest_collision_callback (SCM smob, SCM prev_offset) return scm_from_double (offset + staff_space * shift); } +MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Beam, pure_rest_collision_callback, 4, 1, ""); +SCM +Beam::pure_rest_collision_callback (SCM smob, + SCM, /* prev_offset */ + SCM, /* start */ + SCM /* end */) +{ + Real amount = 0.0; + + Grob *me = unsmob_grob (smob); + Grob *stem = unsmob_grob (me->get_object ("stem")); + if (!stem) + return scm_from_double (amount); + Grob *beam = unsmob_grob (stem->get_object ("beam")); + if (!beam + || !Beam::normal_stem_count (beam)) + return scm_from_double (amount); + + Real ss = Staff_symbol_referencer::staff_space (me); + + /* + This gives the extrema of rest positions. + In general, beams are never typeset more than one staff space away + from the staff in either direction. + */ + Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); + Interval rest_max_pos = staff ? Staff_symbol::line_span (staff) : Interval (0.0, 0.0); + rest_max_pos.widen (1); + rest_max_pos *= ss / 2; + + extract_grob_set (beam, "stems", stems); + vector my_stems; + + for (vsize i = 0; i < stems.size (); i++) + if (Stem::head_count (stems[i]) || stems[i] == stem) + my_stems.push_back (stems[i]); + + vsize idx = -1; + + for (vsize i = 0; i < my_stems.size (); i++) + if (my_stems[i] == stem) + { + idx = i; + break; + } + Grob *left; + Grob *right; + + if (idx == -1 || my_stems.size () == 1) + return scm_from_double (amount); + else if (idx == 0) + left = right = my_stems[1]; + else if (idx == my_stems.size () - 1) + left = right = my_stems[idx - 1]; + else + { + left = my_stems[idx - 1]; + right = my_stems[idx + 1]; + } + Direction beamdir = get_grob_direction (beam); + /* + Take the position between the two bounding head_positions, + then bound it by the minimum and maximum positions outside the staff. + 4.0 = 2.0 to get out of staff space * 2.0 for the average + */ + amount = min (max ((Stem::head_positions (left)[beamdir] + Stem::head_positions (right)[beamdir]) / 4.0, rest_max_pos[DOWN]), rest_max_pos[UP]); + + return scm_from_double (amount); +} + + bool Beam::is_knee (Grob *me) { diff --git a/lily/include/beam.hh b/lily/include/beam.hh index d89c35d..f99fbf8 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -71,6 +71,7 @@ public: static Interval no_visible_stem_positions (Grob *me, Interval default_value); DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM prev_off)); + DECLARE_SCHEME_CALLBACK (pure_rest_collision_callback, (SCM element, SCM prev_off, SCM, SCM)); DECLARE_SCHEME_CALLBACK (print, (SCM)); DECLARE_SCHEME_CALLBACK (calc_beaming, (SCM)); DECLARE_SCHEME_CALLBACK (calc_stem_shorten, (SCM)); diff --git a/lily/include/staff-spacing.hh b/lily/include/staff-spacing.hh index 935bcf5..b404e35 100644 --- a/lily/include/staff-spacing.hh +++ b/lily/include/staff-spacing.hh @@ -31,7 +31,7 @@ class Staff_spacing public: DECLARE_GROB_INTERFACE (); - static Spring get_spacing (Grob *, Grob *right_col); + static Spring get_spacing (Grob *, Grob *, Real); static Interval bar_y_positions (Grob *); }; diff --git a/lily/rest.cc b/lily/rest.cc index 97deba3..0115e51 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -52,7 +52,8 @@ Rest::y_offset_callback (SCM smob) amount += ss / 2; if (!position_override) - amount += 2 * ss * get_grob_direction (me);; + amount += 2 * ss * get_grob_direction (me); + return scm_from_double (amount); } diff --git a/lily/spacing-determine-loose-columns.cc b/lily/spacing-determine-loose-columns.cc index 79551ec..99d9e59 100644 --- a/lily/spacing-determine-loose-columns.cc +++ b/lily/spacing-determine-loose-columns.cc @@ -163,7 +163,7 @@ Spacing_spanner::set_distances_for_loose_col (Grob *me, Grob *c, } else if (Staff_spacing::has_interface (sp)) { - Spring spring = Staff_spacing::get_spacing (sp, rc); + Spring spring = Staff_spacing::get_spacing (sp, rc, 0.0); dists[d] = max (dists[d], spring.min_distance ()); } diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 75dc166..b09384f 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -495,6 +495,12 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r, vector springs; Spring spring; + Real full_measure_space = 0.0; + if (Paper_column::is_musical (r) + && l->break_status_dir () == CENTER + && fills_measure (me, l, r)) + full_measure_space = robust_scm2double (l->get_property ("full-measure-extra-space"), 1.0); + Moment dt = Paper_column::when_mom (r) - Paper_column::when_mom (l); if (dt == Moment (0, 0)) @@ -514,7 +520,8 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r, */ assert (spacing_grob->get_column () == l); - springs.push_back (Staff_spacing::get_spacing (spacing_grob, r)); + springs.push_back (Staff_spacing::get_spacing (spacing_grob, r, + full_measure_space)); } } @@ -533,15 +540,6 @@ Spacing_spanner::breakable_column_spacing (Grob *me, Item *l, Item *r, spring *= 0.8; } - if (Paper_column::is_musical (r) - && l->break_status_dir () == CENTER - && fills_measure (me, l, r)) - { - Real full_measure_extra_space = robust_scm2double (l->get_property ("full-measure-extra-space"), 1.0); - spring.set_distance (spring.distance () + full_measure_extra_space); - spring.set_default_compress_strength (); - } - if (options->stretch_uniformly_ && l->break_status_dir () != RIGHT) { spring.set_min_distance (0.0); diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc index 58cfa41..7c4ece4 100644 --- a/lily/staff-spacing.cc +++ b/lily/staff-spacing.cc @@ -124,7 +124,7 @@ Staff_spacing::next_notes_correction (Grob *me, We arrange things so that the fixed distance will be attained when the line is compressed with a force of 1.0 */ Spring -Staff_spacing::get_spacing (Grob *me, Grob *right_col) +Staff_spacing::get_spacing (Grob *me, Grob *right_col, Real situational_space) { Item *me_item = dynamic_cast (me); Grob *left_col = me_item->get_column (); @@ -195,18 +195,26 @@ Staff_spacing::get_spacing (Grob *me, Grob *right_col) ideal = fixed; } + Real stretchability = ideal - fixed; + + /* 'situational_space' passed by the caller + could include full-measure-extra-space */ + ideal += situational_space; + Real optical_correction = next_notes_correction (me, last_grob); + fixed += optical_correction; + ideal += optical_correction; + Real min_dist = Paper_column::minimum_distance (left_col, right_col); /* ensure that the "fixed" distance will leave a gap of at least 0.3 ss. */ Real min_dist_correction = max (0.0, 0.3 + min_dist - fixed); - Real correction = max (optical_correction, min_dist_correction); - - fixed += correction; - ideal += correction; + fixed += min_dist_correction; + ideal = max (ideal, fixed); Spring ret (ideal, min_dist); - ret.set_inverse_stretch_strength (max (0.0, ideal - fixed)); + ret.set_inverse_stretch_strength (max (0.0, stretchability)); + ret.set_inverse_compress_strength (max (0.0, ideal - fixed)); return ret; } diff --git a/python/convertrules.py b/python/convertrules.py index 425212d..b1e3fef 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -3213,14 +3213,6 @@ def conv(str): def conv (str): return str -@rule ((2, 15, 2), - _ ("Change in internal property for MultiMeasureRest")) -def conv (str): - if re.search (r'use-breve-rest',str): - stderr_write (NOT_SMART % _("use-breve-rest. This internal property has been replaced by round-to-longer-rest and usable-duration-logs.\n")) - stderr_write (UPDATE_MANUALLY) - return str - @rule ((2, 15, 7), _ ("Handling of non-automatic footnotes.")) def conv(str): @@ -3230,6 +3222,16 @@ def conv(str): stderr_write (UPDATE_MANUALLY) return str +@rule ((2, 15, 9), + _ ("Change in internal property for MultiMeasureRest")) +def conv (str): + if re.search (r'use-breve-rest',str): + stderr_write ("\n") + stderr_write (NOT_SMART % "use-breve-rest.\n") + stderr_write (_ ("This internal property has been replaced by round-up-to-longer-rest, round-up-exceptions and usable-duration-logs.\n")) + stderr_write (UPDATE_MANUALLY) + return str + # Guidelines to write rules (please keep this at the end of this file) # diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index bfe0323..2dbaa4c 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -527,7 +527,7 @@ (key-signature . (minimum-space . 3.5)) (time-signature . (minimum-space . 4.2)) (first-note . (minimum-fixed-space . 5.0)) - (next-note . (extra-space . 0.5)) + (next-note . (extra-space . 1.0)) (right-edge . (extra-space . 0.5)))) (stencil . ,ly:clef::print) (Y-offset . ,ly:staff-symbol-referencer::callback) @@ -593,7 +593,7 @@ (time-signature . (minimum-space . 4.2)) (custos . (minimum-space . 0.0)) (first-note . (minimum-fixed-space . 3.0)) - (next-note . (extra-space . 0.5)) + (next-note . (extra-space . 1.0)) (right-edge . (extra-space . 0.5)))) (stencil . ,ly:clef::print) (Y-offset . ,ly:staff-symbol-referencer::callback) @@ -620,7 +620,7 @@ (key-signature . (minimum-space . 3.5)) (time-signature . (minimum-space . 4.2)) (first-note . (minimum-fixed-space . 5.0)) - (next-note . (extra-space . 0.5)) + (next-note . (extra-space . 1.0)) (right-edge . (extra-space . 0.5)))) (stencil . ,ly:clef::print) (Y-offset . ,ly:staff-symbol-referencer::callback) @@ -919,6 +919,7 @@ (fret-diagram-details . ((finger-code . below-string))) (stencil . ,fret-board::calc-stencil) (extra-spacing-height . (0.2 . -0.2)) + (extra-spacing-width . (-0.5 . 0.5)) (meta . ((class . Item) (interfaces . (chord-name-interface font-interface @@ -1071,7 +1072,7 @@ (key-signature . (extra-space . 0.5)) (cue-clef . (extra-space . 0.5)) (right-edge . (extra-space . 0.5)) - (first-note . (fixed-space . 2.5)))) + (first-note . (semi-fixed-space . 2.5)))) (stencil . ,ly:key-signature-interface::print) (extra-spacing-width . (0.0 . 0.5)) (Y-offset . ,ly:staff-symbol-referencer::callback) @@ -1095,7 +1096,7 @@ (staff-bar . (extra-space . 1.1)) (cue-clef . (extra-space . 0.5)) (right-edge . (extra-space . 0.5)) - (first-note . (fixed-space . 2.5)))) + (first-note . (semi-fixed-space . 2.5)))) (stencil . ,ly:key-signature-interface::print) (extra-spacing-width . (0.0 . 0.5)) (Y-offset . ,ly:staff-symbol-referencer::callback) @@ -2241,7 +2242,7 @@ (non-musical . #t) (space-alist . ( (cue-clef . (extra-space . 1.5)) - (first-note . (fixed-space . 2.0)) + (first-note . (semi-fixed-space . 2.0)) (right-edge . (extra-space . 0.5)) (staff-bar . (minimum-space . 2.0)))) (stencil . ,ly:time-signature::print) @@ -2615,6 +2616,7 @@ (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height) (,ly:axis-group-interface::calc-staff-staff-spacing . ,ly:axis-group-interface::calc-pure-staff-staff-spacing) (,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height) + (,ly:beam::rest-collision-callback . ,ly:beam::pure-rest-collision-callback) (,ly:grob::stencil-height . ,pure-stencil-height) (,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height) (,ly:rest-collision::force-shift-callback-rest . ,pure-chain-offset-callback)