X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fpredefined-guitar-fretboards.ly;h=0a93939a71a6a8eb775cac4ec1d48a85f77f6834;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=0211ca98a7845583d859debf1080b5d2423930a1;hpb=487f44ae4bebfe14e56bbd8a6de5e7a9aea35028;p=lilypond.git

diff --git a/ly/predefined-guitar-fretboards.ly b/ly/predefined-guitar-fretboards.ly
index 0211ca98a7..0a93939a71 100644
--- a/ly/predefined-guitar-fretboards.ly
+++ b/ly/predefined-guitar-fretboards.ly
@@ -1,6 +1,6 @@
 %%%% This file is part of LilyPond, the GNU music typesetter.
 %%%%
-%%%% Copyright (C) 2008--2010 Carl D. Sorensen <c_sorensen@byu.edu>
+%%%% Copyright (C) 2008--2015 Carl D. Sorensen <c_sorensen@byu.edu>
 %%%%
 %%%% LilyPond is free software: you can redistribute it and/or modify
 %%%% it under the terms of the GNU General Public License as published by
@@ -16,14 +16,13 @@
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 % chord definitions require default pitchnames
-#(define prev-pitchnames pitchnames)
-#(set! pitchnames default-language)
+\languageSaveAndChange #default-language
 
 \include "predefined-guitar-ninth-fretboards.ly"
 
 %%%  Add basic chordshapes
 
-\version "2.13.36"
+\version "2.16.0"
 
 \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-);"
@@ -31,14 +30,15 @@
 \addChordShape #'f:m7 #guitar-tuning #"1-1-(;3-3;1-1;1-1;1-1;1-1-);"
 \addChordShape #'bes #guitar-tuning #"x;1-1-(;3-2;3-3;3-4;1-1-);"
 \addChordShape #'bes:m #guitar-tuning #"x;1-1-(;3-3;3-4;2-2;1-1-);"
+\addChordShape #'bes:dim #guitar-tuning #"x;1-1;2-2;3-4;2-3;x;"
 \addChordShape #'bes:m7 #guitar-tuning #"x;1-1-(;3-3;1-1;2-2;1-1-);"
 \addChordShape #'bes:7 #guitar-tuning #"x;1-1-(;3-2;1-1;3-3;1-1-);"
 \addChordShape #'bes:maj7 #guitar-tuning #"x;1-1;3-3;2-2;3-4;x;"
-\addChordShape #'c:dim #guitar-tuning #"x;x;1-1;2-3;1-2;2-4;"
+\addChordShape #'c:dim7 #guitar-tuning #"x;x;1-1;2-3;1-2;2-4;"
 \addChordShape #'c:aug #guitar-tuning #"x;x;2-2;1-1-(;1-1-);4-4;"
 \addChordShape #'cis #guitar-tuning #"x;x;3-3;1-1-(;2-2;1-1-);"
-\addChordShape #'ees:dim #guitar-tuning #"x;x;1-1;2-3;1-2;2-4;"
-\addChordShape #'a:dim #guitar-tuning #"x;x;1-1;2-3;1-2;2-4;"
+\addChordShape #'d:dim #guitar-tuning #"x;x;3-3;1-1-(;3-4;1-1-);"
+\addChordShape #'ees:dim7 #guitar-tuning #"x;x;1-1;2-3;1-2;2-4;"
 
 %%%  Add predefined chords
 
@@ -57,7 +57,10 @@
                         #(chord-shape 'c:aug guitar-tuning)
 \storePredefinedDiagram #default-fret-table \chordmode {c:dim}
                         #guitar-tuning
-                        #(chord-shape 'c:dim guitar-tuning)
+                        #(offset-fret 2 (chord-shape 'bes:dim guitar-tuning))
+\storePredefinedDiagram #default-fret-table \chordmode {c:dim7}
+                        #guitar-tuning
+                        #(chord-shape 'c:dim7 guitar-tuning)
 \storePredefinedDiagram #default-fret-table \chordmode {c:7}
                         #guitar-tuning
                         #"o;3-3;2-2;3-4;1-1;o;"
@@ -81,7 +84,10 @@
                         #"x;4-4;3-3;2-1;2-2;x;"
 \storePredefinedDiagram #default-fret-table \chordmode {cis:dim}
                         #guitar-tuning
-                        #(offset-fret 1 (chord-shape 'c:dim guitar-tuning))
+                        #"x;x;2-3;o;2-4;o;"
+\storePredefinedDiagram #default-fret-table \chordmode {cis:dim7}
+                        #guitar-tuning
+                        #(offset-fret 1 (chord-shape 'c:dim7 guitar-tuning))
 \storePredefinedDiagram #default-fret-table \chordmode {cis:7}
                         #guitar-tuning
                         #"x;x;3-2;4-3;2-1;4-4;"
@@ -105,7 +111,10 @@
                         #"x;4-4;3-3;2-1;2-2;x;"
 \storePredefinedDiagram #default-fret-table \chordmode {des:dim}
                         #guitar-tuning
-                        #(offset-fret 1 (chord-shape 'c:dim guitar-tuning))
+                        #"x;x;2-3;o;2-4;o;"
+\storePredefinedDiagram #default-fret-table \chordmode {des:dim7}
+                        #guitar-tuning
+                        #(offset-fret 1 (chord-shape 'c:dim7 guitar-tuning))
 \storePredefinedDiagram #default-fret-table \chordmode {des:7}
                         #guitar-tuning
                         #"x;x;3-2;4-3;2-1;4-4;"
@@ -128,6 +137,9 @@
                         #guitar-tuning
                         #"x;x;o;3-2;3-3;2-1;"
 \storePredefinedDiagram #default-fret-table \chordmode {d:dim}
+                        #guitar-tuning
+                        #"x;x;o;1-1-(;3-3;1-1-);"
+\storePredefinedDiagram #default-fret-table \chordmode {d:dim7}
                         #guitar-tuning
                         #"x;x;o;1-1;o;1-2;"
 \storePredefinedDiagram #default-fret-table \chordmode {d:7}
@@ -150,10 +162,13 @@
                         #"x;x;4-3;3-2;4-4;1-1;"
 \storePredefinedDiagram #default-fret-table \chordmode {dis:aug}
                         #guitar-tuning
-                        #"3-3;2-2;1-1;o;o;3-4"
+                        #"3-3;2-2;1-1;o;o;3-4;"
 \storePredefinedDiagram #default-fret-table \chordmode {dis:dim}
                         #guitar-tuning
-                        #(chord-shape 'ees:dim guitar-tuning)
+                        #(offset-fret 1 (chord-shape 'd:dim guitar-tuning))
+\storePredefinedDiagram #default-fret-table \chordmode {dis:dim7}
+                        #guitar-tuning
+                        #(chord-shape 'ees:dim7 guitar-tuning)
 \storePredefinedDiagram #default-fret-table \chordmode {dis:7}
                         #guitar-tuning
                         #"x;x;1-1;3-3;2-2;3-4;"
@@ -174,10 +189,13 @@
                         #"x;x;4-3;3-2;4-4;1-1;"
 \storePredefinedDiagram #default-fret-table \chordmode {ees:aug}
                         #guitar-tuning
-                        #"3-3;2-2;1-1;o;o;3-4"
+                        #"3-3;2-2;1-1;o;o;3-4;"
 \storePredefinedDiagram #default-fret-table \chordmode {ees:dim}
                         #guitar-tuning
-                        #(chord-shape 'ees:dim guitar-tuning)
+                        #(offset-fret 1 (chord-shape 'd:dim guitar-tuning))
+\storePredefinedDiagram #default-fret-table \chordmode {ees:dim7}
+                        #guitar-tuning
+                        #(chord-shape 'ees:dim7 guitar-tuning)
 \storePredefinedDiagram #default-fret-table \chordmode {ees:7}
                         #guitar-tuning
                         #"x;x;1-1;3-3;2-2;3-4;"
@@ -201,7 +219,10 @@
                         #"o;3-3;2-2;1-1;x;x;"
 \storePredefinedDiagram #default-fret-table \chordmode {e:dim}
                         #guitar-tuning
-                        #(offset-fret 1 (chord-shape 'ees:dim guitar-tuning))
+                        #(offset-fret 2 (chord-shape 'd:dim guitar-tuning))
+\storePredefinedDiagram #default-fret-table \chordmode {e:dim7}
+                        #guitar-tuning
+                        #(offset-fret 1 (chord-shape 'ees:dim7 guitar-tuning))
 \storePredefinedDiagram #default-fret-table \chordmode {e:7}
                         #guitar-tuning
                         #"o;2-2;o;1-1;o;o;"
@@ -224,6 +245,9 @@
                         #guitar-tuning
                         #"x;x;1-1;4-3;4-4;3-2;"
 \storePredefinedDiagram #default-fret-table \chordmode {f:dim}
+                        #guitar-tuning
+                        #(offset-fret 3 (chord-shape 'd:dim guitar-tuning))
+\storePredefinedDiagram #default-fret-table \chordmode {f:dim7}
                         #guitar-tuning
                         #"x;x;o;1-1;o;1-2;"
 \storePredefinedDiagram #default-fret-table \chordmode {f:7}
@@ -249,7 +273,10 @@
                         #"2-2;1-1;o;3-4-(;3-4-);2-3;"
 \storePredefinedDiagram #default-fret-table \chordmode {fis:dim}
                         #guitar-tuning
-                        #"x;x;1-1;2-3;1-2;2-4;"
+                        #(offset-fret 4 (chord-shape 'd:dim guitar-tuning))
+\storePredefinedDiagram #default-fret-table \chordmode {fis:dim7}
+                        #guitar-tuning
+                        #(chord-shape 'ees:dim7 guitar-tuning)
 \storePredefinedDiagram #default-fret-table \chordmode {fis:7}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'f:7 guitar-tuning))
@@ -273,7 +300,10 @@
                         #"2-2;1-1;o;3-4-(;3-4-);2-3;"
 \storePredefinedDiagram #default-fret-table \chordmode {ges:dim}
                         #guitar-tuning
-                        #"x;x;1-1;2-3;1-2;2-4;"
+                        #(offset-fret 4 (chord-shape 'd:dim guitar-tuning))
+\storePredefinedDiagram #default-fret-table \chordmode {ges:dim7}
+                        #guitar-tuning
+                        #(chord-shape 'ees:dim7 guitar-tuning)
 \storePredefinedDiagram #default-fret-table \chordmode {ges:7}
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'f:7 guitar-tuning))
@@ -297,7 +327,10 @@
                         #"x;x;5-1;8-3;8-4;7-2;"
 \storePredefinedDiagram #default-fret-table \chordmode {g:dim}
                         #guitar-tuning
-                        #"x;x;5-2;6-4;5-3;3-1;"
+                        #(offset-fret 5 (chord-shape 'd:dim guitar-tuning))
+\storePredefinedDiagram #default-fret-table \chordmode {g:dim7}
+                        #guitar-tuning
+                        #(offset-fret 1 (chord-shape 'ees:dim7 guitar-tuning))
 \storePredefinedDiagram #default-fret-table \chordmode {g:7}
                         #guitar-tuning
                         #"3-3;2-2;o;o;o;1-1;"
@@ -320,6 +353,9 @@
                         #guitar-tuning
                         #"o;3-4;2-3;1-1;1-2;o;"
 \storePredefinedDiagram #default-fret-table \chordmode {gis:dim}
+                        #guitar-tuning
+                        #(offset-fret 6 (chord-shape 'd:dim guitar-tuning))
+\storePredefinedDiagram #default-fret-table \chordmode {gis:dim7}
                         #guitar-tuning
                         #"x;x;o;1-1;o;1-2;"
 \storePredefinedDiagram #default-fret-table \chordmode {gis:7}
@@ -344,6 +380,9 @@
                         #guitar-tuning
                         #"o;3-4;2-3;1-1;1-2;o;"
 \storePredefinedDiagram #default-fret-table \chordmode {aes:dim}
+                        #guitar-tuning
+                        #(offset-fret 6 (chord-shape 'd:dim guitar-tuning))
+\storePredefinedDiagram #default-fret-table \chordmode {aes:dim7}
                         #guitar-tuning
                         #"x;x;o;1-1;o;1-2;"
 \storePredefinedDiagram #default-fret-table \chordmode {aes:7}
@@ -369,7 +408,10 @@
                         #"x;o;3-4;2-2;2-3;1-1;"
 \storePredefinedDiagram #default-fret-table \chordmode {a:dim}
                         #guitar-tuning
-                        #(chord-shape 'a:dim guitar-tuning)
+                        #"x;o;1-1;2-2;1-3;x;"
+\storePredefinedDiagram #default-fret-table \chordmode {a:dim7}
+                        #guitar-tuning
+                        #(chord-shape 'ees:dim7 guitar-tuning)
 \storePredefinedDiagram #default-fret-table \chordmode {a:7}
                         #guitar-tuning
                         #"x;o;2-1;o;2-3;o;"
@@ -393,7 +435,10 @@
                         #"2-2;1-1;o;3-4-(;3-4-);2-3;"
 \storePredefinedDiagram #default-fret-table \chordmode {ais:dim}
                         #guitar-tuning
-                        #(offset-fret 1 (chord-shape 'a:dim guitar-tuning))
+                        #(chord-shape 'bes:dim guitar-tuning)
+\storePredefinedDiagram #default-fret-table \chordmode {ais:dim7}
+                        #guitar-tuning
+                        #(offset-fret 1 (chord-shape 'ees:dim7 guitar-tuning))
 \storePredefinedDiagram #default-fret-table \chordmode {ais:7}
                         #guitar-tuning
                         #(chord-shape 'bes:7 guitar-tuning)
@@ -417,7 +462,10 @@
                         #"2-2;1-1;o;3-4-(;3-4-);2-3;"
 \storePredefinedDiagram #default-fret-table \chordmode {bes:dim}
                         #guitar-tuning
-                        #(offset-fret 1 (chord-shape 'a:dim guitar-tuning))
+                        #(chord-shape 'bes:dim guitar-tuning)
+\storePredefinedDiagram #default-fret-table \chordmode {bes:dim7}
+                        #guitar-tuning
+                        #(offset-fret 1 (chord-shape 'ees:dim7 guitar-tuning))
 \storePredefinedDiagram #default-fret-table \chordmode {bes:7}
                         #guitar-tuning
                         #(chord-shape 'bes:7 guitar-tuning)
@@ -440,11 +488,14 @@
                         #guitar-tuning
                         #"x;3-2;2-1;o;o;x;"
 \storePredefinedDiagram #default-fret-table \chordmode {b:dim}
+                        #guitar-tuning
+                        #(offset-fret 1 (chord-shape 'bes:dim guitar-tuning))
+\storePredefinedDiagram #default-fret-table \chordmode {b:dim7}
                         #guitar-tuning
                         #"x;x;o;1-1;o;1-2;"
 \storePredefinedDiagram #default-fret-table \chordmode {b:7}
                         #guitar-tuning
-                        #(offset-fret 1 (chord-shape 'bes:7 guitar-tuning))
+                        #"x;2-2;1-1;2-3;o;2-4;"
 \storePredefinedDiagram #default-fret-table \chordmode {b:maj7}
                         #guitar-tuning
                         #"x;2-1;4-3;3-2;4-4;x;"
@@ -452,4 +503,4 @@
                         #guitar-tuning
                         #(offset-fret 1 (chord-shape 'bes:m7 guitar-tuning))
 
-#(set! pitchnames prev-pitchnames)
+\languageRestore