From 3f611b64f3488269b1a2bfe7e511ce4d4677c0f6 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Wed, 27 Jun 2007 06:38:27 +0300 Subject: [PATCH] reinstate separating-group-spanner --- input/regression/spacing-bar-arpeggio.ly | 2 +- lily/separating-group-spanner.cc | 101 +++++++++++++++++++++++ lily/separating-line-group-engraver.cc | 39 +++++++++ scm/define-grobs.scm | 8 ++ scm/safe-lily.scm | 1 + 5 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 lily/separating-group-spanner.cc diff --git a/input/regression/spacing-bar-arpeggio.ly b/input/regression/spacing-bar-arpeggio.ly index fd84be5a9b..8318b5f24a 100644 --- a/input/regression/spacing-bar-arpeggio.ly +++ b/input/regression/spacing-bar-arpeggio.ly @@ -12,5 +12,5 @@ \override Score.NonMusicalPaperColumn #'layer = #1 s1 - 1\arpeggio + 2\arpeggio } diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc new file mode 100644 index 0000000000..7de9341e39 --- /dev/null +++ b/lily/separating-group-spanner.cc @@ -0,0 +1,101 @@ +/* + separating-group-spanner.cc -- implement Separating_group_spanner + + source file of the GNU LilyPond music typesetter + + (c) 1998--2007 Han-Wen Nienhuys +*/ + +#include "separating-group-spanner.hh" + +#include "separation-item.hh" +#include "paper-column.hh" +#include "output-def.hh" +#include "dimensions.hh" +#include "pointer-group-interface.hh" +#include "moment.hh" + +void +Separating_group_spanner::find_rods (Item *r, + vector const &separators, + vsize idx, + Real padding) +{ + + /* + This is an inner loop: look for the first normal (unbroken) Left + grob. This looks like an inner loop (ie. quadratic total), but in + most cases, the interesting L will just be the first entry of + NEXT, making it linear in most of the cases. + */ + for (; idx != VPOS; idx--) + { + Item *l = dynamic_cast (separators[idx]); + Item *lb = l->find_prebroken_piece (RIGHT); + + if (lb) + { + Separation_item::set_distance (Drul_array (lb, r), padding); + } + + if (Separation_item::set_distance (Drul_array (l, r), padding) + /* + This check is because grace notes are set very tight, and + the accidentals of main note may stick out so far to cover + a barline preceding the grace note. + */ + && spanned_time_interval (l, r).length ().main_part_ > Rational (0)) + break; + + /* + this grob doesn't cause a constraint. We look further until we + find one that does. + */ + } +} + +MAKE_SCHEME_CALLBACK (Separating_group_spanner, set_spacing_rods, 1); +SCM +Separating_group_spanner::set_spacing_rods (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + /* + Ugh: padding is added doubly, also for SeparationItem + */ + Real padding = robust_scm2double (me->get_property ("padding"), 0.1); + + extract_grob_set (me, "elements", elts); + for (vsize i = elts.size (); i-- > 1;) + { + Item *r = dynamic_cast (elts[i]); + if (!r) + continue; + + if (Separation_item::width (r).is_empty ()) + continue; + + Item *rb + = dynamic_cast (r->find_prebroken_piece (LEFT)); + + find_rods (r, elts, i - 1, padding); + if (rb) + find_rods (rb, elts, i - 1, padding); + } + + return SCM_UNSPECIFIED; +} + +void +Separating_group_spanner::add_spacing_unit (Grob *me, Item *i) +{ + Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("elements"), i); +} + +ADD_INTERFACE (Separating_group_spanner, + "A spanner that calculates spacing constraints (\"rods\") " + "using the @code{separation-item-interface} grobs in @code{elements}.", + + /* properties */ + "elements " + "padding "); diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 7a2beb7d5f..f493840d95 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -53,7 +53,11 @@ protected: Spacings current_spacings_; Spacings last_spacings_; + Spanner *sep_span_; + DECLARE_ACKNOWLEDGER (item); + void process_music (); + virtual void finalize (); void stop_translation_timestep (); void start_translation_timestep (); public: @@ -62,10 +66,38 @@ public: Separating_line_group_engraver::Separating_line_group_engraver () { + sep_span_ = 0; break_item_ = 0; musical_item_ = 0; } +void +Separating_line_group_engraver::process_music () +{ + if (!sep_span_) + { + sep_span_ = make_spanner ("SeparatingGroupSpanner", SCM_EOL); + + sep_span_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn"))); + } +} +void +Separating_line_group_engraver::finalize () +{ + if (!sep_span_) + return; + + SCM ccol = get_property ("currentCommandColumn"); + Grob *column = unsmob_grob (ccol); + + sep_span_->set_bound (RIGHT, unsmob_grob (ccol)); + sep_span_ = 0; + + if (last_spacings_.staff_spacing_ + && last_spacings_.staff_spacing_->get_column () == column) + last_spacings_.staff_spacing_->suicide (); +} + void Separating_line_group_engraver::acknowledge_item (Grob_info i) { @@ -144,6 +176,9 @@ Separating_line_group_engraver::start_translation_timestep () void Separating_line_group_engraver::stop_translation_timestep () { + if (break_item_) + Separating_group_spanner::add_spacing_unit (sep_span_, break_item_); + if (Item *sp = current_spacings_.staff_spacing_) { /* @@ -160,6 +195,9 @@ Separating_line_group_engraver::stop_translation_timestep () current_spacings_.clear (); + if (musical_item_) + Separating_group_spanner::add_spacing_unit (sep_span_, musical_item_); + musical_item_ = 0; } @@ -169,6 +207,7 @@ ADD_TRANSLATOR (Separating_line_group_engraver, /* create */ "SeparationItem " + "SeparatingGroupSpanner " "StaffSpacing", /* read */ "createSpacing", /* write */ "breakableSeparationItem"); diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index abd2a7c9de..7f9a068c2b 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1448,6 +1448,14 @@ (interfaces . ( separation-item-interface)))))) + (SeparatingGroupSpanner + . ( + (springs-and-rods . ,ly:separating-group-spanner::set-spacing-rods) + (meta . ((class . Spanner) + (interfaces . (only-prebreak-interface + + separating-group-spanner-interface)))))) + (Slur . ((details . ,default-slur-details) (control-points . ,ly:slur::calc-control-points) diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm index 8309ec390f..12657af88a 100644 --- a/scm/safe-lily.scm +++ b/scm/safe-lily.scm @@ -177,6 +177,7 @@ ly:piano-pedal-bracket::print ly:rest::print ly:script-interface::print + ly:separating-group-spanner::set-spacing-rods ly:slur::height ly:slur::print ly:spacing-spanner::set-springs -- 2.39.2