fix unwanted capo indication in fret diagrams

issue 4644

Adding a condition to do 1+ for capo-fret only if open strings are
absent and capo-fret is not zero

diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index 3b0990cf415109a0d52ddb9dfedd05c0a9b802fb..45db612b9658b054a4ecf9a845d87f3bf1be9f7a 100644 (file)
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -281,7 +281,8 @@ with magnification @var{mag} of the string @var{text}."
                 (cons minfret
                       (let ((upfret (- (+ minfret my-fret-count) 1)))
                         (if (> maxfret upfret) maxfret upfret)))))
-      (set! capo-fret (1+ (- capo-fret minfret)))
+      (if (not (zero? (apply min capo-fret (map cadr dot-list))))
+          (set! capo-fret (1+ (- capo-fret minfret))))
       ;; subtract fret from dots
       (set! dot-list (subtract-base-fret (- (car fret-range) 1) dot-list)))
     (acons 'fret-range fret-range