X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fstencil.scm;h=536425b9c680ce5a44b0c7bcbe9f8924d94142fd;hb=9d443bdf00804696a1c48bb3c08fe75543044ad9;hp=baa8fe8ccd626685b0f67e7e4da313a69fc0d1a8;hpb=5bc67e225f0f7f25c658013c0757a36ccdb069a4;p=lilypond.git diff --git a/scm/stencil.scm b/scm/stencil.scm index baa8fe8ccd..536425b9c6 100644 --- a/scm/stencil.scm +++ b/scm/stencil.scm @@ -134,11 +134,16 @@ encloses the contents. (let* ((xext (interval-widen (ly:stencil-extent stencil 0) padding)) (yext (interval-widen (ly:stencil-extent stencil 1) padding)) + (min-ext (min (-(cdr xext) (car xext)) (-(cdr yext) (car yext)))) + (ideal-blot (min blot (/ min-ext 2))) + (ideal-thickness (min thickness (/ min-ext 2))) (outer (ly:round-filled-box - (interval-widen xext thickness) (interval-widen yext thickness) blot)) - (inner (ly:make-stencil (list 'color (x11-color 'white) (ly:stencil-expr (ly:round-filled-box - (cons (+ (car xext) thickness) (- (cdr xext) thickness)) - (cons (+ (car yext) thickness) (- (cdr yext) thickness)) (* blot 0.8))))))) + (interval-widen xext ideal-thickness) + (interval-widen yext ideal-thickness) + ideal-blot)) + (inner (ly:make-stencil (list 'color (x11-color 'white) + (ly:stencil-expr (ly:round-filled-box + xext yext (- ideal-blot ideal-thickness))))))) (set! stencil (ly:stencil-add outer inner)) stencil))