Fix #573.

[lilypond.git] / scm / fret-diagrams.scm

diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index 80bf4fc22a7c4e4d3df97f32aabb7cfa4f9add7e..6378f7d12f4b53a37826f3f2b6bd33d6a6193ba5 100644 (file)
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -147,7 +147,7 @@ fret & string spacing by @var{size}. Orientation is given by @var{orientation}"
          (y1 (- half-thick))
          (y2 (+ top-fret-thick half-thick))
          (x-extent (cons (- x1) x2))
-         (y-extent (cons 0 y2)))
+         (y-extent (cons sth top-fret-thick)))
     (if (eq? orientation 'normal)
         (ly:make-stencil (list 'round-filled-box x1 x2 y1 y2 sth)
                          x-extent y-extent)
@@ -366,7 +366,7 @@ Line thickness is given by @var{th}, fret & string spacing by
                  (make-bezier-sandwich-list
                   (* size barre-start-string-coordinate)
                   (* size barre-end-string-coordinate)
-                  (* size (+ 1 (- top-fret fret) barre-fret-coordinate))
+                   (* size (+ 2 (- top-fret (+ low-fret barre-fret-coordinate))))
                   (* size bezier-height)
                   (* size bezier-thick)
                   orientation)
@@ -435,12 +435,12 @@ Line thickness is given by @var{th}, fret & string spacing by
         (label-text
          (cond
            ((equal? number-type 'roman-lower)
-           (fancy-format #f "~(~:@r~)" base-fret))
+           (fancy-format #f "~(~@r~)" base-fret))
            ((equal? number-type 'roman-upper)
-           (fancy-format #f "~:@r" base-fret))
+           (fancy-format #f "~@r" base-fret))
            ((equal? 'arabic number-type)
            (fancy-format #f "~d" base-fret))
-           (else (fancy-format #f "~(~:@r~)" base-fret)))))
+           (else (fancy-format #f "~(~@r~)" base-fret)))))
     (if (eq? orientation 'normal)
        (ly:stencil-translate-axis
         (sans-serif-stencil layout props (* size label-font-mag) label-text)