abcjs 6.0.0-beta.8 → 6.0.1

package/src/test/abc_midi_lint.js

@@ -1,22 +1,8 @@
 //    abc_vertical_lint.js: Analyzes the vertical position of the output object.
-//    Copyright (C) 2015-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 //This file takes as input the output structure of the writing routine and lists the vertical position of all the elements.
 
-/*globals toString */
+var pitchToNoteName = require('../synth/pitch-to-note-name');
 
 var midiLint = function(tune) {
 	"use strict";
@@ -30,14 +16,11 @@ var midiLint = function(tune) {
 				case 'program':
 					ret += "\tProgram: ch=" + event.channel + " inst=" + event.instrument + "\n";
 					break;
-				case 'start':
-					ret += "\tStart: " + event.pitch + " Volume: " + event.volume + "\n";
+				case 'note':
+					ret += "\tNote: pitch=" + pitchToNoteName[event.pitch] + " (" + event.pitch + ") start=" + event.start + " dur=" + event.duration + " gap=" + event.gap + " vol=" + event.volume + " inst=" + event.instrument + "\n";
 					break;
-				case 'stop':
-					ret += "\tStop: " + event.pitch + "\n";
-					break;
-				case 'move':
-					ret += "\tMove: " + event.duration + "\n";
+				case 'text':
+					ret += "\tText: " + event.type + '=' + event.text + "\n";
 					break;
 				default:
 					ret += "\tUnknown: " + event.cmd + "\n";

package/src/test/abc_midi_sequencer_lint.js

@@ -1,18 +1,4 @@
 //    abc_vertical_lint.js: Analyzes the vertical position of the output object.
-//    Copyright (C) 2015-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 //This file takes as input the output structure of the writing routine and lists the vertical position of all the elements.
 
@@ -33,6 +19,8 @@ var midiSequencerLint = function(tune) {
 				case "note":
 					ret += "\t\t";
 					ret += 'duration: ' + element.duration + '\n';
+					if (element.decoration && element.decoration.length > 0)
+						ret += '\t\tdecoration: ' + element.decoration.join(", ") + '\n';
 					ret += "\t\t";
 					if (element.chord) {
 						ret += 'chord: ';
@@ -73,6 +61,10 @@ var midiSequencerLint = function(tune) {
 							if (element.pitches[n].endTie)
 								ret += ' endTie';
 						}
+						if (element.style && element.style !== "normal")
+							ret += "\n\t\tstyle: " + element.style;
+						if (element.noChordVoice)
+							ret += "\n\t\tnoChordVoice";
 					}
 					ret += '\n';
 					break;
@@ -143,6 +135,11 @@ var midiSequencerLint = function(tune) {
 					ret += "[" + params.pattern.join(" ") + "] bars=" + params.bars + " intro=" + params.intro + " on=" + params.on;
 					ret += '\n';
 					break;
+				case "name":
+					ret += "\t\t";
+					ret += element.trackName;
+					ret += '\n';
+					break;
 				default:
 					ret += "Unknown el_type: " + element.el_type + "\n";
 					break;

package/src/test/abc_parser_lint.js

@@ -1,18 +1,4 @@
 //    abc_parser_lint.js: Analyzes the output of abc_parse.
-//    Copyright (C) 2010-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 //This file takes as input the output of AbcParser and analyzes it to make sure there are no
 //unexpected elements in it. It also returns a person-readable version of it that is suitable
@@ -74,15 +60,17 @@ var ParserLint = function() {
 		"segno", "coda", "D.S.", "D.C.", "fine", "crescendo(", "crescendo)", "diminuendo(", "diminuendo)",
 		"p", "pp", "f", "ff", "mf", "mp", "ppp", "pppp",  "fff", "ffff", "sfz", "repeatbar", "repeatbar2", "slide",
 		"upbow", "downbow", "staccato", "trem1", "trem2", "trem3", "trem4",
-		"/", "//", "//", "///", "////", "turnx", "invertedturn", "invertedturnx", "arpeggio", "trill(", "trill)", "xstem",
+		"/", "//", "///", "////", "turnx", "invertedturn", "invertedturnx", "arpeggio", "trill(", "trill)", "xstem",
 		"mark", "marcato", "umarcato"
 	] } };
 
 	var tempoProperties =  {
 		duration: { type: "array", optional: true, output: "join", requires: [ 'bpm'], items: { type: "number"} },
 		bpm: { type: "number", optional: true, requires: [ 'duration'] },
+		endChar: { type: 'number'},
 		preString: { type: 'string', optional: true},
 		postString: { type: 'string', optional: true},
+		startChar: { type: 'number'},
 		suppress: { type: 'boolean', Enum: [ true ], optional: true},
 		suppressBpm: { type: 'boolean', Enum: [ true ], optional: true}
 	};
@@ -112,9 +100,71 @@ var ParserLint = function() {
 		}
 	};
 
+	var percMapElement = {
+		type: 'object', optional: true, properties: {
+			sound: { type: 'number', minimum: 35, maximum: 81  },
+			noteHead: { type: 'string', Enum: ['normal', 'harmonic', 'rhythm', 'x', 'triangle'], optional: true },
+		}
+	};
+	var percMapProps = {
+		"C": percMapElement,
+		"_C": percMapElement,
+		"^C": percMapElement,
+		"=C": percMapElement,
+		"D": percMapElement,
+		"_D": percMapElement,
+		"^D": percMapElement,
+		"=D": percMapElement,
+		"E": percMapElement,
+		"_E": percMapElement,
+		"^E": percMapElement,
+		"=E": percMapElement,
+		"F": percMapElement,
+		"_F": percMapElement,
+		"^F": percMapElement,
+		"=F": percMapElement,
+		"G": percMapElement,
+		"_G": percMapElement,
+		"^G": percMapElement,
+		"=G": percMapElement,
+		"A": percMapElement,
+		"_A": percMapElement,
+		"^A": percMapElement,
+		"=A": percMapElement,
+		"B": percMapElement,
+		"_B": percMapElement,
+		"^B": percMapElement,
+		"=B": percMapElement,
+		"c": percMapElement,
+		"_c": percMapElement,
+		"^c": percMapElement,
+		"=c": percMapElement,
+		"d": percMapElement,
+		"_d": percMapElement,
+		"^d": percMapElement,
+		"=d": percMapElement,
+		"e": percMapElement,
+		"_e": percMapElement,
+		"^e": percMapElement,
+		"=e": percMapElement,
+		"f": percMapElement,
+		"_f": percMapElement,
+		"^f": percMapElement,
+		"=f": percMapElement,
+		"g": percMapElement,
+		"_g": percMapElement,
+		"^g": percMapElement,
+		"=g": percMapElement,
+		"a": percMapElement,
+		"_a": percMapElement,
+		"^a": percMapElement,
+		"=a": percMapElement,
+	};
+
 	var clefProperties = {
 		stafflines: { type: 'number', minimum: 0, maximum: 10, optional: true },
-		transpose: { type: 'number', minimum: -11, maximum: 11, optional: true },
+		staffscale: { type: 'number', minimum: 0.1, maximum: 10, optional: true },
+		transpose: { type: 'number', minimum: -24, maximum: 24, optional: true },
 		type: { type: 'string', Enum: [ 'treble', 'tenor', 'bass', 'alto', 'treble+8', 'tenor+8', 'bass+8', 'alto+8', 'treble-8', 'tenor-8', 'bass-8', 'alto-8', 'none', 'perc' ] },
 		verticalPos: { type: 'number', minimum: -20, maximum: 10 },	// the pitch that goes in the middle of the staff C=0
 		clefPos: { type: 'number', minimum: 2, maximum: 10, optional: true }	// this is needed if there is a clef, but should not be present if the clef is 'none'
@@ -181,12 +231,13 @@ var ParserLint = function() {
 				endSlur: { type: 'array', optional: true, output: "join", items: { type: 'number', minimum: 0 } },
 				endTie: { type: 'boolean', Enum: [ true ], optional: true },
 				midipitch: { type: 'number', optional: true },
+				name: { type: 'string' },
 				pitch: { type: 'number' },
 				verticalPos: { type: 'number' },
 				startBeam: { type: 'boolean', Enum: [ true ], prohibits: [ 'endBeam', 'beambr' ], optional: true },
 				startSlur: slurProperties,
-				startTie: tieProperties
-			}
+				startTie: tieProperties,
+				}
 		}},
 		lyric: { type: 'array', optional: true, output: "noindex", items: {
 			type: 'object', properties: {
@@ -200,11 +251,12 @@ var ParserLint = function() {
 					endSlur: { type: 'array', optional: true, output: "join", items: { type: 'number', minimum: 0 } },
 					endTie: { type: 'boolean', Enum: [ true ], optional: true },
 					midipitch: { type: 'number', optional: true },
+					name: { type: 'string' },
 					pitch: { type: 'number' },
 					verticalPos: { type: 'number' },
 					startSlur: slurProperties,
 					startTie: tieProperties,
-					style: {	type: 'string', Enum: ['normal', 'harmonic', 'rhythm', 'x'], optional: true }
+					style: {	type: 'string', Enum: ['normal', 'harmonic', 'rhythm', 'x', 'triangle'], optional: true },
 				}
 		}},
 		positioning: { type: 'object', optional: true, properties: {
@@ -215,7 +267,8 @@ var ParserLint = function() {
 			volumePosition: { type: 'string', Enum: [ 'above', 'below', 'hidden' ], optional: true}
 		}},
 		rest: { type: 'object',  optional: true, prohibits: [ 'pitches', 'lyric' ], properties: {
-			type: { type: 'string', Enum: [ 'invisible', 'spacer', 'rest', 'multimeasure', 'whole' ] },	// multimeasure requires duration to be the number of measures.
+			type: { type: 'string', Enum: [ 'invisible', 'spacer', 'rest', 'multimeasure', 'invisible-multimeasure', 'whole' ] },	// multimeasure requires duration to be the number of measures.
+			text: { type: 'number', minimum: 1, maximum: 100, optional: true },
 			endTie: { type: 'boolean', Enum: [ true ], optional: true },
 			startTie: tieProperties
 		}},
@@ -223,8 +276,9 @@ var ParserLint = function() {
 		startSlur: slurProperties,
 		startTriplet: { type: 'number', minimum: 2, maximum: 9, optional: true },
 		tripletMultiplier: { type: 'number', minimum: .1, maximum: 9, optional: true },
+		tripletR: { type: 'number', minimum: .1, maximum: 9, optional: true },
 		stemConnectsToAbove: { type: 'boolean', Enum: [ true ], optional: true },
-		style: {	type: 'string', Enum: ['normal', 'harmonic', 'rhythm', 'x'], optional: true }
+		style: {	type: 'string', Enum: ['normal', 'harmonic', 'rhythm', 'x', 'triangle'], optional: true }
 };
 
 	var keyProperties = { // change deepCopyKey (in parse_header) if there are changes around here
@@ -294,7 +348,7 @@ var ParserLint = function() {
 				direction: { type: 'string', Enum: [ 'up', 'down', 'auto', 'none' ] }
 			}},
 			{ value: 'style', properties: {
-				head: { type: 'string', Enum: [ 'normal', 'harmonic', 'rhythm', 'x' ] }
+				head: { type: 'string', Enum: [ 'normal', 'harmonic', 'rhythm', 'x', 'triangle' ] }
 			}},
 			{ value: 'tempo', properties: appendPositioning(tempoProperties) },
 			{ value: 'transpose', properties: { steps: { type: "number" } } },
@@ -305,9 +359,11 @@ var ParserLint = function() {
 	var textFieldProperties = { type: "stringorarray", optional: true, output: 'noindex',
 		items: {
 			type: 'object', properties: {
+				endChar: { type: 'number', optional: true},
 				font: fontType,
 				text: { type: 'string' },
-				center: { type: 'boolean', Enum: [ true ], optional: true }
+				center: { type: 'boolean', Enum: [ true ], optional: true },
+				startChar: { type: 'number', optional: true}
 			}
 		}
 	};
@@ -393,7 +449,7 @@ var ParserLint = function() {
 			freegchord: { type: "boolean", optional: true },
 			gchordbox: { type: "boolean", optional: true },
 			gchordfont: fontType,
-			graceslurs: { type: "boolean", optional: true },
+			graceSlurs: { type: "boolean", optional: true },
 			gracespacebefore: { type: "number", optional: true },
 			gracespaceinside: { type: "number", optional: true },
 			gracespaceafter: { type: "number", optional: true },
@@ -405,6 +461,7 @@ var ParserLint = function() {
 			infoline: { type: "boolean", optional: true },
 			infospace: { type: "number", optional: true },
 //					landscape: { type: "boolean", optional: true },
+			jazzchords: { type: "boolean", optional: true },
 			leftmargin: { type: "number", optional: true },
 			linesep: { type: "number", optional: true },
 			lineskipfac: { type: "number", optional: true },
@@ -476,13 +533,12 @@ var ParserLint = function() {
 			partsbox: { type: "boolean", optional: true },
 			partsfont: fontType,
 			partsspace: { type: "number", optional: true },
-			percmap: { type: "string", optional: true },
+			percmap: {type: 'object', optional: true, properties: percMapProps},
 			playtempo: { type: "string", optional: true },
 			repeatfont: fontType,
 			rightmargin: { type: "number", optional: true },
 			scale: { type: "number", optional: true },
 			score: { type: "string", optional: true },
-			slurgraces: { type: "boolean", optional: true },
 			slurheight: { type: "number", optional: true },
 			splittune: { type: "boolean", optional: true },
 			squarebreve: { type: "boolean", optional: true },
@@ -490,12 +546,15 @@ var ParserLint = function() {
 			staffwidth: { type: "number", optional: true },
 			stemheight: { type: "number", optional: true },
 			straightflags: { type: "boolean", optional: true },
-			stretchlast: { type: "boolean", optional: true },
+			stretchlast: {type: "number", optional: true, minimum: 0, maximum: 1 },
 			stretchstaff: { type: "boolean", optional: true },
 			subtitlefont: fontType,
 			subtitlespace: { type: "number", optional: true },
 			sysstaffsep: { type: "number", optional: true },
 			systemsep: { type: "number", optional: true },
+			tabgracefont: fontType,
+			tablabelfont: fontType,
+			tabnumberfont: fontType,
 			tempofont: fontType,
 			textfont: fontType,
 			textspace: { type: "number", optional: true },
@@ -539,13 +598,27 @@ var ParserLint = function() {
 				staffbreak: { type: 'number', optional: true },
 				separator: { type: 'object', optional: true, prohibits: [ 'staff', 'text', 'subtitle' ],
 					properties: {
+						endChar: { type: 'number'},
 						lineLength: { type: 'number', optional: true },
 						spaceAbove: { type: 'number', optional: true },
-						spaceBelow: { type: 'number', optional: true }
+						spaceBelow: { type: 'number', optional: true },
+						startChar: { type: 'number'}
+					}
+				},
+				subtitle: { type: "object", optional: true, prohibits: [ 'staff', 'text', 'separator' ],
+					properties: {
+						endChar: { type: 'number'},
+						startChar: { type: 'number'},
+						text: { type: 'string'}
+					}
+				},
+				text: { type: "object", optional: true, prohibits: [ 'staff', 'subtitle', 'separator' ],
+					properties: {
+						endChar: { type: 'number'},
+						startChar: { type: 'number'},
+						text: textFieldProperties
 					}
 				},
-				subtitle: { type: "string", optional: true, prohibits: [ 'staff', 'text', 'separator' ]  },
-				text: addProhibits(textFieldProperties, [ 'staff', 'subtitle', 'separator' ]),
 				staff: { type: 'array', optional: true, prohibits: [ 'subtitle', 'text', 'separator' ],
 					items: { type: 'object',
 						properties: {
@@ -554,6 +627,7 @@ var ParserLint = function() {
 							bracket: { type: 'string', optional: true, Enum: [ "start", "continue", "end" ] },
 							clef: { type: 'object', optional: true, properties: clefProperties },
 							connectBarLines: { type: 'string', optional: true, Enum: [ "start", "continue", "end" ] },
+							gchordfont: fontType,
 							tripletfont: fontType,
 							vocalfont: fontType,
 							key: { type: 'object', optional: true, properties: keyProperties },
@@ -581,7 +655,7 @@ var ParserLint = function() {
 		description:"ABC Internal Music Representation",
 		type:"object",
 		properties: {
-			version: { type: "string", Enum: [ "1.0.1" ] },
+			version: { type: "string", Enum: [ "1.1.0" ] },
 			media: { type: "string", Enum: [ "screen", "print" ] },
 
 			formatting: formattingProperties,
@@ -630,7 +704,37 @@ var ParserLint = function() {
 					unalignedWords: { type: 'array', optional: true, items: textFieldProperties },
 					url: { type: "string", optional: true }
 				}
-			}
+			},
+			metaTextInfo: {type:"object",
+				description: "There can only be one of these per tune",
+				properties: {
+					"abc-copyright": { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					"abc-creator": { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					"abc-version": { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					"abc-charset": { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					"abc-edited-by": { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					author: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					book: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					composer: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					discography: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					footer: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					group: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					header: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					history: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					instruction: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					notes: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					origin: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					partOrder: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					rhythm: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					source: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					tempo: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					textBlock: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					title: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					transcription: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					unalignedWords: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+					url: { type: "object", optional: true, properties: { startChar: { type: "number"}, endChar: { type: "number"}, } },
+				}
+			},
 		}
 	};
 

package/src/test/abc_vertical_lint.js

@@ -1,18 +1,4 @@
 //    abc_vertical_lint.js: Analyzes the vertical position of the output object.
-//    Copyright (C) 2015-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 //This file takes as input the output structure of the writing routine and lists the vertical position of all the elements.
 
@@ -51,6 +37,23 @@ var verticalLint = function(tunes) {
 	function formatArrayStart(tabs, i) {
 		return tabs + i + ": ";
 	}
+	function collectBrace(brace) {
+		var ret;
+		if (brace) {
+			ret = [];
+			for (var b1 = 0; b1 < brace.length; b1++) {
+				var bracket = {
+					x: brace[b1].x,
+					top: fixed1(brace[b1].startY),
+					bottom: fixed1(brace[b1].endY)
+				};
+				if (brace[b1].header)
+					bracket.header = brace[b1].header;
+				ret.push(bracket);
+			}
+		}
+		return ret;
+	}
 	function getType(obj) {
 		if (obj.$type.indexOf('staff-extra') >= 0) {
 			if (obj.elem.length === 1) {
@@ -144,6 +147,12 @@ var verticalLint = function(tunes) {
 		return tabs + str;
 	}
 
+	function formatClasses(obj) {
+		if (obj.classes)
+			return " " + obj.classes;
+		return '';
+	}
+
 	function formatElements(arr, indent) {
 		var tabs = "";
 		for (var i = 0; i < indent; i++) tabs += "\t";
@@ -152,9 +161,9 @@ var verticalLint = function(tunes) {
 			var obj = arr[i];
 			var type = getType(obj);
 			if (type === "unknown")
-				str += formatArrayStart(tabs, i) + "\n" + formatObject(obj, indent) + "\n";
+				str += formatArrayStart(tabs, i) + "\n" + formatObject(obj, indent) + formatClasses(obj) + "\n";
 			else
-				str += formatArrayStart(tabs, i) + type + ' ' + formatY(obj) + formatX(obj) + "\n";
+				str += formatArrayStart(tabs, i) + type + ' ' + formatY(obj) + formatX(obj) + formatClasses(obj) + "\n";
 		}
 		return tabs + str;
 	}
@@ -170,7 +179,7 @@ var verticalLint = function(tunes) {
 			var params = "";
 			for (var j = 0; j < keys.length; j++)
 				params += keys[j] + ": " + arr[i].params[keys[j]] + " ";
-			str += arr[i].type + " (" + params + ")\n";
+			str += arr[i].type + " (" + params + ")" + formatClasses(arr[i].params) + "\n";
 		}
 		return str + "\n";
 	}
@@ -235,13 +244,23 @@ var verticalLint = function(tunes) {
 		return str.join("\n");
 	}
 
+	function addHeader(obj) {
+		if (obj.header)
+			return " " + obj.header;
+		return "";
+	}
+
 	function formatLine(line, lineNum) {
 		var str = "";
 		str += "Line: " + lineNum + ": (" + fixed1(line.height) + ")\n";
-		if (line.brace)
-			str += "brace: " + fixed1(line.brace.x) + " " + formatY(line.brace) + "\n";
-		if (line.bracket)
-			str += "bracket: " + fixed1(line.bracket.x) + " " + formatY(line.bracket) + "\n";
+		if (line.brace) {
+			for (var i = 0; i < line.brace.length; i++)
+				str += "brace: " + fixed1(line.brace[i].x) + " " + formatY(line.brace[i]) + addHeader(line.brace[i]) + "\n";
+		}
+		if (line.bracket) {
+			for (var i2 = 0; i2 < line.bracket.length; i2++)
+			str += "bracket: " + fixed1(line.bracket[i2].x) + " " + formatY(line.bracket[i2]) + addHeader(line.bracket[i2]) + "\n";
+		}
 		str += "staffs: " + formatStaffs(line.staffs, 1);
 		str += "voices: " + formatVoices(line.voices, 1);
 		return str;
@@ -260,12 +279,8 @@ var verticalLint = function(tunes) {
 
 	function extractPositioningInfo(staffGroup, lineNum) {
 		var ret = { height: staffGroup.height, minSpace: staffGroup.minspace, spacingUnits: staffGroup.spacingunits, width: staffGroup.w, startX: staffGroup.startX, staffs: [], voices: [] };
-		if (staffGroup.brace) {
-			ret.brace = { x: staffGroup.brace.x, top: fixed1(staffGroup.brace.startY), bottom: fixed1(staffGroup.brace.endY) };
-		}
-		if (staffGroup.bracket) {
-			ret.bracket = { x: staffGroup.bracket.x, top: fixed1(staffGroup.bracket.startY), bottom: fixed1(staffGroup.bracket.endY) };
-		}
+		ret.brace = collectBrace(staffGroup.brace);
+		ret.bracket = collectBrace(staffGroup.bracket);
 		for (var i = 0; i < staffGroup.staffs.length; i++) {
 			var staff = staffGroup.staffs[i];
 			ret.staffs.push({bottom: fixed1(staff.bottom), top: fixed1(staff.top), specialY: setSpecialY(staff) });
@@ -276,16 +291,34 @@ var verticalLint = function(tunes) {
 			for (var j = 0; j < voice.children.length; j++) {
 				var child = voice.children[j];
 				var type = child.type;
+				var classes = [];
+				if (child.elemset) {
+					for (var jj = 0; jj < child.elemset.length; jj++) {
+						var cl = child.elemset[jj].classList;
+						if (cl && cl.length > 0) {
+							for (var jjj = 0; jjj < cl.length; jjj++)
+								classes.push(cl[jjj]);
+						}
+					}
+				}
 				if (type === 'note' || type === 'rest') {
 					if (child.abcelem.pitches) {
 						var pitches = [];
 						for (var ii = 0; ii < child.abcelem.pitches.length; ii++) pitches.push(child.abcelem.pitches[ii].verticalPos);
 						type += "(" + pitches.join(',') + ")";
-					} else
-						type = "note(rest)";
+					} else {
+						var r = "rest";
+						switch (child.abcelem.rest.type) {
+							case "invisible": r += "/inv"; break;
+							case "spacer": r += "/sp"; break;
+						}
+						type = "note(" + r + ")";
+					}
 					if (child.abcelem.lyric && child.abcelem.lyric.length > 0) type += " " + child.abcelem.lyric[0].syllable;
 				}
 				var obj2 = { $type: type, bottom: fixed1(child.bottom), top: fixed1(child.top), specialY: setSpecialY(child), minSpacing: child.minspacing, duration: child.duration, width: child.w, x: child.x };
+				if (classes.length > 0)
+					obj2.classes = classes.join(" ");
 				obj2.elem = [];
 				if (type === 'tempo') {
 					var tempo = child.children[0].tempo;
@@ -327,6 +360,19 @@ var verticalLint = function(tunes) {
 							var value = otherChild[key];
 							if (value === null)
 								ch.params[key] = "null";
+							else if (value === className && key === 'type')
+								;
+							else if (key === "elemset") {
+								var cls = [];
+								for (var j2 = 0; j2 < otherChild.elemset.length; j2++) {
+									var c2 = otherChild.elemset[j2].classList;
+									if (c2 && c2.length > 0) {
+										for (var j3 = 0; j3 < c2.length; j3++)
+											cls.push(c2[j3]);
+									}
+								}
+								ch.params.classes = cls.join(" ");
+							}
 							else if (typeof value === "object") {
 								var obj3 = value.constructor.name + '[';
 								switch (value.constructor.name) {
@@ -379,16 +425,32 @@ var verticalLint = function(tunes) {
 		return formatLine(ret, lineNum);
 	}
 
+	function extractText(label, arr) {
+		var items = [];
+		items.push(label);
+		for (var i = 0; i < arr.length; i++) {
+			var item = arr[i];
+			items.push("\t" + JSON.stringify(item));
+		}
+		items.push("");
+		return items.join("\n");
+	}
+
 	var positioning = [];
 	for (var i = 0; i < tunes.length; i++) {
-		for (var j = 0; j < tunes[i].lines.length; j++) {
-			var line = tunes[i].lines[j];
+		var tune = tunes[i];
+		if (tune.topText && tune.topText.rows.length > 0)
+			positioning.push(extractText("Top Text", tune.topText.rows));
+		for (var j = 0; j < tune.lines.length; j++) {
+			var line = tune.lines[j];
 			if (line.staffGroup)
-				positioning.push(extractPositioningInfo(tunes[i].lines[j].staffGroup, j));
+				positioning.push(extractPositioningInfo(tune.lines[j].staffGroup, j));
 			else
 				positioning.push(JSON.stringify(line));
 		}
 	}
+	if (tune.bottomText && tune.bottomText.rows.length > 0)
+		positioning.push(extractText("Bottom Text", tune.bottomText.rows));
 	return positioning;
 };