From 0e7a8fddbf5e23b7943b39c851aeae124a5f61c3 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 1 Dec 2006 16:48:47 +0100 Subject: [PATCH] Look at stem extents iso. head extents in 2nd loop for accidental placement. Fixes #20. (cherry picked from c16791d9bf61125932e672ff6e99698508b78785 commit) --- input/regression/accidental-collision.ly | 10 ++++++++++ lily/accidental-placement.cc | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 input/regression/accidental-collision.ly diff --git a/input/regression/accidental-collision.ly b/input/regression/accidental-collision.ly new file mode 100644 index 0000000000..eeb03d5981 --- /dev/null +++ b/input/regression/accidental-collision.ly @@ -0,0 +1,10 @@ +\header { + texidoc = "accidentals avoid stems of other notes too." + } + +\version "2.10.1" + +\paper { + ragged-right = ##t + } +\new Staff \relative <> diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index 02f0c522a2..2aea505679 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -364,8 +364,8 @@ Accidental_placement::calc_positioning_done (SCM smob) { int very_large = INT_MAX; - Box b (heads[i]->extent (common[X_AXIS], X_AXIS), - heads[i]->pure_height (common[Y_AXIS], 0, very_large)); + Box b (stems[i]->extent (common[X_AXIS], X_AXIS), + stems[i]->pure_height (common[Y_AXIS], 0, very_large)); insert_extent_into_skyline (&head_skyline, b, Y_AXIS, LEFT); } -- 2.39.5