From: Torsten Hämmerle <torsten.haemmerle@web.de>
Date: Sat, 29 Dec 2012 16:10:43 +0000 (+0000)
Subject: \fret-diagram-verbose with capo > 1
X-Git-Tag: release/2.17.10-1~42
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f29be3cf2d0571eb281a3ba7761bcc993fd024e6;p=lilypond.git

\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 83c4ee6b7a..bac631a63e 100644
--- 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)))