From: Carl Sorensen <c_sorensen@byu.edu>
Date: Fri, 4 Jul 2008 03:29:57 +0000 (-0600)
Subject: Fix FretBoards to work properly with fret-diagram-details
X-Git-Tag: release/2.11.51-1~24^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fe9615dc2c254f9b77652e5f937fef486cfe347d;p=lilypond.git

Fix FretBoards to work properly with fret-diagram-details
---

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index c5e7ad131e..de4e658fe4 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -679,11 +679,15 @@ centered, X==1 is at the right, X == -1 is at the left."
 
 (define-public (fret-board::calc-stencil grob)
   (let* ((string-frets (ly:grob-property grob 'string-fret-finger-combinations))
-	 (string-count (ly:grob-property grob 'string-count)))
+	 (string-count (assoc-get 
+                         'string-count 
+                         (ly:grob-property grob 'fret-diagram-details)
+                         6)))
     
-    (grob-interpret-markup grob
-			   (make-fret-diagram-verbose-markup
-			    (string-frets->description string-frets string-count)))))
+    (grob-interpret-markup 
+      grob
+      (make-fret-diagram-verbose-markup
+	(string-frets->description string-frets string-count)))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; scripts
diff --git a/scm/translation-functions.scm b/scm/translation-functions.scm
index fc7552fc35..0367a007ae 100644
--- a/scm/translation-functions.scm
+++ b/scm/translation-functions.scm
@@ -174,6 +174,7 @@
 	b))
 (let*
       ((tunings (ly:context-property context 'stringTunings))
+       (details (ly:grob-property grob 'fret-diagram-details))
        (minimum-fret (ensure-number
 		      (ly:context-property context 'minimumFret) 0))
        (max-stretch (ensure-number
@@ -182,11 +183,11 @@
 					 minimum-fret max-stretch
 					 tunings)))
 
-       	      
-  (set! (ly:grob-property grob 'string-count) (length tunings))
-  (set! (ly:grob-property grob 'string-fret-finger-combinations) string-frets)
-
-  ))
+  (set! (ly:grob-property grob 'fret-diagram-details)
+          (if (null? details)
+              (acons 'string-count (length tunings) '())
+              (acons 'string-count (length tunings) details)))
+  (set! (ly:grob-property grob 'string-fret-finger-combinations) string-frets)))
 
 (define-public (determine-frets-mf notes string-numbers
 				   minimum-fret max-stretch