Merge commit 'origin' into beamlets2

[lilypond.git] / scm / predefined-fretboards.scm

diff --git a/scm/predefined-fretboards.scm b/scm/predefined-fretboards.scm
index 7040add95ee10eb3d0258f30a23a0651f5cc29aa..c08aa07a8eba0c6a428770b6769b7387a0a774b7 100644 (file)
--- a/scm/predefined-fretboards.scm
+++ b/scm/predefined-fretboards.scm
@@ -7,62 +7,40 @@
 
 (define-public (parse-terse-string terse-definition)
 "Parse a fret-diagram-terse definition string @code{terse-definition} and
-return a marking list, which can be used as with a fretboard grob."
+return a marking list, which can be used with a fretboard grob."
    (cdr (fret-parse-terse-definition-string (list '()) terse-definition)))
 
-(define-public (get-chord-shape shape-code base-chord-shapes)
-"Return the chord shape associated with key @code{shape-code} in
-the alist @code{base-chord-shapes}."
-   (assoc-get shape-code base-chord-shapes #f))
-
-(define-public (offset-fret fret-offset terse-string)
-"Add @code{fret-offset} to each fret indication in @code{terse-string}
-and return the resulting fret-diagram-terse definition string."
-
-   (define (split-fretstring fret-string)
-     (map (lambda (x) (split-item x))
-          (string-split fret-string #\sp )))
-
-   (define (split-item item-string)
-     (string-split item-string #\- ))
-
-   (define (split-terse-string terse-string)
-      (let ((long-list
-               (string-split terse-string #\;)))
-        (map (lambda (x) (split-fretstring x))
-           (list-head long-list (1- (length long-list))))))
-
-   (define (join-terse-string terse-string-list)
-     (string-join
-        (map (lambda (x) (join-fretstring x)) terse-string-list)
-        ";" 'suffix))
-
-   (define (join-item item-list)
-     (string-join item-list "-" ))
-
-   (define (join-fretstring fretstring-list)
-     (string-join
-       (map (lambda (x) (join-item x)) fretstring-list)
-       " " ))
-
-  (define (add-item-fret-offset fret-offset item-list)
-     (let ((fretval (string->number (car item-list))))
-       (if fretval
-           (cons (number->string (+ fretval fret-offset))
-                 (cdr item-list))
-           item-list)))
-
-  (define (add-fretstring-fret-offset fret-offset fretstring-list)
-    (map (lambda (x) (add-item-fret-offset fret-offset x))
-         fretstring-list))
-
-  (define (add-terse-fret-offset fret-offset terse-string-list)
-    (map (lambda (x) (add-fretstring-fret-offset fret-offset x))
-         terse-string-list))
-
-;; body
-  (join-terse-string
-    (add-terse-fret-offset
-      fret-offset
-      (split-terse-string terse-string))))
+(define-public (get-chord-shape shape-code tuning base-chord-shapes)
+"Return the chord shape associated with @code{shape-code} and
+@code{tuning} in the hash-table @code{base-chord-shapes}."
+  (let ((hash-handle (hash-get-handle base-chord-shapes
+                                       (cons shape-code tuning))))
+     (if hash-handle
+         (cdr hash-handle)
+         '())))
+
+(define-public (offset-fret fret-offset diagram-definition)
+"Add @code{fret-offset} to each fret indication in @code{diagram-definition}
+and return the resulting verbose fret-diagram-definition."
+   (let ((verbose-definition 
+           (if (string? diagram-definition)
+               (parse-terse-string diagram-definition)
+               diagram-definition)))
+     (map (lambda(item) 
+            (let ((code (car item)))
+              (cond
+                ((eq? code 'barre)
+                  (list-set! item 3
+                     (+ fret-offset (list-ref item 3)))
+                  item)
+                ((eq? code 'capo)
+                  (list-set! item 1
+                     (+ fret-offset (list-ref item 1)))
+                  item)
+                ((eq? code 'place-fret)
+                  (list-set! item 2
+                     (+ fret-offset (list-ref item 2)))
+                  item)
+                (else item))))
+            verbose-definition)))