diff --git a/javascripts/jtab.js b/javascripts/jtab.js index 45dcbdc..a7cbdd3 100644 --- a/javascripts/jtab.js +++ b/javascripts/jtab.js @@ -53,7 +53,7 @@ var jtab = { Cmaj7 : [ [ 0, [-1 ], [3,3], [2,2], [0 ], [0 ], [0 ] ], [ 12, [-1,-1], [15,4], [14,3], [12,1], [12,1], [12,1] ] ], C7b5 : [ [ 2, [-1 ], [3,1], [4,3], [3,2], [5,4], [-1 ] ], [ ] ], "C7#5" : [ [ 0, [-1 ], [-1 ], [2,2], [3,3], [1,1], [4,4] ], [ ] ], - "Cm7b5" : [ [ 2, [-1 ], [3,1], [4,3], [3,2], [4,4], [-1 ] ], [ ] ], + "Cm7b5" : [ [ 0, [-1 ], [3,1], [4,3], [3,2], [4,4], [-1 ] ], [ ] ], C7b9 : [ [ 0, [-1 ], [3,3], [2,1], [3,4], [2,2], [0 ] ], [ ] ], C9 : [ [ 0, [-1 ], [3,2], [2,1], [3,3], [3,4], [-1 ] ], [ ] ], Cm9 : [ [ 0, [-1 ], [3,2], [1,1], [3,3], [3,3], [3,3] ], [ ] ], @@ -215,7 +215,7 @@ var jtab = { Gmaj7 : [ [ 0, [3,3], [2,2], [0 ], [0 ], [0 ], [2,1] ], [ 12, [15,3], [14,2], [12,1], [12,1], [12,1], [14,4] ] ], "G7b5" : [ [ 0, [3,2], [-1 ], [3,3], [4,4], [2,1], [-1 ] ], [ ], [ 4, [-1 ], [-1 ], [5,1], [6,2], [6,3], [7,4] ] ], "G7#5" : [ [ 0, [3,1], [-1 ], [3,2], [4,3], [4,4], [-1 ] ], [ ] ], - Gm7b5 : [ [ 4, [-1 ], [-1 ], [5,1], [6,2], [6,3], [6,4] ], [ ] ], + Gm7b5 : [ [ 2, [3,1], [4,2], [3,1], [3,1], [6,4], [3,1] ], [ ] ], G7b9 : [ [ 0, [3,4], [2,3], [0 ], [1,1], [0 ], [1,2] ], [ 12, [15,4], [14,3], [12,1], [13,2], [12,1], [13,] ] ], G9 : [ [ 0, [3,3], [-1 ], [0 ], [2,2], [0 ], [1,1] ], [ 12, [15,4], [-1 ], [12,1], [14,3], [12,1], [13,2] ] ], Gm9 : [ [ 2, [3,1], [5,3], [3,1], [3,1], [3,1], [5,4] ], [ ] ], @@ -238,7 +238,7 @@ var jtab = { "G#maj7": [ [ 0, [-1 ], [-1 ], [1,1], [1,1], [1,1], [3,3] ], [ ] ], "G#7b5" : [ [ 2, [4,2], [-1 ], [4,3], [5,4], [3,2], [-1 ] ], [ ] ], "G#7#5" : [ [ 3, [4,1], [-1 ], [4,2], [5,3], [5,4], [-1 ] ], [ ] ], - "G#m7b5": [ [ 5, [-1 ], [-1 ], [6,1], [7,2], [7,3], [7,4] ], [ ] ], + "G#m7b5": [ [ 0, [4,1], [5,2], [4,1], [4,1], [7,4], [4,1] ], [ ] ], "G#7b9" : [ [ 0, [4,3], [3,2], [4,4], [2,1], [-1 ], [-1 ] ], [ ] ], "G#9" : [ [ 0, [2,2], [1,1], [1,1], [1,1], [1,1], [2,4] ], [ ] ], "G#m9" : [ [ 0, [2,2], [1,1], [1,1], [1,1], [0 ], [2,4] ], [ ] ], diff --git a/jtab-unittest.html b/jtab-unittest.html index 8081489..57fc54a 100644 --- a/jtab-unittest.html +++ b/jtab-unittest.html @@ -459,7 +459,25 @@

jTab - Unit Tests

assertHashEqual( modelChordArray, c.chordArray, "jtabChord('" + token + "') returned incorrect chordArray" ); }}, - + testChord_Dm7b5_fingering: function() { with(this) { + var token = 'Dm7b5'; + var modelChordArray = [ 0, [-1 ], [-1 ], [0 ], [1,1], [1,1], [1,1] ]; + var c = new jtabChord(token); + assert( c.isValid, "jtabChord('" + token + "') should be valid" ); + assert( ! c.isCaged, "jtabChord('" + token + "') should not be CAGED" ); + assertHashEqual( modelChordArray, c.chordArray, "jtabChord('" + token + "') returned incorrect chordArray" ); + }}, + + testChord_Dm7b5p2_fingering: function() { with(this) { + var token = 'Dm7b5:2'; + var modelChordArray = [ 1, [-1, null], [5,1 ], [6,3], [5,2], [6,4], [-1, null] ]; + var c = new jtabChord(token); + assert( c.isValid, "jtabChord('" + token + "') should be valid" ); + assert( c.isCaged, "jtabChord('" + token + "') should be CAGED" ); + assertHashEqual( modelChordArray, c.chordArray, "jtabChord('" + token + "') returned incorrect chordArray" ); + }}, + + }); // ]]>