X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-lib.scm;h=7a50af6c1e3034acc3f7b919cb10501205618b6a;hb=c829306cde358aea95ce565af8417e7e16c01669;hp=c5e7ad131eab702cdccd1db69b445df2cc7fa079;hpb=ecf2b5e9dcfa7654803fb0050d7127e0ec7fd934;p=lilypond.git

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index c5e7ad131e..7a50af6c1e 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -650,40 +650,11 @@ centered, X==1 is at the right, X == -1 is at the left."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; fret boards
 
-(define (string-frets->description string-frets string-count)
-  (let*
-      ((desc (list->vector
-	      (map (lambda (x) (list 'mute  (1+ x)))
-		   (iota string-count)))))
-       
-       (for-each (lambda (sf)
-		   (let*
-		       ((string (car sf))
-			(fret (cadr sf))
-			(finger (caddr sf)))
-
-		     
-		     (vector-set! desc (1- string)
-				  (if (= 0 fret)
-				      (list 'open string)
-				      (if finger
-					  (list 'place-fret string fret finger) 
-					  (list 'place-fret string fret))
-					  
-
-				      ))
-		     ))
-		 string-frets)
-
-       (vector->list desc)))
-
 (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)))
-    
-    (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
+        (ly:grob-property grob 'dot-placement-list))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; scripts