X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ffret-diagrams.scm;h=3b0990cf415109a0d52ddb9dfedd05c0a9b802fb;hb=7b5ff8ac30bccd7c31954d6fffeb0cf333fd9d4f;hp=85cfbb9b3679c0a01677e288c9a4d28e6f0c44f1;hpb=24f655ac48ac3703394f1a43c0e2803824eb1b08;p=lilypond.git diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm index 85cfbb9b36..3b0990cf41 100644 --- a/scm/fret-diagrams.scm +++ b/scm/fret-diagrams.scm @@ -405,17 +405,17 @@ baseline at fret coordinate @var{base}, a height of bottom-control-point-height cp-right-width))) ;; order of bezier control points is: - ;; left cp low, right cp low, right end low, left end low - ;; right cp high, left cp high, left end high, right end high. + ;; left cp low, left cp low, right cp low, right end low + ;; right cp high, left cp high - (list left-lower-control-point + (list + left-end-point + left-lower-control-point right-lower-control-point right-end-point - left-end-point + right-upper-control-point - left-upper-control-point - left-end-point - right-end-point))) + left-upper-control-point))) (define (draw-strings) "Draw the string lines for a fret diagram with @@ -564,24 +564,10 @@ fret-diagram overall parameters." (* size end-string-coordinate) (* size fret-coordinate) (* size bezier-height) - (* size bezier-thick))) - (box-lower-left - (stencil-coordinates - (+ (* size fret-coordinate) half-thickness) - (- (* size start-string-coordinate) half-thickness))) - (box-upper-right - (stencil-coordinates - (- (* size fret-coordinate) - (* size bezier-height) - half-thickness) - (+ (* size end-string-coordinate) half-thickness))) - (x-extent (cons (car box-lower-left) (car box-upper-right))) - (y-extent (cons (cdr box-lower-left) (cdr box-upper-right)))) + (* size bezier-thick)))) (make-bezier-sandwich-stencil bezier-list - (* size bezier-thick) - x-extent - y-extent))) + (* size bezier-thick)))) (define (draw-dots dot-list) "Make dots for fret diagram."