From: Thomas Morley <thomasmorley65@gmail.com>
Date: Fri, 12 Jun 2015 21:16:47 +0000 (-0500)
Subject: fret-diagram with barre returns weird output
X-Git-Tag: release/2.19.22-1~52
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=23c84a80ca6a678e9cb55c6084688f488cc92cd9;p=lilypond.git

fret-diagram with barre returns weird output

issue 4428

take the fret-settings from barre into account
---

diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index f8ccb59a11..5b6580d650 100644
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -261,6 +261,9 @@ 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)))))
+      ;; take frets of 'barre-settings into account
+      (if (not (null? barre-list))
+          (set! minfret (apply min minfret (map last barre-list))))
       (if (or (> maxfret my-fret-count) (> capo-fret 1))
           (set! fret-range
                 (cons minfret