Allow user-defined predefined fretboard hash-table

Add fretboard-table argument to \storePredefinedDiagram

Add rule to convertrules.py

Modify all predefined-*-fretboards.ly

Modify regression tests

Run makelsr.py

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index f754c5111f8f962a3d5ab576de3d4ed6acbc3fbf..90d964256f19fd14a61024aee69b18ec1b7b9098 100644 (file)
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -66,6 +66,11 @@ which scares away people.
 
 @end ignore
 
+@item
+The user is now able to specify the name of the predefined fretboard
+table.  This allows the use of multiple tables, with switching between them
+based on user input.
+
 @item
 The part-combiner's decision to combine/not combine notes can now be customized
 @lilypond[quote,relative=2]

diff --git a/Documentation/snippets/adding-fingerings-to-tablatures.ly b/Documentation/snippets/adding-fingerings-to-tablatures.ly
index d6a5253b9e0d06839e0fbe9bb0388c174dbdb729..0f356426644ca12df4539f481140c76f32e78109 100644 (file)
--- a/Documentation/snippets/adding-fingerings-to-tablatures.ly
+++ b/Documentation/snippets/adding-fingerings-to-tablatures.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.17
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
index 3c8c45c66ea75e4b8a25da18069831341e511c6c..f94113afdffce24c015ea7376b7edf4603af2afd 100644 (file)
--- a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
+++ b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.34
-\version "2.13.34"
+\version "2.13.36"
 
 \header {
   lsrtags="vocal-music, staff-notation"
@@ -81,4 +81,4 @@ pianoLH = \relative c { c4 <c' e> e, <g c> }
       }
     >>
   >>
-}
\ No newline at end of file
+}

diff --git a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
index 3055669397d75046a9cf121ed932df659f9c11e8..693dce15bd26e9ef32f7bf8651461b3788d91f29 100644 (file)
--- a/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
+++ b/Documentation/snippets/adjusting-lyrics-vertical-spacing.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.16
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/ancient-headword.ly b/Documentation/snippets/ancient-headword.ly
index 947721650423ccb85b67f9de1bf38495c7f452c4..20d36a9a94258a253467137dabfcb80fb9e61ce1 100644 (file)
--- a/Documentation/snippets/ancient-headword.ly
+++ b/Documentation/snippets/ancient-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 
 #(set-global-staff-size 15)
 \paper {

diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly
index a46c4e9e9608d8f791e905547f2afaa66d29b6f3..0cc03d74f51ce704b6f8a6305b80b7e7b3853858 100644 (file)
--- a/Documentation/snippets/anglican-psalm-template.ly
+++ b/Documentation/snippets/anglican-psalm-template.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.32
-\version "2.13.32"
+\version "2.13.36"
 
 \header {
   lsrtags = "vocal-music, template"

diff --git a/Documentation/snippets/automatic-beam-subdivisions.ly b/Documentation/snippets/automatic-beam-subdivisions.ly
index a08bd6b1523cc1555e47558c29da7c3f1383c2f4..91d4a14cc3439874887886f187857fa057e3ed4e 100644 (file)
--- a/Documentation/snippets/automatic-beam-subdivisions.ly
+++ b/Documentation/snippets/automatic-beam-subdivisions.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.29
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/beam-endings-in-score-context.ly b/Documentation/snippets/beam-endings-in-score-context.ly
index 1c340524c452037fa648a8e4d7767baa4afdc8bf..f79d00a93d3e5b0f9557ce04349e918e6b26d71e 100644 (file)
--- a/Documentation/snippets/beam-endings-in-score-context.ly
+++ b/Documentation/snippets/beam-endings-in-score-context.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.29
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/beam-grouping-in-7-8-time.ly b/Documentation/snippets/beam-grouping-in-7-8-time.ly
index d478bdc5c2f3233a50f4a27612f98741271ca37c..13fbce022d14494b523da8ae46bf58775985fcb8 100644 (file)
--- a/Documentation/snippets/beam-grouping-in-7-8-time.ly
+++ b/Documentation/snippets/beam-grouping-in-7-8-time.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.29
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/centering-markup-on-note-heads-automatically.ly b/Documentation/snippets/centering-markup-on-note-heads-automatically.ly
index f76a23e5da9c11b94beec73e24ad7c0f0d717b52..d6ea01ba94c5320f88164ed9835e4e1c173636d9 100644 (file)
--- a/Documentation/snippets/centering-markup-on-note-heads-automatically.ly
+++ b/Documentation/snippets/centering-markup-on-note-heads-automatically.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.15
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
   lsrtags = "text, tweaks-and-overrides, contexts-and-engravers"

diff --git a/Documentation/snippets/changing-the-ambitus-gap.ly b/Documentation/snippets/changing-the-ambitus-gap.ly
index 3a6c1bcec1d0c6b44c47722c7f0a8a3f837e5000..3fea24e98cb858ae42ab8613330bfdbc7394a2d5 100644 (file)
--- a/Documentation/snippets/changing-the-ambitus-gap.ly
+++ b/Documentation/snippets/changing-the-ambitus-gap.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.26
-\version "2.13.31"
+\version "2.13.36"
 \header {
 %% Translation of GIT committish: 31097723b2b816696ad61696630a80ff17a39557
   texidocfr = "L'affichage d'un @emph{ambitus} peut s'affiner pour

diff --git a/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly b/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly
index 72598af1aa69885998dfc124cf1320016e397062..c4727d00b6c30321aeb732cdd8a2b1a7fdeda3cb 100644 (file)
--- a/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly
+++ b/Documentation/snippets/changing-the-number-of-augmentation-dots-per-note.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.26
-\version "2.13.31"
+\version "2.13.36"
 \header {
 %% Translation of GIT committish: 190a067275167c6dc9dd0afef683d14d392b7033
 

diff --git a/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly b/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
index 83899ec84b38436af180a775e96d6fa32c905294..743af1c0225c27fa48157b94cbc600e5c60aef1a 100644 (file)
--- a/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
+++ b/Documentation/snippets/changing-the-size-of-woodwind-diagrams.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.31
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506

diff --git a/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly b/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly
index 8a444bb2dad90fcaf6dc11b5a535cbcc8692d2ca..2ccf8260cbc4407384fc439ea06a225abdcca2bf 100644 (file)
--- a/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly
+++ b/Documentation/snippets/changing-the-time-signature-without-affecting-the-beaming.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.5
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/chordchanges-for-fretboards.ly b/Documentation/snippets/chordchanges-for-fretboards.ly
index 80e6b2c2309662c23d539ef9acc3c2f9fa883e93..945b2fdeb45f75404b36800afedda80f00210659 100644 (file)
--- a/Documentation/snippets/chordchanges-for-fretboards.ly
+++ b/Documentation/snippets/chordchanges-for-fretboards.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.0
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/chords-headword.ly b/Documentation/snippets/chords-headword.ly
index fd71dc59024b2dbebb934d1aa2e56a6d62a81d74..c67bbeba95f55a4dc439429d451ccac61a7b6a5e 100644 (file)
--- a/Documentation/snippets/chords-headword.ly
+++ b/Documentation/snippets/chords-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 #(set-global-staff-size 15)
 \paper {
   ragged-right = ##f

diff --git a/Documentation/snippets/clip-systems.ly b/Documentation/snippets/clip-systems.ly
index b004980c4175ef7808523009d36896a95c538294..01ebb9f1384cd0aa0eaf4297ac2b5ac39beb6239 100644 (file)
--- a/Documentation/snippets/clip-systems.ly
+++ b/Documentation/snippets/clip-systems.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.4
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/compound-time-signatures.ly b/Documentation/snippets/compound-time-signatures.ly
index a12c86d65014f0b11729c6de149ba982c8e534ba..4bf94638029ce15405ff96bc5a15651380668650 100644 (file)
--- a/Documentation/snippets/compound-time-signatures.ly
+++ b/Documentation/snippets/compound-time-signatures.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.29
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
index cfb6e65e27c23597be3b63ebb58237f9f821bdc7..0ec502832f6a010caa3c280b5ebfafed1a9e7302 100644 (file)
--- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
+++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.29
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
index e532cc7a0a4443d9ff047ca5527571c94ca26f10..894727b7a37ecbedfeb1df522163ab2428c8e42d 100644 (file)
--- a/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
+++ b/Documentation/snippets/controlling-spanner-visibility-after-a-line-break.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.1
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
index ed1a240b63cee94256c4128faf6d7db221a1f5d4..e613a633233f2260c4e41a4248e77b04400edb46 100644 (file)
--- a/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
+++ b/Documentation/snippets/customizing-fretboard-fret-diagrams.ly
@@ -1,9 +1,39 @@
+% Do not edit this file; it is automatically
+% generated from Documentation/snippets/new
+% This file is in the public domain.
+%% Note: this file works from version 2.13.31
 %% Do not edit this file; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
+%% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
+  texidoces = "
+Se pueden establecer las propiedades de los diagramas de
+posiciones de acordes por medio de @code{'fret-diagram-details}.
+Para los diagramas de posiciones de FretBoard, se aplican los
+overrides (sobreescrituras) al objeto @code{FretBoards.FretBoard}.
+Como @code{Voice}, @code{FretBoards} es un contexto del nivel
+inferior, y por tanto se puede omitir su nombre en la
+sobreescritura de propiedades.
+
+"
+  doctitlees = "Personalizar los diagramas de posiciones"
+
+
+%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
+  texidocde = "
+Eigenschaften von Bunddiagrammen können in
+@code{'fret-diagram-details} verändert werden.  Einstellungen mit
+dem @code{\\override}-Befehl werden dem @code{FretBoards.FretBoard}-Objekt
+zugewiesen.  Genauso wie @code{Voice} ist auch @code{FretBoards} ein
+Kontext der niedrigsten Ebene, weshalb der Kontext auch in dem Befehl
+weggelassen werden kann.
+
+"
+  doctitlede = "Bunddiagramme anpassen"
+
   lsrtags = "fretted-strings, tweaks-and-overrides"
 
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b
@@ -44,7 +74,8 @@ can be omitted in property overrides.
 } % begin verbatim
 
 \include "predefined-guitar-fretboards.ly"
-\storePredefinedDiagram \chordmode { c' }
+\storePredefinedDiagram #default-fret-table \chordmode { c' } % begin verbatim
+
                         #guitar-tuning
                         #"x;1-1-(;3-2;3-3;3-4;1-1-);"
 <<

diff --git a/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly b/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly
index b54d3f601b46f0435ca3893fbdb43436c9d138f0..b7b55113f0a8fc99fb2f36f68410eaf10cb73232 100644 (file)
--- a/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly
+++ b/Documentation/snippets/defining-an-engraver-in-scheme-ambitus-engraver.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.15
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/displaying-complex-chords.ly b/Documentation/snippets/displaying-complex-chords.ly
index 61bcfd6f35e0237eef12a036f35dd0231b8b3367..f9dd0ae78a99c26587a30f3358c1c4841bb80a37 100644 (file)
--- a/Documentation/snippets/displaying-complex-chords.ly
+++ b/Documentation/snippets/displaying-complex-chords.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.1
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/displaying-grob-ancestry.ly b/Documentation/snippets/displaying-grob-ancestry.ly
index a13e95523076ba8c793960de077766e35d07aae3..bf1f5adda575198425aa9460aa8ad2fda9fff38c 100644 (file)
--- a/Documentation/snippets/displaying-grob-ancestry.ly
+++ b/Documentation/snippets/displaying-grob-ancestry.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.10
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly b/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
index 9e21edc34c950a1d9e6df25e2482ee19a65e013c..89fb5eb51341b4615ba38924e8363a599a83013f 100644 (file)
--- a/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
+++ b/Documentation/snippets/dodecaphonic-style-accidentals-for-each-note-including-naturals.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.4
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
index 73582ab227c03d28edcf6aa3a5cca47883e9ec35..16bc2962ca58a313e38a5d1ac85a930e99d38a5a 100644 (file)
--- a/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
+++ b/Documentation/snippets/dynamics-custom-text-spanner-postfix.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.8
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/dynamics-text-spanner-postfix.ly b/Documentation/snippets/dynamics-text-spanner-postfix.ly
index 24c94d618b34892b2dc245bf6cc3dba0c71847a1..a8553ed11e421a603d6b5519a9fb635903c8bee5 100644 (file)
--- a/Documentation/snippets/dynamics-text-spanner-postfix.ly
+++ b/Documentation/snippets/dynamics-text-spanner-postfix.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.20
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/editorial-headword.ly b/Documentation/snippets/editorial-headword.ly
index 6efcdb489d65124c341025ba94d6e3c6e843deba..f2b26ade96361427ae8be1ba82772e714e5750f9 100644 (file)
--- a/Documentation/snippets/editorial-headword.ly
+++ b/Documentation/snippets/editorial-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {

diff --git a/Documentation/snippets/expressive-headword.ly b/Documentation/snippets/expressive-headword.ly
index b7bbe4d9ae9deed2849ae279ef40b631a847f3ad..1c494bfc8ab7ebff735dca3ffe304b1387a42710 100644 (file)
--- a/Documentation/snippets/expressive-headword.ly
+++ b/Documentation/snippets/expressive-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {

diff --git a/Documentation/snippets/faking-a-hammer-in-tablatures.ly b/Documentation/snippets/faking-a-hammer-in-tablatures.ly
index e2933839644d3e313a21795c0e2e992878042cbe..c41d3430e7db862c3b51064003daa28fd6ead98b 100644 (file)
--- a/Documentation/snippets/faking-a-hammer-in-tablatures.ly
+++ b/Documentation/snippets/faking-a-hammer-in-tablatures.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.4
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/figured-bass-headword.ly b/Documentation/snippets/figured-bass-headword.ly
index 7b05b2990b7cde42553af2bef624a4d2282e1a94..13850a5ba016dd7af3d24f22fa130202946926b5 100644 (file)
--- a/Documentation/snippets/figured-bass-headword.ly
+++ b/Documentation/snippets/figured-bass-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 #(set-global-staff-size 15)
 \paper {
   ragged-right = ##f

diff --git a/Documentation/snippets/flamenco-notation.ly b/Documentation/snippets/flamenco-notation.ly
index e10b507039f07840f0e56036a14675a05fac251c..41aa067686754ee905c99bd93967f083883a5b6e 100644 (file)
--- a/Documentation/snippets/flamenco-notation.ly
+++ b/Documentation/snippets/flamenco-notation.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.10
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/fretted-headword.ly b/Documentation/snippets/fretted-headword.ly
index 3c96cf7dc67eac8e9a5d1f4ebd1d4975845e2499..5b1370652f338b5f6390876c7ae0501d14adae6e 100644 (file)
--- a/Documentation/snippets/fretted-headword.ly
+++ b/Documentation/snippets/fretted-headword.ly
@@ -7,7 +7,7 @@
 % on melodies from Bellini's "Norma"                              %
 %*****************************************************************%
 
-\version "2.13.31"
+\version "2.13.36"
 
 #(set-global-staff-size 15)
 \paper {

diff --git a/Documentation/snippets/fretted-strings.snippet-list b/Documentation/snippets/fretted-strings.snippet-list
index fe91aa1482d8d4d7f4af2c8105b95d06a07742b2..056eb0dfea75ef9e20015257c22bcfab829d514c 100644 (file)
--- a/Documentation/snippets/fretted-strings.snippet-list
+++ b/Documentation/snippets/fretted-strings.snippet-list
@@ -12,6 +12,7 @@ faking-a-hammer-in-tablatures.ly
 fingerings,-string-indications,-and-right-hand-fingerings.ly
 flamenco-notation.ly
 fret-diagrams-explained-and-developed.ly
+fretboards-alternate-tables.ly
 guitar-slides.ly
 guitar-strum-rhythms.ly
 how-to-change-fret-diagram-position.ly

diff --git a/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly b/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
index d6a558dfe864912dfe2f23b91cd7f5ad2e13b86a..8feb3cf7dea195b5d5d1476edb4cede7b21a0056 100644 (file)
--- a/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
+++ b/Documentation/snippets/graphical-and-text-woodwind-diagrams.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.31
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506

diff --git a/Documentation/snippets/grouping-beats.ly b/Documentation/snippets/grouping-beats.ly
index 9b1ac2276db14b8f3c5e35844ced7c161a0faf2b..2ee5ae56cdbb872aedea80b30558aae3643bac66 100644 (file)
--- a/Documentation/snippets/grouping-beats.ly
+++ b/Documentation/snippets/grouping-beats.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.4
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/guitar-slides.ly b/Documentation/snippets/guitar-slides.ly
index 5fd9890013b056b506b88f66b7e64d499ea9b777..41812a5ad18a152add7b7defc5b1b54c0e57901c 100644 (file)
--- a/Documentation/snippets/guitar-slides.ly
+++ b/Documentation/snippets/guitar-slides.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.4
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly b/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
index 9bcb1539028c7e52dd7761f1327db08678eb6263..b3a8fae7989dcc9a785d22e66ca4fded324191bb 100644 (file)
--- a/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
+++ b/Documentation/snippets/hiding-accidentals-on-tied-notes-at-the-start-of-a-new-system.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.26
-\version "2.13.31"
+\version "2.13.36"
 \header {
 %% Translation of GIT committish: 31097723b2b816696ad61696630a80ff17a39557
   texidocfr = "Cet exemple illustre comment, lorsqu'une note affublée

diff --git a/Documentation/snippets/incipit.ly b/Documentation/snippets/incipit.ly
index 27d526d1fa671861415439fad1769925d94b04a0..c96d3f93c488d1d96076d66c69a979a23e787125 100644 (file)
--- a/Documentation/snippets/incipit.ly
+++ b/Documentation/snippets/incipit.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.4
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/keyboard-headword.ly b/Documentation/snippets/keyboard-headword.ly
index 97f405b56c786c11b96e5f505f56dc6ec87c5350..25041bc4a29cce22fd901a87718a16c0fdf37664 100644 (file)
--- a/Documentation/snippets/keyboard-headword.ly
+++ b/Documentation/snippets/keyboard-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 \include "english.ly"
 
 #(set-global-staff-size 15)

diff --git a/Documentation/snippets/letter-tablature-formatting.ly b/Documentation/snippets/letter-tablature-formatting.ly
index 4e277e4c6b1a0146ea3f810a98f42f9158fcb0c0..148f94c665c5c1b9a6a8c5a6650efce369c66a8e 100644 (file)
--- a/Documentation/snippets/letter-tablature-formatting.ly
+++ b/Documentation/snippets/letter-tablature-formatting.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.10
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/makam-example.ly b/Documentation/snippets/makam-example.ly
index 916c5a71986fbd60300f7ee3dfb20d58fe899548..04d485de808dce44a71d8b938b50e4d2c1a19378 100644 (file)
--- a/Documentation/snippets/makam-example.ly
+++ b/Documentation/snippets/makam-example.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.0
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
index cec17e80ec3979c198c9cc75ff039cbc92172ad3..94c12621ec277e6176b0c2556d1116b3b69020b4 100644 (file)
--- a/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
+++ b/Documentation/snippets/making-slurs-with-complex-dash-structure.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.1
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/modern-tab-text-clef.ly b/Documentation/snippets/modern-tab-text-clef.ly
index caf014be42a4783e5dcf6044493c405207bbc7ac..a506584cf2cd1ff00192bc5d2732d0598b158a86 100644 (file)
--- a/Documentation/snippets/modern-tab-text-clef.ly
+++ b/Documentation/snippets/modern-tab-text-clef.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.4
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/new/fretboards-alternate-tables.ly b/Documentation/snippets/new/fretboards-alternate-tables.ly
new file mode 100644 (file)
index 0000000..ec4cff1
--- /dev/null
+++ b/Documentation/snippets/new/fretboards-alternate-tables.ly
@@ -0,0 +1,61 @@
+\version "2.13.36"
+
+\header {
+  lsrtags = "fretted-strings"
+
+  texidoc = "
+Alternate fretboard tables can be created.  These would be used in
+order to have alternate fretboards for a given chord.
+
+In order to use an alternate fretboard table, the table must first
+be created.  Fretboards are then added to the table.
+
+The table to be used in displaying predefined fretboards is selected
+by the property @code{\predefinedDiagramTable}.
+"
+
+  doctitle = "Alternate fretboard tables"
+}
+
+\include "predefined-guitar-fretboards.ly"
+
+#(define custom-fretboard-table-one (make-hash-table 101))
+
+#(define custom-fretboard-table-two (make-hash-table 101))
+
+\storePredefinedDiagram #custom-fretboard-table-one
+                        \chordmode{c}
+                        #guitar-tuning
+                        "3-(;3;5;5;5;3-);"
+
+\storePredefinedDiagram #custom-fretboard-table-two
+                        \chordmode{c}
+                        #guitar-tuning
+                        "x;3;5;5;5;o;"
+
+<<
+  \chords {
+    c1 |
+    c1 |
+    c1
+  }
+  \new FretBoards {
+    \chordmode {
+      \set predefinedDiagramTable = #default-fret-table
+      c1
+      \set predefinedDiagramTable = #custom-fretboard-table-one
+      c1
+      \set predefinedDiagramTable = #custom-fretboard-table-two
+      c1
+    }
+  }
+  \new Staff {
+    \clef "treble_8"
+    \chordmode {
+      c1 |
+      c1 |
+      c1
+    }
+  }
+>>
+

diff --git a/Documentation/snippets/non-default-tuplet-numbers.ly b/Documentation/snippets/non-default-tuplet-numbers.ly
index 302820e731daea7601c8ffa9a38099921beca250..f00960e58f695a12bdfe701fe156c6815785447b 100644 (file)
--- a/Documentation/snippets/non-default-tuplet-numbers.ly
+++ b/Documentation/snippets/non-default-tuplet-numbers.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.1
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/non-traditional-key-signatures.ly b/Documentation/snippets/non-traditional-key-signatures.ly
index a140ee0c30d34dbc4dc0a4d15cfa5989080550d9..46770a23b76f0a57af52f3d2ac6011b31038e8fc 100644 (file)
--- a/Documentation/snippets/non-traditional-key-signatures.ly
+++ b/Documentation/snippets/non-traditional-key-signatures.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.0
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/numbers-as-easy-note-heads.ly b/Documentation/snippets/numbers-as-easy-note-heads.ly
index c1ea51e7cf3fdb5dcf05307f7dda85a237ebf0e0..03781d5334cf15ae0ae5849898ccacae5d50c0bc 100644 (file)
--- a/Documentation/snippets/numbers-as-easy-note-heads.ly
+++ b/Documentation/snippets/numbers-as-easy-note-heads.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.11
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/piano-template-with-centered-dynamics.ly b/Documentation/snippets/piano-template-with-centered-dynamics.ly
index 56e2b7aee2a2858862e8d6b4fbbd68547e99d716..f81b9998504b26e36f87db7e6687528e0e123763 100644 (file)
--- a/Documentation/snippets/piano-template-with-centered-dynamics.ly
+++ b/Documentation/snippets/piano-template-with-centered-dynamics.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.4
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/pitches-headword.ly b/Documentation/snippets/pitches-headword.ly
index e81b0c119683659b93b28e1bc691b489013ac1a6..345957df2985e60f442f086ebbfcf03a3bc93429 100644 (file)
--- a/Documentation/snippets/pitches-headword.ly
+++ b/Documentation/snippets/pitches-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {

diff --git a/Documentation/snippets/repeats-headword.ly b/Documentation/snippets/repeats-headword.ly
index e703c067d36c3bd407cc7d1cb0c68caf0c4dbbed..ffbac3420ad1f666bf940380c3ec11bed6398194 100644 (file)
--- a/Documentation/snippets/repeats-headword.ly
+++ b/Documentation/snippets/repeats-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {

diff --git a/Documentation/snippets/reverting-default-beam-endings.ly b/Documentation/snippets/reverting-default-beam-endings.ly
index 4e3cc2271a535d3d36bb61b00b0a6617a3ea7f4e..58991448d591eb9dbebdcabac28a438099e0b7b2 100644 (file)
--- a/Documentation/snippets/reverting-default-beam-endings.ly
+++ b/Documentation/snippets/reverting-default-beam-endings.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.29
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/rhythms-headword.ly b/Documentation/snippets/rhythms-headword.ly
index 1fea62052f8a120c2e3699788d2686af739e27b9..d687a9ffe654bc9d8cc12389493dedb228258dca 100644 (file)
--- a/Documentation/snippets/rhythms-headword.ly
+++ b/Documentation/snippets/rhythms-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {

diff --git a/Documentation/snippets/screech-boink.ly b/Documentation/snippets/screech-boink.ly
index 536429d37804510940c4e147cb43e6e360d3728d..0980f4965c269459d96c0ca2075740068e052dd9 100644 (file)
--- a/Documentation/snippets/screech-boink.ly
+++ b/Documentation/snippets/screech-boink.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 \header {
   lsrtags = "headwords"
   texidoc = "Random complex notation"

diff --git a/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly b/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
index 910a603c6f234ec70135fd8f624eedc051901be8..14a3a04ddd178e88560311e236ab3cc1e09365b3 100644 (file)
--- a/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
+++ b/Documentation/snippets/setting-the-double-repeat-default-for-volte.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.26
-\version "2.13.31"
+\version "2.13.36"
 \header {
 %% Translation of GIT committish: 158658dc75b6f6553e77ff53119ac802eb91f50c
   texidocfr = "LilyPond dispose de trois styles de barre différents

diff --git a/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly b/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
index b92baa87775368356b931d4ade868ee10306a270..b803c69b89235b14f83b7855942821f8ab1530d2 100644 (file)
--- a/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
+++ b/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.27
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
   lsrtags = "expressive-marks, tweaks-and-overrides"

diff --git a/Documentation/snippets/simultaneous-headword.ly b/Documentation/snippets/simultaneous-headword.ly
index d81490500ab0b851da825f180b7a12561bb449ab..80bdf858d05c1d09710411b9780fedd00aa9efa7 100644 (file)
--- a/Documentation/snippets/simultaneous-headword.ly
+++ b/Documentation/snippets/simultaneous-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {

diff --git a/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly b/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly
index 86887461697e9dabfac04ae68151077699e0dea6..354575dcb3491980fcdb5d31cca4d4c1eb9d5b06 100644 (file)
--- a/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly
+++ b/Documentation/snippets/snap-pizzicato-bartok-pizzicato.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.4
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/staff-headword.ly b/Documentation/snippets/staff-headword.ly
index d450fd03573cbcbb4cc47bb1c19ee33451dd0a61..3a954a573e35cd606dffe09f2e7054b238117b17 100644 (file)
--- a/Documentation/snippets/staff-headword.ly
+++ b/Documentation/snippets/staff-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 \include "catalan.ly"
 #(set-global-staff-size 15)
 \paper{

diff --git a/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
index c21d261d144009e37510946dab06eb4d5b3d80a5..487ab92d7e32a622a1345fbb672c507a0d417555 100644 (file)
--- a/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
+++ b/Documentation/snippets/stem-and-beam-behavior-in-tablature.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.4
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/subdividing-beams.ly b/Documentation/snippets/subdividing-beams.ly
index c96569bdc86413da43706e97590dd10a92326dbb..7dbdc83b1d7f3e920f95caecc309b070fe1431d3 100644 (file)
--- a/Documentation/snippets/subdividing-beams.ly
+++ b/Documentation/snippets/subdividing-beams.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.29
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 190a067275167c6dc9dd0afef683d14d392b7033

diff --git a/Documentation/snippets/text-headword.ly b/Documentation/snippets/text-headword.ly
index 6f96e8f774a81073b7784901c4432c4ce0835877..e14f48624f3f8c1dabdfa372b8ff5287c2d6bead 100644 (file)
--- a/Documentation/snippets/text-headword.ly
+++ b/Documentation/snippets/text-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 \include "english.ly"
 #(set-global-staff-size 15)
 \paper {

diff --git a/Documentation/snippets/unfretted-headword.ly b/Documentation/snippets/unfretted-headword.ly
index 137c1bddf72b101adfa218a17a4da9e6096752b0..a662e68c7d8fed20df3e484d600313d13d131130 100644 (file)
--- a/Documentation/snippets/unfretted-headword.ly
+++ b/Documentation/snippets/unfretted-headword.ly
@@ -33,7 +33,7 @@
 
 
 
-\version "2.13.31"
+\version "2.13.36"
 #(set-global-staff-size 15)
 
 %%%

diff --git a/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly b/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly
index 4061da16f0956f38b530b9f3d212d73b03084f8b..d7334b9e6bd7a7d400cb9a27eb6be0a6b18adb3a 100644 (file)
--- a/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly
+++ b/Documentation/snippets/using-ly-grob-object-to-access-grobs-with--tweak.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.10
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/using-the-whiteout-property.ly b/Documentation/snippets/using-the-whiteout-property.ly
index c0ba9a9db30a239f927bce8ee9095f640f5382dd..2b4ba77295fb0637f13e17cf8785ad45fc55cada 100644 (file)
--- a/Documentation/snippets/using-the-whiteout-property.ly
+++ b/Documentation/snippets/using-the-whiteout-property.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.10
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly b/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
index 442d3d2b47b049a0494e6056c6e55cd3084e8042..6d795b0eade9fda9b520b82b38a494f450ec8224 100644 (file)
--- a/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
+++ b/Documentation/snippets/vocal-ensemble-template-with-verse-and-refrain.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.21
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %% Translation of GIT committish: 0b55335aeca1de539bf1125b717e0c21bb6fa31b

diff --git a/Documentation/snippets/wind-headword.ly b/Documentation/snippets/wind-headword.ly
index b6fa2bd14c55ee54adc7340ebb4a198784415bb6..7b2940c84821d2a1c7682eb608aed1710ea26314 100644 (file)
--- a/Documentation/snippets/wind-headword.ly
+++ b/Documentation/snippets/wind-headword.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.12.0
-\version "2.13.31"
+\version "2.13.36"
 #(set-global-staff-size 15)
 \paper {
   line-width = 16\cm

diff --git a/Documentation/snippets/woodwind-diagrams-key-lists.ly b/Documentation/snippets/woodwind-diagrams-key-lists.ly
index 61b9391096df2b30692dac7757b2a72e40637e4a..d379e9235a71b3b69e5be52d86c0300a41547bdb 100644 (file)
--- a/Documentation/snippets/woodwind-diagrams-key-lists.ly
+++ b/Documentation/snippets/woodwind-diagrams-key-lists.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.24
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506

diff --git a/Documentation/snippets/woodwind-diagrams-listing.ly b/Documentation/snippets/woodwind-diagrams-listing.ly
index bc314e098fe281c8ec79824875fa093cf85ea3e2..1f657495d91bc9062353d98dece46a7f1f01a859 100644 (file)
--- a/Documentation/snippets/woodwind-diagrams-listing.ly
+++ b/Documentation/snippets/woodwind-diagrams-listing.ly
@@ -2,7 +2,7 @@
 % generated from Documentation/snippets/new
 % This file is in the public domain.
 %% Note: this file works from version 2.13.31
-\version "2.13.31"
+\version "2.13.36"
 
 \header {
 %%%    Translation of GIT committish: ab9e3136d78bfaf15cc6d77ed1975d252c3fe506

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index 621c78d52afece25cb54def6ae12623c0361a114..ba68f30d005831f7a520ee352540e167a2e60bf4 100644 (file)
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -9,9 +9,9 @@
 @c used for news about the upcoming release; see CG 10.2
 
 @newsItem
-@subsubheading Alpha test two of 2.14 -- LilyPond 2.13.35 released!  @emph{Sep 29, 2010}
+@subsubheading Alpha test two of 2.14 -- LilyPond 2.13.36 released!  @emph{Sep 29, 2010}
 
-LilyPond 2.13.35 is out; this is the second alpha test of the
+LilyPond 2.13.36 is out; this is the second alpha test of the
 upcoming 2.14 stable release.  Users are invited to experiment
 with this version.  New features since 2.12.3 are listed in the
 @qq{Changes} manual on the website section about

diff --git a/VERSION b/VERSION
index b653b3b51b731b125c55da1d29539cdf1f6a054e..0f92d632f50828e20ad23b40ce7f8e5266fdbb05 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -4,4 +4,4 @@ MINOR_VERSION=13
 PATCH_LEVEL=36
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.12.3
-VERSION_DEVEL=2.13.35
+VERSION_DEVEL=2.13.36

diff --git a/input/regression/auto-beam-partial-grace.ly b/input/regression/auto-beam-partial-grace.ly
index f80c49edc9a6b880ec28a8154bc7c001d90ad718..0ef46447913511d570a1a63e45da6087d600f5ff 100644 (file)
--- a/input/regression/auto-beam-partial-grace.ly
+++ b/input/regression/auto-beam-partial-grace.ly
@@ -1,4 +1,4 @@
-\version "2.13.35"
+\version "2.13.36"
 
 \header {
   texidoc = "Grace notes at the start of a partial measure do not

diff --git a/input/regression/page-breaking-outside-staff-estimation.ly b/input/regression/page-breaking-outside-staff-estimation.ly
index b955da38558859363e452e3541dca90bb82e071d..927d4ce817c6366c781d702ff6d5c0364664904f 100644 (file)
--- a/input/regression/page-breaking-outside-staff-estimation.ly
+++ b/input/regression/page-breaking-outside-staff-estimation.ly
@@ -1,4 +1,4 @@
-\version "2.13.35"
+\version "2.13.36"
 
 \header {
   texidoc = "The height-estimation routine takes into account

diff --git a/input/regression/part-combine-force-mmrest-position.ly b/input/regression/part-combine-force-mmrest-position.ly
index 94ea88f09e1250eefcd9a00dc033d29fde3c243e..6e4e3964e7d4db5b43f555ce278b439fd7c2d9de 100644 (file)
--- a/input/regression/part-combine-force-mmrest-position.ly
+++ b/input/regression/part-combine-force-mmrest-position.ly
@@ -7,7 +7,7 @@
 
 \layout { ragged-right = ##t }
 
-\version "2.13.35"
+\version "2.13.36"
 
 mI = \relative c'' {
   \partcombineApart

diff --git a/input/regression/part-combine-force-once.ly b/input/regression/part-combine-force-once.ly
index b2b30dce0e765a8f9d9113189f4dc8c27b8c96b8..0ad75ab56b412679e73b508dbab288ab97bf84a6 100644 (file)
--- a/input/regression/part-combine-force-once.ly
+++ b/input/regression/part-combine-force-once.ly
@@ -8,7 +8,7 @@
 
 \layout { ragged-right = ##t }
 
-\version "2.13.35"
+\version "2.13.36"
 
 mI = \relative c' {
        e4 e \partcombineApartOnce c c |

diff --git a/input/regression/part-combine-force.ly b/input/regression/part-combine-force.ly
index b66d1b71b57242c508c3fb77cf2db5298e8334b4..af582f50f25fa856b5f4d025fd4eba4bb3281fb6 100644 (file)
--- a/input/regression/part-combine-force.ly
+++ b/input/regression/part-combine-force.ly
@@ -8,7 +8,7 @@
 
 \layout { ragged-right = ##t }
 
-\version "2.13.35"
+\version "2.13.36"
 
 mI = \relative c' {
        e4 e c2 |

diff --git a/input/regression/predefined-fretboards.ly b/input/regression/predefined-fretboards.ly
index 8644ca0ba378c2d39c8c2c773034cbf7c0295dab..8ed97dda83ec595cb7b9bd82ec8695b4771ab721 100644 (file)
--- a/input/regression/predefined-fretboards.ly
+++ b/input/regression/predefined-fretboards.ly
@@ -1,4 +1,4 @@
-\version "2.12.0"
+\version "2.13.36"
 
 \header {
 texidoc = "Predefined fretboards and chord shapes can be added.
@@ -11,11 +11,11 @@ texidoc = "Predefined fretboards and chord shapes can be added.
 
 % add chords
 
-\storePredefinedDiagram \chordmode {bes}
+\storePredefinedDiagram #default-fret-table \chordmode {bes}
                         #guitar-tuning
                         #(chord-shape 'bes guitar-tuning)
 
-\storePredefinedDiagram \chordmode {c}
+\storePredefinedDiagram #default-fret-table \chordmode {c}
                         #guitar-tuning
                         #(offset-fret 2 (chord-shape 'bes guitar-tuning))
 

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 5ab0e77ab2168698a0117f9969cddd8ddc909e93..54aa7121e2ec6c1fe037da8ac4068b2a291ae86d 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -32,7 +32,7 @@ maxima = #(ly:make-duration -3 0)
 %% default note names are dutch
 \include "nederlands.ly"
 
-\include "drumpitch-init.ly"           
+\include "drumpitch-init.ly"
 \include "chord-modifiers-init.ly"
 \include "script-init.ly"
 
@@ -68,7 +68,7 @@ startStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent START)))
 %
 % Code articulation definitions
 %
-noBeam = #(make-music 'BeamForbidEvent) 
+noBeam = #(make-music 'BeamForbidEvent)
 pipeSymbol = #(make-music 'BarCheck)
 bracketOpenSymbol = #(make-span-event 'BeamEvent START)
 bracketCloseSymbol = #(make-span-event 'BeamEvent STOP)
@@ -82,7 +82,7 @@ escapedBiggerSymbol = #(make-span-event 'DecrescendoEvent START)
 escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START)
 
 
-#(define fretboard-table (make-hash-table 100))
+#(define default-fret-table (make-hash-table 100))
 #(define chord-shape-table (make-hash-table 100))
 
 \include "scale-definitions-init.ly"
@@ -92,7 +92,7 @@ melismaEnd = #(context-spec-music (make-property-unset 'melismaBusy) 'Bottom)
 
 laissezVibrer = #(make-music 'LaissezVibrerEvent)
 repeatTie = #(make-music 'RepeatTieEvent)
-                 
+
 \include "grace-init.ly"
 \include "midi-init.ly"
 \include "paper-defaults-init.ly"
@@ -104,7 +104,7 @@ repeatTie = #(make-music 'RepeatTieEvent)
     in = #(* 25.4 mm)
     pt = #(/  in 72.27)
     cm = #(* 10 mm)
-    
+
     \include "engraver-init.ly"
 
     #(set-paper-dimension-variables (current-module))

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 6a94777e0c4f5d23bc9c2617577e2889186a3061..0b6cd7b3aa68fc1dbda2aff660eb160553b9083a 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -40,7 +40,7 @@
   \consists "Font_size_engraver"
   \consists "Instrument_name_engraver"
 
-  predefinedDiagramTable = #fretboard-table
+  predefinedDiagramTable = #default-fret-table
 }
 
 \context {

diff --git a/ly/predefined-fretboards-init.ly b/ly/predefined-fretboards-init.ly
index f205b63269ce9c9be08d476e4f58ba6f95b87273..b6a60c085bbc8df32d78b9bb4991cded273ff264 100644 (file)
--- a/ly/predefined-fretboards-init.ly
+++ b/ly/predefined-fretboards-init.ly
@@ -46,17 +46,18 @@ hash with the key @var{(cons key-symbol tuning)}.")
 % fretboard-table
 
 storePredefinedDiagram =
-#(define-music-function (parser location chord tuning diagram-definition)
-  (ly:music? pair? string-or-pair?)
+#(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}.")
-  (let* ((pitches (event-chord-pitches 
+  (let* ((pitches (event-chord-pitches
                     (car (extract-named-music chord 'EventChord))))
          (hash-key (cons tuning pitches))
          (verbose-definition (if (string? diagram-definition)
                                  (parse-terse-string diagram-definition)
                                  diagram-definition)))
-  (hash-set! fretboard-table 
-             hash-key 
-             verbose-definition))
-  (make-music 'SequentialMusic 'void #t))
+  (hash-set! fretboard-table
+             hash-key
+             verbose-definition)
+  (make-music 'SequentialMusic 'void #t)))

diff --git a/ly/predefined-guitar-fretboards.ly b/ly/predefined-guitar-fretboards.ly
index 1ee17fc5b779c47d0df6390c36030d692f6c049f..c6d30b0dc2e87b058dbd73bbab2c58060dfd48e2 100644 (file)
--- a/ly/predefined-guitar-fretboards.ly
+++ b/ly/predefined-guitar-fretboards.ly
@@ -20,7 +20,7 @@
 
 %%%  Add basic chordshapes
 
-\version "2.12.0"
+\version "2.13.36"
 
 \addChordShape #'f #guitar-tuning #"1-1-(;3-3;3-4;2-2;1-1;1-1-);"
 \addChordShape #'f:m #guitar-tuning #"1-1-(;3-3;3-4;1-1;1-1;1-1-);"
@@ -43,409 +43,409 @@
 
 %%%%  c chords
 %
-\storePredefinedDiagram \chordmode {c}
+\storePredefinedDiagram #default-fret-table \chordmode {c}
                         #guitar-tuning
                         #"x;3-3;2-2;o;1-1;o;"
-\storePredefinedDiagram \chordmode {c:m}
+\storePredefinedDiagram #default-fret-table \chordmode {c:m}
                         #guitar-tuning
                         #(offset-fret 2 (chord-shape 'bes:m guitar-tuning))
-\storePredefinedDiagram \chordmode {c:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {c:aug}
                         #guitar-tuning
                         #(chord-shape 'c:aug guitar-tuning)
-\storePredefinedDiagram \chordmode {c:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {c:dim}
                         #guitar-tuning
                         #(chord-shape 'c:dim guitar-tuning)
-\storePredefinedDiagram \chordmode {c:7}
+\storePredefinedDiagram #default-fret-table \chordmode {c:7}
                         #guitar-tuning
                         #"o;3-3;2-2;3-4;1-1;o;"
-\storePredefinedDiagram \chordmode {c:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {c:maj7}
                         #guitar-tuning
                         #"x;3-3;2-2;o;o;o;"
-\storePredefinedDiagram \chordmode {c:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {c:m7}
                         #guitar-tuning
                         #(offset-fret 2 (chord-shape 'bes:m7 guitar-tuning))
 
 %%%%  cis chords
 %
-\storePredefinedDiagram \chordmode {cis}
+\storePredefinedDiagram #default-fret-table \chordmode {cis}
                         #guitar-tuning
                         #(chord-shape 'cis guitar-tuning)
-\storePredefinedDiagram \chordmode {cis:m}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:m}
                         #guitar-tuning
                         #"x;x;2-2;1-1;2-3;o;"
-\storePredefinedDiagram \chordmode {cis:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:aug}
                         #guitar-tuning
                         #"x;4-4;3-3;2-1;2-2;x;"
-\storePredefinedDiagram \chordmode {cis:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:dim}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'c:dim guitar-tuning))
-\storePredefinedDiagram \chordmode {cis:7}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:7}
                         #guitar-tuning
                         #"x;x;3-2;4-3;2-1;4-4;"
-\storePredefinedDiagram \chordmode {cis:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:maj7}
                         #guitar-tuning
                         #"x;4-4;3-3;1-1-(;1-1;1-1-);"
-\storePredefinedDiagram \chordmode {cis:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:m7}
                         #guitar-tuning
                         #"x;4-4;2-2;1-1;o;o;"
 
 %%%%  des chords
 %
-\storePredefinedDiagram \chordmode {des}
+\storePredefinedDiagram #default-fret-table \chordmode {des}
                         #guitar-tuning
                         #"x;x;3-3;1-1-(;2-2;1-1-);"
-\storePredefinedDiagram \chordmode {des:m}
+\storePredefinedDiagram #default-fret-table \chordmode {des:m}
                         #guitar-tuning
                         #"x;x;2-2;1-1;2-3;o;"
-\storePredefinedDiagram \chordmode {des:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {des:aug}
                         #guitar-tuning
                         #"x;4-4;3-3;2-1;2-2;x;"
-\storePredefinedDiagram \chordmode {des:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {des:dim}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'c:dim guitar-tuning))
-\storePredefinedDiagram \chordmode {des:7}
+\storePredefinedDiagram #default-fret-table \chordmode {des:7}
                         #guitar-tuning
                         #"x;x;3-2;4-3;2-1;4-4;"
-\storePredefinedDiagram \chordmode {des:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {des:maj7}
                         #guitar-tuning
                         #"x;4-4;3-3;1-1-(;1-1;1-1-);"
-\storePredefinedDiagram \chordmode {des:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {des:m7}
                         #guitar-tuning
                         #"x;4-4;2-2;1-1;o;o;"
 
 %%%%  d chords
 %
-\storePredefinedDiagram \chordmode {d}
+\storePredefinedDiagram #default-fret-table \chordmode {d}
                         #guitar-tuning
                         #"x;x;o;2-1;3-3;2-2;"
-\storePredefinedDiagram \chordmode {d:m}
+\storePredefinedDiagram #default-fret-table \chordmode {d:m}
                         #guitar-tuning
                         #"x;x;o;2-2;3-3;1-1;"
-\storePredefinedDiagram \chordmode {d:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {d:aug}
                         #guitar-tuning
                         #"x;x;o;3-2;3-3;2-1;"
-\storePredefinedDiagram \chordmode {d:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {d:dim}
                         #guitar-tuning
                         #"x;x;o;1-1;o;1-2;"
-\storePredefinedDiagram \chordmode {d:7}
+\storePredefinedDiagram #default-fret-table \chordmode {d:7}
                         #guitar-tuning
                         #"x;x;o;2-2;1-1;2-3;"
-\storePredefinedDiagram \chordmode {d:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {d:maj7}
                         #guitar-tuning
                         #"x;x;o;2-1;2-2;2-3;"
-\storePredefinedDiagram \chordmode {d:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {d:m7}
                         #guitar-tuning
                         #"x;x;o;2-2;1-1-(;1-1-);"
 
 %%%%  dis chords
 %
-\storePredefinedDiagram \chordmode {dis}
+\storePredefinedDiagram #default-fret-table \chordmode {dis}
                         #guitar-tuning
                         #(offset-fret 2 (chord-shape 'cis guitar-tuning))
-\storePredefinedDiagram \chordmode {dis:m}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:m}
                         #guitar-tuning
                         #"x;x;4-3;3-2;4-4;1-1;"
-\storePredefinedDiagram \chordmode {dis:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:aug}
                         #guitar-tuning
                         #"3-3;2-2;1-1;o;o;3-4"
-\storePredefinedDiagram \chordmode {dis:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:dim}
                         #guitar-tuning
                         #(chord-shape 'ees:dim guitar-tuning)
-\storePredefinedDiagram \chordmode {dis:7}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:7}
                         #guitar-tuning
                         #"x;x;1-1;3-3;2-2;3-4;"
-\storePredefinedDiagram \chordmode {dis:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:maj7}
                         #guitar-tuning
                         #"x;x;1-1;3-2;3-3;3-4;"
-\storePredefinedDiagram \chordmode {dis:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:m7}
                         #guitar-tuning
                         #"x;x;1-1;3-2;2-3;2-4;"
 
 %%%%  ees chords
 %
-\storePredefinedDiagram \chordmode {ees}
+\storePredefinedDiagram #default-fret-table \chordmode {ees}
                         #guitar-tuning
                         #(offset-fret 2 (chord-shape 'cis guitar-tuning))
-\storePredefinedDiagram \chordmode {ees:m}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:m}
                         #guitar-tuning
                         #"x;x;4-3;3-2;4-4;1-1;"
-\storePredefinedDiagram \chordmode {ees:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:aug}
                         #guitar-tuning
                         #"3-3;2-2;1-1;o;o;3-4"
-\storePredefinedDiagram \chordmode {ees:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:dim}
                         #guitar-tuning
                         #(chord-shape 'ees:dim guitar-tuning)
-\storePredefinedDiagram \chordmode {ees:7}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:7}
                         #guitar-tuning
                         #"x;x;1-1;3-3;2-2;3-4;"
-\storePredefinedDiagram \chordmode {ees:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:maj7}
                         #guitar-tuning
                         #"x;x;1-1;3-2;3-3;3-4;"
-\storePredefinedDiagram \chordmode {ees:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:m7}
                         #guitar-tuning
                         #"x;x;1-1;3-2;2-3;2-4;"
 
 %%%%  e chords
 %
-\storePredefinedDiagram \chordmode {e}
+\storePredefinedDiagram #default-fret-table \chordmode {e}
                         #guitar-tuning
                         #"o;2-2;2-3;1-1;o;o;"
-\storePredefinedDiagram \chordmode {e:m}
+\storePredefinedDiagram #default-fret-table \chordmode {e:m}
                         #guitar-tuning
                         #"o;2-2;2-3;o;o;o;"
-\storePredefinedDiagram \chordmode {e:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {e:aug}
                         #guitar-tuning
                         #"o;3-3;2-2;1-1;x;x;"
-\storePredefinedDiagram \chordmode {e:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {e:dim}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'ees:dim guitar-tuning))
-\storePredefinedDiagram \chordmode {e:7}
+\storePredefinedDiagram #default-fret-table \chordmode {e:7}
                         #guitar-tuning
                         #"o;2-2;o;1-1;o;o;"
-\storePredefinedDiagram \chordmode {e:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {e:maj7}
                         #guitar-tuning
                         #"o;2-3;1-1;1-2;o;x;"
-\storePredefinedDiagram \chordmode {e:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {e:m7}
                         #guitar-tuning
                         #"o;2-2;o;o;o;o;"
 
 %%%%  f chords
 %
-\storePredefinedDiagram \chordmode {f}
+\storePredefinedDiagram #default-fret-table \chordmode {f}
                         #guitar-tuning
                         #(chord-shape 'f guitar-tuning)
-\storePredefinedDiagram \chordmode {f:m}
+\storePredefinedDiagram #default-fret-table \chordmode {f:m}
                         #guitar-tuning
                         #(chord-shape 'f:m guitar-tuning)
-\storePredefinedDiagram \chordmode {f:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {f:aug}
                         #guitar-tuning
                         #"x;x;1-1;4-3;4-4;3-2;"
-\storePredefinedDiagram \chordmode {f:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {f:dim}
                         #guitar-tuning
                         #"x;x;o;1-1;o;1-2;"
-\storePredefinedDiagram \chordmode {f:7}
+\storePredefinedDiagram #default-fret-table \chordmode {f:7}
                         #guitar-tuning
                         #(chord-shape 'f:7 guitar-tuning)
-\storePredefinedDiagram \chordmode {f:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {f:maj7}
                         #guitar-tuning
                         #"x;x;3-3;2-2;1-1;o;"
-\storePredefinedDiagram \chordmode {f:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {f:m7}
                         #guitar-tuning
                         #(chord-shape 'f:m7 guitar-tuning)
 
 %%%%  fis chords
 %
-\storePredefinedDiagram \chordmode {fis}
+\storePredefinedDiagram #default-fret-table \chordmode {fis}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'f guitar-tuning))
-\storePredefinedDiagram \chordmode {fis:m}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:m}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'f:m guitar-tuning))
-\storePredefinedDiagram \chordmode {fis:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:aug}
                         #guitar-tuning
                         #"2-2;1-1;o;3-4-(;3-4-);2-3;"
-\storePredefinedDiagram \chordmode {fis:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:dim}
                         #guitar-tuning
                         #"x;x;1-1;2-3;1-2;2-4;"
-\storePredefinedDiagram \chordmode {fis:7}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:7}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'f:7 guitar-tuning))
-\storePredefinedDiagram \chordmode {fis:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:maj7}
                         #guitar-tuning
                         #"x;x;4-4;3-3;2-2;1-1;"
-\storePredefinedDiagram \chordmode {fis:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:m7}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'f:m7 guitar-tuning))
 
 %%%%  ges chords
 %
-\storePredefinedDiagram \chordmode {ges}
+\storePredefinedDiagram #default-fret-table \chordmode {ges}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'f guitar-tuning))
-\storePredefinedDiagram \chordmode {ges:m}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:m}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'f:m guitar-tuning))
-\storePredefinedDiagram \chordmode {ges:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:aug}
                         #guitar-tuning
                         #"2-2;1-1;o;3-4-(;3-4-);2-3;"
-\storePredefinedDiagram \chordmode {ges:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:dim}
                         #guitar-tuning
                         #"x;x;1-1;2-3;1-2;2-4;"
-\storePredefinedDiagram \chordmode {ges:7}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:7}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'f:7 guitar-tuning))
-\storePredefinedDiagram \chordmode {ges:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:maj7}
                         #guitar-tuning
                         #"x;x;4-4;3-3;2-2;1-1;"
-\storePredefinedDiagram \chordmode {ges:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:m7}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'f:m7 guitar-tuning))
 
 %%%%  g chords
 %
-\storePredefinedDiagram \chordmode {g}
+\storePredefinedDiagram #default-fret-table \chordmode {g}
                         #guitar-tuning
                         #"3-2;2-1;o;o;o;3-3;"
-\storePredefinedDiagram \chordmode {g:m}
+\storePredefinedDiagram #default-fret-table \chordmode {g:m}
                         #guitar-tuning
                         #(offset-fret 2 (chord-shape 'f:m guitar-tuning))
-\storePredefinedDiagram \chordmode {g:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {g:aug}
                         #guitar-tuning
                         #"x;x;5-1;8-3;8-4;7-2;"
-\storePredefinedDiagram \chordmode {g:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {g:dim}
                         #guitar-tuning
                         #"x;x;5-2;6-4;5-3;3-1;"
-\storePredefinedDiagram \chordmode {g:7}
+\storePredefinedDiagram #default-fret-table \chordmode {g:7}
                         #guitar-tuning
                         #"3-3;2-2;o;o;o;1-1;"
-\storePredefinedDiagram \chordmode {g:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {g:maj7}
                         #guitar-tuning
                         #"x;x;5-4;4-3;3-2;2-1;"
-\storePredefinedDiagram \chordmode {g:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {g:m7}
                         #guitar-tuning
                         #(offset-fret 2 (chord-shape 'f:m7 guitar-tuning))
 
 %%%%  gis chords
 %
-\storePredefinedDiagram \chordmode {gis}
+\storePredefinedDiagram #default-fret-table \chordmode {gis}
                         #guitar-tuning
                         #(offset-fret 3 (chord-shape 'f guitar-tuning))
-\storePredefinedDiagram \chordmode {gis:m}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:m}
                         #guitar-tuning
                         #(offset-fret 3 (chord-shape 'f:m guitar-tuning))
-\storePredefinedDiagram \chordmode {gis:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:aug}
                         #guitar-tuning
                         #"o;3-4;2-3;1-1;1-2;o;"
-\storePredefinedDiagram \chordmode {gis:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:dim}
                         #guitar-tuning
                         #"x;x;o;1-1;o;1-2;"
-\storePredefinedDiagram \chordmode {gis:7}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:7}
                         #guitar-tuning
                         #(offset-fret 3 (chord-shape 'f:7 guitar-tuning))
-\storePredefinedDiagram \chordmode {gis:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:maj7}
                         #guitar-tuning
                         #"x;x;1-1-(;1-1;1-1-);3-3;"
-\storePredefinedDiagram \chordmode {gis:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:m7}
                         #guitar-tuning
                         #(offset-fret 3 (chord-shape 'f:m7 guitar-tuning))
 
 %%%%  aes chords
 %
-\storePredefinedDiagram \chordmode {aes}
+\storePredefinedDiagram #default-fret-table \chordmode {aes}
                         #guitar-tuning
                         #(offset-fret 3 (chord-shape 'f guitar-tuning))
-\storePredefinedDiagram \chordmode {aes:m}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:m}
                         #guitar-tuning
                         #(offset-fret 3 (chord-shape 'f:m guitar-tuning))
-\storePredefinedDiagram \chordmode {aes:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:aug}
                         #guitar-tuning
                         #"o;3-4;2-3;1-1;1-2;o;"
-\storePredefinedDiagram \chordmode {aes:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:dim}
                         #guitar-tuning
                         #"x;x;o;1-1;o;1-2;"
-\storePredefinedDiagram \chordmode {aes:7}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:7}
                         #guitar-tuning
                         #(offset-fret 3 (chord-shape 'f:7 guitar-tuning))
-\storePredefinedDiagram \chordmode {aes:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:maj7}
                         #guitar-tuning
                         #"x;x;1-1-(;1-1;1-1-);3-3;"
-\storePredefinedDiagram \chordmode {aes:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:m7}
                         #guitar-tuning
                         #(offset-fret 3 (chord-shape 'f:m7 guitar-tuning))
 
 %%%%  a chords
 %
-\storePredefinedDiagram \chordmode {a}
+\storePredefinedDiagram #default-fret-table \chordmode {a}
                         #guitar-tuning
                         #"x;o;2-1;2-2;2-3;o;"
-\storePredefinedDiagram \chordmode {a:m}
+\storePredefinedDiagram #default-fret-table \chordmode {a:m}
                         #guitar-tuning
                         #"x;o;2-2;2-3;1-1;o;"
-\storePredefinedDiagram \chordmode {a:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {a:aug}
                         #guitar-tuning
                         #"x;o;3-4;2-2;2-3;1-1;"
-\storePredefinedDiagram \chordmode {a:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {a:dim}
                         #guitar-tuning
                         #(chord-shape 'a:dim guitar-tuning)
-\storePredefinedDiagram \chordmode {a:7}
+\storePredefinedDiagram #default-fret-table \chordmode {a:7}
                         #guitar-tuning
                         #"x;o;2-1;o;2-3;o;"
-\storePredefinedDiagram \chordmode {a:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {a:maj7}
                         #guitar-tuning
                         #"x;o;2-2;1-1;2-3;o;"
-\storePredefinedDiagram \chordmode {a:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {a:m7}
                         #guitar-tuning
                         #"x;o;2-2;o;1-1;o;"
 
 %%%%  ais chords
 %
-\storePredefinedDiagram \chordmode {ais}
+\storePredefinedDiagram #default-fret-table \chordmode {ais}
                         #guitar-tuning
                         #(chord-shape 'bes guitar-tuning)
-\storePredefinedDiagram \chordmode {ais:m}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:m}
                         #guitar-tuning
                         #(chord-shape 'bes:m guitar-tuning)
-\storePredefinedDiagram \chordmode {ais:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:aug}
                         #guitar-tuning
                         #"2-2;1-1;o;3-4-(;3-4-);2-3;"
-\storePredefinedDiagram \chordmode {ais:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:dim}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'a:dim guitar-tuning))
-\storePredefinedDiagram \chordmode {ais:7}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:7}
                         #guitar-tuning
                         #(chord-shape 'bes:7 guitar-tuning)
-\storePredefinedDiagram \chordmode {ais:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:maj7}
                         #guitar-tuning
                         #"x;1-1;3-3;2-2;3-4;x;"
-\storePredefinedDiagram \chordmode {ais:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:m7}
                         #guitar-tuning
                         #(chord-shape 'bes:m7 guitar-tuning)
 
 %%%%  bes chords
 %
-\storePredefinedDiagram \chordmode {bes}
+\storePredefinedDiagram #default-fret-table \chordmode {bes}
                         #guitar-tuning
                         #(chord-shape 'bes guitar-tuning)
-\storePredefinedDiagram \chordmode {bes:m}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:m}
                         #guitar-tuning
                         #(chord-shape 'bes:m guitar-tuning)
-\storePredefinedDiagram \chordmode {bes:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:aug}
                         #guitar-tuning
                         #"2-2;1-1;o;3-4-(;3-4-);2-3;"
-\storePredefinedDiagram \chordmode {bes:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:dim}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'a:dim guitar-tuning))
-\storePredefinedDiagram \chordmode {bes:7}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:7}
                         #guitar-tuning
                         #(chord-shape 'bes:7 guitar-tuning)
-\storePredefinedDiagram \chordmode {bes:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:maj7}
                         #guitar-tuning
                         #"x;1-1;3-3;2-2;3-4;x;"
-\storePredefinedDiagram \chordmode {bes:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:m7}
                         #guitar-tuning
                         #(chord-shape 'bes:m7 guitar-tuning)
 
 %%%%  b chords
 %
-\storePredefinedDiagram \chordmode {b}
+\storePredefinedDiagram #default-fret-table \chordmode {b}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'bes guitar-tuning))
-\storePredefinedDiagram \chordmode {b:m}
+\storePredefinedDiagram #default-fret-table \chordmode {b:m}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'bes:m guitar-tuning))
-\storePredefinedDiagram \chordmode {b:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {b:aug}
                         #guitar-tuning
                         #"x;3-2;2-1;o;o;x;"
-\storePredefinedDiagram \chordmode {b:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {b:dim}
                         #guitar-tuning
                         #"x;x;o;1-1;o;1-2;"
-\storePredefinedDiagram \chordmode {b:7}
+\storePredefinedDiagram #default-fret-table \chordmode {b:7}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'bes:7 guitar-tuning))
-\storePredefinedDiagram \chordmode {b:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {b:maj7}
                         #guitar-tuning
                         #"x;2-1;4-3;3-2;4-4;x;"
-\storePredefinedDiagram \chordmode {b:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {b:m7}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'bes:m7 guitar-tuning))
 

diff --git a/ly/predefined-guitar-ninth-fretboards.ly b/ly/predefined-guitar-ninth-fretboards.ly
index fe3f957ea06e602df8253dad7c76456035d421fe..34204ca0229dff4f39a101a548a0ac5fd21f3a1c 100644 (file)
--- a/ly/predefined-guitar-ninth-fretboards.ly
+++ b/ly/predefined-guitar-ninth-fretboards.ly
@@ -15,61 +15,61 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.12.0"
+\version "2.13.36"
 
 %  Add ninth chords to predefined fret diagrams for standard guitar tunings
 
 \addChordShape #'c:9 #guitar-tuning #"x;3-2;2-1;3-3-(;3-3;3-3-);"
 \addChordShape #'f:9 #guitar-tuning #"1-1-(;3-3;1-1;2-2;1-1-);3-4;"
 
-\storePredefinedDiagram \chordmode {c:9}
+\storePredefinedDiagram #default-fret-table \chordmode {c:9}
                         #guitar-tuning
                        #(chord-shape 'c:9 guitar-tuning)
-\storePredefinedDiagram \chordmode {cis:9}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:9}
                         #guitar-tuning
                        #(offset-fret 1 (chord-shape 'c:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {des:9}
+\storePredefinedDiagram #default-fret-table \chordmode {des:9}
                         #guitar-tuning
                        #(offset-fret 1 (chord-shape 'c:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {d:9}
+\storePredefinedDiagram #default-fret-table \chordmode {d:9}
                         #guitar-tuning
                        #(offset-fret 2 (chord-shape 'c:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {dis:9}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:9}
                         #guitar-tuning
                        #(offset-fret 3 (chord-shape 'c:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {ees:9}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:9}
                         #guitar-tuning
                        #(offset-fret 3 (chord-shape 'c:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {e:9}
+\storePredefinedDiagram #default-fret-table \chordmode {e:9}
                         #guitar-tuning
                        #"o;2-2;o;1-1;o;2-3;"
-\storePredefinedDiagram \chordmode {f:9}
+\storePredefinedDiagram #default-fret-table \chordmode {f:9}
                         #guitar-tuning
                        #(chord-shape 'f:9 guitar-tuning)
-\storePredefinedDiagram \chordmode {fis:9}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:9}
                         #guitar-tuning
                        #(offset-fret 1 (chord-shape 'f:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {ges:9}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:9}
                         #guitar-tuning
                        #(offset-fret 1 (chord-shape 'f:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {g:9}
+\storePredefinedDiagram #default-fret-table \chordmode {g:9}
                         #guitar-tuning
                        #(offset-fret 2 (chord-shape 'f:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {gis:9}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:9}
                         #guitar-tuning
                        #(offset-fret 3 (chord-shape 'f:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {aes:9}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:9}
                         #guitar-tuning
                        #(offset-fret 3 (chord-shape 'f:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {a:9}
+\storePredefinedDiagram #default-fret-table \chordmode {a:9}
                         #guitar-tuning
                        #(offset-fret 4 (chord-shape 'f:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {ais:9}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:9}
                         #guitar-tuning
                        #(offset-fret 5 (chord-shape 'f:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {bes:9}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:9}
                         #guitar-tuning
                        #(offset-fret 5 (chord-shape 'f:9 guitar-tuning))
-\storePredefinedDiagram \chordmode {b:9}
+\storePredefinedDiagram #default-fret-table \chordmode {b:9}
                         #guitar-tuning
                        #(offset-fret -1 (chord-shape 'c:9 guitar-tuning))

diff --git a/ly/predefined-ukulele-fretboards.ly b/ly/predefined-ukulele-fretboards.ly
index 0c8829e87908ba8d5031e3cb6c3dd5d02026c318..554c828fe4b3da93b36ac515245553619526d99f 100644 (file)
--- a/ly/predefined-ukulele-fretboards.ly
+++ b/ly/predefined-ukulele-fretboards.ly
@@ -15,7 +15,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.13.9"
+\version "2.13.36"
 
 %%%% sources:
 %%%%   ukulele hall of fame museum website (http://www.ukulele.org/),
@@ -24,782 +24,782 @@
 
 %%% a chords
 
-\storePredefinedDiagram \chordmode {a}
+\storePredefinedDiagram #default-fret-table \chordmode {a}
                         #ukulele-tuning
                         #"2-2;1-1;o;o;"
 
-\storePredefinedDiagram \chordmode {a:m}
+\storePredefinedDiagram #default-fret-table \chordmode {a:m}
                         #ukulele-tuning
                         #"2-1;o;o;o;"
 
-\storePredefinedDiagram \chordmode {a:7}
+\storePredefinedDiagram #default-fret-table \chordmode {a:7}
                         #ukulele-tuning
                         #"o;1-1;o;o;"
 
-\storePredefinedDiagram \chordmode {a:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {a:m7}
                         #ukulele-tuning
                         #"o;o;o;o;"
 
-\storePredefinedDiagram \chordmode {a:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {a:dim}
                         #ukulele-tuning
                         #"2-1;3-3;2-2;3-4;"
 
-\storePredefinedDiagram \chordmode {a:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {a:maj7}
                         #ukulele-tuning
                         #"1-1;1-2;o;o;"
 
-\storePredefinedDiagram \chordmode {a:6}
+\storePredefinedDiagram #default-fret-table \chordmode {a:6}
                         #ukulele-tuning
                         #"2-1;4-3;2-2;4-4;"
 
-\storePredefinedDiagram \chordmode {a:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {a:sus2}
                         #ukulele-tuning
                         #"2-2;4-3;5-4;2-1;"
 
-\storePredefinedDiagram \chordmode {a:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {a:sus4}
                         #ukulele-tuning
                         #"2-1;2-2;o;o;"
 
-\storePredefinedDiagram \chordmode {a:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {a:aug}
                         #ukulele-tuning
                         #"2-2;1-1-(;1-1-);4-4;"
 
-\storePredefinedDiagram \chordmode {a:9}
+\storePredefinedDiagram #default-fret-table \chordmode {a:9}
                         #ukulele-tuning
                         #"o;1-1;o;2-2;"
 
 %%% ais chords
 
-\storePredefinedDiagram \chordmode {ais}
+\storePredefinedDiagram #default-fret-table \chordmode {ais}
                         #ukulele-tuning
                         #"3-3;2-2;1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {ais:m}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:m}
                         #ukulele-tuning
                         #"3-3;1-1-(;1-1;1-1-);"
 
-\storePredefinedDiagram \chordmode {ais:7}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:7}
                         #ukulele-tuning
                         #"1-1-(;2-2;1-1;1-1-);"
 
-\storePredefinedDiagram \chordmode {ais:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:m7}
                         #ukulele-tuning
                         #"1-1-(;1-1;1-1;1-1-);"
 
-\storePredefinedDiagram \chordmode {ais:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:dim}
                         #ukulele-tuning
                         #"o;1-1;o;1-2;"
 
-\storePredefinedDiagram \chordmode {ais:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:maj7}
                         #ukulele-tuning
                         #"2-2-(;2-2-);1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {ais:6}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:6}
                         #ukulele-tuning
                         #"o;2-2;1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {ais:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:sus2}
                         #ukulele-tuning
                         #"3-3;o;1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {ais:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:sus4}
                         #ukulele-tuning
                         #"3-3-(;3-3-);1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {ais:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:aug}
                         #ukulele-tuning
                         #"3-2;1-1-(;1-1-);5-4;"
 
-\storePredefinedDiagram \chordmode {ais:9}
+\storePredefinedDiagram #default-fret-table \chordmode {ais:9}
                         #ukulele-tuning
                         #"1-1-(;2-2;1-1-);3-3;"
 
 %%% bes chords
 
-\storePredefinedDiagram \chordmode {bes}
+\storePredefinedDiagram #default-fret-table \chordmode {bes}
                         #ukulele-tuning
                         #"3-3;2-2;1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {bes:m}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:m}
                         #ukulele-tuning
                         #"3-3;1-1-(;1-1;1-1-);"
 
-\storePredefinedDiagram \chordmode {bes:7}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:7}
                         #ukulele-tuning
                         #"1-1-(;2-2;1-1;1-1-);"
 
-\storePredefinedDiagram \chordmode {bes:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:m7}
                         #ukulele-tuning
                         #"1-1-(;1-1;1-1;1-1-);"
 
-\storePredefinedDiagram \chordmode {bes:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:dim}
                         #ukulele-tuning
                         #"o;1-1;o;1-2;"
 
-\storePredefinedDiagram \chordmode {bes:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:maj7}
                         #ukulele-tuning
                         #"2-2-(;2-2-);1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {bes:6}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:6}
                         #ukulele-tuning
                         #"o;2-2;1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {bes:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:sus2}
                         #ukulele-tuning
                         #"3-3;o;1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {bes:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:sus4}
                         #ukulele-tuning
                         #"3-3-(;3-3-);1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {bes:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:aug}
                         #ukulele-tuning
                         #"3-2;1-1-(;1-1-);5-4;"
 
-\storePredefinedDiagram \chordmode {bes:9}
+\storePredefinedDiagram #default-fret-table \chordmode {bes:9}
                         #ukulele-tuning
                         #"1-1-(;2-2;1-1-);3-3;"
 
 %%% b chords
 
-\storePredefinedDiagram \chordmode {b}
+\storePredefinedDiagram #default-fret-table \chordmode {b}
                         #ukulele-tuning
                         #"4-3;3-2;2-1-(;2-1-);"
 
-\storePredefinedDiagram \chordmode {b:m}
+\storePredefinedDiagram #default-fret-table \chordmode {b:m}
                         #ukulele-tuning
                         #"4-3;2-1-(;2-1;2-1-);"
 
-\storePredefinedDiagram \chordmode {b:7}
+\storePredefinedDiagram #default-fret-table \chordmode {b:7}
                         #ukulele-tuning
                         #"2-1-(;3-2;2-1;2-1-);"
 
-\storePredefinedDiagram \chordmode {b:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {b:m7}
                         #ukulele-tuning
                         #"2-1-(;2-1;2-1;2-1-);"
 
-\storePredefinedDiagram \chordmode {b:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {b:dim}
                         #ukulele-tuning
                         #"1-1;2-3;1-2;2-4;"
 
-\storePredefinedDiagram \chordmode {b:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {b:maj7}
                         #ukulele-tuning
                         #"3-2-(;3-2-);2-1-(;2-1-);"
 
-\storePredefinedDiagram \chordmode {b:6}
+\storePredefinedDiagram #default-fret-table \chordmode {b:6}
                         #ukulele-tuning
                         #"1-1;3-4;2-2;2-3;"
 
-\storePredefinedDiagram \chordmode {b:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {b:sus2}
                         #ukulele-tuning
                         #"5-4;1-1;2-3;2-2;"
 
-\storePredefinedDiagram \chordmode {b:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {b:sus4}
                         #ukulele-tuning
                         #"4-2-(;4-2-);2-1-(;2-1-);"
 
-\storePredefinedDiagram \chordmode {b:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {b:aug}
                         #ukulele-tuning
                         #"o;3-2-(;3-2-);2-1;"
 
-\storePredefinedDiagram \chordmode {b:9}
+\storePredefinedDiagram #default-fret-table \chordmode {b:9}
                         #ukulele-tuning
                         #"2-2-(;3-3;2-2-);4-4;"
 
 %%% c chords
 
-\storePredefinedDiagram \chordmode {c}
+\storePredefinedDiagram #default-fret-table \chordmode {c}
                         #ukulele-tuning
                         #"o;o;o;3-3;"
 
-\storePredefinedDiagram \chordmode {c:m}
+\storePredefinedDiagram #default-fret-table \chordmode {c:m}
                         #ukulele-tuning
                         #"o;3-1;3-2;3-3;"
 
-\storePredefinedDiagram \chordmode {c:7}
+\storePredefinedDiagram #default-fret-table \chordmode {c:7}
                         #ukulele-tuning
                         #"o;o;o;1-1;"
 
-\storePredefinedDiagram \chordmode {c:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {c:m7}
                         #ukulele-tuning
                         #"3-1-(;3-1;3-1;3-1-);"
 
-\storePredefinedDiagram \chordmode {c:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {c:dim}
                         #ukulele-tuning
                         #"2-1;3-3;2-2;3-4;"
 
-\storePredefinedDiagram \chordmode {c:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {c:maj7}
                         #ukulele-tuning
                         #"o;o;o;2-1;"
 
-\storePredefinedDiagram \chordmode {c:6}
+\storePredefinedDiagram #default-fret-table \chordmode {c:6}
                         #ukulele-tuning
                         #"o;o;o;o;"
 
-\storePredefinedDiagram \chordmode {c:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {c:sus2}
                         #ukulele-tuning
                         #"o;2-1;3-2-(;3-2-);"
 
-\storePredefinedDiagram \chordmode {c:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {c:sus4}
                         #ukulele-tuning
                         #"o;o;1-1;3-3;"
 
-\storePredefinedDiagram \chordmode {c:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {c:aug}
                         #ukulele-tuning
                         #"1-1;o;o;3-4;"
 
-\storePredefinedDiagram \chordmode {c:9}
+\storePredefinedDiagram #default-fret-table \chordmode {c:9}
                         #ukulele-tuning
                         #"o;2-2;o;1-1;"
 
 %%% cis chords
 
-\storePredefinedDiagram \chordmode {cis}
+\storePredefinedDiagram #default-fret-table \chordmode {cis}
                         #ukulele-tuning
                         #"1-1-(;1-1;1-1-);4-4;"
 
-\storePredefinedDiagram \chordmode {cis:m}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:m}
                         #ukulele-tuning
                         #"1-1;4-2;4-3-(;4-3-);"
 
-\storePredefinedDiagram \chordmode {cis:7}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:7}
                         #ukulele-tuning
                         #"1-1-(;1-1;1-1-);2-2;"
 
-\storePredefinedDiagram \chordmode {cis:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:m7}
                         #ukulele-tuning
                         #"2-2-(;2-2-);1-1;3-3;"
 
-\storePredefinedDiagram \chordmode {cis:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:dim}
                         #ukulele-tuning
                         #"o;1-1;o;1-2;"
 
-\storePredefinedDiagram \chordmode {cis:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:maj7}
                         #ukulele-tuning
                         #"1-1-(;1-1;1-1-);3-3;"
 
-\storePredefinedDiagram \chordmode {cis:6}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:6}
                         #ukulele-tuning
                         #"1-1-(;1-1;1-1;1-1-);"
 
-\storePredefinedDiagram \chordmode {cis:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:sus2}
                         #ukulele-tuning
                         #"1-1;3-2;4-3-(;4-3-);"
 
-\storePredefinedDiagram \chordmode {cis:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:sus4}
                         #ukulele-tuning
                         #"1-1-(;1-1-);2-2;4-4;"
 
-\storePredefinedDiagram \chordmode {cis:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:aug}
                         #ukulele-tuning
                         #"2-2;1-1-(;1-1-);4-4;"
 
-\storePredefinedDiagram \chordmode {cis:9}
+\storePredefinedDiagram #default-fret-table \chordmode {cis:9}
                         #ukulele-tuning
                         #"1-1-(;3-3;1-1-);2-2;"
 
 %%% des chords
 
-\storePredefinedDiagram \chordmode {des}
+\storePredefinedDiagram #default-fret-table \chordmode {des}
                         #ukulele-tuning
                         #"1-1-(;1-1;1-1-);4-4;"
 
-\storePredefinedDiagram \chordmode {des:m}
+\storePredefinedDiagram #default-fret-table \chordmode {des:m}
                         #ukulele-tuning
                         #"1-1;4-2;4-3-(;4-3-);"
 
-\storePredefinedDiagram \chordmode {des:7}
+\storePredefinedDiagram #default-fret-table \chordmode {des:7}
                         #ukulele-tuning
                         #"1-1-(;1-1;1-1-);2-2;"
 
-\storePredefinedDiagram \chordmode {des:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {des:m7}
                         #ukulele-tuning
                         #"2-2-(;2-2-);1-1;3-3;"
 
-\storePredefinedDiagram \chordmode {des:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {des:dim}
                         #ukulele-tuning
                         #"o;1-1;o;1-2;"
 
-\storePredefinedDiagram \chordmode {des:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {des:maj7}
                         #ukulele-tuning
                         #"1-1-(;1-1;1-1-);3-3;"
 
-\storePredefinedDiagram \chordmode {des:6}
+\storePredefinedDiagram #default-fret-table \chordmode {des:6}
                         #ukulele-tuning
                         #"1-1-(;1-1;1-1;1-1-);"
 
-\storePredefinedDiagram \chordmode {des:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {des:sus2}
                         #ukulele-tuning
                         #"1-1;3-2;4-3-(;4-3-);"
 
-\storePredefinedDiagram \chordmode {des:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {des:sus4}
                         #ukulele-tuning
                         #"1-1-(;1-1-);2-2;4-4;"
 
-\storePredefinedDiagram \chordmode {des:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {des:aug}
                         #ukulele-tuning
                         #"2-2;1-1-(;1-1-);4-4;"
 
-\storePredefinedDiagram \chordmode {des:9}
+\storePredefinedDiagram #default-fret-table \chordmode {des:9}
                         #ukulele-tuning
                         #"1-1-(;3-3;1-1-);2-2;"
 
 %%% d chords
 
-\storePredefinedDiagram \chordmode {d}
+\storePredefinedDiagram #default-fret-table \chordmode {d}
                         #ukulele-tuning
                         #"2-1;2-2;2-3;o;"
 
-\storePredefinedDiagram \chordmode {d:m}
+\storePredefinedDiagram #default-fret-table \chordmode {d:m}
                         #ukulele-tuning
                         #"2-2-(;2-2-);1-1;o;"
 
-\storePredefinedDiagram \chordmode {d:7}
+\storePredefinedDiagram #default-fret-table \chordmode {d:7}
                         #ukulele-tuning
                         #"2-1-(;2-1;2-1-);3-2;"
 
-\storePredefinedDiagram \chordmode {d:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {d:m7}
                         #ukulele-tuning
                         #"2-2-(;2-2-);1-1;3-3;"
 
-\storePredefinedDiagram \chordmode {d:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {d:dim}
                         #ukulele-tuning
                         #"1-1;2-3;1-2;2-4;"
 
-\storePredefinedDiagram \chordmode {d:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {d:maj7}
                         #ukulele-tuning
                         #"2-1-(;2-1;2-1-);4-3;"
 
-\storePredefinedDiagram \chordmode {d:6}
+\storePredefinedDiagram #default-fret-table \chordmode {d:6}
                         #ukulele-tuning
                         #"2-1-(;2-1;2-1;2-1-);"
 
-\storePredefinedDiagram \chordmode {d:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {d:sus2}
                         #ukulele-tuning
                         #"2-1;2-2;o;o;"
 
-\storePredefinedDiagram \chordmode {d:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {d:sus4}
                         #ukulele-tuning
                         #"o;2-1;3-2;o;"
 
-\storePredefinedDiagram \chordmode {d:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {d:aug}
                         #ukulele-tuning
                         #"3-2;2-1-(;2-1-);5-4;"
 
-\storePredefinedDiagram \chordmode {d:9}
+\storePredefinedDiagram #default-fret-table \chordmode {d:9}
                         #ukulele-tuning
                         #"2-1-(;4-3;2-1-);3-2;"
 
 %%%% dis chords
 
-\storePredefinedDiagram \chordmode {dis}
+\storePredefinedDiagram #default-fret-table \chordmode {dis}
                         #ukulele-tuning
                         #"o;3-2-(;3-2-);1-1;"
 
-\storePredefinedDiagram \chordmode {dis:m}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:m}
                         #ukulele-tuning
                         #"3-3-(;3-3-);2-2;1-1;"
 
-\storePredefinedDiagram \chordmode {dis:7}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:7}
                         #ukulele-tuning
                         #"3-1-(;3-1;3-1-);4-2;"
 
-\storePredefinedDiagram \chordmode {dis:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:m7}
                         #ukulele-tuning
                         #"3-2-(;3-2-);2-1;4-4;"
 
-\storePredefinedDiagram \chordmode {dis:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:dim}
                         #ukulele-tuning
                         #"2-1;3-3;2-1;3-4;"
 
-\storePredefinedDiagram \chordmode {dis:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:maj7}
                         #ukulele-tuning
                         #"3-1-(;3-2;3-1-);5-2;"
 
-\storePredefinedDiagram \chordmode {dis:6}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:6}
                         #ukulele-tuning
                         #"3-1-(;3-1;3-1;3-1-);"
 
-\storePredefinedDiagram \chordmode {dis:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:sus2}
                         #ukulele-tuning
                         #"3-2-(;3-2-);1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {dis:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:sus4}
                         #ukulele-tuning
                         #"1-2;3-3;4-4;1-1;"
 
-\storePredefinedDiagram \chordmode {dis:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:aug}
                         #ukulele-tuning
                         #"o;3-2-(;3-2-);2-1;"
 
-\storePredefinedDiagram \chordmode {dis:9}
+\storePredefinedDiagram #default-fret-table \chordmode {dis:9}
                         #ukulele-tuning
                         #"o;1-1-(;1-1;1-1-);"
 
 %%%% ees chords
 
-\storePredefinedDiagram \chordmode {ees}
+\storePredefinedDiagram #default-fret-table \chordmode {ees}
                         #ukulele-tuning
                         #"o;3-2-(;3-2-);1-1;"
 
-\storePredefinedDiagram \chordmode {ees:m}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:m}
                         #ukulele-tuning
                         #"3-3-(;3-3-);2-2;1-1;"
 
-\storePredefinedDiagram \chordmode {ees:7}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:7}
                         #ukulele-tuning
                         #"3-1-(;3-1;3-1-);4-2;"
 
-\storePredefinedDiagram \chordmode {ees:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:m7}
                         #ukulele-tuning
                         #"3-2-(;3-2-);2-1;4-4;"
 
-\storePredefinedDiagram \chordmode {ees:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:dim}
                         #ukulele-tuning
                         #"2-1;3-3;2-1;3-4;"
 
-\storePredefinedDiagram \chordmode {ees:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:maj7}
                         #ukulele-tuning
                         #"3-1-(;3-2;3-1-);5-2;"
 
-\storePredefinedDiagram \chordmode {ees:6}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:6}
                         #ukulele-tuning
                         #"3-1-(;3-1;3-1;3-1-);"
 
-\storePredefinedDiagram \chordmode {ees:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:sus2}
                         #ukulele-tuning
                         #"3-2-(;3-2-);1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {ees:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:sus4}
                         #ukulele-tuning
                         #"1-2;3-3;4-4;1-1;"
 
-\storePredefinedDiagram \chordmode {ees:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:aug}
                         #ukulele-tuning
                         #"o;3-2-(;3-2-);2-1;"
 
-\storePredefinedDiagram \chordmode {ees:9}
+\storePredefinedDiagram #default-fret-table \chordmode {ees:9}
                         #ukulele-tuning
                         #"o;1-1-(;1-1;1-1-);"
 
 %%%% e chords
 
-\storePredefinedDiagram \chordmode {e}
+\storePredefinedDiagram #default-fret-table \chordmode {e}
                         #ukulele-tuning
                         #"4-2;4-3;4-4;2-1;"
 
-\storePredefinedDiagram \chordmode {e:m}
+\storePredefinedDiagram #default-fret-table \chordmode {e:m}
                         #ukulele-tuning
                         #"4-3;4-3;3-2;2-1;"
 
-\storePredefinedDiagram \chordmode {e:7}
+\storePredefinedDiagram #default-fret-table \chordmode {e:7}
                         #ukulele-tuning
                         #"1-1;2-2;o;2-3;"
 
-\storePredefinedDiagram \chordmode {e:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {e:m7}
                         #ukulele-tuning
                         #"o;2-1;o;2-2;"
 
-\storePredefinedDiagram \chordmode {e:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {e:dim}
                         #ukulele-tuning
                         #"o;1-1;o;1-2;"
 
-\storePredefinedDiagram \chordmode {e:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {e:maj7}
                         #ukulele-tuning
                         #"1-1;3-3;o;2-2;"
 
-\storePredefinedDiagram \chordmode {e:6}
+\storePredefinedDiagram #default-fret-table \chordmode {e:6}
                         #ukulele-tuning
                         #"4-1-(;4-1;4-1;4-1-);"
 
-\storePredefinedDiagram \chordmode {e:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {e:sus2}
                         #ukulele-tuning
                         #"4-3-(;4-3-);2-1-(;2-1-);"
 
-\storePredefinedDiagram \chordmode {e:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {e:sus4}
                         #ukulele-tuning
                         #"2-2;4-4;o;2-1;"
 
-\storePredefinedDiagram \chordmode {e:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {e:aug}
                         #ukulele-tuning
                         #"1-1;o;o;3-4;"
 
-\storePredefinedDiagram \chordmode {e:9}
+\storePredefinedDiagram #default-fret-table \chordmode {e:9}
                         #ukulele-tuning
                         #"1-1;2-2-(;2-2;2-2-);"
 
 %%%% f chords
 
-\storePredefinedDiagram \chordmode {f}
+\storePredefinedDiagram #default-fret-table \chordmode {f}
                         #ukulele-tuning
                         #"2-2;o;1-1;o;"
 
-\storePredefinedDiagram \chordmode {f:m}
+\storePredefinedDiagram #default-fret-table \chordmode {f:m}
                         #ukulele-tuning
                         #"1-1;o;1-2;3-4;"
 
-\storePredefinedDiagram \chordmode {f:7}
+\storePredefinedDiagram #default-fret-table \chordmode {f:7}
                         #ukulele-tuning
                         #"2-2;3-3;1-1;3-4;"
 
-\storePredefinedDiagram \chordmode {f:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {f:m7}
                         #ukulele-tuning
                         #"1-1;3-3;1-2;3-4;"
 
-\storePredefinedDiagram \chordmode {f:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {f:dim}
                         #ukulele-tuning
                         #"1-1;2-3;1-2;2-4;"
 
-\storePredefinedDiagram \chordmode {f:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {f:maj7}
                         #ukulele-tuning
                         #"2-2;4-4;1-1;3-3;"
 
-\storePredefinedDiagram \chordmode {f:6}
+\storePredefinedDiagram #default-fret-table \chordmode {f:6}
                         #ukulele-tuning
                         #"2-2-(;2-2-);1-1;3-4;"
 
-\storePredefinedDiagram \chordmode {f:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {f:sus2}
                         #ukulele-tuning
                         #"o;o;1-1;3-3;"
 
-\storePredefinedDiagram \chordmode {f:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {f:sus4}
                         #ukulele-tuning
                         #"3-3;o;1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {f:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {f:aug}
                         #ukulele-tuning
                         #"2-2;1-1-(;1-1-);4-4;"
 
-\storePredefinedDiagram \chordmode {f:9}
+\storePredefinedDiagram #default-fret-table \chordmode {f:9}
                         #ukulele-tuning
                         #"2-1;3-2-(;3-2;3-2-);"
 
 %%%% fis chords
 
-\storePredefinedDiagram \chordmode {fis}
+\storePredefinedDiagram #default-fret-table \chordmode {fis}
                         #ukulele-tuning
                         #"3-3;1-1;2-2;1-1;"
 
-\storePredefinedDiagram \chordmode {fis:m}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:m}
                         #ukulele-tuning
                         #"2-2;1-1;2-3;o;"
 
-\storePredefinedDiagram \chordmode {fis:7}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:7}
                         #ukulele-tuning
                         #"3-3;4-4;2-2;1-1;"
 
-\storePredefinedDiagram \chordmode {fis:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:m7}
                         #ukulele-tuning
                         #"2-1;4-3;2-2;4-4;"
 
-\storePredefinedDiagram \chordmode {fis:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:dim}
                         #ukulele-tuning
                         #"2-1;3-3;2-2;3-4;"
 
-\storePredefinedDiagram \chordmode {fis:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:maj7}
                         #ukulele-tuning
                         #"3-2;5-4;2-1;4-3;"
 
-\storePredefinedDiagram \chordmode {fis:6}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:6}
                         #ukulele-tuning
                         #"3-2-(;3-2-);2-1;4-4;"
 
-\storePredefinedDiagram \chordmode {fis:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:sus2}
                         #ukulele-tuning
                         #"1-1-(;1-1-);2-2;4-4;"
 
-\storePredefinedDiagram \chordmode {fis:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:sus4}
                         #ukulele-tuning
                         #"4-4;1-1;2-2;2-3;"
 
-\storePredefinedDiagram \chordmode {fis:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:aug}
                         #ukulele-tuning
                         #"3-2;2-1-(;2-1-);5-4;"
 
-\storePredefinedDiagram \chordmode {fis:9}
+\storePredefinedDiagram #default-fret-table \chordmode {fis:9}
                         #ukulele-tuning
                         #"3-1;4-2-(;4-2;4-2-);"
 
 %%%% ges chords
 
-\storePredefinedDiagram \chordmode {ges}
+\storePredefinedDiagram #default-fret-table \chordmode {ges}
                         #ukulele-tuning
                         #"3-3;1-1;2-2;1-1;"
 
-\storePredefinedDiagram \chordmode {ges:m}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:m}
                         #ukulele-tuning
                         #"2-2;1-1;2-3;o;"
 
-\storePredefinedDiagram \chordmode {ges:7}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:7}
                         #ukulele-tuning
                         #"3-3;4-4;2-2;1-1;"
 
-\storePredefinedDiagram \chordmode {ges:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:m7}
                         #ukulele-tuning
                         #"2-1;4-3;2-2;4-4;"
 
-\storePredefinedDiagram \chordmode {ges:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:dim}
                         #ukulele-tuning
                         #"2-1;3-3;2-2;3-4;"
 
-\storePredefinedDiagram \chordmode {ges:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:maj7}
                         #ukulele-tuning
                         #"3-2;5-4;2-1;4-3;"
 
-\storePredefinedDiagram \chordmode {ges:6}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:6}
                         #ukulele-tuning
                         #"3-2-(;3-2-);2-1;4-4;"
 
-\storePredefinedDiagram \chordmode {ges:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:sus2}
                         #ukulele-tuning
                         #"1-1-(;1-1-);2-2;4-4;"
 
-\storePredefinedDiagram \chordmode {ges:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:sus4}
                         #ukulele-tuning
                         #"4-4;1-1;2-2;2-3;"
 
-\storePredefinedDiagram \chordmode {ges:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:aug}
                         #ukulele-tuning
                         #"3-2;2-1-(;2-1-);5-4;"
 
-\storePredefinedDiagram \chordmode {ges:9}
+\storePredefinedDiagram #default-fret-table \chordmode {ges:9}
                         #ukulele-tuning
                         #"3-1;4-2-(;4-2;4-2-);"
 
 %%%% g chords
 
-\storePredefinedDiagram \chordmode {g}
+\storePredefinedDiagram #default-fret-table \chordmode {g}
                         #ukulele-tuning
                         #"o;2-1;3-3;2-2;"
 
-\storePredefinedDiagram \chordmode {g:m}
+\storePredefinedDiagram #default-fret-table \chordmode {g:m}
                         #ukulele-tuning
                         #"o;2-2;3-3;1-1;"
 
-\storePredefinedDiagram \chordmode {g:7}
+\storePredefinedDiagram #default-fret-table \chordmode {g:7}
                         #ukulele-tuning
                         #"o;2-2;1-1;2-3;"
 
-\storePredefinedDiagram \chordmode {g:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {g:m7}
                         #ukulele-tuning
                         #"o;2-2;1-1-(;1-1-);"
 
-\storePredefinedDiagram \chordmode {g:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {g:dim}
                         #ukulele-tuning
                         #"o;1-1;o;1-2;"
 
-\storePredefinedDiagram \chordmode {g:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {g:maj7}
                         #ukulele-tuning
                         #"o;2-1;2-2;2-3;"
 
-\storePredefinedDiagram \chordmode {g:6}
+\storePredefinedDiagram #default-fret-table \chordmode {g:6}
                         #ukulele-tuning
                         #"o;2-1;o;2-2;"
 
-\storePredefinedDiagram \chordmode {g:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {g:sus2}
                         #ukulele-tuning
                         #"o;2-1;3-2;o;"
 
-\storePredefinedDiagram \chordmode {g:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {g:sus4}
                         #ukulele-tuning
                         #"o;2-1;3-2;3-3;"
 
-\storePredefinedDiagram \chordmode {g:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {g:aug}
                         #ukulele-tuning
                         #"o;3-2-(;3-2-);2-1;"
 
-\storePredefinedDiagram \chordmode {g:9}
+\storePredefinedDiagram #default-fret-table \chordmode {g:9}
                         #ukulele-tuning
                         #"2-2;2-3;1-1;2-4;"
 
 %%%% gis chords
 
-\storePredefinedDiagram \chordmode {gis}
+\storePredefinedDiagram #default-fret-table \chordmode {gis}
                         #ukulele-tuning
                         #"5-3;3-1-(;4-2;3-1-);"
 
-\storePredefinedDiagram \chordmode {gis:m}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:m}
                         #ukulele-tuning
                         #"1-1;3-3;4-4;2-2;"
 
-\storePredefinedDiagram \chordmode {gis:7}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:7}
                         #ukulele-tuning
                         #"1-1;3-3;2-2;3-4;"
 
-\storePredefinedDiagram \chordmode {gis:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:m7}
                         #ukulele-tuning
                         #"1-1;3-4;2-2;2-3;"
 
-\storePredefinedDiagram \chordmode {gis:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:dim}
                         #ukulele-tuning
                         #"1-1;2-3;1-2;2-4;"
 
-\storePredefinedDiagram \chordmode {gis:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:maj7}
                         #ukulele-tuning
                         #"1-1;3-2;3-3-(;3-3-);"
 
-\storePredefinedDiagram \chordmode {gis:6}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:6}
                         #ukulele-tuning
                         #"1-1;3-3;1-2;3-4;"
 
-\storePredefinedDiagram \chordmode {gis:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:sus2}
                         #ukulele-tuning
                         #"1-2;3-3;4-4;1-1;"
 
-\storePredefinedDiagram \chordmode {gis:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:sus4}
                         #ukulele-tuning
                         #"1-1;2-3;4-3-(;4-3-);"
 
-\storePredefinedDiagram \chordmode {gis:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:aug}
                         #ukulele-tuning
                         #"1-1;o;o;3-4;"
 
-\storePredefinedDiagram \chordmode {gis:9}
+\storePredefinedDiagram #default-fret-table \chordmode {gis:9}
                         #ukulele-tuning
                         #"1-1;o;2-3;1-2;"
 
 %%%% aes chords
 
-\storePredefinedDiagram \chordmode {aes}
+\storePredefinedDiagram #default-fret-table \chordmode {aes}
                         #ukulele-tuning
                         #"5-3;3-1-(;4-2;3-1-);"
 
-\storePredefinedDiagram \chordmode {aes:m}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:m}
                         #ukulele-tuning
                         #"1-1;3-3;4-4;2-2;"
 
-\storePredefinedDiagram \chordmode {aes:7}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:7}
                         #ukulele-tuning
                         #"1-1;3-3;2-2;3-4;"
 
-\storePredefinedDiagram \chordmode {aes:m7}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:m7}
                         #ukulele-tuning
                         #"1-1;3-4;2-2;2-3;"
 
-\storePredefinedDiagram \chordmode {aes:dim}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:dim}
                         #ukulele-tuning
                         #"1-1;2-3;1-2;2-4;"
 
-\storePredefinedDiagram \chordmode {aes:maj7}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:maj7}
                         #ukulele-tuning
                         #"1-1;3-2;3-3-(;3-3-);"
 
-\storePredefinedDiagram \chordmode {aes:6}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:6}
                         #ukulele-tuning
                         #"1-1;3-3;1-2;3-4;"
 
-\storePredefinedDiagram \chordmode {aes:sus2}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:sus2}
                         #ukulele-tuning
                         #"1-2;3-3;4-4;1-1;"
 
-\storePredefinedDiagram \chordmode {aes:sus4}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:sus4}
                         #ukulele-tuning
                         #"1-1;2-3;4-3-(;4-3-);"
 
-\storePredefinedDiagram \chordmode {aes:aug}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:aug}
                         #ukulele-tuning
                         #"1-1;o;o;3-4;"
 
-\storePredefinedDiagram \chordmode {aes:9}
+\storePredefinedDiagram #default-fret-table \chordmode {aes:9}
                         #ukulele-tuning
                         #"1-1;o;2-3;1-2;"

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 109166270574e26a9de09338cad3116c5ff2a51f..3283df7b2e673cc763c9537809d5d547a6941118 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -337,7 +337,7 @@ back to the lilypond source statement.")
 predefinedFretboardsOff =
   \set predefinedDiagramTable = ##f
 predefinedFretboardsOn =
-  \set predefinedDiagramTable = #fretboard-table
+  \set predefinedDiagramTable = #default-fret-table
 
 
 %% shape note heads

diff --git a/python/convertrules.py b/python/convertrules.py
index 063da1f4f9ca6d35f184b975cf2cff62d6ab5d0d..df2540967a955107d4540542268dc363b2e553ed 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -3056,6 +3056,15 @@ def conv(str):
                   r"style = #'none",
                   str);
     return str
+
+@rule ((2, 13, 36),
+    _ ("Add fretboard-table argument to savePredefinedFretboard."))
+def conv(str):
+    str = re.sub (r"storePredefinedDiagram",
+                  r"storePredefinedDiagram #default-fret-table",
+                  str);
+    return str
+
 # Guidelines to write rules (please keep this at the end of this file)
 #
 # - keep at most one rule per version; if several conversions should be done,