abcjs-rails 2.3 → 3.0

data/app/assets/javascripts/abcjs/midi/abc_midi_sequencer.js

@@ -1,5 +1,5 @@
 //    abc_midi_sequencer.js: Turn parsed abc into a linear series of events.
-//    Copyright (C) 2010,2015 Gregory Dyke (gregdyke at gmail dot com) and Paul Rosen
+//    Copyright (C) 2010,2016 Gregory Dyke (gregdyke at gmail dot com) and Paul Rosen
 //
 //    This program is free software: you can redistribute it and/or modify
 //    it under the terms of the GNU General Public License as published by
@@ -31,9 +31,14 @@ if (!window.ABCJS.midi)
 		// Global options
 		options = options || {};
 		var qpm = options.qpm || 180;	// The tempo if there isn't a tempo specified.
-		var program = options.program || 2;	// The program if there isn't a program specified.
+		var program = options.program || 0;	// The program if there isn't a program specified.
 		var transpose = options.transpose || 0;
 		var channel = options.channel || 0;
+		// All of the above overrides need to be integers
+		qpm = parseInt(qpm, 10);
+		program = parseInt(program, 10);
+		transpose = parseInt(transpose, 10);
+		channel = parseInt(channel, 10);
 
 		var bagpipes = abctune.formatting.bagpipes; // If it is bagpipes, then the gracenotes are played on top of the main note.
 		if (bagpipes)
@@ -142,7 +147,7 @@ if (!window.ABCJS.midi)
 									// figure out repeats and endings --
 									// The important part is where there is a start repeat, and end repeat, or a first ending.
 									var endRepeat = (elem.type === "bar_right_repeat" || elem.type === "bar_dbl_repeat");
-									var startEnding = (elem.startEnding) ? true : false;
+									var startEnding = (elem.startEnding === '1');
 									var startRepeat = (elem.type === "bar_left_repeat" || elem.type === "bar_dbl_repeat" || elem.type === "bar_thick_thin" || elem.type === "bar_thin_thick" || elem.type === "bar_thin_thin" || elem.type === "bar_right_repeat");
 									if (endRepeat) {
 										var s = startRepeatPlaceholder[voiceNumber];
@@ -150,6 +155,9 @@ if (!window.ABCJS.midi)
 										var e = skipEndingPlaceholder[voiceNumber];
 										if (!e) e = voices[voiceNumber].length; // If there wasn't a first ending marker, then we copy everything.
 										voices[voiceNumber] = voices[voiceNumber].concat(voices[voiceNumber].slice(s, e));
+										// reset these in case there is a second repeat later on.
+										skipEndingPlaceholder[voiceNumber] = undefined;
+										startRepeatPlaceholder[voiceNumber] = undefined;
 									}
 									if (startEnding)
 										skipEndingPlaceholder[voiceNumber] = voices[voiceNumber].length;

data/app/assets/javascripts/abcjs/parse/abc_common.js

@@ -30,6 +30,30 @@ window.ABCJS.parse.clone = function(source) {
 	return destination;
 };
 
+window.ABCJS.parse.cloneArray = function(source) {
+	var destination = [];
+	for (var i = 0; i < source.length; i++) {
+		destination.push(ABCJS.parse.clone(source[i]));
+	}
+	return destination;
+};
+
+window.ABCJS.parse.cloneHashOfHash = function(source) {
+	var destination = {};
+	for (var property in source)
+		if (source.hasOwnProperty(property))
+			destination[property] = ABCJS.parse.clone(source[property]);
+	return destination;
+};
+
+window.ABCJS.parse.cloneHashOfArrayOfHash = function(source) {
+	var destination = {};
+	for (var property in source)
+		if (source.hasOwnProperty(property))
+			destination[property] = ABCJS.parse.cloneArray(source[property]);
+	return destination;
+};
+
 window.ABCJS.parse.gsub = function(source, pattern, replacement) {
 	return source.split(pattern).join(replacement);
 };

data/app/assets/javascripts/abcjs/parse/abc_parse.js

@@ -840,14 +840,12 @@ window.ABCJS.parse.Parse = function() {
 			if (multilineVars.currentVoice.style)
 				params.style = multilineVars.currentVoice.style;
 		}
+		var isFirstVoice = multilineVars.currentVoice === undefined || (multilineVars.currentVoice.staffNum ===  0 && multilineVars.currentVoice.index ===  0);
+		if (multilineVars.barNumbers === 0 && isFirstVoice && multilineVars.currBarNumber !== 1)
+			params.barNumber = multilineVars.currBarNumber;
 		tune.startNewLine(params);
 
 		multilineVars.partForNextLine = "";
-		if (multilineVars.currentVoice === undefined || (multilineVars.currentVoice.staffNum === multilineVars.staves.length-1 && multilineVars.staves[multilineVars.currentVoice.staffNum].numVoices-1 === multilineVars.currentVoice.index)) {
-			//multilineVars.meter = null;
-			if (multilineVars.barNumbers === 0)
-				multilineVars.barNumOnNextNote = multilineVars.currBarNumber;
-		}
 	}
 
 	var letter_to_grace =  function(line, i) {
@@ -1145,9 +1143,12 @@ window.ABCJS.parse.Parse = function() {
 						else if (bar.endEnding)
 							multilineVars.barFirstEndingNum = undefined;
 						if (bar.type !== 'bar_invisible' && multilineVars.measureNotEmpty) {
-							multilineVars.currBarNumber++;
-							if (multilineVars.barNumbers && multilineVars.currBarNumber % multilineVars.barNumbers === 0)
-								multilineVars.barNumOnNextNote = multilineVars.currBarNumber;
+							var isFirstVoice = multilineVars.currentVoice === undefined || (multilineVars.currentVoice.staffNum ===  0 && multilineVars.currentVoice.index ===  0);
+							if (isFirstVoice) {
+								multilineVars.currBarNumber++;
+								if (multilineVars.barNumbers && multilineVars.currBarNumber % multilineVars.barNumbers === 0)
+									bar.barNumber = multilineVars.currBarNumber;
+							}
 						}
 						multilineVars.addFormattingOptions(el, tune.formatting, 'bar');
 						tune.appendElement('bar', startOfLine+i, startOfLine+i+ret[0], bar);
@@ -1291,10 +1292,7 @@ window.ABCJS.parse.Parse = function() {
 									if (chordDuration !== null) {
 										el.duration = el.duration * chordDuration;
 									}
-									if (multilineVars.barNumOnNextNote) {
-										el.barNumber = multilineVars.barNumOnNextNote;
-										multilineVars.barNumOnNextNote = null;
-									}
+
 									multilineVars.addFormattingOptions(el, tune.formatting, 'note');
 									tune.appendElement('note', startOfLine+chordStartChar, startOfLine+i, el);
 									multilineVars.measureNotEmpty = true;
@@ -1365,10 +1363,6 @@ window.ABCJS.parse.Parse = function() {
 								el.duration = durationOfMeasure(multilineVars);
 							}
 
-							if (multilineVars.barNumOnNextNote) {
-								el.barNumber = multilineVars.barNumOnNextNote;
-								multilineVars.barNumOnNextNote = null;
-							}
 							multilineVars.addFormattingOptions(el, tune.formatting, 'note');
 							tune.appendElement('note', startOfLine+startI, startOfLine+i, el);
 							multilineVars.measureNotEmpty = true;
@@ -1400,12 +1394,57 @@ window.ABCJS.parse.Parse = function() {
 			parseLine(ret.str);
 	};
 
+	function appendLastMeasure(voice, nextVoice) {
+		voice.push({
+			el_type: 'hint'
+		});
+		for (var i = 0; i < nextVoice.length; i++) {
+			var element = nextVoice[i];
+			var hint = window.ABCJS.parse.clone(element);
+			voice.push(hint);
+			if (element.el_type === 'bar')
+					return;
+		}
+	}
+
+	function addHintMeasure(staff, nextStaff) {
+		for (var i = 0; i < staff.length; i++) {
+			var stave = staff[i];
+			var nextStave = nextStaff[i];
+			if (nextStave) { // Be sure there is the same number of staves on the next line.
+				for (var j = 0; j < nextStave.voices.length; j++) {
+					var nextVoice = nextStave.voices[j];
+					var voice = stave.voices[j];
+					if (voice) { // Be sure there are the same number of voices on the previous line.
+						appendLastMeasure(voice, nextVoice);
+					}
+				}
+			}
+		}
+	}
+
+	function addHintMeasures() {
+		for (var i = 0; i < tune.lines.length; i++) {
+			var line = tune.lines[i].staff;
+			if (line) {
+				var j = i+1;
+				while (j < tune.lines.length && tune.lines[j].staff === undefined)
+					j++;
+				if (j < tune.lines.length) {
+					var nextLine = tune.lines[j].staff;
+					addHintMeasure(line, nextLine);
+				}
+			}
+		}
+	}
+
 	this.parse = function(strTune, switches) {
 		// the switches are optional and cause a difference in the way the tune is parsed.
 		// switches.header_only : stop parsing when the header is finished
 		// switches.stop_on_warning : stop at the first warning encountered.
 		// switches.print: format for the page instead of the browser.
 		// switches.format: a hash of the desired formatting commands.
+		// switches.hint_measures: put the next measure at the end of the current line.
 		if (!switches) switches = {};
 		tune.reset();
 		if (switches.print)
@@ -1482,5 +1521,8 @@ window.ABCJS.parse.Parse = function() {
 			if (err !== "normal_abort")
 				throw err;
 		}
+		if (switches.hint_measures) {
+			addHintMeasures();
+		}
 	};
 };

data/app/assets/javascripts/abcjs/parse/abc_parse_header.js

@@ -34,7 +34,10 @@ window.ABCJS.parse.ParseHeader = function(tokenizer, warn, multilineVars, tune)
 			tune.addSubtitle(tokenizer.translateString(tokenizer.stripComment(title)));	// display secondary title
 		else
 		{
-			tune.addMetaText("title", tokenizer.translateString(tokenizer.theReverser(tokenizer.stripComment(title))));
+			var titleStr = tokenizer.translateString(tokenizer.theReverser(tokenizer.stripComment(title)));
+			if (multilineVars.titlecaps)
+				titleStr = titleStr.toUpperCase();
+			tune.addMetaText("title", titleStr);
 			multilineVars.hasMainTitle = true;
 		}
 	};

data/app/assets/javascripts/abcjs/parse/abc_parse_key_voice.js

@@ -403,6 +403,11 @@ window.ABCJS.parse.parseKeyVoice = {};
 								mode = retMode.token;
 							}
 						}
+						// Be sure that the key specified is in the list: not all keys are physically possible, like Cbmin.
+						if (window.ABCJS.parse.parseKeyVoice.standardKey(key) === undefined) {
+							warn("Unsupported key signature: " + key, str, 0);
+							return ret;
+						}
 					}
 					// We need to do a deep copy because we are going to modify it
 					var oldKey = window.ABCJS.parse.parseKeyVoice.deepCopyKey(multilineVars.key);

data/app/assets/javascripts/abcjs/write/abc_absolute_element.js

@@ -25,8 +25,9 @@ if (!window.ABCJS.write)
 // duration - actual musical duration - different from notehead duration in triplets. refer to abcelem to get the notehead duration
 // minspacing - spacing which must be taken on top of the width defined by the duration
 // type is a meta-type for the element. It is not necessary for drawing, but it is useful to make semantic sense of the element. For instance, it can be used in the element's class name.
-ABCJS.write.AbsoluteElement = function(abcelem, duration, minspacing, type) {
+ABCJS.write.AbsoluteElement = function(abcelem, duration, minspacing, type, tuneNumber) {
 	//console.log("Absolute:",abcelem, type);
+	this.tuneNumber = tuneNumber;
 	this.abcelem = abcelem;
 	this.duration = duration;
 	this.minspacing = minspacing || 0;
@@ -165,6 +166,10 @@ ABCJS.write.AbsoluteElement.prototype.setX = function (x) {
 		this.children[i].setX(x);
 };
 
+ABCJS.write.AbsoluteElement.prototype.setHint = function () {
+	this.hint = true;
+};
+
 ABCJS.write.AbsoluteElement.prototype.draw = function (renderer, bartop) {
 	this.elemset = renderer.paper.set();
 	if (this.invisible) return;
@@ -179,13 +184,15 @@ ABCJS.write.AbsoluteElement.prototype.draw = function (renderer, bartop) {
 	this.elemset.push(renderer.endGroup(this.type));
 	if (this.klass)
 		this.setClass("mark", "", "#00ff00");
+	if (this.hint)
+		this.setClass("abcjs-hint", "", null);
 	var color = ABCJS.write.debugPlacement ? "rgba(0,0,0,0.3)" : "rgba(0,0,0,0)"; // Create transparent box that encompasses the element, and not so transparent to debug it.
 	var target = renderer.printShadedBox(this.x, renderer.calcY(this.top), this.w, renderer.calcY(this.bottom)-renderer.calcY(this.top), color);
 	var self = this;
 	var controller = renderer.controller;
 //	this.elemset.mouseup(function () {
 	target.mouseup(function () {
-		controller.notifySelect(self);
+		controller.notifySelect(self, self.tuneNumber);
 	});
 	this.abcelem.abselem = this;
 

data/app/assets/javascripts/abcjs/write/abc_abstract_engraver.js

@@ -43,9 +43,10 @@ ABCJS.write.getDurlog = function(duration) {
   return Math.floor(Math.log(duration)/Math.log(2));
 };
 
-ABCJS.write.AbstractEngraver = function(bagpipes, renderer) {
+ABCJS.write.AbstractEngraver = function(bagpipes, renderer, tuneNumber) {
 	this.decoration = new ABCJS.write.Decoration();
 	this.renderer = renderer;
+	this.tuneNumber = tuneNumber;
   this.isBagpipes = bagpipes;
   this.chartable = {rest:{0:"rests.whole", 1:"rests.half", 2:"rests.quarter", 3:"rests.8th", 4: "rests.16th",5: "rests.32nd", 6: "rests.64th", 7: "rests.128th"},
                  note:{"-1": "noteheads.dbl", 0:"noteheads.whole", 1:"noteheads.half", 2:"noteheads.quarter", 3:"noteheads.quarter", 4:"noteheads.quarter", 5:"noteheads.quarter", 6:"noteheads.quarter", 7:"noteheads.quarter", 'nostem':"noteheads.quarter"},
@@ -138,9 +139,11 @@ ABCJS.write.AbstractEngraver.prototype.createABCLine = function(staffs, tempo) {
   this.staffgroup = new ABCJS.write.StaffGroupElement();
 	this.tempoSet = false;
   for (this.s = 0; this.s < staffs.length; this.s++) {
+	  if (ABCJS.write.hint)
+		  this.restoreState();
+	  ABCJS.write.hint = false;
     this.createABCStaff(staffs[this.s], tempo);
   }
-
   return this.staffgroup;
 };
 
@@ -155,16 +158,20 @@ ABCJS.write.AbstractEngraver.prototype.createABCStaff = function(abcstaff, tempo
       this.voice.duplicate = true; // bar lines and other duplicate info need not be created
     }
     if (abcstaff.title && abcstaff.title[this.v]) this.voice.header=abcstaff.title[this.v];
-	  var clef = ABCJS.write.createClef(abcstaff.clef);
-	  if (clef)
-    this.voice.addChild(clef);
-	  var keySig = ABCJS.write.createKeySignature(abcstaff.key);
+	  var clef = ABCJS.write.createClef(abcstaff.clef, this.tuneNumber);
+	  if (clef) {
+		  if (this.v ===0 && abcstaff.barNumber) {
+			  this.addMeasureNumber(abcstaff.barNumber, clef);
+		  }
+		  this.voice.addChild(clef);
+	  }
+	  var keySig = ABCJS.write.createKeySignature(abcstaff.key, this.tuneNumber);
 	  if (keySig) {
 		  this.voice.addChild(keySig);
 		  this.startlimitelem = keySig; // limit ties here
 	  }
     if (abcstaff.meter) {
-		var ts = ABCJS.write.createTimeSignature(abcstaff.meter);
+		var ts = ABCJS.write.createTimeSignature(abcstaff.meter, this.tuneNumber);
 		this.voice.addChild(ts);
 		this.startlimitelem = ts; // limit ties here
 	}
@@ -174,6 +181,18 @@ ABCJS.write.AbstractEngraver.prototype.createABCStaff = function(abcstaff, tempo
     this.staffgroup.addVoice(this.voice,this.s,staffLines);
 	  this.createABCVoice(abcstaff.voices[this.v],tempo);
 	  this.staffgroup.setStaffLimits(this.voice);
+            //Tony: Here I am following what staves need to be surrounded by the brace, by incrementing the length of the brace class.
+            //So basically this keeps incrementing the number of staff surrounded by the brace until it sees "end".
+            //This then gets processed in abc_staff_group_element.js, so that it will have the correct top and bottom coordinates for the brace.
+			if(abcstaff.brace === "start"){
+				this.staffgroup.brace = new ABCJS.write.BraceElem(1, true);
+			}
+			else if(abcstaff.brace === "end" && this.staffgroup.brace) {
+				this.staffgroup.brace.increaseStavesIncluded();
+			}
+			else if(abcstaff.brace === "continue" && this.staffgroup.brace){
+				this.staffgroup.brace.increaseStavesIncluded();
+			}
   }
 };
 
@@ -188,11 +207,13 @@ ABCJS.write.AbstractEngraver.prototype.createABCVoice = function(abcline, tempo)
   for (var slur in this.slurs) {
     if (this.slurs.hasOwnProperty(slur)) {
       this.slurs[slur]= new ABCJS.write.TieElem(null, null, this.slurs[slur].above, this.slurs[slur].force, false);
+		if (ABCJS.write.hint) this.slurs[slur].setHint();
         this.voice.addOther(this.slurs[slur]);
     }
   }
   for (var i=0; i<this.ties.length; i++) {
     this.ties[i]=new ABCJS.write.TieElem(null, null, this.ties[i].above, this.ties[i].force, true);
+	  if (ABCJS.write.hint) this.ties[i].setHint();
     this.voice.addOther(this.ties[i]);
   }
 
@@ -202,7 +223,7 @@ ABCJS.write.AbstractEngraver.prototype.createABCVoice = function(abcline, tempo)
     for (i=0; i<abselems.length; i++) {
       if (!this.tempoSet && tempo && !tempo.suppress) {
         this.tempoSet = true;
-        abselems[i].addChild(new ABCJS.write.TempoElement(tempo));
+        abselems[i].addChild(new ABCJS.write.TempoElement(tempo, this.tuneNumber));
       }
       this.voice.addChild(abselems[i]);
     }
@@ -211,6 +232,19 @@ ABCJS.write.AbstractEngraver.prototype.createABCVoice = function(abcline, tempo)
   this.pushCrossLineElems();
 };
 
+	ABCJS.write.AbstractEngraver.prototype.saveState = function() {
+		this.tiesSave = ABCJS.parse.cloneArray(this.ties);
+		this.slursSave = ABCJS.parse.cloneHashOfHash(this.slurs);
+		this.slursbyvoiceSave = ABCJS.parse.cloneHashOfHash(this.slursbyvoice);
+		this.tiesbyvoiceSave = ABCJS.parse.cloneHashOfArrayOfHash(this.tiesbyvoice);
+	};
+	
+	ABCJS.write.AbstractEngraver.prototype.restoreState = function() {
+		this.ties = ABCJS.parse.cloneArray(this.tiesSave);
+		this.slurs = ABCJS.parse.cloneHashOfHash(this.slursSave);
+		this.slursbyvoice = ABCJS.parse.cloneHashOfHash(this.slursbyvoiceSave);
+		this.tiesbyvoice = ABCJS.parse.cloneHashOfArrayOfHash(this.tiesbyvoiceSave);
+	};
 
 // return an array of ABCJS.write.AbsoluteElement
 ABCJS.write.AbstractEngraver.prototype.createABCElement = function() {
@@ -225,17 +259,17 @@ ABCJS.write.AbstractEngraver.prototype.createABCElement = function() {
     if (this.voice.duplicate) elemset[0].invisible = true;
     break;
   case "meter":
-    elemset[0] = ABCJS.write.createTimeSignature(elem);
+    elemset[0] = ABCJS.write.createTimeSignature(elem, this.tuneNumber);
 	  this.startlimitelem = elemset[0]; // limit ties here
     if (this.voice.duplicate) elemset[0].invisible = true;
     break;
   case "clef":
-    elemset[0] = ABCJS.write.createClef(elem);
+    elemset[0] = ABCJS.write.createClef(elem, this.tuneNumber);
 	  if (!elemset[0]) return null;
     if (this.voice.duplicate) elemset[0].invisible = true;
     break;
   case "key":
-	  var absKey = ABCJS.write.createKeySignature(elem);
+	  var absKey = ABCJS.write.createKeySignature(elem, this.tuneNumber);
 	  if (absKey) {
 		  elemset[0] = absKey;
 		  this.startlimitelem = elemset[0]; // limit ties here
@@ -246,14 +280,14 @@ ABCJS.write.AbstractEngraver.prototype.createABCElement = function() {
     this.stemdir=elem.direction;
     break;
   case "part":
-    var abselem = new ABCJS.write.AbsoluteElement(elem,0,0, 'part');
+    var abselem = new ABCJS.write.AbsoluteElement(elem,0,0, 'part', this.tuneNumber);
 	  var dim = this.renderer.getTextSize(elem.title, 'partsfont', "part");
     abselem.addChild(new ABCJS.write.RelativeElement(elem.title, 0, 0, undefined, {type:"part", height: dim.height/ABCJS.write.spacing.STEP}));
     elemset[0] = abselem;
     break;
   case "tempo":
-    var abselem3 = new ABCJS.write.AbsoluteElement(elem,0,0, 'tempo');
-    abselem3.addChild(new ABCJS.write.TempoElement(elem));
+    var abselem3 = new ABCJS.write.AbsoluteElement(elem,0,0, 'tempo', this.tuneNumber);
+    abselem3.addChild(new ABCJS.write.TempoElement(elem, this.tuneNumber));
     elemset[0] = abselem3;
     break;
 	  case "style":
@@ -262,8 +296,12 @@ ABCJS.write.AbstractEngraver.prototype.createABCElement = function() {
 		  else
 			  this.style = elem.head;
 		  break;
+	  case "hint":
+		  ABCJS.write.hint = true;
+		  this.saveState();
+		  break;
   default:
-    var abselem2 = new ABCJS.write.AbsoluteElement(elem,0,0, 'unsupported');
+    var abselem2 = new ABCJS.write.AbsoluteElement(elem,0,0, 'unsupported', this.tuneNumber);
     abselem2.addChild(new ABCJS.write.RelativeElement("element type "+elem.el_type, 0, 0, undefined, {type:"debug"}));
     elemset[0] = abselem2;
   }
@@ -296,6 +334,7 @@ ABCJS.write.AbstractEngraver.prototype.createBeam = function() {
   if (this.getElem().startBeam && !this.getElem().endBeam) {
 	  var dir = this.calcBeamDir();
          var beamelem = new ABCJS.write.BeamElem(this.stemHeight, dir);
+	  if (ABCJS.write.hint) beamelem.setHint();
          var oldDir = this.stemdir;
          this.stemdir = dir;
     while (this.getElem()) {
@@ -360,8 +399,8 @@ ABCJS.write.AbstractEngraver.prototype.createNote = function(elem, nostem, dontD
   }
   
 
-  var abselem = new ABCJS.write.AbsoluteElement(elem, duration * this.tripletmultiplier, 1, 'note');
-  
+  var abselem = new ABCJS.write.AbsoluteElement(elem, duration * this.tripletmultiplier, 1, 'note', this.tuneNumber);
+  if (ABCJS.write.hint) abselem.setHint();
 
   if (elem.rest) {
     var restpitch = 7;
@@ -542,6 +581,7 @@ ABCJS.write.AbstractEngraver.prototype.createNote = function(elem, nostem, dontD
     var gracebeam = null;
     if (elem.gracenotes.length>1) {
       gracebeam = new ABCJS.write.BeamElem(this.stemHeight*graceScaleStem, "grace",this.isBagpipes);
+		if (ABCJS.write.hint) gracebeam.setHint();
 		gracebeam.mainNote = abselem;	// this gives us a reference back to the note this is attached to so that the stems can be attached somewhere.
     }
 
@@ -774,7 +814,9 @@ ABCJS.write.AbstractEngraver.prototype.createNoteHead = function(abselem, c, pit
   if (pitchelem.startTie) {
     //PER: bug fix: var tie = new ABCJS.write.TieElem(notehead, null, (this.stemdir=="up" || dir=="down") && this.stemdir!="down",(this.stemdir=="down" || this.stemdir=="up"));
     var tie = new ABCJS.write.TieElem(notehead, null, (this.stemdir==="down" || dir==="down") && this.stemdir!=="up",(this.stemdir==="down" || this.stemdir==="up"), true);
-    this.ties[this.ties.length]=tie;
+	  if (ABCJS.write.hint) tie.setHint();
+
+	  this.ties[this.ties.length]=tie;
     this.voice.addOther(tie);
 	  // HACK-PER: For the animation, we need to know if a note is tied to the next one, so here's a flag.
 	  // Unfortunately, only some of the notes in the current event might be tied, but this will consider it
@@ -792,6 +834,7 @@ ABCJS.write.AbstractEngraver.prototype.createNoteHead = function(abselem, c, pit
         delete this.slurs[slurid];
       } else {
         slur = new ABCJS.write.TieElem(null, notehead, dir==="down",(this.stemdir==="up" || dir==="down") && this.stemdir!=="down", false);
+		  if (ABCJS.write.hint) slur.setHint();
         this.voice.addOther(slur);
       }
       if (this.startlimitelem) {
@@ -805,6 +848,7 @@ ABCJS.write.AbstractEngraver.prototype.createNoteHead = function(abselem, c, pit
       var slurid = pitchelem.startSlur[i].label;
       //PER: bug fix: var slur = new ABCJS.write.TieElem(notehead, null, (this.stemdir=="up" || dir=="down") && this.stemdir!="down", this.stemdir);
       var slur = new ABCJS.write.TieElem(notehead, null, (this.stemdir==="down" || dir==="down") && this.stemdir!=="up", false, false);
+		if (ABCJS.write.hint) slur.setHint();
       this.slurs[slurid]=slur;
       this.voice.addOther(slur);
     }
@@ -814,13 +858,21 @@ ABCJS.write.AbstractEngraver.prototype.createNoteHead = function(abselem, c, pit
 
 };
 
+ABCJS.write.AbstractEngraver.prototype.addMeasureNumber = function (number, abselem) {
+	var measureNumHeight = this.renderer.getTextSize(number, "measurefont", 'bar-number');
+	abselem.addChild(new ABCJS.write.RelativeElement(number, 0, 0, 11+measureNumHeight.height / ABCJS.write.spacing.STEP, {type:"barNumber"}));
+};
+
 ABCJS.write.AbstractEngraver.prototype.createBarLine = function (elem) {
 // bar_thin, bar_thin_thick, bar_thin_thin, bar_thick_thin, bar_right_repeat, bar_left_repeat, bar_double_repeat
 
-  var abselem = new ABCJS.write.AbsoluteElement(elem, 0, 10, 'bar');
+  var abselem = new ABCJS.write.AbsoluteElement(elem, 0, 10, 'bar', this.tuneNumber);
   var anchor = null; // place to attach part lines
   var dx = 0;
 
+	if (elem.barNumber) {
+		this.addMeasureNumber(elem.barNumber, abselem);
+	}
 
 
   var firstdots = (elem.type==="bar_right_repeat" || elem.type==="bar_dbl_repeat");