fix unwanted capo indication in fret diagrams (issue 272150043 by address@hidden)

[thomasmorley65]

Reviewers: ,

Message:
please review

Description:
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

Please review this at https://codereview.appspot.com/272150043/

Affected files (+3, -1 lines):
  M scm/fret-diagrams.scm


Index: scm/fret-diagrams.scm
diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index  
3b0990cf415109a0d52ddb9dfedd05c0a9b802fb..ce96752b6378088ec041b13530e32c409f347c3e  
100644
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -281,7 +281,9 @@ 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 (and (zero? (apply min (map cadr dot-list)))
+                    (zero? capo-fret)))
+          (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