From dd87abcb392b82031b1acb23de381b07b448b8b0 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Sat, 23 Feb 2008 20:38:45 +0100 Subject: [PATCH] Fine-tune alignment for TrillSpanners. Allow line spanners to specify anchor alignments for both endpoints. --- lily/line-spanner.cc | 31 +++++++++++++++++++------------ scm/define-grobs.scm | 3 ++- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 7066c3de25..e9f18461a1 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -254,6 +254,7 @@ Line_spanner::print (SCM smob) Drul_array gaps (0, 0); Drul_array arrows (0, 0); + Drul_array anchor_align (0, 0); Drul_array stencils (0,0); Drul_array common_y (0, 0); do @@ -262,6 +263,8 @@ Line_spanner::print (SCM smob) bounds[d], SCM_BOOL_F), 0.0); arrows[d] = to_boolean (ly_assoc_get (ly_symbol2scm ("arrow"), bounds[d], SCM_BOOL_F)); + anchor_align[d] = robust_scm2double (ly_assoc_get (ly_symbol2scm ("anchor-alignment"), + bounds[d], SCM_BOOL_F), LEFT); stencils[d] = unsmob_stencil (ly_assoc_get (ly_symbol2scm ("stencil"), bounds[d], SCM_BOOL_F)); common_y[d] = unsmob_grob (ly_assoc_get (ly_symbol2scm ("common-Y"), @@ -290,22 +293,26 @@ Line_spanner::print (SCM smob) if (stencils[d]) { - Stencil s = stencils[d]->translated (span_points[d]); - SCM align = ly_assoc_get (ly_symbol2scm ("stencil-align-dir-y"), - bounds[d], SCM_BOOL_F); - SCM off = ly_assoc_get (ly_symbol2scm ("stencil-offset"), - bounds[d], SCM_BOOL_F); + Interval ext = stencils[d]->extent (X_AXIS); + Real anchor = ext.linear_combination (anchor_align[d]) - ext[LEFT]; + span_points[d][X_AXIS] -= anchor; - if (scm_is_number (align)) - s.align_to (Y_AXIS, scm_to_double (align)); + Stencil s = stencils[d]->translated (span_points[d]); + SCM align = ly_assoc_get (ly_symbol2scm ("stencil-align-dir-y"), + bounds[d], SCM_BOOL_F); + SCM off = ly_assoc_get (ly_symbol2scm ("stencil-offset"), + bounds[d], SCM_BOOL_F); - /* - todo: should use font-size. + if (scm_is_number (align)) + s.align_to (Y_AXIS, scm_to_double (align)); + + /* + todo: should use font-size. */ - if (is_number_pair (off)) - s.translate (ly_scm2offset (off)); + if (is_number_pair (off)) + s.translate (ly_scm2offset (off)); - line.add_stencil (s); + line.add_stencil (s); } } while (flip (&d) != LEFT); diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 2ef83b3d30..93e4a1ba4c 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1951,7 +1951,8 @@ (Y . 0) (stencil-offset . (-0.5 . 0)) (padding . 1.5) - (attach-dir . ,LEFT) + (attach-dir . ,CENTER) + (anchor-alignment . ,CENTER) )) (left-broken . ((end-on-note . #t))) (right . ((Y . 0))) -- 2.39.2