abcjs-rails 1.8 → 1.11

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

@@ -0,0 +1,83 @@
+//    abc_tie_element.js: Definition of the TieElement class.
+//    Copyright (C) 2010,2014 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
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+/*globals ABCJS */
+
+if (!window.ABCJS)
+	window.ABCJS = {};
+
+if (!window.ABCJS.write)
+	window.ABCJS.write = {};
+
+ABCJS.write.TieElem = function(anchor1, anchor2, above, forceandshift) {
+	this.anchor1 = anchor1; // must have a .x and a .pitch, and a .parent property or be null (means starts at the "beginning" of the line - after keysig)
+	this.anchor2 = anchor2; // must have a .x and a .pitch property or be null (means ends at the end of the line)
+	this.above = above; // true if the arc curves above
+	this.force = forceandshift; // force the arc curve, regardless of beaming if true
+	// move by +7 "up" by -7 if "down"
+};
+
+ABCJS.write.TieElem.prototype.draw = function (renderer, linestartx, lineendx) {
+	var startpitch;
+	var endpitch;
+
+	if (this.startlimitelem) {
+		linestartx = this.startlimitelem.x+this.startlimitelem.w;
+	}
+
+	if (this.endlimitelem) {
+		lineendx = this.endlimitelem.x;
+	}
+	// PER: We might have to override the natural slur direction if the first and last notes are not in the
+	// save direction. We always put the slur up in this case. The one case that works out wrong is that we always
+	// want the slur to be up when the last note is stem down. We can tell the stem direction if the top is
+	// equal to the pitch: if so, there is no stem above it.
+	if (!this.force && this.anchor2 && this.anchor2.pitch === this.anchor2.top)
+		this.above = true;
+
+	if (this.anchor1) {
+		linestartx = this.anchor1.x;
+		startpitch = this.above ? this.anchor1.highestVert : this.anchor1.pitch;
+		if (!this.anchor2) {
+			endpitch = this.above ? this.anchor1.highestVert : this.anchor1.pitch;
+		}
+	}
+
+	if (this.anchor2) {
+		lineendx = this.anchor2.x;
+		endpitch = this.above ? this.anchor2.highestVert : this.anchor2.pitch;
+		if (!this.anchor1) {
+			startpitch = this.above ? this.anchor2.highestVert : this.anchor2.pitch;
+		}
+	}
+
+	//  if (this.anchor1 && this.anchor2) {
+	//    if ((!this.force && this.anchor1.parent.beam && this.anchor2.parent.beam &&
+	//	 this.anchor1.parent.beam.asc===this.anchor2.parent.beam.asc) ||
+	//	((this.force==="up") || this.force==="down") && this.anchor1.parent.beam && this.anchor2.parent.beam && this.anchor1.parent.beam===this.anchor2.parent.beam) {
+	//      this.above = !this.anchor1.parent.beam.asc;
+	//      preservebeamdir = true;
+	//    }
+	//  }
+
+	//  var pitchshift = 0;
+	//  if (this.force==="up" && !preservebeamdir) pitchshift = 7;
+	//  if (this.force==="down" && !preservebeamdir) pitchshift = -7;
+
+	//	renderer.debugMsgLow(linestartx, debugMsg);
+	renderer.drawArc(linestartx, lineendx, startpitch, endpitch,  this.above);
+
+};

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

@@ -0,0 +1,85 @@
+//    abc_triplet_element.js: Definition of the TripletElem class.
+//    Copyright (C) 2010,2014 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
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+/*globals ABCJS */
+
+if (!window.ABCJS)
+	window.ABCJS = {};
+
+if (!window.ABCJS.write)
+	window.ABCJS.write = {};
+
+ABCJS.write.TripletElem = function(number, anchor1, anchor2, above) {
+	this.anchor1 = anchor1; // must have a .x and a .parent property or be null (means starts at the "beginning" of the line - after keysig)
+	this.anchor2 = anchor2; // must have a .x property or be null (means ends at the end of the line)
+	this.above = above;
+	this.number = number;
+};
+
+ABCJS.write.TripletElem.prototype.draw = function (renderer, linestartx, lineendx) {
+	// TODO end and beginning of line
+	if (this.anchor1 && this.anchor2) {
+		var ypos = this.above?16:-1;	// PER: Just bumped this up from 14 to make (3z2B2B2 (3B2B2z2 succeed. There's probably a better way.
+
+		if (this.anchor1.parent.beam &&
+			this.anchor1.parent.beam===this.anchor2.parent.beam) {
+			var beam = this.anchor1.parent.beam;
+			this.above = beam.asc;
+			ypos = beam.pos;
+		} else {
+			this.drawLine(renderer,renderer.calcY(ypos));
+		}
+		var xsum = this.anchor1.x+this.anchor2.x;
+		var ydelta = 0;
+		if (beam) {
+			if (this.above) {
+				xsum += (this.anchor2.w + this.anchor1.w);
+				ydelta = 4;
+			} else {
+				ydelta = -4;
+			}
+		} else {
+			xsum += this.anchor2.w;
+		}
+
+
+		renderer.printText(xsum/2, ypos+ydelta, this.number, "middle", 'triplet').attr({"font-size":"10px", 'font-style': 'italic' });
+
+	}
+};
+
+ABCJS.write.TripletElem.prototype.drawLine = function (renderer, y) {
+	var pathString;
+	var linestartx = this.anchor1.x;
+	pathString = ABCJS.write.sprintf("M %f %f L %f %f",
+		linestartx, y, linestartx, y+5);
+	renderer.printPath({path:pathString, stroke:"#000000", 'class': renderer.addClasses('triplet')});
+
+	var lineendx = this.anchor2.x+this.anchor2.w;
+	pathString = ABCJS.write.sprintf("M %f %f L %f %f",
+		lineendx, y, lineendx, y+5);
+	renderer.printPath({path:pathString, stroke:"#000000", 'class': renderer.addClasses('triplet')});
+
+	pathString = ABCJS.write.sprintf("M %f %f L %f %f",
+		linestartx, y, (linestartx+lineendx)/2-5, y);
+	renderer.printPath({path:pathString, stroke:"#000000", 'class': renderer.addClasses('triplet')});
+
+
+	pathString = ABCJS.write.sprintf("M %f %f L %f %f",
+			(linestartx+lineendx)/2+5, y, lineendx, y);
+	renderer.printPath({path:pathString, stroke:"#000000", 'class': renderer.addClasses('triplet')});
+
+};

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

@@ -0,0 +1,177 @@
+//    abc_voice_element.js: Definition of the VoiceElement class.
+//    Copyright (C) 2010,2014 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
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+/*globals ABCJS */
+
+if (!window.ABCJS)
+	window.ABCJS = {};
+
+if (!window.ABCJS.write)
+	window.ABCJS.write = {};
+
+ABCJS.write.VoiceElement = function(voicenumber, voicetotal) {
+	this.children = [];
+	this.beams = [];
+	this.otherchildren = []; // ties, slurs, triplets
+	this.w = 0;
+	this.duplicate = false;
+	this.voicenumber = voicenumber; //number of the voice on a given stave (not staffgroup)
+	this.voicetotal = voicetotal;
+};
+
+ABCJS.write.VoiceElement.prototype.addChild = function (child) {
+	if (child.type === 'bar') {
+		var firstItem = true;
+		for (var i = 0; firstItem && i < this.children.length; i++) {
+			if (this.children[i].type !== "staff-extra")
+				firstItem = false;
+		}
+		if (!firstItem) {
+			this.beams.push("bar");
+			this.otherchildren.push("bar");
+		}
+	}
+	this.children[this.children.length] = child;
+};
+
+ABCJS.write.VoiceElement.prototype.addOther = function (child) {
+	if (child instanceof ABCJS.write.BeamElem) {
+		this.beams.push(child);
+	} else {
+		this.otherchildren.push(child);
+	}
+};
+
+ABCJS.write.VoiceElement.prototype.updateIndices = function () {
+	if (!this.layoutEnded()) {
+		this.durationindex += this.children[this.i].duration;
+		if (this.children[this.i].duration===0) this.durationindex = Math.round(this.durationindex*64)/64; // everytime we meet a barline, do rounding to nearest 64th
+		this.i++;
+	}
+};
+
+ABCJS.write.VoiceElement.prototype.layoutEnded = function () {
+	return (this.i>=this.children.length);
+};
+
+ABCJS.write.VoiceElement.prototype.getDurationIndex = function () {
+	return this.durationindex - (this.children[this.i] && (this.children[this.i].duration>0)?0:0.0000005); // if the ith element doesn't have a duration (is not a note), its duration index is fractionally before. This enables CLEF KEYSIG TIMESIG PART, etc. to be laid out before we get to the first note of other voices
+};
+
+// number of spacing units expected for next positioning
+ABCJS.write.VoiceElement.prototype.getSpacingUnits = function () {
+	return (this.minx<this.nextx) ? Math.sqrt(this.spacingduration*8) : 0; // we haven't used any spacing units if we end up using minx
+};
+
+//
+ABCJS.write.VoiceElement.prototype.getNextX = function () {
+	return Math.max(this.minx, this.nextx);
+};
+
+ABCJS.write.VoiceElement.prototype.beginLayout = function (startx) {
+	this.i=0;
+	this.durationindex=0;
+	this.ii=this.children.length;
+	this.startx=startx;
+	this.minx=startx; // furthest left to where negatively positioned elements are allowed to go
+	this.nextx=startx; // x position where the next element of this voice should be placed assuming no other voices and no fixed width constraints
+	this.spacingduration=0; // duration left to be laid out in current iteration (omitting additional spacing due to other aspects, such as bars, dots, sharps and flats)
+};
+
+// Try to layout the element at index this.i
+// x - position to try to layout the element at
+// spacing - base spacing
+// can't call this function more than once per iteration
+ABCJS.write.VoiceElement.prototype.layoutOneItem = function (x, spacing) {
+	var child = this.children[this.i];
+	if (!child) return 0;
+	var er = x - this.minx; // available extrawidth to the left
+	if (er<child.getExtraWidth()) { // shift right by needed amount
+		x+=child.getExtraWidth()-er;
+	}
+	child.x=x; // place child at x
+
+	this.spacingduration = child.duration;
+	//update minx
+	this.minx = x+child.getMinWidth(); // add necessary layout space
+	if (this.i!==this.ii-1) this.minx+=child.minspacing; // add minimumspacing except on last elem
+
+	this.updateNextX(x, spacing);
+
+	// contribute to staff y position
+	this.staff.highest = Math.max(child.top,this.staff.highest);
+	this.staff.lowest = Math.min(child.bottom,this.staff.lowest);
+
+	return x; // where we end up having placed the child
+};
+
+// call when spacingduration has been updated
+ABCJS.write.VoiceElement.prototype.updateNextX = function (x, spacing) {
+	this.nextx= x + (spacing*Math.sqrt(this.spacingduration*8));
+};
+
+ABCJS.write.VoiceElement.prototype.shiftRight = function (dx) {
+	var child = this.children[this.i];
+	if (!child) return;
+	child.x+=dx;
+	this.minx+=dx;
+	this.nextx+=dx;
+};
+
+ABCJS.write.VoiceElement.prototype.draw = function (renderer, bartop) {
+	var width = this.w-1;
+	renderer.y = this.staff.y;
+	renderer.staffbottom = this.staff.bottom;
+	this.barbottom = renderer.calcY(2);
+
+	renderer.measureNumber = null;
+	if (this.header) { // print voice name
+		var textpitch = 12 - (this.voicenumber+1)*(12/(this.voicetotal+1));
+		var headerX = (this.startx-renderer.paddingleft)/2+renderer.paddingleft;
+		headerX = headerX*renderer.scale;
+		renderer.paper.text(headerX, renderer.calcY(textpitch)*renderer.scale, this.header).attr({"font-size":12*renderer.scale, "font-family":"serif", 'font-weight':'bold', 'class': renderer.addClasses('staff-extra voice-name')}); // code duplicated above
+	}
+
+	for (var i=0, ii=this.children.length; i<ii; i++) {
+		var child = this.children[i];
+		var justInitializedMeasureNumber = false;
+		if (child.type !== 'staff-extra' && renderer.measureNumber === null) {
+			renderer.measureNumber = 0;
+			justInitializedMeasureNumber = true;
+		}
+		child.draw(renderer, (this.barto || i===ii-1)?bartop:0);
+		if (child.type === 'bar' && !justInitializedMeasureNumber)
+			renderer.measureNumber++;
+	}
+
+	renderer.measureNumber = 0;
+	window.ABCJS.parse.each(this.beams, function(beam) {
+		if (beam === 'bar')
+			renderer.measureNumber++;
+		else
+			beam.draw(renderer); // beams must be drawn first for proper printing of triplets, slurs and ties.
+	});
+
+	renderer.measureNumber = 0;
+	var self = this;
+	window.ABCJS.parse.each(this.otherchildren, function(child) {
+		if (child === 'bar')
+			renderer.measureNumber++;
+		else
+			child.draw(renderer,self.startx+10,width);
+	});
+
+};

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

@@ -15,7 +15,7 @@
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-/*global window, ABCJS, Math */
+/*global window, ABCJS, Math, Raphael */
 
 if (!window.ABCJS)
 	window.ABCJS = {};
@@ -50,6 +50,18 @@ ABCJS.write.Printer = function(paper, params) {
   this.paddingright = params.paddingright || 50;
   this.paddingleft = params.paddingleft || 15;
   this.editable = params.editable || false;
+	// HACK-PER: Raphael doesn't support setting the class of an element, so this adds that support. This doesn't work on IE8 or less, though.
+	this.usingSvg = (window.SVGAngle || document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") ? true : false); // Same test Raphael uses
+	if (this.usingSvg && params.add_classes)
+		Raphael._availableAttrs['class'] = "";
+};
+
+ABCJS.write.Printer.prototype.addClasses = function (c) {
+	var ret = [];
+	if (c.length > 0) ret.push(c);
+	if (this.lineNumber !== null) ret.push("l"+this.lineNumber);
+	if (this.measureNumber !== null) ret.push("m"+this.measureNumber);
+	return ret.join(' ');
 };
 
 // notify all listeners that a graphical element has been selected
@@ -125,10 +137,10 @@ ABCJS.write.Printer.prototype.addPath = function (path) {
   }
 };
 
-ABCJS.write.Printer.prototype.endGroup = function () {
+ABCJS.write.Printer.prototype.endGroup = function (klass) {
   this.ingroup = false;
   if (this.path.length===0) return null;
-  var ret = this.paper.path().attr({path:this.path, stroke:"none", fill:"#000000"});
+  var ret = this.paper.path().attr({path:this.path, stroke:"none", fill:"#000000", 'class': this.addClasses(klass)});
   if (this.scale!==1) {
     ret.scale(this.scale, this.scale, 0, 0);
   }
@@ -146,7 +158,7 @@ ABCJS.write.Printer.prototype.printStaveLine = function (x1,x2, pitch) {
   var y = this.calcY(pitch);
   var pathString = ABCJS.write.sprintf("M %f %f L %f %f L %f %f L %f %f z", x1, y-dy, x2, y-dy,
 			   x2, y+dy, x1, y+dy);
-  var ret = this.paper.path().attr({path:pathString, stroke:"none", fill:fill}).toBack();
+  var ret = this.paper.path().attr({path:pathString, stroke:"none", fill:fill, 'class': this.addClasses('staff')}).toBack();
   if (this.scale!==1) {
     ret.scale(this.scale, this.scale, 0, 0);
   }
@@ -170,7 +182,7 @@ ABCJS.write.Printer.prototype.printStem = function (x, dx, y1, y2) {
   if (!isIE && this.ingroup) {
     this.addPath(pathArray);
   } else {
-    var ret = this.paper.path().attr({path:pathArray, stroke:"none", fill:fill}).toBack();
+    var ret = this.paper.path().attr({path:pathArray, stroke:"none", fill:fill, 'class': this.addClasses('stem')}).toBack();
     if (this.scale!==1) {
       ret.scale(this.scale, this.scale, 0, 0);
     }
@@ -178,9 +190,9 @@ ABCJS.write.Printer.prototype.printStem = function (x, dx, y1, y2) {
   }
 };
 
-ABCJS.write.Printer.prototype.printText = function (x, offset, text, anchor) {
+ABCJS.write.Printer.prototype.printText = function (x, offset, text, anchor, extraClass) {
   anchor = anchor || "start";
-  var ret = this.paper.text(x*this.scale, this.calcY(offset)*this.scale, text).attr({"text-anchor":anchor, "font-size":12*this.scale});
+  var ret = this.paper.text(x*this.scale, this.calcY(offset)*this.scale, text).attr({"text-anchor":anchor, "font-size":12*this.scale, 'class': this.addClasses(extraClass)});
 //  if (this.scale!==1) {
 //    ret.scale(this.scale, this.scale, 0, 0);
 //  }
@@ -190,7 +202,7 @@ ABCJS.write.Printer.prototype.printText = function (x, offset, text, anchor) {
 // assumes this.y is set appropriately
 // if symbol is a multichar string without a . (as in scripts.staccato) 1 symbol per char is assumed
 // not scaled if not in printgroup
-ABCJS.write.Printer.prototype.printSymbol = function(x, offset, symbol, scalex, scaley) {
+ABCJS.write.Printer.prototype.printSymbol = function(x, offset, symbol, scalex, scaley, klass) {
 	var el;
   if (!symbol) return null;
   if (symbol.length>0 && symbol.indexOf(".")<0) {
@@ -198,7 +210,7 @@ ABCJS.write.Printer.prototype.printSymbol = function(x, offset, symbol, scalex,
     var dx =0;
     for (var i=0; i<symbol.length; i++) {
       var ycorr = this.glyphs.getYCorr(symbol.charAt(i));
-      el = this.glyphs.printSymbol(x+dx, this.calcY(offset+ycorr), symbol.charAt(i), this.paper);
+      el = this.glyphs.printSymbol(x+dx, this.calcY(offset+ycorr), symbol.charAt(i), this.paper, klass);
       if (el) {
 	elemset.push(el);
 	dx+=this.glyphs.getSymbolWidth(symbol.charAt(i));
@@ -215,7 +227,7 @@ ABCJS.write.Printer.prototype.printSymbol = function(x, offset, symbol, scalex,
     if (this.ingroup) {
       this.addPath(this.glyphs.getPathForSymbol(x, this.calcY(offset+ycorr), symbol, scalex, scaley));
     } else {
-      el = this.glyphs.printSymbol(x, this.calcY(offset+ycorr), symbol, this.paper);
+      el = this.glyphs.printSymbol(x, this.calcY(offset+ycorr), symbol, this.paper, klass);
       if (el) {
 	if (this.scale!==1) {
 	  el.scale(this.scale, this.scale, 0, 0);
@@ -262,7 +274,7 @@ ABCJS.write.Printer.prototype.drawArc = function(x1, x2, pitch1, pitch2, above)
   var pathString = ABCJS.write.sprintf("M %f %f C %f %f %f %f %f %f C %f %f %f %f %f %f z", x1, y1,
 			   controlx1, controly1, controlx2, controly2, x2, y2, 
 			   controlx2-thickness*uy, controly2+thickness*ux, controlx1-thickness*uy, controly1+thickness*ux, x1, y1);
-  var ret = this.paper.path().attr({path:pathString, stroke:"none", fill:"#000000"});
+  var ret = this.paper.path().attr({path:pathString, stroke:"none", fill:"#000000", 'class': this.addClasses('slur')});
   if (this.scale!==1) {
     ret.scale(this.scale, this.scale, 0, 0);
   }
@@ -270,15 +282,15 @@ ABCJS.write.Printer.prototype.drawArc = function(x1, x2, pitch1, pitch2, above)
 };
 
 ABCJS.write.Printer.prototype.debugMsg = function(x, msg) {
-  return this.paper.text(x, this.y, msg).scale(this.scale, this.scale, 0, 0);
+  return this.paper.text(x, this.y, msg).scale(this.scale, this.scale, 0, 0).attr({'class': this.addClasses('debug-msg')});
 };
 
 ABCJS.write.Printer.prototype.debugMsgLow = function(x, msg) {
-    return this.paper.text(x, this.calcY(this.layouter.minY-7), msg).attr({"font-family":"serif", "font-size":12, "text-anchor":"begin"}).scale(this.scale, this.scale, 0, 0);
+    return this.paper.text(x, this.calcY(this.layouter.minY-7), msg).attr({"font-family":"serif", "font-size":12, "text-anchor":"begin", 'class': this.addClasses('debug-msg')}).scale(this.scale, this.scale, 0, 0);
 };
 
 ABCJS.write.Printer.prototype.printLyrics = function(x, msg) {
-    var el = this.paper.text(x, this.calcY(this.layouter.minY-7), msg).attr({"font-family":"Times New Roman", "font-weight":'bold', "font-size":14, "text-anchor":"begin"}).scale(this.scale, this.scale, 0, 0);
+    var el = this.paper.text(x, this.calcY(this.layouter.minY-7), msg).attr({"font-family":"Times New Roman", "font-weight":'bold', "font-size":14, "text-anchor":"begin", 'class': this.addClasses('lyrics')}).scale(this.scale, this.scale, 0, 0);
     el[0].setAttribute("class", "abc-lyric");
     return el;
 };
@@ -316,7 +328,7 @@ ABCJS.write.Printer.prototype.printABC = function(abctunes) {
 };
 
 ABCJS.write.Printer.prototype.printTempo = function (tempo, paper, layouter, y, printer, x) {
-	var fontStyle = {"text-anchor":"start", 'font-size':12*printer.scale, 'font-weight':'bold'};
+	var fontStyle = {"text-anchor":"start", 'font-size':12*printer.scale, 'font-weight':'bold', 'class': this.addClasses('tempo')};
 	if (tempo.preString) {
 		var text = paper.text(x*printer.scale, y*printer.scale + 20*printer.scale, tempo.preString).attr(fontStyle);
 		x += (text.getBBox().width + 20*printer.scale);
@@ -325,7 +337,7 @@ ABCJS.write.Printer.prototype.printTempo = function (tempo, paper, layouter, y,
 		var temposcale = 0.75*printer.scale;
 		var tempopitch = 14.5;
 		var duration = tempo.duration[0]; // TODO when multiple durations
-		var abselem = new ABCJS.write.AbsoluteElement(tempo, duration, 1);
+		var abselem = new ABCJS.write.AbsoluteElement(tempo, duration, 1, 'tempo');
 		var durlog = Math.floor(Math.log(duration) / Math.log(2));
 		var dot = 0;
 		for (var tot = Math.pow(2, durlog), inc = tot / 2; tot < duration; dot++, tot += inc, inc /= 2);
@@ -364,6 +376,8 @@ ABCJS.write.Printer.prototype.printTempo = function (tempo, paper, layouter, y,
 };
 
 ABCJS.write.Printer.prototype.printTune = function (abctune) {
+	this.lineNumber = null;
+	this.measureNumber = null;
   this.layouter = new ABCJS.write.Layout(this.glyphs, abctune.formatting.bagpipes);
 	this.layouter.printer = this;	// TODO-PER: this is a hack to get access, but it tightens the coupling.
   if (abctune.media === 'print') {
@@ -390,28 +404,29 @@ ABCJS.write.Printer.prototype.printTune = function (abctune) {
   this.width+=this.paddingleft;
   if (abctune.formatting.scale) { this.scale=abctune.formatting.scale; }
 	if (abctune.metaText.title)
-	  this.paper.text(this.width*this.scale/2, this.y, abctune.metaText.title).attr({"font-size":20*this.scale, "font-family":"serif"});
+	  this.paper.text(this.width*this.scale/2, this.y, abctune.metaText.title).attr({"font-size":20*this.scale, "font-family":"serif", 'class': this.addClasses('title meta-top')});
   this.y+=20*this.scale;
   if (abctune.lines[0] && abctune.lines[0].subtitle) {
     this.printSubtitleLine(abctune.lines[0]);
     this.y+=20*this.scale;
   }
   if (abctune.metaText.rhythm) {
-    this.paper.text(this.paddingleft, this.y, abctune.metaText.rhythm).attr({"text-anchor":"start","font-style":"italic","font-family":"serif", "font-size":12*this.scale});
+    this.paper.text(this.paddingleft, this.y, abctune.metaText.rhythm).attr({"text-anchor":"start","font-style":"italic","font-family":"serif", "font-size":12*this.scale, 'class': this.addClasses('meta-top')});
     !(abctune.metaText.author || abctune.metaText.origin || abctune.metaText.composer) && (this.y+=15*this.scale);
   }
 	var composerLine = "";
 	if (abctune.metaText.composer) composerLine += abctune.metaText.composer;
 	if (abctune.metaText.origin) composerLine += ' (' + abctune.metaText.origin + ')';
-  if (composerLine.length > 0) {this.paper.text(this.width*this.scale, this.y, composerLine).attr({"text-anchor":"end","font-style":"italic","font-family":"serif", "font-size":12*this.scale});this.y+=15;}
-	if (abctune.metaText.author) {this.paper.text(this.width*this.scale, this.y, abctune.metaText.author).attr({"text-anchor":"end","font-style":"italic","font-family":"serif", "font-size":12*this.scale}); this.y+=15;}
+  if (composerLine.length > 0) {this.paper.text(this.width*this.scale, this.y, composerLine).attr({"text-anchor":"end","font-style":"italic","font-family":"serif", "font-size":12*this.scale, 'class': this.addClasses('meta-top')});this.y+=15;}
+	if (abctune.metaText.author) {this.paper.text(this.width*this.scale, this.y, abctune.metaText.author).attr({"text-anchor":"end","font-style":"italic","font-family":"serif", "font-size":12*this.scale, 'class': this.addClasses('meta-top')}); this.y+=15;}
   if (abctune.metaText.tempo && !abctune.metaText.tempo.suppress) {
-	  this.y = this.printTempo(abctune.metaText.tempo, this.paper, this.layouter, this.y, this, 50);
+	  this.y = this.printTempo(abctune.metaText.tempo, this.paper, this.layouter, this.y, this, 50, -1);
 	  this.y += 20*this.scale;
   }
   this.staffgroups = [];
   var maxwidth = this.width;
   for(var line=0; line<abctune.lines.length; line++) {
+	  this.lineNumber = line;
     var abcline = abctune.lines[line];
     if (abcline.staff) {
 		staffgroup = this.printStaffLine(abctune, abcline, line);
@@ -421,18 +436,20 @@ ABCJS.write.Printer.prototype.printTune = function (abctune) {
       this.y+=20*this.scale; //hardcoded
     } else if (abcline.text) {
 		if (typeof abcline.text === 'string')
-	      this.paper.text(100, this.y, "TEXT: " + abcline.text);
+	      this.paper.text(100, this.y, "TEXT: " + abcline.text).attr({'class': this.addClasses('defined-text')});
 	  else {
 		  var str = "";
 		  for (var i = 0; i < abcline.text.length; i++) {
 			  str += " FONT " + abcline.text[i].text;
 		  }
-	      this.paper.text(100, this.y, "TEXT: " + str);
+	      this.paper.text(100, this.y, "TEXT: " + str).attr({'class': this.addClasses('defined-text')});
 	  }
       this.y+=20*this.scale; //hardcoded
     }
   }
-  var extraText = "";
+	this.lineNumber = null;
+	this.measureNumber = null;
+	var extraText = "";
 	var text2;
 	var height;
   if (abctune.metaText.partOrder) extraText += "Part Order: " + abctune.metaText.partOrder + "\n";
@@ -447,7 +464,7 @@ ABCJS.write.Printer.prototype.printTune = function (abctune) {
        extraText += "\n";
   }
 }
- text2 = this.paper.text(this.paddingleft*this.scale+50*this.scale, this.y*this.scale+25*this.scale, extraText).attr({"text-anchor":"start", "font-family":"serif", "font-size":17*this.scale});
+ text2 = this.paper.text(this.paddingleft*this.scale+50*this.scale, this.y*this.scale+25*this.scale, extraText).attr({"text-anchor":"start", "font-family":"serif", "font-size":17*this.scale, 'class': this.addClasses('meta-bottom')});
   height = text2.getBBox().height + 17*this.scale;
   text2.translate(0,height/2);
   this.y+=height;
@@ -459,7 +476,7 @@ ABCJS.write.Printer.prototype.printTune = function (abctune) {
   if (abctune.metaText.notes) extraText += "Notes: " + abctune.metaText.notes + "\n";
   if (abctune.metaText.transcription) extraText += "Transcription: " + abctune.metaText.transcription + "\n";
   if (abctune.metaText.history) extraText += "History: " + abctune.metaText.history + "\n";
-  text2 = this.paper.text(this.paddingleft, this.y*this.scale+25*this.scale, extraText).attr({"text-anchor":"start", "font-family":"serif", "font-size":17*this.scale});
+  text2 = this.paper.text(this.paddingleft, this.y*this.scale+25*this.scale, extraText).attr({"text-anchor":"start", "font-family":"serif", "font-size":17*this.scale, 'class': this.addClasses('meta-bottom')});
   height = text2.getBBox().height;
 	if (!height) height = 25*this.scale;	// TODO-PER: Hack! Don't know why Raphael chokes on this sometimes and returns NaN. Perhaps only when printing to PDF? Possibly if the SVG is hidden?
   text2.translate(0,height/2);
@@ -476,9 +493,28 @@ ABCJS.write.Printer.prototype.printTune = function (abctune) {
 };
 
 ABCJS.write.Printer.prototype.printSubtitleLine = function(abcline) {
-  this.paper.text(this.width/2, this.y, abcline.subtitle).attr({"font-size":16}).scale(this.scale, this.scale, 0,0);
+  this.paper.text(this.width/2, this.y, abcline.subtitle).attr({"font-size":16, 'class': 'text meta-top'}).scale(this.scale, this.scale, 0,0);
 };
 
+function centerWholeRests(voices) {
+	// whole rests are a special case: if they are by themselves in a measure, then they should be centered.
+	// (If they are not by themselves, that is probably a user error, but we'll just center it between the two items to either side of it.)
+	for (var i = 0; i < voices.length; i++) {
+		var voice = voices[i];
+		// Look through all of the elements except for the first and last. If the whole note appears there then there isn't anything to center it between anyway.
+		for (var j = 1; j < voice.children.length-1; j++) {
+			var absElem = voice.children[j];
+			if (absElem.abcelem.rest && absElem.abcelem.rest.type === 'whole') {
+				var before = voice.children[j-1];
+				var after = voice.children[j+1];
+				var midpoint = (after.x - before.x) / 2 + before.x;
+				absElem.x = midpoint - absElem.w / 2;
+
+			}
+		}
+	}
+}
+
 ABCJS.write.Printer.prototype.printStaffLine = function (abctune, abcline, line) {
 	var staffgroup = this.layouter.printABCLine(abcline.staff);
 	var newspace = this.space;
@@ -494,9 +530,10 @@ ABCJS.write.Printer.prototype.printStaffLine = function (abctune, abcline, line)
 			}
 		}
 	}
+	centerWholeRests(staffgroup.voices);
 	staffgroup.draw(this, this.y);
 	this.staffgroups[this.staffgroups.length] = staffgroup;
 	this.y = staffgroup.y + staffgroup.height;
 	this.y += ABCJS.write.spacing.STAVEHEIGHT * 0.2;
 	return staffgroup;
-}
+};