abcjs 6.6.2 → 6.6.4

package/src/synth/chord-track.js

@@ -255,14 +255,19 @@ ChordTrack.prototype.interpretChord = function (name) {
 }
 
 ChordTrack.prototype.chordNotes = function (bass, modifier) {
-	var intervals = this.chordIntervals[modifier];
+	// accept either chord spelling
+	modifier = modifier.replace(/♭/g,'b').replace(/♯/g,'#')
+
+	var intervals = chordIntervals[modifier];
 	if (!intervals) {
+		// If the chord isn't in our list, we can at least guess
+		// whether it is major or minor.
 		if (modifier.slice(0, 2).toLowerCase() === 'ma' || modifier[0] === 'M')
-			intervals = this.chordIntervals.M;
+			intervals = chordIntervals.M;
 		else if (modifier[0] === 'm' || modifier[0] === '-')
-			intervals = this.chordIntervals.m;
+			intervals = chordIntervals.m;
 		else
-			intervals = this.chordIntervals.M;
+			intervals = chordIntervals.M;
 	}
 	bass += 12;	// the chord is an octave above the bass note.
 
@@ -416,7 +421,7 @@ function extractNote(chord, index) {
 	// This creates an arpeggio note no matter how many notes are in the chord - if it runs out of notes it continues in the next octave
 	var octave = Math.floor(index / chord.chick.length)
 	var note = chord.chick[index % chord.chick.length]
-	//console.log(chord.chick, {index, octave, note}, index % chord.chick.length)
+	//console.log(chord.chick, {index, octave, note, index % chord.chick.length)
 	return note + octave * 12
 }
 
@@ -477,131 +482,375 @@ ChordTrack.prototype.basses = {
 	'A': 33, 'B': 35, 'C': 36, 'D': 38, 'E': 40, 'F': 41, 'G': 43
 };
 
-ChordTrack.prototype.chordIntervals = {
-	// diminished (all flat 5 chords)
-	'dim': [0, 3, 6],
-	'°': [0, 3, 6],
-	'˚': [0, 3, 6],
-
-	'dim7': [0, 3, 6, 9],
-	'°7': [0, 3, 6, 9],
-	'˚7': [0, 3, 6, 9],
-
-	'ø7': [0, 3, 6, 10],
-	'm7(b5)': [0, 3, 6, 10],
-	'm7b5': [0, 3, 6, 10],
-	'm7♭5': [0, 3, 6, 10],
-	'-7(b5)': [0, 3, 6, 10],
-	'-7b5': [0, 3, 6, 10],
-
-	'7b5': [0, 4, 6, 10],
-	'7(b5)': [0, 4, 6, 10],
-	'7♭5': [0, 4, 6, 10],
-
-	'7(b9,b5)': [0, 4, 6, 10, 13],
-	'7b9,b5': [0, 4, 6, 10, 13],
-	'7(#9,b5)': [0, 4, 6, 10, 15],
-	'7#9b5': [0, 4, 6, 10, 15],
-	'maj7(b5)': [0, 4, 6, 11],
-	'maj7b5': [0, 4, 6, 11],
-	'13(b5)': [0, 4, 6, 10, 14, 21],
-	'13b5': [0, 4, 6, 10, 14, 21],
-
-	// minor (all normal 5, minor 3 chords)
-	'm': [0, 3, 7],
-	'-': [0, 3, 7],
-	'm6': [0, 3, 7, 9],
-	'-6': [0, 3, 7, 9],
-	'm7': [0, 3, 7, 10],
-	'-7': [0, 3, 7, 10],
-
-	'-(b6)': [0, 3, 7, 8],
-	'-b6': [0, 3, 7, 8],
-	'-6/9': [0, 3, 7, 9, 14],
-	'-7(b9)': [0, 3, 7, 10, 13],
-	'-7b9': [0, 3, 7, 10, 13],
-	'-maj7': [0, 3, 7, 11],
-	'-9+7': [0, 3, 7, 11, 13],
-	'-11': [0, 3, 7, 11, 14, 17],
-	'm11': [0, 3, 7, 11, 14, 17],
-	'-maj9': [0, 3, 7, 11, 14],
-	'-∆9': [0, 3, 7, 11, 14],
-	'mM9': [0, 3, 7, 11, 14],
-
-	// major (all normal 5, major 3 chords)
-	'M': [0, 4, 7],
-	'6': [0, 4, 7, 9],
-	'6/9': [0, 4, 7, 9, 14],
-	'6add9': [0, 4, 7, 9, 14],
-	'69': [0, 4, 7, 9, 14],
-
-	'7': [0, 4, 7, 10],
-	'9': [0, 4, 7, 10, 14],
-	'11': [0, 7, 10, 14, 17],
-	'13': [0, 4, 7, 10, 14, 21],
-	'7b9': [0, 4, 7, 10, 13],
-	'7♭9': [0, 4, 7, 10, 13],
-	'7(b9)': [0, 4, 7, 10, 13],
-	'7(#9)': [0, 4, 7, 10, 15],
-	'7#9': [0, 4, 7, 10, 15],
-	'(13)': [0, 4, 7, 10, 14, 21],
-	'7(9,13)': [0, 4, 7, 10, 14, 21],
-	'7(#9,b13)': [0, 4, 7, 10, 15, 20],
-	'7(#11)': [0, 4, 7, 10, 14, 18],
-	'7#11': [0, 4, 7, 10, 14, 18],
-	'7(b13)': [0, 4, 7, 10, 20],
-	'7b13': [0, 4, 7, 10, 20],
-	'9(#11)': [0, 4, 7, 10, 14, 18],
-	'9#11': [0, 4, 7, 10, 14, 18],
-	'13(#11)': [0, 4, 7, 10, 18, 21],
-	'13#11': [0, 4, 7, 10, 18, 21],
-
-	'maj7': [0, 4, 7, 11],
-	'∆7': [0, 4, 7, 11],
-	'Δ7': [0, 4, 7, 11],
-	'maj9': [0, 4, 7, 11, 14],
-	'maj7(9)': [0, 4, 7, 11, 14],
-	'maj7(11)': [0, 4, 7, 11, 17],
-	'maj7(#11)': [0, 4, 7, 11, 18],
-	'maj7(13)': [0, 4, 7, 14, 21],
-	'maj7(9,13)': [0, 4, 7, 11, 14, 21],
-
-	'7sus4': [0, 5, 7, 10],
-	'm7sus4': [0, 3, 7, 10, 17],
-	'sus4': [0, 5, 7],
-	'sus2': [0, 2, 7],
-	'7sus2': [0, 2, 7, 10],
-	'9sus4': [0, 5, 7, 10, 14],
-	'13sus4': [0, 5, 7, 10, 14, 21],
-
-	// augmented (all sharp 5 chords)
-	'aug7': [0, 4, 8, 10],
-	'+7': [0, 4, 8, 10],
-	'+': [0, 4, 8],
-	'7#5': [0, 4, 8, 10],
-	'7♯5': [0, 4, 8, 10],
-	'7+5': [0, 4, 8, 10],
-	'9#5': [0, 4, 8, 10, 14],
-	'9♯5': [0, 4, 8, 10, 14],
-	'9+5': [0, 4, 8, 10, 14],
-	'-7(#5)': [0, 3, 8, 10],
-	'-7#5': [0, 3, 8, 10],
-	'7(#5)': [0, 4, 8, 10],
-	'7(b9,#5)': [0, 4, 8, 10, 13],
-	'7b9#5': [0, 4, 8, 10, 13],
-	'maj7(#5)': [0, 4, 8, 11],
-	'maj7#5': [0, 4, 8, 11],
-	'maj7(#5,#11)': [0, 4, 8, 11, 18],
-	'maj7#5#11': [0, 4, 8, 11, 18],
-	'9(#5)': [0, 4, 8, 10, 14],
-	'13(#5)': [0, 4, 8, 10, 14, 21],
-	'13#5': [0, 4, 8, 10, 14, 21],
-	// MAE Power chords added 10 April 2024
-	'5': [0, 7],
-	'5(8)': [0, 7, 12],
-	'5add8': [0, 7, 12]
-
-};
+var chordIntervals = {
+	// unusual chords
+	"-addb2": [0, 1, 3, 7],
+	"maddb2": [0, 1, 3, 7],
+	"addb2": [0, 1, 4, 7],
+	"susb2": [0, 1, 7],
+	"-add2": [0, 2, 3, 7],
+	"madd2": [0, 2, 3, 7],
+	"add2": [0, 2, 4, 7],
+	"sus2": [0, 2, 7],
+	"-7sus2": [0, 2, 7, 10],
+	"7sus2": [0, 2, 7, 10],
+	"m7sus2": [0, 2, 7, 10],
+	"min7sus2": [0, 2, 7, 10],
+	"7sus2/9": [0, 2, 7, 10, 14],
+	"add#2": [0, 3, 4, 7],
+	"-add4": [0, 3, 5, 7],
+	"madd4": [0, 3, 5, 7],
+
+	// diminished chords
+	"dim": [0, 3, 6],
+	"m(b5)": [0, 3, 6],
+	"°": [0, 3, 6],
+	"˚": [0, 3, 6],
+	"-add#4": [0, 3, 6, 7],
+	"madd#4": [0, 3, 6, 7],
+	"dim7": [0, 3, 6, 9],
+	"°7": [0, 3, 6, 9],
+	"˚7": [0, 3, 6, 9],
+	"-7(b5)": [0, 3, 6, 10],
+	"-7b5": [0, 3, 6, 10],
+	"m7(b5)": [0, 3, 6, 10],
+	"m7b5": [0, 3, 6, 10],
+	"ø": [0, 3, 6, 10],
+	"ø7": [0, 3, 6, 10],
+
+	// minor chords
+	"-": [0, 3, 7],
+	"m": [0, 3, 7],
+	"-(b6)": [0, 3, 7, 8],
+	"-b6": [0, 3, 7, 8],
+	"m(b6)": [0, 3, 7, 8],
+	"mb6": [0, 3, 7, 8],
+	"-6": [0, 3, 7, 9],
+	"m6": [0, 3, 7, 9],
+	"-6(9)": [0, 3, 7, 9, 14],
+	"-6/9": [0, 3, 7, 9, 14],
+	"-69": [0, 3, 7, 9, 14],
+	"m6(9)": [0, 3, 7, 9, 14],
+	"m6/9": [0, 3, 7, 9, 14],
+	"m69": [0, 3, 7, 9, 14],
+	"-7": [0, 3, 7, 10],
+	"m7": [0, 3, 7, 10],
+	"-7(b9)": [0, 3, 7, 10, 13],
+	"-7b9": [0, 3, 7, 10, 13],
+	"-7(9)": [0, 3, 7, 10, 14],
+	"-7/9": [0, 3, 7, 10, 14],
+	"-9": [0, 3, 7, 10, 14],
+	"m7(9)": [0, 3, 7, 10, 14],
+	"m7/9": [0, 3, 7, 10, 14],
+	"m9": [0, 3, 7, 10, 14],
+	"-7(9,11)": [0, 3, 7, 10, 14, 17],
+	"-7/9/11": [0, 3, 7, 10, 14, 17],
+	"m7(9,11)": [0, 3, 7, 10, 14, 17],
+	"m7/9/11": [0, 3, 7, 10, 14, 17],
+	"-13": [0, 3, 7, 10, 14, 17, 21],
+	"-7(9,11,13)": [0, 3, 7, 10, 14, 17, 21],
+	"-7/9/11/13": [0, 3, 7, 10, 14, 17, 21],
+	"m13": [0, 3, 7, 10, 14, 17, 21],
+	"m7(9,11,13)": [0, 3, 7, 10, 14, 17, 21],
+	"m7/9/11/13": [0, 3, 7, 10, 14, 17, 21],
+	"-7(9,13)": [0, 3, 7, 10, 14, 21],
+	"-7/9/13": [0, 3, 7, 10, 14, 21],
+	"m7(9,13)": [0, 3, 7, 10, 14, 21],
+	"m7/9/13": [0, 3, 7, 10, 14, 21],
+	"-7(11)": [0, 3, 7, 10, 17],
+	"-7/11": [0, 3, 7, 10, 17],
+	"m7(11)": [0, 3, 7, 10, 17],
+	"m7/11": [0, 3, 7, 10, 17],
+	"-7(11,13)": [0, 3, 7, 10, 17, 21],
+	"-7/11/13": [0, 3, 7, 10, 17, 21],
+	"m7(11,13)": [0, 3, 7, 10, 17, 21],
+	"m7/11/13": [0, 3, 7, 10, 17, 21],
+	"-(maj7)": [0, 3, 7, 11],
+	"-7M": [0, 3, 7, 11],
+	"-maj7": [0, 3, 7, 11],
+	"-∆7": [0, 3, 7, 11],
+	"m(maj7)": [0, 3, 7, 11],
+	"mM7": [0, 3, 7, 11],
+	"min(maj7)": [0, 3, 7, 11],
+	"-9+7": [0, 3, 7, 11, 13],
+	"-(maj9)": [0, 3, 7, 11, 14],
+	"-7M(9)": [0, 3, 7, 11, 14],
+	"-maj9": [0, 3, 7, 11, 14],
+	"-∆9": [0, 3, 7, 11, 14],
+	"m(maj9)": [0, 3, 7, 11, 14],
+	"mM9": [0, 3, 7, 11, 14],
+	"min(maj9)": [0, 3, 7, 11, 14],
+	"-11": [0, 3, 7, 11, 14, 17],
+	"m11": [0, 3, 7, 11, 14, 17],
+	"-addb9": [0, 3, 7, 13],
+	"maddb9": [0, 3, 7, 13],
+	"-add9": [0, 3, 7, 14],
+	"madd9": [0, 3, 7, 14],
+	"-add11": [0, 3, 7, 17],
+	"madd11": [0, 3, 7, 17],
+	"-add#11": [0, 3, 7, 18],
+	"madd#11": [0, 3, 7, 18],
+
+	// altered minor chords
+	"-#5": [0, 3, 8],
+	"-(#5)": [0, 3, 8],
+	"m#5": [0, 3, 8],
+	"m(#5)": [0, 3, 8],
+	"-7#5": [0, 3, 8, 10],
+	"-7(#5)": [0, 3, 8, 10],
+	"dim7(b13)": [0, 3, 9, 20],
+	"°7(b13)": [0, 3, 9, 20],
+	"˚7(b13)": [0, 3, 9, 20],
+
+	// altered major chords
+	"add4": [0, 4, 5, 7],
+	"maj(b5)": [0, 4, 6],
+	"majb5": [0, 4, 6],
+	"add#4": [0, 4, 6, 7],
+	"7(b5)": [0, 4, 6, 10],
+	"7b5": [0, 4, 6, 10],
+	"7(b5,b9)": [0, 4, 6, 10, 13],
+	"7(b9,b5)": [0, 4, 6, 10, 13],
+	"7b5(b9)": [0, 4, 6, 10, 13],
+	"7b9,b5": [0, 4, 6, 10, 13],
+	"7b9b5": [0, 4, 6, 10, 13],
+	"7(b5,b9,b13)": [0, 4, 6, 10, 13, 20],
+	"7/b5/b9/b13": [0, 4, 6, 10, 13, 20],
+	"7b5/b9/b13": [0, 4, 6, 10, 13, 20],
+	"7(b5,b9,13)": [0, 4, 6, 10, 13, 21],
+	"7/b5/b9/13": [0, 4, 6, 10, 13, 21],
+	"7b5/b9/13": [0, 4, 6, 10, 13, 21],
+	"7(9,b5)": [0, 4, 6, 10, 14],
+	"7(b5,9)": [0, 4, 6, 10, 14],
+	"7b5(9)": [0, 4, 6, 10, 14],
+	"9b5": [0, 4, 6, 10, 14],
+	"13(b5)": [0, 4, 6, 10, 14, 21],
+	"13b5": [0, 4, 6, 10, 14, 21],
+	"7(b5,9,13)": [0, 4, 6, 10, 14, 21],
+	"7/b5/9/13": [0, 4, 6, 10, 14, 21],
+	"7b5/9/13": [0, 4, 6, 10, 14, 21],
+	"7#9b5": [0, 4, 6, 10, 15],
+	"7(#9,b5)": [0, 4, 6, 10, 15],
+	"7(b5,#9)": [0, 4, 6, 10, 15],
+	"7b5(#9)": [0, 4, 6, 10, 15],
+	"7(b5,#9,b13)": [0, 4, 6, 10, 15, 20],
+	"7/b5/#9/b13": [0, 4, 6, 10, 15, 20],
+	"7b5/#9/b13": [0, 4, 6, 10, 15, 20],
+	"7(b5,#9,13)": [0, 4, 6, 10, 15, 21],
+	"7/b5/#9/13": [0, 4, 6, 10, 15, 21],
+	"7b5/#9/13": [0, 4, 6, 10, 15, 21],
+	"7(b5,b13)": [0, 4, 6, 10, 20],
+	"7/b5/b13": [0, 4, 6, 10, 20],
+	"7b5/b13": [0, 4, 6, 10, 20],
+	"7(b5,13)": [0, 4, 6, 10, 21],
+	"7/b5/13": [0, 4, 6, 10, 21],
+	"7b5(13)": [0, 4, 6, 10, 21],
+	"7b5/13": [0, 4, 6, 10, 21],
+	"7M(b5)": [0, 4, 6, 11],
+	"maj7(b5)": [0, 4, 6, 11],
+	"maj7b5": [0, 4, 6, 11],
+	"7M(b5,9)": [0, 4, 6, 11, 14],
+	"maj7(b5,9)": [0, 4, 6, 11, 14],
+	"maj7b5/9": [0, 4, 6, 11, 14],
+	"7M(b5,9,13)": [0, 4, 6, 11, 14, 21],
+	"maj7(b5,9,13)": [0, 4, 6, 11, 14, 21],
+	"maj7b5/9/13": [0, 4, 6, 11, 14, 21],
+	"7M(b5,13)": [0, 4, 6, 11, 21],
+	"maj7(b5,13)": [0, 4, 6, 11, 21],
+	"maj7b5/13": [0, 4, 6, 11, 21],
+
+	// major chords
+	"M": [0, 4, 7],
+	"Δ": [0, 4, 7],
+	"∆": [0, 4, 7],
+	"6": [0, 4, 7, 9],
+	"6(9)": [0, 4, 7, 9, 14],
+	"6/9": [0, 4, 7, 9, 14],
+	"69": [0, 4, 7, 9, 14],
+	"6add9": [0, 4, 7, 9, 14],
+	"6(9,11)": [0, 4, 7, 9, 14, 17],
+	"6/9/11": [0, 4, 7, 9, 14, 17],
+	"6911": [0, 4, 7, 9, 14, 17],
+	"6(9,#11)": [0, 4, 7, 9, 14, 18],
+	"6/9/#11": [0, 4, 7, 9, 14, 18],
+	"69#11": [0, 4, 7, 9, 14, 18],
+	"6(11)": [0, 4, 7, 9, 17],
+	"6/11": [0, 4, 7, 9, 17],
+	"611": [0, 4, 7, 9, 17],
+	"6#11": [0, 4, 7, 9, 18],
+	"6(#11)": [0, 4, 7, 9, 18],
+	"6/#11": [0, 4, 7, 9, 18],
+	"7": [0, 4, 7, 10],
+	"7(b9)": [0, 4, 7, 10, 13],
+	"7b9": [0, 4, 7, 10, 13],
+	"7(9)": [0, 4, 7, 10, 14],
+	"7/9": [0, 4, 7, 10, 14],
+	"9": [0, 4, 7, 10, 14],
+	"7(9,11)": [0, 4, 7, 10, 14, 17],
+	"7/9/11": [0, 4, 7, 10, 14, 17],
+	"7(9,11,13)": [0, 4, 7, 10, 14, 17, 21],
+	"7/9/11/13": [0, 4, 7, 10, 14, 17, 21],
+	"7#11": [0, 4, 7, 10, 14, 18],
+	"7(#11)": [0, 4, 7, 10, 14, 18],
+	"9#11": [0, 4, 7, 10, 14, 18],
+	"9(#11)": [0, 4, 7, 10, 14, 18],
+	"(13)": [0, 4, 7, 10, 14, 21],
+	"13": [0, 4, 7, 10, 14, 21],
+	"7(9,13)": [0, 4, 7, 10, 14, 21],
+	"7/9/13": [0, 4, 7, 10, 14, 21],
+	"9/13": [0, 4, 7, 10, 14, 21],
+	"7#9": [0, 4, 7, 10, 15],
+	"7(#9)": [0, 4, 7, 10, 15],
+	"7(#9,b13)": [0, 4, 7, 10, 15, 20],
+	"7(11)": [0, 4, 7, 10, 17],
+	"7/11": [0, 4, 7, 10, 17],
+	"7(11,13)": [0, 4, 7, 10, 17, 21],
+	"7/11/13": [0, 4, 7, 10, 17, 21],
+	"13#11": [0, 4, 7, 10, 18, 21],
+	"13(#11)": [0, 4, 7, 10, 18, 21],
+	"7(b13)": [0, 4, 7, 10, 20],
+	"7b13": [0, 4, 7, 10, 20],
+	"7(13)": [0, 4, 7, 10, 21],
+	"7/13": [0, 4, 7, 10, 21],
+	"7M": [0, 4, 7, 11],
+	"maj7": [0, 4, 7, 11],
+	"Δ7": [0, 4, 7, 11],
+	"∆7": [0, 4, 7, 11],
+	"7M(9)": [0, 4, 7, 11, 14],
+	"7M/9": [0, 4, 7, 11, 14],
+	"maj7(9)": [0, 4, 7, 11, 14],
+	"maj7/9": [0, 4, 7, 11, 14],
+	"maj9": [0, 4, 7, 11, 14],
+	"Δ9": [0, 4, 7, 11, 14],
+	"∆9": [0, 4, 7, 11, 14],
+	"7M(9,11)": [0, 4, 7, 11, 14, 17],
+	"7M/9/11": [0, 4, 7, 11, 14, 17],
+	"maj11": [0, 4, 7, 11, 14, 17],
+	"maj7(9,11)": [0, 4, 7, 11, 14, 17],
+	"maj7/9/11": [0, 4, 7, 11, 14, 17],
+	"Δ11": [0, 4, 7, 11, 14, 17],
+	"∆11": [0, 4, 7, 11, 14, 17],
+	"7M(9,11,13)": [0, 4, 7, 11, 14, 17, 21],
+	"7M/9/11/13": [0, 4, 7, 11, 14, 17, 21],
+	"maj13": [0, 4, 7, 11, 14, 17, 21],
+	"maj7(9,11,13)": [0, 4, 7, 11, 14, 17, 21],
+	"maj7/9/11/13": [0, 4, 7, 11, 14, 17, 21],
+	"Δ11(13)": [0, 4, 7, 11, 14, 17, 21],
+	"Δ13": [0, 4, 7, 11, 14, 17, 21],
+	"∆11(13)": [0, 4, 7, 11, 14, 17, 21],
+	"7M(9,#11)": [0, 4, 7, 11, 14, 18],
+	"7M/9/#11": [0, 4, 7, 11, 14, 18],
+	"maj7(9,#11)": [0, 4, 7, 11, 14, 18],
+	"maj7/9/#11": [0, 4, 7, 11, 14, 18],
+	"maj9#11": [0, 4, 7, 11, 14, 18],
+	"maj9(#11)": [0, 4, 7, 11, 14, 18],
+	"maj9/#11": [0, 4, 7, 11, 14, 18],
+	"Δ9(#11)": [0, 4, 7, 11, 14, 18],
+	"7M(9,#11,13)": [0, 4, 7, 11, 14, 18, 21],
+	"7M/9/#11/13": [0, 4, 7, 11, 14, 18, 21],
+	"maj13#11": [0, 4, 7, 11, 14, 18, 21],
+	"maj13(#11)": [0, 4, 7, 11, 14, 18, 21],
+	"maj13/#11": [0, 4, 7, 11, 14, 18, 21],
+	"Δ13(#11)": [0, 4, 7, 11, 14, 18, 21],
+	"∆13(#11)": [0, 4, 7, 11, 14, 18, 21],
+	"7M(9,13)": [0, 4, 7, 11, 14, 21],
+	"7M/9/13": [0, 4, 7, 11, 14, 21],
+	"maj7(9,13)": [0, 4, 7, 11, 14, 21],
+	"maj7/9/13": [0, 4, 7, 11, 14, 21],
+	"maj9(13)": [0, 4, 7, 11, 14, 21],
+	"Δ9(13)": [0, 4, 7, 11, 14, 21],
+	"∆9(13)": [0, 4, 7, 11, 14, 21],
+	"7M(11)": [0, 4, 7, 11, 17],
+	"7M/11": [0, 4, 7, 11, 17],
+	"maj7(11)": [0, 4, 7, 11, 17],
+	"maj7/11": [0, 4, 7, 11, 17],
+	"Δ7(11)": [0, 4, 7, 11, 17],
+	"∆7(11)": [0, 4, 7, 11, 17],
+	"7M(#11)": [0, 4, 7, 11, 18],
+	"7M/#11": [0, 4, 7, 11, 18],
+	"maj7(#11)": [0, 4, 7, 11, 18],
+	"maj7/#11": [0, 4, 7, 11, 18],
+	"Δ7(#11)": [0, 4, 7, 11, 18],
+	"∆7(#11)": [0, 4, 7, 11, 18],
+	"7M(13)": [0, 4, 7, 11, 21],
+	"7M/13": [0, 4, 7, 11, 21],
+	"maj7(13)": [0, 4, 7, 11, 21],
+	"maj7/13": [0, 4, 7, 11, 21],
+	"Δ7(13)": [0, 4, 7, 11, 21],
+	"∆7(13)": [0, 4, 7, 11, 21],
+	"addb9": [0, 4, 7, 13],
+	"add9": [0, 4, 7, 14],
+	"add#9": [0, 4, 7, 15],
+	"add11": [0, 4, 7, 17],
+	"add#11": [0, 4, 7, 18],
+
+	// augmented chords
+	"+": [0, 4, 8],
+	"aug": [0, 4, 8],
+	"+7": [0, 4, 8, 10],
+	"7#5": [0, 4, 8, 10],
+	"7(#5)": [0, 4, 8, 10],
+	"7+5": [0, 4, 8, 10],
+	"aug7": [0, 4, 8, 10],
+	"7(b9,#5)": [0, 4, 8, 10, 13],
+	"7b9#5": [0, 4, 8, 10, 13],
+	"9#5": [0, 4, 8, 10, 14],
+	"9(#5)": [0, 4, 8, 10, 14],
+	"9+5": [0, 4, 8, 10, 14],
+	"13#5": [0, 4, 8, 10, 14, 21],
+	"13(#5)": [0, 4, 8, 10, 14, 21],
+	"7M(#5)": [0, 4, 8, 11],
+	"maj7#5": [0, 4, 8, 11],
+	"maj7(#5)": [0, 4, 8, 11],
+	"7M(#5,9)": [0, 4, 8, 11, 14],
+	"maj7#5/9": [0, 4, 8, 11, 14],
+	"maj7(#5,9)": [0, 4, 8, 11, 14],
+	"maj7#5#11": [0, 4, 8, 11, 18],
+	"maj7(#5,#11)": [0, 4, 8, 11, 18],
+
+	// sus4 chords
+	"sus": [0, 5, 7],
+	"sus4": [0, 5, 7],
+	"-7sus4": [0, 5, 7, 10],
+	"7sus": [0, 5, 7, 10],
+	"7sus4": [0, 5, 7, 10],
+	"m7sus4": [0, 5, 7, 10],
+	"min7sus4": [0, 5, 7, 10],
+	"7sus(b9)": [0, 5, 7, 10, 13],
+	"7sus4(b9)": [0, 5, 7, 10, 13],
+	"-9sus4": [0, 5, 7, 10, 14],
+	"7sus4(9)": [0, 5, 7, 10, 14],
+	"7sus4/9": [0, 5, 7, 10, 14],
+	"9sus": [0, 5, 7, 10, 14],
+	"9sus4": [0, 5, 7, 10, 14],
+	"m9sus4": [0, 5, 7, 10, 14],
+	"min9sus4": [0, 5, 7, 10, 14],
+	"11sus4": [0, 5, 7, 10, 14, 17],
+	"13sus4": [0, 5, 7, 10, 14, 21],
+	"7sus(#9)": [0, 5, 7, 10, 15],
+	"7sus4(#9)": [0, 5, 7, 10, 15],
+	"7sus4(11)": [0, 5, 7, 10, 17],
+	"7sus4(13)": [0, 5, 7, 10, 21],
+	"7Msus": [0, 5, 7, 11],
+	"7Msus4": [0, 5, 7, 11],
+	"maj7sus": [0, 5, 7, 11],
+	"maj7sus4": [0, 5, 7, 11],
+
+	// power chords and unusual chords
+	"#4": [0, 6],
+	"b5": [0, 6],
+	"sus#4": [0, 6, 7],
+	"7Msus#4": [0, 6, 11],
+	"maj7sus#4": [0, 6, 11],
+	"5": [0, 7],
+	"11": [0, 7, 10, 14, 17],
+	"5(8)": [0, 7, 12],
+	"5add8": [0, 7, 12],
+	"5(9)": [0, 7, 14],
+	"5add9": [0, 7, 14],
+	"#5": [0, 8],
+	"b6": [0, 8],
+}
 
 ChordTrack.prototype.rhythmPatterns = {
 	"2/2": ['boom', '', '', '', 'chick', '', '', ''],

package/src/synth/create-synth.js

@@ -317,8 +317,14 @@ function CreateSynth() {
 
 				var noteMapTracks = createNoteMap(self.flattened);
 
-				if (self.options.swing)
-					addSwing(noteMapTracks, self.options.swing, self.meterFraction, self.pickupLength)
+				if (self.options.swing) {
+					// If we have a drum intro, then the pickup is already incorporated into the beat.
+					// That is, without a drum intro, the first note starts at 0 whether it
+					// is a pickup or not. With a drum intro, the first note will be in its
+					// proper place.
+					var pickupLength = self.options.drumIntro ? 0 : self.pickupLength
+					addSwing(noteMapTracks, self.options.swing, self.meterFraction, pickupLength)
+				}
 
 				if (self.sequenceCallback)
 					self.sequenceCallback(noteMapTracks, self.callbackContext);
@@ -564,7 +570,7 @@ function CreateSynth() {
 	function addSwing(noteMapTracks, swing, meterFraction, pickupLength) {
 
 		// we can only swing in X/4 and X/8 meters.
-		if (meterFraction.den != 4 && meterFraction.den != 8)
+		if (meterFraction.den !== 4 && meterFraction.den !== 8)
 			return;
 
 		swing = parseFloat(swing);
@@ -586,7 +592,7 @@ function CreateSynth() {
 		// could be also in the settings. Try out values such 0.1, 0.2
 		var volumeIncrease = 0.0;
 
-		// the beatLength in X/8 meters
+		// the beatLength in X/4 meters
 		var beatLength = 0.25; 
 
 		// in X/8 meters the 16s swing so the beatLength is halved
@@ -605,15 +611,15 @@ function CreateSynth() {
 				var event = track[i];
 				if (
 					// is halfbeat
-					(event.start-pickupLength) % halfbeatLength == 0 && (event.start-pickupLength) % beatLength != 0 
+					(event.start-pickupLength) % halfbeatLength === 0 && (event.start-pickupLength) % beatLength !== 0
 					&& (
 						// the previous note is on the beat or before OR there is no previous note 
-						i == 0 
+						i === 0
 						|| track[i-1].start <= track[i].start - halfbeatLength
 					)
 					&& (
 						// the next note is on the beat or after OR there is no next note
-						i == track.length - 1 
+						i === track.length - 1
 						|| track[i+1].start >= track[i].start + halfbeatLength
 					)
 				) {
@@ -626,7 +632,7 @@ function CreateSynth() {
 
 					// if there is a previous note ending at the start of this note, extend its end
 					// and decrease its volume
-					if (i > 0 && track[i-1].end == oldEventStart) {
+					if (i > 0 && track[i-1].end === oldEventStart) {
 						track[i-1].end = event.start;
 						track[i-1].volume *= 1 - volumeIncrease;
 					}

package/src/synth/repeats.js

@@ -15,10 +15,10 @@ function Repeats(voice) {
 				this.sections.push({type: "startRepeat", index: this.sections[this.sections.length-1].index})
 			this.sections.push({type: "endRepeat", index: thisIndex})
 		}
-		if (isStartRepeat)
-			this.sections.push({type:"startRepeat", index: thisIndex})
 		if (startEnding)
 			this.sections.push({type:"startEnding", index: thisIndex, endings: startEnding})
+		if (isStartRepeat)
+			this.sections.push({type:"startRepeat", index: thisIndex})
 	}
 
 	this.resolveRepeats = function() {

package/src/write/creation/abstract-engraver.js

@@ -718,8 +718,9 @@ AbstractEngraver.prototype.addNoteToAbcElement = function (abselem, elem, dot, s
 		}
 
 		var hasStem = !nostem && durlog <= -1;
+		var chordPos = pp > 1 ? p+1 : null
 		var ret = createNoteHead(abselem, c, elem.pitches[p],
-			{ dir: dir, extrax: -roomTaken, flag: flag, dot: dot, dotshiftx: dotshiftx, scale: this.voiceScale, accidentalSlot: accidentalSlot, shouldExtendStem: !stemdir, printAccidentals: !voice.isPercussion });
+			{ dir: dir, extrax: -roomTaken, flag: flag, dot: dot, dotshiftx: dotshiftx, scale: this.voiceScale, accidentalSlot: accidentalSlot, shouldExtendStem: !stemdir, printAccidentals: !voice.isPercussion, chordPos: chordPos });
 		symbolWidth = Math.max(glyphs.getSymbolWidth(c), symbolWidth);
 		abselem.extraw -= ret.extraLeft;
 		noteHead = ret.notehead;
@@ -765,7 +766,7 @@ AbstractEngraver.prototype.addNoteToAbcElement = function (abselem, elem, dot, s
 	return { noteHead: noteHead, roomTaken: roomTaken, roomTakenRight: roomTakenRight, min: min, additionalLedgers: additionalLedgers, dir: dir, symbolWidth: symbolWidth };
 };
 
-AbstractEngraver.prototype.addLyric = function (abselem, elem) {
+AbstractEngraver.prototype.addLyric = function (abselem, elem, voiceNumber) {
 	var lyricStr = "";
 	elem.lyric.forEach(function (ly) {
 		var div = ly.divider === ' ' ? "" : ly.divider;
@@ -773,7 +774,7 @@ AbstractEngraver.prototype.addLyric = function (abselem, elem) {
 	});
 	var lyricDim = this.getTextSize.calc(lyricStr, 'vocalfont', "lyric");
 	var position = elem.positioning ? elem.positioning.vocalPosition : 'below';
-	abselem.addCentered(new RelativeElement(lyricStr, 0, lyricDim.width, undefined, { type: "lyric", position: position, height: lyricDim.height / spacing.STEP, dim: this.getTextSize.attr('vocalfont', "lyric") }));
+	abselem.addCentered(new RelativeElement(lyricStr, 0, lyricDim.width, undefined, { type: "lyric", position: position, height: lyricDim.height / spacing.STEP, dim: this.getTextSize.attr('vocalfont', "lyric"), voiceNumber: voiceNumber }));
 };
 
 AbstractEngraver.prototype.createNote = function (elem, nostem, isSingleLineStaff, voice) { //stem presence: true for drawing stemless notehead
@@ -827,7 +828,7 @@ AbstractEngraver.prototype.createNote = function (elem, nostem, isSingleLineStaf
 	}
 
 	if (elem.lyric !== undefined) {
-		this.addLyric(abselem, elem);
+		this.addLyric(abselem, elem, voice.voicenumber);
 	}
 
 	if (elem.gracenotes !== undefined) {