Allow user-defined predefined fretboard hash-table

Add fretboard-table argument to \storePredefined Diagram

Add rule to convertrules.py

Modify all predefined-*-fretboards.ly

Modify regression tests

Modify docs

Update relevant snippets

2 files changed, 21 insertions, 5 deletions

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index bddd34e582..403bb0d01d 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -39,6 +39,9 @@ pitchnames = #default-language
 
 \include "chord-repetition-init.ly"
 
+#(define default-fret-table (make-hash-table 101))
+#(define chord-shape-table (make-hash-table 29))
+
 % declarations for standard directions
 left = #-1
 right = #1
@@ -83,9 +86,6 @@ escapedBiggerSymbol = #(make-span-event 'DecrescendoEvent START)
 escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START)
 
 
-#(define default-fret-table (make-hash-table 100))
-#(define chord-shape-table (make-hash-table 100))
-
 \include "scale-definitions-init.ly"
 
 melisma = #(context-spec-music (make-property-set 'melismaBusy #t) 'Bottom)
diff --git a/ly/predefined-fretboards-init.ly b/ly/predefined-fretboards-init.ly
index 9e91ed2220..d190430fb2 100644
--- a/ly/predefined-fretboards-init.ly
+++ b/ly/predefined-fretboards-init.ly
@@ -42,12 +42,28 @@ hash with the key @var{(cons key-symbol tuning)}.")
 #(define (chord-shape shape-code tuning)
    (get-chord-shape shape-code tuning chord-shape-table))
 
+% scheme function for copying/creating fretboard tables
+
+#(define (make-fretboard-table . rest)
+  "Create a new fretboard table.  @code{rest} is an optional table name.
+If present, the new fretboard table starts as a copy of the fretboard
+table @code{rest}."
+  (if (null? rest)
+      (make-hash-table 101)
+      (let ((source-table (car rest)))
+        (hash-fold
+          (lambda (key value tab)
+            (hash-set! tab key value)
+            tab)
+          (make-hash-table 101)
+          source-table))))
+
 % music function for adding a predefined diagram to
 % fretboard-table
 
 storePredefinedDiagram =
-#(define-music-function (parser location
-    fretboard-table chord tuning diagram-definition)
+#(define-music-function
+   (parser location fretboard-table chord tuning diagram-definition)
    (hash-table? ly:music? pair? string-or-pair?)
   (_i "Add predefined fret diagram defined by @var{diagram-definition}
   for the chord pitches @var{chord} and the stringTuning @var{tuning}.")