\fret-diagram-verbose with capo > 1

Issue 2961

Even if all dots and barrés fit in the default fret-range, the fret-range
will have to be shifted if capo-fret > 1 in order to make sure that the
capo will be the lowest fret in the fret diagram.

diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index 83c4ee6b7addef25458262764112fb01379a640e..bac631a63eff84f8927d9a7c407fc7060bffeca1 100644 (file)
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -229,7 +229,7 @@ with magnification @var{mag} of the string @var{text}."
               (if (> fretval maxfret) (set! maxfret fretval))
               (if (< fretval minfret) (set! minfret fretval))
               (updatemax (cdr fret-list)))))
-      (if (> maxfret my-fret-count)
+      (if (or (> maxfret my-fret-count) (> capo-fret 1))
           (set! fret-range
                 (cons minfret
                       (let ((upfret (- (+ minfret my-fret-count) 1)))