From 11666bd0847dc1b53de0c558b6d47692c8b5c54a Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Thu, 26 Dec 2013 14:52:01 -0800 Subject: [PATCH] Revert "Prevents dynamics from colliding with cross-staff stems." This reverts commit 3bcfd69d91f52f70598f73719fbed7aa6eea8ad3. Conflicts: input/regression/dynamics-avoid-cross-staff-stem.ly lily/include/interval-minefield.hh lily/include/self-alignment-interface.hh lily/interval-minefield.cc lily/new-dynamic-engraver.cc lily/self-alignment-interface.cc scm/define-grob-properties.scm scm/define-grobs.scm scm/output-lib.scm --- .../dynamics-avoid-cross-staff-stem.ly | 19 ------------------- lily/dynamic-engraver.cc | 3 --- lily/self-alignment-interface.cc | 8 -------- scm/define-grob-properties.scm | 11 ----------- scm/define-grobs.scm | 2 -- 5 files changed, 43 deletions(-) delete mode 100644 input/regression/dynamics-avoid-cross-staff-stem.ly diff --git a/input/regression/dynamics-avoid-cross-staff-stem.ly b/input/regression/dynamics-avoid-cross-staff-stem.ly deleted file mode 100644 index 078d876ad7..0000000000 --- a/input/regression/dynamics-avoid-cross-staff-stem.ly +++ /dev/null @@ -1,19 +0,0 @@ -\version "2.17.10" - -\header { - texidoc = "Dynamics are correctly nested over/under cross staff stems. -They are, however, not yet factored into horizontal spacing - the fff -collides with other grobs. -" -} - -\new GrandStaff << - \new Staff = "PnRH" { - \relative g { - \stemDown gis8 \p [ \change Staff = "PnLH" \stemUp a, \fff ] - a8 \p [ \change Staff = "PnRH" \stemDown gis'8 \fff ] - \change Staff = "PnRH" r4 - } - } - \new Staff = "PnLH" { \clef "F" { s2 r4 } } ->> diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index a4d4e06f5a..4c4f613898 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -260,7 +260,6 @@ Dynamic_engraver::acknowledge_note_column (Grob_info info) if (script_ && !script_->get_parent (X_AXIS)) { extract_grob_set (info.grob (), "note-heads", heads); - Grob *stem = unsmob_grob (info.grob ()->get_object ("stem")); /* Spacing constraints may require dynamics to be aligned on rests, so check for a rest if this note column has no note heads. @@ -273,8 +272,6 @@ Dynamic_engraver::acknowledge_note_column (Grob_info info) script_->set_parent (x_parent, X_AXIS); Self_alignment_interface::set_center_parent (script_, X_AXIS); } - if (stem) - Pointer_group_interface::add_grob (script_, ly_symbol2scm ("potential-X-colliding-grobs"), stem); } if (current_spanner_ && !current_spanner_->get_bound (LEFT)) diff --git a/lily/self-alignment-interface.cc b/lily/self-alignment-interface.cc index 1b4e421b70..54d4a8ec6f 100644 --- a/lily/self-alignment-interface.cc +++ b/lily/self-alignment-interface.cc @@ -19,10 +19,7 @@ #include "self-alignment-interface.hh" -#include "directional-element-interface.hh" #include "grob.hh" -#include "grob-array.hh" -#include "interval-minefield.hh" #include "note-column.hh" #include "paper-column.hh" #include "pointer-group-interface.hh" @@ -199,11 +196,6 @@ ADD_INTERFACE (Self_alignment_interface, "@end table\n", /* properties */ - "collision-bias " - "collision-padding " - "potential-X-colliding-grobs " "self-alignment-X " "self-alignment-Y " - "X-colliding-grobs " - "Y-colliding-grobs " ); diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index 6e7e8ad955..e87ae779ab 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -179,13 +179,8 @@ hairpins (al/@/del niente).") edges of beams?") (collapse-height ,ly:dimension? "Minimum height of system start delimiter. If equal or smaller, the bracket/@/brace/@/line is removed.") - (collision-bias ,number? "Number determining how much to favor the -left (negative) or right (positive). Larger absolute values in either -direction will push a collision in this direction.") (collision-interfaces ,list? "A list of interfaces for which automatic beam-collision resolution is run.") - (collision-padding ,number? "Amount of padding to apply after -a collision is detected via the self-alignment-interface.") (collision-voice-only ,boolean? "Does automatic beam collsion apply only to the voice in which the beam was created?") (color ,color? "The color of this grob.") @@ -1148,8 +1143,6 @@ pure-from-neighbor-interface to determine various grob heights.") (note-heads ,ly:grob-array? "An array of note head grobs.") (pedal-text ,ly:grob? "A pointer to the text of a mixed-style piano pedal.") - (potential-X-colliding-grobs ,ly:grob-array? "Grobs that can potentially -collide with a self-aligned grob on the X-axis.") (pure-relevant-grobs ,ly:grob-array? "All the grobs (items and spanners) that are relevant for finding the @code{pure-Y-extent}") (pure-relevant-items ,ly:grob-array? "A subset of elements that are @@ -1196,10 +1189,6 @@ results, use @code{LEFT} and @code{RIGHT}.") (vertical-skyline-elements ,ly:grob-array? "An array of grobs used to create vertical skylines.") - (X-colliding-grobs ,ly:grob-array? "Grobs that can collide -with a self-aligned grob on the X-axis.") - (Y-colliding-grobs ,ly:grob-array? "Grobs that can collide -with a self-aligned grob on the Y-axis.") (X-common ,ly:grob? "Common reference point for axis group.") (Y-common ,ly:grob? "See @code{X-common}.") diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 82c787cdac..5720838880 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -846,8 +846,6 @@ ;; todo. - (collision-bias . -2.0) - (collision-padding . 0.5) (direction . ,ly:script-interface::calc-direction) (extra-spacing-width . (+inf.0 . -inf.0)) (font-encoding . fetaText) -- 2.39.2