From: Thomas Morley <thomasmorley65@gmail.com>
Date: Sun, 25 Oct 2015 20:43:19 +0000 (+0100)
Subject: fix unwanted capo indication in fret diagrams
X-Git-Tag: release/2.19.31-1~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ab821c832529d77acd0a7d31772f0e8b1de251d6;p=lilypond.git

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 3b0990cf41..45db612b96 100644
--- 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