From: Joe Neeman Date: Wed, 31 Jan 2007 07:38:46 +0000 (+0200) Subject: Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond X-Git-Tag: release/2.11.15-1~9^2~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e9a308e9c6002900fc336733950a0175bcbcc333;hp=49c5e7ba9c44a60281f45a802a77e006570c7ac0;p=lilypond.git Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond Conflicts: lily/text-spanner-engraver.cc --- diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely index a15df59045..377a74ea13 100644 --- a/Documentation/user/spacing.itely +++ b/Documentation/user/spacing.itely @@ -484,7 +484,6 @@ staves inside a system. @menu * Vertical spacing inside a system:: -* Vertical spacing of piano staves:: * Vertical spacing between systems:: * Controlling spacing of individual systems:: * Two-pass vertical spacing:: @@ -538,53 +537,6 @@ Example files: @inputfileref{input/regression/,page-spacing.ly}, @inputfileref{input/regression/,alignment-vertical-spacing.ly}. -@node Vertical spacing of piano staves -@subsection Vertical spacing of piano staves - -The distance between staves of a @internalsref{PianoStaff} cannot be -computed during formatting. Rather, to make cross-staff beaming work -correctly, that distance has to be fixed beforehand. - -The distance of staves in a @code{PianoStaff} is set with the -@code{forced-distance} property of the -@internalsref{VerticalAlignment} object, created in -@internalsref{PianoStaff}. - -It can be adjusted as follows -@example -\new PianoStaff \with @{ - \override VerticalAlignment #'forced-distance = #7 -@} @{ - ... -@} -@end example - -@noindent -This would bring the staves together at a distance of 7 staff spaces, -measured from the center line of each staff. - -The difference is demonstrated in the following example, -@lilypond[quote,verbatim] -\relative c'' << - \new PianoStaff \with { - \override VerticalAlignment #'forced-distance = #7 - } << - \new Staff { c1 } - \new Staff { c } - >> - \new PianoStaff << - \new Staff { c } - \new Staff { c } - >> ->> -@end lilypond - - -@seealso - -Example files: @inputfileref{input/regression/,alignment-vertical-spacing.ly}. - - @node Vertical spacing between systems @subsection Vertical spacing between systems diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely index bc41f8d617..51c27f4f57 100644 --- a/Documentation/user/templates.itely +++ b/Documentation/user/templates.itely @@ -366,7 +366,6 @@ pedal = { \context { \PianoStaff \accepts Dynamics - \override VerticalAlignment #'forced-distance = #7 } } } diff --git a/input/test/music-box.ly b/input/test/music-box.ly index 9e5b09cdb8..ae4567dbf7 100644 --- a/input/test/music-box.ly +++ b/input/test/music-box.ly @@ -126,10 +126,6 @@ prelude = >> \layout { - \context { - \PianoStaff - \override VerticalAlignment #'forced-distance = #10 - } line-width = 18.0 \cm } diff --git a/input/typography-demo.ly b/input/typography-demo.ly index 0ea37e871d..9182285cf1 100644 --- a/input/typography-demo.ly +++ b/input/typography-demo.ly @@ -157,10 +157,6 @@ pianoLH = \relative c'' \repeat volta 2\new Voice { \override Stem #'stemlet-length = #0.5 \override Slur #'height-limit = #1.5 } - \context { - \PianoStaff - \override VerticalAlignment #'forced-distance = #10 - } } \midi { diff --git a/lily/align-interface.cc b/lily/align-interface.cc index 09887a7c9f..68077c8176 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -36,17 +36,13 @@ Align_interface::calc_positioning_done (SCM smob) SCM axis = scm_car (me->get_property ("axes")); Axis ax = Axis (scm_to_int (axis)); - SCM force = me->get_property ("forced-distance"); - if (scm_is_number (force)) - Align_interface::align_to_fixed_distance (me, ax); - else - Align_interface::align_elements_to_extents (me, ax); + Align_interface::align_elements_to_extents (me, ax); return SCM_BOOL_T; } /* - merge with align-to-extents? + TODO: This belongs to the old two-pass spacing. Delete me. */ MAKE_SCHEME_CALLBACK(Align_interface, stretch_after_break, 1) SCM @@ -83,55 +79,6 @@ Align_interface::stretch_after_break (SCM grob) return SCM_UNSPECIFIED; } -/* - merge with align-to-extents? -*/ -void -Align_interface::align_to_fixed_distance (Grob *me, Axis a) -{ - Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"), - DOWN); - - Real dy = robust_scm2double (me->get_property ("forced-distance"), 0.0); - - extract_grob_set (me, "elements", elem_source); - - vector elems (elem_source); // writable.. - - Real where = 0; - - Interval v; - v.set_empty (); - vector translates; - - for (vsize j = elems.size (); j--;) - { - /* - This is not very elegant, in that we need special support for - hara-kiri. Unfortunately, the generic wiring of - force_hara_kiri_callback () (extent and offset callback) is - such that we might get into a loop if we call extent () or - offset () the elements. - */ - if (a == Y_AXIS - && Hara_kiri_group_spanner::has_interface (elems[j])) - Hara_kiri_group_spanner::consider_suicide (elems[j]); - - if (!elems[j]->is_live ()) - elems.erase (elems.begin () + j); - } - - for (vsize j = 0; j < elems.size (); j++) - { - where += stacking_dir * dy; - translates.push_back (where); - v.unite (Interval (where, where)); - } - - for (vsize i = 0; i < translates.size (); i++) - elems[i]->translate_axis (translates[i] - v.center (), a); -} - /* for each grob, find its upper and lower skylines. If the grob has an empty extent, delete it from the list instead. If the extent is non-empty but there is no skyline available (or pure is true), just @@ -168,52 +115,54 @@ get_skylines (Grob *me, for (vsize i = elements->size (); i--;) { Grob *g = (*elements)[i]; - Interval extent = g->maybe_pure_extent (g, a, pure, start, end); - Interval other_extent = pure ? Interval (-infinity_f, infinity_f) - : g->extent (common_refpoint, other_axis (a)); - Box b; - b[a] = extent; - b[other_axis (a)] = other_extent; - - if (extent.is_empty ()) - { - elements->erase (elements->begin () + i); - continue; - } - Skyline_pair skylines; - if (!pure - && Skyline_pair::unsmob (g->get_property ("skylines"))) - skylines = *Skyline_pair::unsmob (g->get_property ("skylines")); - else - { - if (!pure) - programming_error ("no skylines for alignment-child\n"); - - skylines = Skyline_pair (b, 0, other_axis (a)); - } /* each skyline is calculated relative to (potentially) a different other_axis coordinate. In order to compare the skylines effectively, we need to shift them to some absolute reference point */ if (!pure) { + Skyline_pair *skys = Skyline_pair::unsmob (g->get_property ("skylines")); + if (skys) + skylines = *skys; + else + programming_error ("no skylines for alignment-child\n"); + /* this is perhaps an abuse of minimum-?-extent: maybe we should create another property? But it seems that the only (current) use of minimum-Y-extent is to separate vertically-aligned elements */ SCM min_extent = g->get_property (a == X_AXIS ? "minimum-X-extent" : "minimum-Y-extent"); + if (is_number_pair (min_extent)) { + Box b; + Interval other_extent = g->extent (common_refpoint, other_axis (a)); b[a] = ly_scm2interval (min_extent); - skylines.insert (b, 0, other_axis (a)); + b[other_axis (a)] = other_extent; + if (!other_extent.is_empty ()) + skylines.insert (b, 0, other_axis (a)); } Real offset = child_refpoints[i]->relative_coordinate (common_refpoint, other_axis (a)); skylines.shift (offset); } + else + { + assert (a == Y_AXIS); + Interval extent = g->pure_height (g, start, end); + if (!extent.is_empty ()) + { + Box b; + b[a] = extent; + b[other_axis (a)] = Interval (-infinity_f, infinity_f); + skylines.insert (b, 0, other_axis (a)); + } + } - - ret->push_back (skylines); + if (skylines.is_empty ()) + elements->erase (elements->begin () + i); + else + ret->push_back (skylines); } reverse (*ret); } @@ -250,6 +199,7 @@ Align_interface::get_extents_aligned_translates (Grob *me, get_skylines (me, &elems, a, pure, start, end, &skylines); Real where = 0; + /* TODO: extra-space stuff belongs to two-pass spacing. Delete me */ SCM extra_space_handle = scm_assq (ly_symbol2scm ("alignment-extra-space"), line_break_details); Real extra_space = robust_scm2double (scm_is_pair (extra_space_handle) ? scm_cdr (extra_space_handle) @@ -310,6 +260,25 @@ Align_interface::align_elements_to_extents (Grob *me, Axis a) all_grobs[j]->translate_axis (translates[j], a); } +/* After we have already determined the y-offsets of our children, we may still + want to stretch them a little. */ +void +Align_interface::stretch (Grob *me, Real amount, Axis a) +{ + extract_grob_set (me, "elements", elts); + Real non_empty_elts = stretchable_children_count (me); + Real offset = 0.0; + Direction dir = robust_scm2dir (me->get_property ("stacking-dir"), DOWN); + for (vsize i = 0; i < elts.size (); i++) + { + elts[i]->translate_axis (dir * offset, a); + if (!elts[i]->extent (me, a).is_empty () + && !to_boolean (elts[i]->get_property ("keep-fixed-while-stretching"))) + offset += amount / non_empty_elts; + } + me->flush_extent_cache (Y_AXIS); +} + Real Align_interface::get_pure_child_y_translation (Grob *me, Grob *ch, int start, int end) { @@ -379,22 +348,59 @@ Align_interface::set_ordered (Grob *me) ga->set_ordered (true); } +int +Align_interface::stretchable_children_count (Grob const *me) +{ + extract_grob_set (me, "elements", elts); + int ret = 0; + + /* start at 1: we will never move the first child while stretching */ + for (vsize i = 1; i < elts.size (); i++) + if (!to_boolean (elts[i]->get_property ("keep-fixed-while-stretching")) + && !elts[i]->extent (elts[i], Y_AXIS).is_empty ()) + ret++; + + return ret; +} + +MAKE_SCHEME_CALLBACK (Align_interface, calc_max_stretch, 1) +SCM +Align_interface::calc_max_stretch (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Spanner *spanner_me = dynamic_cast (me); + Real ret = 0; + + if (spanner_me && stretchable_children_count (me) > 0) + { + Paper_column *left = dynamic_cast (spanner_me->get_bound (LEFT)); + Real height = me->extent (me, Y_AXIS).length (); + SCM line_break_details = left->get_property ("line-break-system-details"); + SCM fixed_offsets = scm_assq (ly_symbol2scm ("alignment-offsets"), + line_break_details); + + /* if there are fixed offsets, we refuse to stretch */ + if (fixed_offsets != SCM_BOOL_F) + ret = 0; + else + ret = height * height / 80.0; /* why this, exactly? -- jneem */ + } + return scm_from_double (ret); +} + /* Find Y-axis parent of G that has a #'forced-distance property. This has the effect of finding the piano-staff given an object in that piano staff. + + FIXME: piano staves no longer have forced-distance. The code that + relies on this function (in line-spanner) is broken. */ Grob * find_fixed_alignment_parent (Grob *g) { - while (g) - { - if (scm_is_number (g->get_property ("forced-distance"))) - return g; - - g = g->get_parent (Y_AXIS); - } - + (void) g; + programming_error ("deprecated. We don't use forced-distance anymore"); return 0; } @@ -414,7 +420,6 @@ ADD_INTERFACE (Align_interface, "align-dir " "axes " "elements " - "forced-distance " "padding " "positioning-done " "stacking-dir " diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 23c3087247..8c3ca97607 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -61,9 +61,12 @@ Axis_group_interface::relative_group_extent (vector const &elts, for (vsize i = 0; i < elts.size (); i++) { Grob *se = elts[i]; - Interval dims = se->extent (common, a); - if (!dims.is_empty ()) - r.unite (dims); + if (!to_boolean (se->get_property ("cross-staff"))) + { + Interval dims = se->extent (common, a); + if (!dims.is_empty ()) + r.unite (dims); + } } return r; } @@ -355,6 +358,12 @@ staff_priority_less (Grob * const &g1, Grob * const &g2) else if (priority_1 > priority_2) return false; + /* if neither grob has an outside-staff priority, the ordering will have no + effect -- we just need to choose a consistent ordering. We do this to + avoid the side-effect of calculating extents. */ + if (isinf (priority_1)) + return g1 < g2; + /* if there is no preference in staff priority, choose the left-most one */ Grob *common = g1->common_refpoint (g2, X_AXIS); Real start_1 = g1->extent (common, X_AXIS)[LEFT]; @@ -371,7 +380,8 @@ add_boxes (Grob *me, Grob *x_common, Grob *y_common, vector *const boxes) for (vsize i = 0; i < elements->size (); i++) add_boxes (elements->grob (i), x_common, y_common, boxes); } - else if (!scm_is_number (me->get_property ("outside-staff-priority"))) + else if (!scm_is_number (me->get_property ("outside-staff-priority")) + && !to_boolean (me->get_property ("cross-staff"))) boxes->push_back (Box (me->extent (x_common, X_AXIS), me->extent (y_common, Y_AXIS))); } @@ -486,6 +496,21 @@ Axis_group_interface::skyline_spacing (Grob *me, vector elements) return skylines; } +MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_max_stretch, 1) +SCM +Axis_group_interface::calc_max_stretch (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Real ret = 0; + extract_grob_set (me, "elements", elts); + + for (vsize i = 0; i < elts.size (); i++) + if (Axis_group_interface::has_interface (elts[i])) + ret += robust_scm2double (elts[i]->get_property ("max-stretch"), 0.0); + + return scm_from_double (ret); +} + ADD_INTERFACE (Axis_group_interface, "An object that groups other layout objects.", @@ -495,6 +520,8 @@ ADD_INTERFACE (Axis_group_interface, "Y-common " "axes " "elements " + "keep-fixed-while-stretching " + "max-stretch " "pure-Y-common " "pure-relevant-elements " "skylines " diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index ecc83ac756..9f23965042 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -98,12 +98,7 @@ Bar_number_engraver::acknowledge_break_alignment (Grob_info inf) void Bar_number_engraver::stop_translation_timestep () { - if (text_) - { - text_->set_object ("side-support-elements", - grob_list_to_grob_array (get_property ("stavesFound"))); - text_ = 0; - } + text_ = 0; } void diff --git a/lily/beam.cc b/lily/beam.cc index 28492eaee1..18cfae23cd 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -695,7 +695,7 @@ Beam::consider_auto_knees (Grob *me) sets stem directions, a constant shift does not have an influence. */ - head_extents += stem->relative_coordinate (common, Y_AXIS); + head_extents += stem->pure_relative_y_coordinate (common, 0, INT_MAX); if (to_dir (stem->get_property_data ("direction"))) { @@ -974,7 +974,6 @@ Beam::shift_region_to_valid (SCM grob, SCM posns) Real dx = lvs->relative_coordinate (commonx, X_AXIS) - x0; Drul_array pos = ly_scm2interval (posns); - scale_drul (&pos, Staff_symbol_referencer::staff_space (me)); @@ -1421,6 +1420,24 @@ Beam::is_knee (Grob *me) return knee; } +bool +Beam::is_cross_staff (Grob *me) +{ + extract_grob_set (me, "stems", stems); + Grob *staff_symbol = Staff_symbol_referencer::get_staff_symbol (me); + for (vsize i = 0; i < stems.size (); i++) + if (Staff_symbol_referencer::get_staff_symbol (stems[i]) != staff_symbol) + return true; + return false; +} + +MAKE_SCHEME_CALLBACK (Beam, cross_staff, 1) +SCM +Beam::cross_staff (SCM smob) +{ + return scm_from_bool (is_cross_staff (unsmob_grob (smob))); +} + int Beam::get_direction_beam_count (Grob *me, Direction d) { diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc index a4f3ac4b57..33426c0b3f 100644 --- a/lily/constrained-breaking.cc +++ b/lily/constrained-breaking.cc @@ -109,16 +109,6 @@ Constrained_breaking::calc_subproblem (vsize start, vsize sys, vsize brk) return found_something; } -vector -Constrained_breaking::solve () -{ - if (!systems_) - return get_best_solution (0, VPOS); - - resize (systems_); - return get_solution(0, VPOS, systems_); -} - Column_x_positions Constrained_breaking::space_line (vsize i, vsize j) { @@ -156,7 +146,7 @@ Constrained_breaking::resize (vsize systems) } vector -Constrained_breaking::get_solution (vsize start, vsize end, vsize sys_count) +Constrained_breaking::solve (vsize start, vsize end, vsize sys_count) { vsize start_brk = starting_breakpoints_[start]; vsize end_brk = prepare_solution (start, end, sys_count); @@ -190,16 +180,16 @@ Constrained_breaking::get_solution (vsize start, vsize end, vsize sys_count) } } /* if we get to here, just put everything on one line */ - warning (_ ("cannot find line breaking that satisfies constraints" )); + warning (_ ("cannot find line breaking that satisfies constraints")); ret.push_back (space_line (0, end_brk)); return ret; } vector -Constrained_breaking::get_best_solution (vsize start, vsize end) +Constrained_breaking::best_solution (vsize start, vsize end) { - vsize min_systems = get_min_systems (start, end); - vsize max_systems = get_max_systems (start, end); + vsize min_systems = min_system_count (start, end); + vsize max_systems = max_system_count (start, end); Real best_demerits = infinity_f; vector best_so_far; @@ -211,11 +201,11 @@ Constrained_breaking::get_best_solution (vsize start, vsize end) if (dem < best_demerits) { best_demerits = dem; - best_so_far = get_solution (start, end, i); + best_so_far = solve (start, end, i); } else { - vector cur = get_solution (start, end, i); + vector cur = solve (start, end, i); bool too_many_lines = true; for (vsize j = 0; j < cur.size (); j++) @@ -230,11 +220,11 @@ Constrained_breaking::get_best_solution (vsize start, vsize end) } if (best_so_far.size ()) return best_so_far; - return get_solution (start, end, max_systems); + return solve (start, end, max_systems); } std::vector -Constrained_breaking::get_details (vsize start, vsize end, vsize sys_count) +Constrained_breaking::line_details (vsize start, vsize end, vsize sys_count) { vsize brk = prepare_solution (start, end, sys_count); Matrix const &st = state_[start]; @@ -250,7 +240,7 @@ Constrained_breaking::get_details (vsize start, vsize end, vsize sys_count) } int -Constrained_breaking::get_min_systems (vsize start, vsize end) +Constrained_breaking::min_system_count (vsize start, vsize end) { vsize sys_count; vsize brk = prepare_solution (start, end, 1); @@ -272,7 +262,7 @@ Constrained_breaking::get_min_systems (vsize start, vsize end) } int -Constrained_breaking::get_max_systems (vsize start, vsize end) +Constrained_breaking::max_system_count (vsize start, vsize end) { vsize brk = (end >= start_.size ()) ? breaks_.size () : starting_breakpoints_[end]; return brk - starting_breakpoints_[start]; @@ -352,7 +342,7 @@ Constrained_breaking::initialize () line.force_ = forces[i*breaks_.size () + j]; if (ragged && last && !isinf (line.force_)) - line.force_ = 0; + line.force_ = (line.force_ < 0) ? infinity_f : 0; if (isinf (line.force_)) break; diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index fd22a33bf6..caef2ce4c4 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -64,10 +64,7 @@ class Dynamic_engraver : public Engraver void typeset_all (); TRANSLATOR_DECLARATIONS (Dynamic_engraver); - DECLARE_ACKNOWLEDGER (accidental); - DECLARE_ACKNOWLEDGER (stem_tremolo); DECLARE_ACKNOWLEDGER (note_column); - DECLARE_ACKNOWLEDGER (slur); DECLARE_TRANSLATOR_LISTENER (absolute_dynamic); DECLARE_TRANSLATOR_LISTENER (span_dynamic); @@ -395,27 +392,6 @@ Dynamic_engraver::typeset_all () } } -void -Dynamic_engraver::acknowledge_accidental (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - -void -Dynamic_engraver::acknowledge_stem_tremolo (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - -void -Dynamic_engraver::acknowledge_slur (Grob_info info) -{ - if (line_spanner_) - Side_position_interface::add_support (line_spanner_, info.grob ()); -} - void Dynamic_engraver::acknowledge_note_column (Grob_info info) { @@ -454,10 +430,7 @@ Dynamic_engraver::acknowledge_note_column (Grob_info info) finished_cresc_->set_bound (RIGHT, info.grob ()); } -ADD_ACKNOWLEDGER (Dynamic_engraver, accidental); ADD_ACKNOWLEDGER (Dynamic_engraver, note_column); -ADD_ACKNOWLEDGER (Dynamic_engraver, slur); -ADD_ACKNOWLEDGER (Dynamic_engraver, stem_tremolo); ADD_TRANSLATOR (Dynamic_engraver, /* doc */ diff --git a/lily/grob.cc b/lily/grob.cc index e12152821b..37d715bf07 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -613,6 +613,7 @@ ADD_INTERFACE (Grob, "before-line-breaking " "cause " "color " + "cross-staff " "extra-X-extent " "extra-Y-extent " "extra-offset " diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh index 4f1d349141..8b0e9d9419 100644 --- a/lily/include/align-interface.hh +++ b/lily/include/align-interface.hh @@ -17,11 +17,13 @@ struct Align_interface { DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM)); DECLARE_SCHEME_CALLBACK (stretch_after_break, (SCM element)); - static void align_to_fixed_distance (Grob *, Axis a); + DECLARE_SCHEME_CALLBACK (calc_max_stretch, (SCM)); + static void stretch (Grob *, Real amount, Axis a); static void align_elements_to_extents (Grob *, Axis a); static vector get_extents_aligned_translates (Grob *, vector const&, Axis a, bool safe, int start, int end); + static int stretchable_children_count (Grob const*); static void set_ordered (Grob *); static Axis axis (Grob *); static void add_element (Grob *, Grob *); diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh index d752a05bb4..2f4f501cee 100644 --- a/lily/include/axis-group-interface.hh +++ b/lily/include/axis-group-interface.hh @@ -25,6 +25,7 @@ struct Axis_group_interface DECLARE_SCHEME_CALLBACK (pure_height, (SCM smob, SCM start, SCM end)); DECLARE_SCHEME_CALLBACK (calc_skylines, (SCM smob)); DECLARE_SCHEME_CALLBACK (combine_skylines, (SCM smob)); + DECLARE_SCHEME_CALLBACK (calc_max_stretch, (SCM smob)); static Interval relative_group_extent (vector const &list, Grob *common, Axis); static Interval relative_pure_height (Grob *me, vector const &list, diff --git a/lily/include/beam.hh b/lily/include/beam.hh index 412540b076..e505cd6709 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -74,6 +74,7 @@ public: static Grob *last_normal_stem (Grob *); DECLARE_GROB_INTERFACE(); static void add_stem (Grob *, Grob *); + static bool is_cross_staff (Grob *); static bool is_knee (Grob *); static void set_beaming (Grob *, Beaming_pattern const *); static void set_stemlens (Grob *); @@ -93,6 +94,7 @@ public: DECLARE_SCHEME_CALLBACK (calc_normal_stems, (SCM)); DECLARE_SCHEME_CALLBACK (calc_concaveness, (SCM)); DECLARE_SCHEME_CALLBACK (set_stem_lengths, (SCM)); + DECLARE_SCHEME_CALLBACK (cross_staff, (SCM)); /* position callbacks */ DECLARE_SCHEME_CALLBACK (shift_region_to_valid, (SCM, SCM)); diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh index 502e8c234a..2478afcaca 100644 --- a/lily/include/constrained-breaking.hh +++ b/lily/include/constrained-breaking.hh @@ -93,17 +93,15 @@ struct Constrained_break_node class Constrained_breaking { public: - vector solve (); + vector solve (vsize start, vsize end, vsize sys_count); + vector best_solution (vsize start, vsize end); + vector line_details (vsize start, vsize end, vsize sys_count); + Constrained_breaking (Paper_score *ps); Constrained_breaking (Paper_score *ps, vector const &start_col_posns); - vector get_solution (vsize start, vsize end, vsize sys_count); - vector get_best_solution (vsize start, vsize end); - vector get_details (vsize start, vsize end, vsize sys_count); - int get_max_systems (vsize start, vsize end); - int get_min_systems (vsize start, vsize end); - - void resize (vsize systems); + int max_system_count (vsize start, vsize end); + int min_system_count (vsize start, vsize end); private: Paper_score *pscore_; @@ -127,6 +125,7 @@ private: vector breaks_; void initialize (); + void resize (vsize systems); Column_x_positions space_line (vsize start_col, vsize end_col); vsize prepare_solution (vsize start, vsize end, vsize sys_count); diff --git a/lily/include/grob.hh b/lily/include/grob.hh index c7ecbbabfd..3b5f19d97e 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -80,6 +80,7 @@ public: SCM get_property_alist_chain (SCM) const; SCM internal_get_property (SCM symbol) const; SCM internal_get_property_data (SCM symbol) const; + SCM internal_get_non_callback_marker_property_data (SCM symbol) const; SCM internal_get_object (SCM symbol) const; void internal_set_object (SCM sym, SCM val); void internal_del_property (SCM symbol); diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh index 73790d5963..ae3206ac5f 100644 --- a/lily/include/simple-spacer.hh +++ b/lily/include/simple-spacer.hh @@ -49,6 +49,7 @@ public: vector spring_positions () const; Real force () const; + Real force_penalty (bool ragged) const; bool fits () const; DECLARE_SIMPLE_SMOBS (Simple_spacer); diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh index a4ea033fdb..bccac37238 100644 --- a/lily/include/skyline.hh +++ b/lily/include/skyline.hh @@ -72,6 +72,7 @@ public: Real height (Real airplane) const; Real max_height () const; void set_minimum_height (Real height); + bool is_empty () const; }; class Skyline_pair @@ -90,6 +91,7 @@ public: void merge (Skyline_pair const &other); Skyline &operator [] (Direction d); Skyline const &operator [] (Direction d) const; + bool is_empty () const; }; #endif /* SKYLINE_HH */ diff --git a/lily/include/slur.hh b/lily/include/slur.hh index 20fb7030ce..a5ea54e77e 100644 --- a/lily/include/slur.hh +++ b/lily/include/slur.hh @@ -27,6 +27,7 @@ public: DECLARE_SCHEME_CALLBACK (height, (SCM)); DECLARE_SCHEME_CALLBACK (outside_slur_callback, (SCM, SCM)); DECLARE_SCHEME_CALLBACK (pure_outside_slur_callback, (SCM, SCM, SCM, SCM)); + DECLARE_SCHEME_CALLBACK (cross_staff, (SCM)); DECLARE_GROB_INTERFACE(); static Bezier get_curve (Grob *me); }; diff --git a/lily/include/stem.hh b/lily/include/stem.hh index d022175a7c..c9b509ce7d 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -34,6 +34,7 @@ public: static int head_count (Grob *); static bool is_invisible (Grob *); static bool is_normal_stem (Grob *); + static bool is_cross_staff (Grob *); static Interval head_positions (Grob *); static Real stem_end_position (Grob *); static Stencil flag (Grob *); @@ -53,5 +54,6 @@ public: DECLARE_SCHEME_CALLBACK (width, (SCM smob)); DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM)); DECLARE_SCHEME_CALLBACK (height, (SCM)); + DECLARE_SCHEME_CALLBACK (cross_staff, (SCM)); }; #endif diff --git a/lily/include/system.hh b/lily/include/system.hh index 48e6875dfb..3a5b39ad4e 100644 --- a/lily/include/system.hh +++ b/lily/include/system.hh @@ -20,7 +20,7 @@ class System : public Spanner { int rank_; Grob_array *all_elements_; - Drul_array skylines_; + Skyline_pair skylines_; void build_skylines (); void init_elements (); friend class Paper_score; // ugh. @@ -29,9 +29,11 @@ class System : public Spanner public: Paper_score *paper_score () const; int get_rank () const; + void do_break_substitution_and_fixup_refpoints (); void post_processing (); SCM get_paper_system (); SCM get_paper_systems (); + SCM get_broken_system_grobs (); System (SCM); System (System const &); diff --git a/lily/include/volta-bracket.hh b/lily/include/volta-bracket.hh index 4cc75a6ba5..cc69660a42 100644 --- a/lily/include/volta-bracket.hh +++ b/lily/include/volta-bracket.hh @@ -16,7 +16,6 @@ public: DECLARE_GROB_INTERFACE(); DECLARE_SCHEME_CALLBACK (print, (SCM)); static void modify_edge_height (Spanner *); - static void add_column (Grob *, Grob *col); static void add_bar (Grob *me, Item *bar); }; diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 984eb687a0..1f4a0c3f72 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -91,12 +91,7 @@ Mark_engraver::acknowledge_break_alignment (Grob_info inf) void Mark_engraver::stop_translation_timestep () { - if (text_) - { - text_->set_object ("side-support-elements", - grob_list_to_grob_array (get_property ("stavesFound"))); - text_ = 0; - } + text_ = 0; mark_ev_ = 0; } diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index a663e57351..897948d88b 100644 --- a/lily/metronome-engraver.cc +++ b/lily/metronome-engraver.cc @@ -61,9 +61,6 @@ Metronome_mark_engraver::stop_translation_timestep () { Grob *mc = unsmob_grob (get_property ("currentMusicalColumn")); text_->set_parent (mc, X_AXIS); - text_->set_object ("side-support-elements", - grob_list_to_grob_array (get_property ("stavesFound"))); - text_ = 0; } } diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc index 76a874d4e3..83add92ae0 100644 --- a/lily/page-breaking.cc +++ b/lily/page-breaking.cc @@ -93,8 +93,8 @@ Page_breaking::break_into_pieces (vsize start_break, vsize end_break, Line_divis line_breaker_args (sys, chunks[i], chunks[i+1], &start, &end); vector pos = ignore_div - ? line_breaking_[sys].get_best_solution (start, end) - : line_breaking_[sys].get_solution (start, end, div[i]); + ? line_breaking_[sys].best_solution (start, end) + : line_breaking_[sys].solve (start, end, div[i]); all_[sys].pscore_->root_system ()->break_into_pieces (pos); } } @@ -108,8 +108,9 @@ Page_breaking::systems () { if (all_[sys].pscore_) { - SCM lines = all_[sys].pscore_->root_system ()->get_paper_systems (); - ret = scm_cons (scm_vector_to_list (lines), ret); + all_[sys].pscore_->root_system ()->do_break_substitution_and_fixup_refpoints (); + SCM lines = all_[sys].pscore_->root_system ()->get_broken_system_grobs (); + ret = scm_cons (lines, ret); } else { @@ -137,7 +138,7 @@ Page_breaking::line_details (vsize start_break, vsize end_break, Line_division c vsize end; line_breaker_args (sys, chunks[i], chunks[i+1], &start, &end); - vector details = line_breaking_[sys].get_details (start, end, div[i]); + vector details = line_breaking_[sys].line_details (start, end, div[i]); ret.insert (ret.end (), details.begin (), details.end ()); } else @@ -186,7 +187,7 @@ Page_breaking::make_pages (vector lines_per_page, SCM systems) SCM layout_module = scm_c_resolve_module ("scm layout-page-layout"); SCM page_module = scm_c_resolve_module ("scm page"); - SCM make_page = scm_c_module_lookup (layout_module, "make-page-from-systems"); + SCM make_page = scm_c_module_lookup (layout_module, "stretch-and-draw-page"); SCM page_stencil = scm_c_module_lookup (page_module, "page-stencil"); make_page = scm_variable_ref (make_page); page_stencil = scm_variable_ref (page_stencil); @@ -358,8 +359,8 @@ Page_breaking::system_count_bounds (vector const &chunks, bool m vsize end; line_breaker_args (sys, chunks[i], chunks[i+1], &start, &end); ret[i] = min - ? line_breaking_[sys].get_min_systems (start, end) - : line_breaking_[sys].get_max_systems (start, end); + ? line_breaking_[sys].min_system_count (start, end) + : line_breaking_[sys].max_system_count (start, end); } } diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 4a2eceef12..db02583282 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -106,9 +106,9 @@ Paper_score::calc_breaking () int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0); if (system_count) - algorithm.resize (system_count); + return algorithm.solve (0, VPOS, system_count); - return algorithm.solve (); + return algorithm.best_solution (0, VPOS); } void @@ -152,6 +152,7 @@ Paper_score::get_paper_systems () vector breaking = calc_breaking (); system_->break_into_pieces (breaking); message (_ ("Drawing systems...") + " "); + system_->do_break_substitution_and_fixup_refpoints (); paper_systems_ = system_->get_paper_systems (); } return paper_systems_; diff --git a/lily/prob-scheme.cc b/lily/prob-scheme.cc index c22c88bc72..a9838bb435 100644 --- a/lily/prob-scheme.cc +++ b/lily/prob-scheme.cc @@ -7,6 +7,7 @@ */ #include "prob.hh" +#include "skyline.hh" LY_DEFINE (ly_prob_set_property_x, "ly:prob-set-property!", 2, 1, 0, (SCM obj, SCM sym, SCM value), @@ -83,3 +84,28 @@ LY_DEFINE(ly_paper_system_p, "ly:paper-system?", { return ly_prob_type_p (obj, ly_symbol2scm ("paper-system")); } + +LY_DEFINE (ly_paper_system_minimum_distance, "ly:paper-system-minimum-distance", + 2, 0, 0, (SCM sys1, SCM sys2), + "Measure the minimum distance between these two paper-systems " + "using their stored skylines if possible and falling back to " + "their extents otherwise.") +{ + Real ret = 0; + Prob *p1 = unsmob_prob (sys1); + Prob *p2 = unsmob_prob (sys2); + Skyline_pair *sky1 = Skyline_pair::unsmob (p1->get_property ("skylines")); + Skyline_pair *sky2 = Skyline_pair::unsmob (p2->get_property ("skylines")); + + if (sky1 && sky2) + ret = (*sky1)[DOWN].distance ((*sky2)[UP]); + else + { + Stencil *s1 = unsmob_stencil (p1->get_property ("stencil")); + Stencil *s2 = unsmob_stencil (p2->get_property ("stencil")); + Interval iv1 = s1->extent (Y_AXIS); + Interval iv2 = s2->extent (Y_AXIS); + ret = iv2[UP] - iv1[DOWN]; + } + return scm_from_double (ret); +} diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index 5f28644ba6..9200554822 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -247,6 +247,20 @@ Simple_spacer::spring_positions () const return ret; } +Real +Simple_spacer::force_penalty (bool ragged) const +{ + /* If we are ragged-right, we don't want to penalise according to the force, + but according to the amount of whitespace that is present after the end + of the line. */ + if (ragged) + return max (0.0, line_len_ - configuration_length (0.0)); + + /* Use a convex compression penalty. */ + Real f = force_; + return f - (f < 0 ? f*f*f*f*4 : 0); +} + /****************************************************************/ Spring_description::Spring_description () @@ -449,14 +463,7 @@ get_line_forces (vector const &columns, } } spacer.solve ((b == 0) ? line_len - indent : line_len, ragged); - - /* add a (convex) penalty for compression. We do this _only_ in get_line_forces, - not get_line_configuration. This is temporary, for backwards compatibility; - the old line/page-breaking stuff ignores page breaks when it calculates line - breaks, so compression penalties can result in scores (eg. wtk-fugue) blowing - up to too many pages. */ - Real f = spacer.force (); - force[b * breaks.size () + c] = f - (f < 0 ? f*f*f*f*4 : 0); + force[b * breaks.size () + c] = spacer.force_penalty (ragged); if (!spacer.fits ()) { @@ -513,12 +520,8 @@ get_line_configuration (vector const &columns, } spacer.solve (line_len, ragged); - ret.force_ = spacer.force (); + ret.force_ = spacer.force_penalty (ragged); - /* - We used to have a penalty for compression, no matter what, but that - fucked up wtk1-fugue2 (taking 3 full pages.) - */ ret.config_ = spacer.spring_positions (); for (vsize i = 0; i < ret.config_.size (); i++) ret.config_[i] += indent; diff --git a/lily/skyline.cc b/lily/skyline.cc index b729e5312b..5eedbe2537 100644 --- a/lily/skyline.cc +++ b/lily/skyline.cc @@ -582,6 +582,12 @@ Skyline::to_points () const return out; } +bool +Skyline::is_empty () const +{ + return buildings_.empty (); +} + Skyline_pair::Skyline_pair () : skylines_ (Skyline (DOWN), Skyline (UP)) { @@ -625,6 +631,13 @@ Skyline_pair::merge (Skyline_pair const &other) skylines_[DOWN].merge (other[DOWN]); } +bool +Skyline_pair::is_empty () const +{ + return skylines_[UP].is_empty () + && skylines_[DOWN].is_empty (); +} + Skyline& Skyline_pair::operator [] (Direction d) { diff --git a/lily/slur.cc b/lily/slur.cc index 9ce45e61f5..3b26af8beb 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -356,6 +356,20 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info const &info, e->warning ("Ignoring grob for slur. avoid-slur not set?"); } +MAKE_SCHEME_CALLBACK (Slur, cross_staff, 1) +SCM +Slur::cross_staff (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); + assert (staff); // delete me + extract_grob_set (me, "note-columns", cols); + + for (vsize i = 0; i < cols.size (); i++) + if (Staff_symbol_referencer::get_staff_symbol (cols[i]) != staff) + return SCM_BOOL_T; + return SCM_BOOL_F; +} ADD_INTERFACE (Slur, diff --git a/lily/stem.cc b/lily/stem.cc index 857dfb7d49..09786b750b 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -239,6 +239,10 @@ Stem::pure_height (SCM smob, SCM start, SCM end) if (!is_normal_stem (me)) return ly_interval2scm (iv); + + /* if we are part of a cross-staff beam, return empty */ + if (get_beam (me) && Beam::is_cross_staff (get_beam (me))) + return ly_interval2scm (iv); Real ss = Staff_symbol_referencer::staff_space (me); Real len = scm_to_double (calc_length (smob)) * ss / 2; @@ -1001,6 +1005,20 @@ Stem::beam_multiplicity (Grob *stem) return le; } +bool +Stem::is_cross_staff (Grob *stem) +{ + Grob *beam = unsmob_grob (stem->get_object ("beam")); + return beam && Beam::is_cross_staff (beam); +} + +MAKE_SCHEME_CALLBACK (Stem, cross_staff, 1) +SCM +Stem::cross_staff (SCM smob) +{ + return scm_from_bool (is_cross_staff (unsmob_grob (smob))); +} + /* FIXME: Too many properties */ ADD_INTERFACE (Stem, "The stem represent the graphical stem. " diff --git a/lily/system-scheme.cc b/lily/system-scheme.cc new file mode 100644 index 0000000000..d0b7cfc9b2 --- /dev/null +++ b/lily/system-scheme.cc @@ -0,0 +1,43 @@ +/* + system-scheme.cc -- implement scheme bindings to System + + source file of the GNU LilyPond music typesetter + + (c) 2007 Joe Neeman +*/ + +#include "align-interface.hh" +#include "pointer-group-interface.hh" +#include "system.hh" + + +LY_DEFINE (ly_system_print, "ly:system-print", + 1, 0, 0, (SCM system), + "Draw the system and return the prob containing its " + "stencil.") +{ + Grob *me = unsmob_grob (system); + System *me_system = dynamic_cast (me); + SCM_ASSERT_TYPE (me, system, SCM_ARG1, __FUNCTION__, "grob"); + + return me_system->get_paper_system (); +} + +LY_DEFINE (ly_system_stretch, "ly:system-stretch", + 2, 0, 0, (SCM system, SCM amount_scm), + "Stretch the system vertically by the given amount. " + "This must be called before the system is drawn (for example " + "with ly:system-print).") +{ + Grob *me = unsmob_grob (system); + Real amount = robust_scm2double (amount_scm, 0.0); + + extract_grob_set (me, "elements", elts); + for (vsize i = 0; i < elts.size (); i++) + if (Align_interface::has_interface (elts[i])) + { + Align_interface::stretch (elts[i], amount, Y_AXIS); + break; + } + return SCM_UNDEFINED; +} diff --git a/lily/system.cc b/lily/system.cc index 06ac09e39a..85670f2927 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -114,8 +114,8 @@ fixup_refpoints (vector const &grobs) grobs[i]->fixup_refpoint (); } -SCM -System::get_paper_systems () +void +System::do_break_substitution_and_fixup_refpoints () { for (vsize i = 0; i < all_elements_->size (); i++) { @@ -178,7 +178,20 @@ System::get_paper_systems () if (be_verbose_global) message (_f ("Element count %d.", count + element_count ())); +} + +SCM +System::get_broken_system_grobs () +{ + SCM ret = SCM_EOL; + for (vsize i = 0; i < broken_intos_.size (); i++) + ret = scm_cons (broken_intos_[i]->self_scm (), ret); + return scm_reverse (ret); +} +SCM +System::get_paper_systems () +{ SCM lines = scm_c_make_vector (broken_intos_.size (), SCM_EOL); for (vsize i = 0; i < broken_intos_.size (); i++) { @@ -187,14 +200,6 @@ System::get_paper_systems () System *system = dynamic_cast (broken_intos_[i]); - system->post_processing (); - system->build_skylines (); - if (i > 0) - { - System *prev = dynamic_cast (broken_intos_[i-1]); - Real r = prev->skylines_[DOWN].distance (system->skylines_[UP]); - system->set_property ("skyline-distance", scm_from_double (r)); - } scm_vector_set_x (lines, scm_from_int (i), system->get_paper_system ()); @@ -334,6 +339,9 @@ System::get_paper_system () SCM exprs = SCM_EOL; SCM *tail = &exprs; + post_processing (); + build_skylines (); + vector entries; for (vsize j = 0; j < all_elements_->size (); j++) { @@ -391,25 +399,18 @@ System::get_paper_system () /* information that the page breaker might need */ Grob *right_bound = this->get_bound (RIGHT); - pl->set_property ("skyline-distance", get_property ("skyline-distance")); + pl->set_property ("skylines", skylines_.smobbed_copy ()); pl->set_property ("page-break-permission", right_bound->get_property ("page-break-permission")); pl->set_property ("page-turn-permission", right_bound->get_property ("page-turn-permission")); pl->set_property ("page-break-penalty", right_bound->get_property ("page-break-penalty")); pl->set_property ("page-turn-penalty", right_bound->get_property ("page-turn-penalty")); - if (!scm_is_pair (pl->get_property ("refpoint-Y-extent"))) - { - Interval staff_refpoints; - staff_refpoints.set_empty (); - extract_grob_set (this, "spaceable-staves", staves); - for (vsize i = 0; i < staves.size (); i++) - { - Grob *g = staves[i]; - staff_refpoints.add_point (g->relative_coordinate (this, Y_AXIS)); - } - pl->set_property ("refpoint-Y-extent", ly_interval2scm (staff_refpoints)); - } + Interval staff_refpoints; + extract_grob_set (this, "spaceable-staves", staves); + for (vsize i = 0; i < staves.size (); i++) + staff_refpoints.add_point (staves[i]->relative_coordinate (this, Y_AXIS)); + pl->set_property ("staff-refpoint-extent", ly_interval2scm (staff_refpoints)); pl->set_property ("system-grob", this->self_scm ()); return pl->unprotect (); diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index c53cf3e4fd..14f519ec85 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -31,9 +31,6 @@ protected: void process_acknowledged (); DECLARE_TRANSLATOR_LISTENER (text_script); - DECLARE_ACKNOWLEDGER (stem_tremolo); - DECLARE_ACKNOWLEDGER (stem); - DECLARE_ACKNOWLEDGER (rhythmic_head); }; IMPLEMENT_TRANSLATOR_LISTENER (Text_engraver, text_script); @@ -43,40 +40,6 @@ Text_engraver::listen_text_script (Stream_event *ev) evs_.push_back (ev); } -void -Text_engraver::acknowledge_rhythmic_head (Grob_info inf) -{ - for (vsize i = 0; i < texts_.size (); i++) - { - Grob *t = texts_[i]; - Side_position_interface::add_support (t, inf.grob ()); - - /* - ugh. - */ - if (Side_position_interface::get_axis (t) == X_AXIS - && !t->get_parent (Y_AXIS)) - t->set_parent (inf.grob (), Y_AXIS); - else if (Side_position_interface::get_axis (t) == Y_AXIS - && !t->get_parent (X_AXIS)) - t->set_parent (inf.grob (), X_AXIS); - } -} - -void -Text_engraver::acknowledge_stem (Grob_info inf) -{ - for (vsize i = 0; i < texts_.size (); i++) - Side_position_interface::add_support (texts_[i], inf.grob ()); -} - -void -Text_engraver::acknowledge_stem_tremolo (Grob_info info) -{ - for (vsize i = 0; i < texts_.size (); i++) - Side_position_interface::add_support (texts_[i], info.grob ()); -} - void Text_engraver::process_acknowledged () { @@ -119,9 +82,6 @@ Text_engraver::Text_engraver () { } -ADD_ACKNOWLEDGER (Text_engraver, stem); -ADD_ACKNOWLEDGER (Text_engraver, stem_tremolo); -ADD_ACKNOWLEDGER (Text_engraver, rhythmic_head); ADD_TRANSLATOR (Text_engraver, /* doc */ "Create text-scripts", /* create */ "TextScript", diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index 0bdc95efc0..f7b2576d85 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -22,7 +22,6 @@ public: TRANSLATOR_DECLARATIONS (Text_spanner_engraver); protected: virtual void finalize (); - DECLARE_ACKNOWLEDGER (note_column); DECLARE_TRANSLATOR_LISTENER (text_span); void stop_translation_timestep (); void process_music (); @@ -82,20 +81,6 @@ Text_spanner_engraver::process_music () } } -void -Text_spanner_engraver::acknowledge_note_column (Grob_info info) -{ - Spanner *spans[2] ={span_, finished_}; - for (int i = 0; i < 2; i++) - { - if (spans[i]) - { - Side_position_interface::add_support (spans[i], info.grob ()); - add_bound_item (spans[i], info.grob ()); - } - } -} - void Text_spanner_engraver::typeset_all () { @@ -136,8 +121,6 @@ Text_spanner_engraver::finalize () } } -ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column); - ADD_TRANSLATOR (Text_spanner_engraver, /* doc */ "Create text spanner from an event.", diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc index 6c7e2a024f..38510ae5f0 100644 --- a/lily/tie-formatting-problem.cc +++ b/lily/tie-formatting-problem.cc @@ -128,7 +128,12 @@ Tie_formatting_problem::set_column_chord_outline (vector bounds, x.add_point (stem->relative_coordinate (x_refpoint_, X_AXIS)); x.widen (staff_space / 20); // ugh. Interval y; - y.add_point (Stem::stem_end_position (stem) * staff_space * .5); + Real stem_end_position = + Stem::is_cross_staff (stem) + ? get_grob_direction (stem) * infinity_f + : Stem::stem_end_position (stem) * staff_space * .5; + + y.add_point (stem_end_position); Direction stemdir = get_grob_direction (stem); y.add_point (Stem::head_positions (stem)[-stemdir] diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc index 0100e66b52..d2ef7e1eb8 100644 --- a/lily/trill-spanner-engraver.cc +++ b/lily/trill-spanner-engraver.cc @@ -29,7 +29,6 @@ public: TRANSLATOR_DECLARATIONS (Trill_spanner_engraver); protected: virtual void finalize (); - DECLARE_ACKNOWLEDGER (note_column); DECLARE_TRANSLATOR_LISTENER (trill_span); void stop_translation_timestep (); void process_music (); @@ -88,20 +87,6 @@ Trill_spanner_engraver::process_music () } } -void -Trill_spanner_engraver::acknowledge_note_column (Grob_info info) -{ - Spanner *spans[2] ={span_, finished_}; - for (int i = 0; i < 2; i++) - { - if (spans[i]) - { - Side_position_interface::add_support (spans[i], info.grob ()); - add_bound_item (spans[i], info.grob ()); - } - } -} - void Trill_spanner_engraver::typeset_all () { @@ -141,7 +126,6 @@ Trill_spanner_engraver::finalize () } } -ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column); ADD_TRANSLATOR (Trill_spanner_engraver, /* doc */ "Create trill spanner from an event.", /* create */ diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc index 49018d8adb..fb3cb12fc6 100644 --- a/lily/volta-bracket.cc +++ b/lily/volta-bracket.cc @@ -160,12 +160,6 @@ Volta_bracket_interface::add_bar (Grob *me, Item *b) add_bound_item (dynamic_cast (me), b); } -void -Volta_bracket_interface::add_column (Grob *me, Grob *c) -{ - Side_position_interface::add_support (me, c); -} - ADD_INTERFACE (Volta_bracket_interface, "Volta bracket with number", diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index 604c53c573..d7611535a7 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -33,7 +33,6 @@ protected: DECLARE_END_ACKNOWLEDGER (staff_symbol); DECLARE_ACKNOWLEDGER (staff_symbol); - DECLARE_ACKNOWLEDGER (note_column); DECLARE_ACKNOWLEDGER (bar_line); virtual void finalize (); @@ -175,13 +174,6 @@ Volta_engraver::process_music () } } -void -Volta_engraver::acknowledge_note_column (Grob_info i) -{ - if (volta_span_) - Volta_bracket_interface::add_column (volta_span_, i.grob ()); -} - void Volta_engraver::acknowledge_bar_line (Grob_info i) { @@ -255,7 +247,6 @@ Volta_engraver::stop_translation_timestep () */ ADD_ACKNOWLEDGER (Volta_engraver, staff_symbol); ADD_END_ACKNOWLEDGER (Volta_engraver, staff_symbol); -ADD_ACKNOWLEDGER (Volta_engraver, note_column); ADD_ACKNOWLEDGER (Volta_engraver, bar_line); ADD_TRANSLATOR (Volta_engraver, /* doc */ "Make volta brackets.", diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index aa78dd538f..0f8560c810 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -57,7 +57,6 @@ \consists "Figured_bass_position_engraver" \consists "Script_row_engraver" - \override VerticalAxisGroup #'minimum-Y-extent = #'(-3.5 . 3.5) localKeySignature = #'() createSpacing = ##t ignoreFiguredBassRest = ##t @@ -307,11 +306,8 @@ contained staves are not connected vertically." \description "Just like @code{GrandStaff} but with a forced distance between the staves, so cross staff beaming and slurring can be used." - - \override VerticalAlignment #'forced-distance = #12 - \override VerticalAlignment #'self-alignment-Y = #0 - \consists "Vertical_align_engraver" + \override VerticalAxisGroup #'minimum-Y-extent = #'(-4 . 4) \consists "Instrument_name_engraver" instrumentName = #'() @@ -380,6 +376,7 @@ printing of a single line of lyrics. " \override VerticalAxisGroup #'remove-first = ##t \override VerticalAxisGroup #'remove-empty = ##t + \override VerticalAxisGroup #'keep-fixed-while-stretching = ##t \override SeparationItem #'padding = #0.2 \override InstrumentName #'self-alignment-Y = ##f diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index 7de42c3ae1..7cf4d853f8 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -166,8 +166,6 @@ include @code{medium}, @code{bold}, @code{bold-narrow}, etc.") (font-shape ,symbol? "Select the shape of a font. Choices include @code{upright}, @code{italic}, @code{caps}.") (forced ,boolean? "manually forced accidental") - (forced-distance ,ly:dimension? "A fixed distance between object -reference points in an alignment.") (force-hshift ,number? "This specifies a manual shift for notes in collisions. The unit is the note head width of the first voice note. This is used by @internalsref{note-collision-interface}.") @@ -207,6 +205,7 @@ set beam/slur quant to this position, and print the respective scores.") (inspect-index ,integer? "If debugging is set, set beam/slur configuration to this index, and print the respective scores.") (implicit ,boolean? "Is this an implicit bass figure?") + (keep-fixed-while-stretching ,boolean? "A grob with this property set to true will be fixed relative to the staff above it when systems are stretched.") (keep-inside-line ,boolean? "If set, this column cannot have things sticking into the margin.") (kern ,ly:dimension? "Amount of extra white space to add. For @@ -239,6 +238,8 @@ column is the start of a system.") (long-text ,markup? "Text markup. See @usermanref{Text markup}.") (max-beam-connect ,integer? "Maximum number of beams to connect to beams from this stem. Further beams are typeset as beamlets.") + (max-stretch ,number? "The maximum amount that this vertical-axis-group +can be vertically stretched (for example, in order to better fill a page).") (measure-length ,ly:moment? "Length of a measure. Used in some spacing situations.") (measure-count ,integer? "The number of measures for a @@ -465,6 +466,7 @@ function is to protect objects from being garbage collected.") (arpeggio ,ly:grob? "pointer to arpeggio object.") (beam ,ly:grob? "pointer to the beam, if applicable.") (bracket ,ly:grob? "the bracket for a number.") + (cross-staff ,boolean? "for a beam or a stem, true if we depend on inter-staff spacing") (direction-source ,ly:grob? "in case side-relative-direction is set, which grob to get the direction from .") (dot ,ly:grob? "reference to Dots object.") diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index b7d25131bf..eefc76fe13 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -319,6 +319,7 @@ (beaming . ,ly:beam::calc-beaming) (stencil . ,ly:beam::print) (clip-edges . #t) + (cross-staff . ,ly:beam::cross-staff) (details . ((hint-direction-penalty . 20))) ;; TODO: should be in SLT. @@ -591,7 +592,6 @@ (Y-offset . ,ly:side-position-interface::y-aligned-side) (staff-padding . 0.1) (padding . 0.6) - (avoid-slur . outside) (slur-padding . 0.3) (minimum-space . 1.2) (direction . ,DOWN) @@ -620,7 +620,6 @@ (font-series . bold) (font-encoding . fetaDynamic) (font-shape . italic) - (avoid-slur . around) (extra-spacing-width . (+inf.0 . -inf.0)) (outside-staff-priority . 250) (meta . ((class . Item) @@ -1257,6 +1256,7 @@ (minimum-length . 1.5) (height-limit . 2.0) (ratio . 0.333) + (cross-staff . ,ly:slur::cross-staff) (meta . ((class . Spanner) (interfaces . (slur-interface)))))) @@ -1455,6 +1455,7 @@ (height-limit . 2.0) (ratio . 0.25) (avoid-slur . inside) + (cross-staff . ,ly:slur::cross-staff) (meta . ((class . Spanner) (interfaces . (slur-interface)))))) @@ -1575,6 +1576,7 @@ (Y-extent . ,ly:stem::height) (length . ,ly:stem::calc-length) (thickness . 1.3) + (cross-staff . ,ly:stem::cross-staff) (details . ( ;; 3.5 (or 3 measured from note head) is standard length @@ -1702,6 +1704,7 @@ (X-extent . ,ly:axis-group-interface::width) (Y-extent . ,ly:axis-group-interface::height) (skylines . ,ly:axis-group-interface::calc-skylines) + (max-stretch . ,ly:axis-group-interface::calc-max-stretch) (skyline-horizontal-padding . 1.0) (meta . ((class . System) (interfaces . (system-interface @@ -2052,6 +2055,7 @@ (stacking-dir . -1) (padding . 0.5) (skylines . ,ly:axis-group-interface::combine-skylines) + (max-stretch . ,ly:align-interface::calc-max-stretch) (meta . ((class . Spanner) (object-callbacks . ((Y-common . ,ly:axis-group-interface::calc-y-common))) (interfaces . (align-interface @@ -2062,7 +2066,8 @@ (Y-offset . ,ly:hara-kiri-group-spanner::force-hara-kiri-callback) (Y-extent . ,ly:hara-kiri-group-spanner::y-extent) (X-extent . ,ly:axis-group-interface::width) - (skylines . ,ly:axis-group-interface::calc-skylines); + (skylines . ,ly:axis-group-interface::calc-skylines) + (max-stretch . ,ly:axis-group-interface::calc-max-stretch) (meta . ((class . Spanner) (object-callbacks . ((X-common . ,ly:axis-group-interface::calc-x-common))) (interfaces . (axis-group-interface diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm index 264d380548..02583858e4 100644 --- a/scm/layout-page-layout.scm +++ b/scm/layout-page-layout.scm @@ -15,14 +15,100 @@ #:use-module (lily) #:export (post-process-pages optimal-page-breaks make-page-from-systems page-breaking-wrapper + stretchable-line? ; delete me ;; utilities for writing custom page breaking functions line-height line-next-space line-next-padding line-minimum-distance line-ideal-distance first-line-position line-ideal-relative-position line-minimum-relative-position - line-minimum-position-on-page stretchable-line? + line-minimum-position-on-page page-maximum-space-to-fill page-maximum-space-left space-systems)) +; this is for 2-pass spacing. Delete me. +(define (stretchable-line? line) + "Say whether a system can be stretched." + (not (or (ly:prob-property? line 'is-title) + (let ((system-extent (paper-system-staff-extents line))) + (= (interval-start system-extent) + (interval-end system-extent)))))) + +(define (stretch-and-draw-page paper-book systems page-number ragged last) + (define (max-stretch sys) + (if (ly:grob? sys) + (ly:grob-property sys 'max-stretch) + 0.0)) + + (define (stretchable? sys) + (and (ly:grob? sys) + (> (max-stretch sys) 0.0))) + + (define (height-estimate sys) + (interval-length + (if (ly:grob? sys) + (ly:grob-property sys 'pure-Y-extent) + (paper-system-extent sys Y)))) + + (define (print-system sys) + (if (ly:grob? sys) + (ly:system-print sys) + sys)) + + (define (set-line-stretch! sorted-lines rest-height space-left) + (if (not (null? sorted-lines)) + (let* ((line (first sorted-lines)) + (height (height-estimate line)) + (stretch (min (max-stretch line) + (if (positive? rest-height) + (/ (* height space-left) rest-height) + 0.0)))) + (if (stretchable? line) + (ly:system-stretch line stretch)) + (set-line-stretch! (cdr sorted-lines) + (if (stretchable? line) + (- rest-height height) + rest-height) + (- space-left stretch))))) + + (let* ((page (make-page paper-book + 'page-number page-number + 'is-last last)) + (paper (ly:paper-book-paper paper-book)) + (height (page-printable-height page)) + ; there is a certain amount of impreciseness going on here: + ; the system heights are estimated, we aren't using skyline distances + ; yet, etc. If we overstretch because of underestimation, the result + ; is very bad. So we stick in some extra space, just to be sure. + (buffer (/ height 10.0)) + (total-system-height (apply + (map height-estimate systems))) + (height-left (- height total-system-height buffer))) + + (if (not ragged) + (set-line-stretch! (sort systems + (lambda (s1 s2) + (< (height-estimate s1) + (height-estimate s2)))) + (apply + (map height-estimate + (filter stretchable? systems))) + (- (page-printable-height page) + total-system-height))) + + (let* ((lines (map print-system systems)) + (posns (if (null? lines) + (list) + (let* ((paper (ly:paper-book-paper paper-book)) + (space-to-fill (page-maximum-space-to-fill + page lines paper)) + (spacing (space-systems space-to-fill lines ragged paper #f))) + (if (and (> (length lines) 1) + (or (not (car spacing)) (inf? (car spacing)))) + (begin + (ly:warning (_ "Can't fit systems on page -- ignoring between-system-padding")) + (cdr (space-systems space-to-fill lines ragged paper #t))) + (cdr spacing)))))) + (page-set-property! page 'lines lines) + (page-set-property! page 'configuration posns) + page))) + (define (page-breaking-wrapper paper-book) "Compute line and page breaks by calling the page-breaking paper variable, then performs the post process function using the page-post-process paper @@ -47,9 +133,13 @@ ;;; ;;; Utilities for computing line distances and positions ;;; +(define (line-extent line) + "Return the extent of the line (its lowest and highest Y-coordinates)." + (paper-system-extent line Y)) + (define (line-height line) "Return the system height, that is the length of its vertical extent." - (interval-length (paper-system-extent line Y))) + (interval-length (line-extent line))) (define (line-next-space line next-line layout) "Return space to use between `line' and `next-line'. @@ -79,10 +169,15 @@ "Minimum distance between `line' reference position and `next-line' reference position. If next-line is #f, return #f." (and next-line - (let ((non-skyline-distance (- (interval-end (paper-system-extent next-line Y)) - (interval-start (paper-system-extent line Y))))) - (max 0 (+ (ly:prob-property next-line 'skyline-distance non-skyline-distance) - (if ignore-padding 0 (line-next-padding line next-line layout))))))) + (let ((padding (if ignore-padding + 0 + (line-next-padding line next-line layout)))) + (if (or (ly:grob? line) (ly:grob? next-line)) + (max 0 (+ padding + (- (interval-start (line-extent line)) + (interval-end (line-extent next-line))))) + (max 0 (+ padding + (ly:paper-system-minimum-distance line next-line))))))) (define (line-ideal-distance line next-line layout ignore-padding) "Ideal distance between `line' reference position and `next-line' @@ -100,7 +195,7 @@ 0.0 (ly:output-def-lookup layout 'page-top-space)) (interval-end (paper-system-staff-extents line))) - (interval-end (paper-system-extent line Y)))) + (interval-end (line-extent line)))) (define (line-ideal-relative-position line prev-line layout ignore-padding) "Return ideal position of `line', relative to `prev-line' position. @@ -129,18 +224,11 @@ (position (+ (line-minimum-relative-position line prev-line layout #f) (if prev-line prev-position 0.0))) (bottom-position (- position - (interval-start (paper-system-extent line Y))))) + (interval-start (line-extent line))))) (and (or (not prev-line) (< bottom-position (page-printable-height page))) position))) -(define (stretchable-line? line) - "Say whether a system can be stretched." - (not (or (ly:prob-property? line 'is-title) - (let ((system-extent (paper-system-staff-extents line))) - (= (interval-start system-extent) - (interval-end system-extent)))))) - (define (page-maximum-space-to-fill page lines paper) "Return the space between the first line top position and the last line bottom position. This constitutes the maximum space to fill on `page' @@ -150,7 +238,7 @@ (first-line-position (first lines) paper) (ly:prob-property last-line 'bottom-space 0.0) - (- (interval-start (paper-system-extent last-line Y)))))) + (- (interval-start (line-extent last-line)))))) (define (page-maximum-space-left page) (let ((paper (ly:paper-book-paper (page-property page 'paper-book)))) @@ -166,7 +254,7 @@ (and position (- (page-printable-height page) (- position - (interval-start (paper-system-extent line Y))))) + (interval-start (line-extent line))))) (bottom-position (cdr lines) line position))))))) ;;; @@ -202,26 +290,6 @@ (+ y topskip))) (cdr space-result))))) -(define (make-page-from-systems paper-book lines page-number ragged last) - "Return a new page, filled with `lines'." - (let* ((page (make-page paper-book - 'lines lines - 'page-number page-number - 'is-last last)) - (posns (if (null? lines) - (list) - (let* ((paper (ly:paper-book-paper paper-book)) - (space-to-fill (page-maximum-space-to-fill - page lines paper)) - (spacing (space-systems space-to-fill lines ragged paper #f))) - (if (and (> (length lines) 1) - (or (not (car spacing)) (inf? (car spacing)))) - (begin - (ly:warning (_ "Can't fit systems on page -- ignoring between-system-padding")) - (cdr (space-systems space-to-fill lines ragged paper #t))) - (cdr spacing)))))) - (page-set-property! page 'configuration posns) - page)) ;;; ;;; Page breaking function