Add 'none to barre-type and update documentation

[lilypond.git] / scm / fret-diagrams.scm

diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index 84d94538287096cb9ec56af1a434249e8b3a0a2b..fb986f91b990f3589d48d05f883017aa2a559220 100644 (file)
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -548,11 +548,14 @@ indications per string.
          (xo-list (cdr (assoc 'xo-list parameters)))
          (fret-range (cdr (assoc 'fret-range parameters)))
          (barre-list (cdr (assoc 'barre-list parameters)))
+         (barre-type
+          (assoc-get 'barre-type details 'curved))
          (fret-diagram-stencil
          (ly:stencil-add
           (draw-strings string-count fret-range th size orientation)
           (draw-frets fret-range string-count th size orientation))))
-    (if (not (null? barre-list))
+    (if (and (not (null? barre-list))
+             (not (eq? 'none barre-type)))
        (set! fret-diagram-stencil
              (ly:stencil-add
               (draw-barre layout props string-count fret-range size