abcjs-rails 2.3 → 3.0

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

@@ -53,6 +53,10 @@ if (!window.ABCJS.write)
 		this.beams = []; // During the layout phase, this will become a list of the beams that need to be drawn.
 	};
 
+	ABCJS.write.BeamElem.prototype.setHint = function () {
+		this.hint = true;
+	};
+
 	ABCJS.write.BeamElem.prototype.add = function(abselem) {
 		var pitch = abselem.abcelem.averagepitch;
 		if (pitch === undefined) return; // don't include elements like spacers in beams
@@ -134,7 +138,7 @@ if (!window.ABCJS.write)
 		renderer.beginGroup();
 		for (var i = 0; i < this.beams.length; i++) {
 			var beam = this.beams[i];
-			drawBeam(renderer, beam.startX, beam.startY, beam.endX, beam.endY, beam.dy);
+			drawBeam(renderer, beam.startX, beam.startY, beam.endX, beam.endY, beam.dy, this.hint);
 		}
 		renderer.endGroup('beam-elem');
 	};
@@ -169,7 +173,11 @@ if (!window.ABCJS.write)
 		return dy;
 	}
 
-	function drawBeam(renderer, startX, startY, endX, endY, dy) {
+	function drawBeam(renderer, startX, startY, endX, endY, dy, isHint) {
+		var klass = 'beam-elem';
+		if (isHint)
+			klass += " abcjs-hint";
+
 		// the X coordinates are actual coordinates, but the Y coordinates are in pitches.
 		startY = renderer.calcY(startY);
 		endY = renderer.calcY(endY);
@@ -179,7 +187,7 @@ if (!window.ABCJS.write)
 			path: pathString,
 			stroke: "none",
 			fill: "#000000",
-			'class': renderer.addClasses('beam-elem')
+			'class': renderer.addClasses(klass)
 		});
 	}
 

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

@@ -0,0 +1,51 @@
+//    abc_brace_element.js: Definition of the BraceElement class.
+//    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
+//    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.BraceElem = function() {
+    this.length = 1;
+};
+
+ABCJS.write.BraceElem.prototype.increaseStavesIncluded = function() {
+    this.length++;
+};
+
+ABCJS.write.BraceElem.prototype.setLocation = function(x) {
+	this.x = x;
+};
+
+ABCJS.write.BraceElem.prototype.getWidth = function() {
+	return 10; // TODO-PER: right now the drawing function doesn't vary the width at all. If it does in the future then this will change.
+};
+
+ABCJS.write.BraceElem.prototype.layout = function (renderer, top, bottom) {
+    this.startY = top;
+    this.endY = bottom;
+};
+
+ABCJS.write.BraceElem.prototype.draw = function (renderer, top, bottom) {
+    this.layout(renderer, top, bottom);
+    renderer.drawBrace(this.x,this.startY, this.endY);
+
+};

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

@@ -1,5 +1,5 @@
 //    abc_create_clef.js
-//    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
@@ -25,10 +25,10 @@ if (!window.ABCJS.write)
 (function() {
 	"use strict";
 
-	ABCJS.write.createClef = function(elem) {
+	ABCJS.write.createClef = function(elem, tuneNumber) {
 		var clef;
 		var octave = 0;
-		var abselem = new ABCJS.write.AbsoluteElement(elem,0,10, 'staff-extra');
+		var abselem = new ABCJS.write.AbsoluteElement(elem,0,10, 'staff-extra', tuneNumber);
 		switch (elem.type) {
 			case "treble": clef = "clefs.G"; break;
 			case "tenor": clef="clefs.C"; break;

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

@@ -1,5 +1,5 @@
 //    abc_create_key_signature.js
-//    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
@@ -25,10 +25,10 @@ if (!window.ABCJS.write)
 (function() {
 	"use strict";
 
-	ABCJS.write.createKeySignature = function(elem) {
+	ABCJS.write.createKeySignature = function(elem, tuneNumber) {
 		if (!elem.accidentals || elem.accidentals.length === 0)
 			return null;
-		var abselem = new ABCJS.write.AbsoluteElement(elem, 0, 10, 'staff-extra');
+		var abselem = new ABCJS.write.AbsoluteElement(elem, 0, 10, 'staff-extra', tuneNumber);
 		var dx = 0;
 		window.ABCJS.parse.each(elem.accidentals, function(acc) {
 			var symbol = (acc.acc === "sharp") ? "accidentals.sharp" : (acc.acc === "natural") ? "accidentals.nat" : "accidentals.flat";

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

@@ -1,5 +1,5 @@
 //    abc_create_time_signature.js
-//    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
@@ -25,8 +25,8 @@ if (!window.ABCJS.write)
 (function() {
 	"use strict";
 
-	ABCJS.write.createTimeSignature = function(elem) {
-		var abselem = new ABCJS.write.AbsoluteElement(elem,0,10, 'staff-extra');
+	ABCJS.write.createTimeSignature = function(elem, tuneNumber) {
+		var abselem = new ABCJS.write.AbsoluteElement(elem,0,10, 'staff-extra', tuneNumber);
 		if (elem.type === "specified") {
 			//TODO make the alignment for time signatures centered
 			for (var i = 0; i < elem.value.length; i++) {

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

@@ -55,7 +55,10 @@ ABCJS.write.CrescendoElem.prototype.draw = function (renderer) {
 };
 
 ABCJS.write.CrescendoElem.prototype.drawLine = function (renderer, y1, y2) {
+	// TODO-PER: This is just a quick hack to make the dynamic marks not crash if they are mismatched. See the slur treatment for the way to get the beginning and end.
+	var left = this.anchor1 ? this.anchor1.x : 0;
+	var right = this.anchor2 ? this.anchor2.x : 800;
 	var pathString = ABCJS.write.sprintf("M %f %f L %f %f",
-		this.anchor1.x, y1, this.anchor2.x, y2);
+		left, y1, right, y2);
 	renderer.printPath({path:pathString, stroke:"#000000", 'class': renderer.addClasses('decoration')});
 };

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

@@ -1,5 +1,5 @@
 // abc_decoration.js: Creates a data structure suitable for printing a line of abc
-// Copyright (C) 2010-2015 Gregory Dyke (gregdyke at gmail dot com) & Paul Rosen
+// Copyright (C) 2010-2016 Gregory Dyke (gregdyke at gmail dot com) & 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

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

@@ -71,6 +71,7 @@ ABCJS.write.EngraverController = function(paper, params) {
 	if (this.usingSvg && params.add_classes)
 		Raphael._availableAttrs['class'] = "";
 	Raphael._availableAttrs['text-decoration'] = "";
+	Raphael._availableAttrs['data-vertical'] = "";
 
   //TODO-GD factor out all calls directly made to renderer.paper and fix all the coupling issues below
   this.renderer=new ABCJS.write.Renderer(paper, params.regression);
@@ -102,7 +103,7 @@ ABCJS.write.EngraverController.prototype.engraveABC = function(abctunes) {
 	this.reset();
 
   for (var i = 0; i < abctunes.length; i++) {
-    this.engraveTune(abctunes[i]);
+    this.engraveTune(abctunes[i], i);
   }
 	if (this.renderer.doRegression)
 		return this.renderer.regressionLines.join("\n");
@@ -121,24 +122,24 @@ ABCJS.write.EngraverController.prototype.adjustNonScaledItems = function (scale)
  * Run the engraving process on a single tune
  * @param {ABCJS.Tune} abctune
  */
-ABCJS.write.EngraverController.prototype.engraveTune = function (abctune) {
+ABCJS.write.EngraverController.prototype.engraveTune = function (abctune, tuneNumber) {
 	this.renderer.lineNumber = null;
 	abctune.formatting.tripletfont = {face: "Times", size: 11, weight: "normal", style: "italic", decoration: "none"}; // TODO-PER: This font isn't defined in the standard, so it's hardcoded here for now.
 
 	this.renderer.abctune = abctune; // TODO-PER: this is just to get the font info.
 	this.renderer.setVerticalSpace(abctune.formatting);
 	this.renderer.measureNumber = null;
-	var scale = abctune.formatting.scale ? abctune.formatting.scale : this.scale;
-	if (scale === undefined) scale = abctune.media === 'print' ? 0.75 : 1;
 	this.renderer.setPrintMode(abctune.media === 'print');
+	var scale = abctune.formatting.scale ? abctune.formatting.scale : this.scale;
+	if (scale === undefined) scale = this.renderer.isPrint ? 0.75 : 1;
 	this.renderer.setPadding(abctune);
-	this.engraver = new ABCJS.write.AbstractEngraver(abctune.formatting.bagpipes,this.renderer);
+	this.engraver = new ABCJS.write.AbstractEngraver(abctune.formatting.bagpipes,this.renderer, tuneNumber);
 	this.engraver.setStemHeight(this.renderer.spacing.stemHeight);
 	this.renderer.engraver = this.engraver; //TODO-PER: do we need this coupling? It's just used for the tempo
 	if (abctune.formatting.staffwidth) {
 		this.width = abctune.formatting.staffwidth * 1.33; // The width is expressed in pt; convert to px.
 	} else {
-		this.width = abctune.media === 'print' ? this.staffwidthPrint : this.staffwidthScreen;
+		this.width = this.renderer.isPrint ? this.staffwidthPrint : this.staffwidthScreen;
 	}
 	this.adjustNonScaledItems(scale);
 
@@ -198,7 +199,7 @@ ABCJS.write.EngraverController.prototype.engraveTune = function (abctune) {
 			this.engraveStaffLine(abcLine.staffGroup);
 		} else if (abcLine.subtitle && line !== 0) {
 			this.renderer.outputSubtitle(this.width, abcLine.subtitle);
-		} else if (abcLine.text) {
+		} else if (abcLine.text !== undefined) {
 			this.renderer.outputFreeText(abcLine.text);
 		}
 	}
@@ -266,7 +267,7 @@ ABCJS.write.EngraverController.prototype.engraveStaffLine = function (staffGroup
  * Called by the Abstract Engraving Structure or any other (e.g. midi playback) to say it was selected (notehead clicked on)
  * @protected
  */
-ABCJS.write.EngraverController.prototype.notifySelect = function (abselem) {
+ABCJS.write.EngraverController.prototype.notifySelect = function (abselem, tuneNumber) {
   this.clearSelection();
   if (abselem.highlight) {
     this.selected = [abselem];
@@ -275,7 +276,7 @@ ABCJS.write.EngraverController.prototype.notifySelect = function (abselem) {
   var abcelem = abselem.abcelem || {};
   for (var i=0; i<this.listeners.length;i++) {
 	  if (this.listeners[i].highlight)
-		  this.listeners[i].highlight(abcelem);
+		  this.listeners[i].highlight(abcelem, tuneNumber);
   }
 };
 

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

@@ -84,7 +84,7 @@ ABCJS.write.Glyphs = function() {
 		'r':{d:[['M',6.33,-9.12],['c',0.27,-0.03,0.93,0.00,1.20,0.06],['c',0.84,0.21,1.23,0.81,1.02,1.53],['c',-0.24,0.75,-0.90,1.17,-1.56,0.96],['c',-0.33,-0.09,-0.51,-0.30,-0.66,-0.75],['c',-0.03,-0.12,-0.09,-0.24,-0.12,-0.30],['c',-0.09,-0.15,-0.30,-0.24,-0.48,-0.24],['c',-0.57,0.00,-1.38,0.54,-1.65,1.08],['c',-0.06,0.15,-0.33,1.17,-0.90,3.27],['c',-0.57,2.31,-0.81,3.12,-0.87,3.21],['c',-0.03,0.06,-0.12,0.15,-0.18,0.21],['l',-0.12,0.06],['l',-0.81,0.03],['c',-0.69,0.00,-0.81,0.00,-0.90,-0.03],['c',-0.09,-0.06,-0.18,-0.21,-0.18,-0.30],['c',0.00,-0.06,0.39,-1.62,0.90,-3.51],['c',0.84,-3.24,0.87,-3.45,0.87,-3.72],['c',0.00,-0.21,0.00,-0.27,-0.03,-0.36],['c',-0.12,-0.15,-0.21,-0.24,-0.42,-0.24],['c',-0.24,0.00,-0.45,0.15,-0.78,0.42],['c',-0.33,0.36,-0.45,0.54,-0.72,1.14],['c',-0.03,0.12,-0.21,0.24,-0.36,0.27],['c',-0.12,0.00,-0.15,0.00,-0.24,-0.06],['c',-0.18,-0.12,-0.18,-0.21,-0.06,-0.54],['c',0.21,-0.57,0.42,-0.93,0.78,-1.32],['c',0.54,-0.51,1.20,-0.81,1.95,-0.87],['c',0.81,-0.03,1.53,0.30,1.92,0.87],['l',0.12,0.18],['l',0.09,-0.09],['c',0.57,-0.45,1.41,-0.84,2.19,-0.96],['z']],w:9.41,h:9.132},
 		's':{d:[['M',4.47,-8.73],['c',0.09,0.00,0.36,-0.03,0.57,-0.03],['c',0.75,0.03,1.29,0.24,1.71,0.63],['c',0.51,0.54,0.66,1.26,0.36,1.83],['c',-0.24,0.42,-0.63,0.57,-1.11,0.42],['c',-0.33,-0.09,-0.60,-0.36,-0.60,-0.57],['c',0.00,-0.03,0.06,-0.21,0.15,-0.39],['c',0.12,-0.21,0.15,-0.33,0.18,-0.48],['c',0.00,-0.24,-0.06,-0.48,-0.15,-0.60],['c',-0.15,-0.21,-0.42,-0.24,-0.75,-0.15],['c',-0.27,0.06,-0.48,0.18,-0.69,0.36],['c',-0.39,0.39,-0.51,0.96,-0.33,1.38],['c',0.09,0.21,0.42,0.51,0.78,0.72],['c',1.11,0.69,1.59,1.11,1.89,1.68],['c',0.21,0.39,0.24,0.78,0.15,1.29],['c',-0.18,1.20,-1.17,2.16,-2.52,2.52],['c',-1.02,0.24,-1.95,0.12,-2.70,-0.42],['c',-0.72,-0.51,-0.99,-1.47,-0.60,-2.19],['c',0.24,-0.48,0.72,-0.63,1.17,-0.42],['c',0.33,0.18,0.54,0.45,0.57,0.81],['c',0.00,0.21,-0.03,0.30,-0.33,0.51],['c',-0.33,0.24,-0.39,0.42,-0.27,0.69],['c',0.06,0.15,0.21,0.27,0.45,0.33],['c',0.30,0.09,0.87,0.09,1.20,0.00],['c',0.75,-0.21,1.23,-0.72,1.29,-1.35],['c',0.03,-0.42,-0.15,-0.81,-0.54,-1.20],['c',-0.24,-0.24,-0.48,-0.42,-1.41,-1.02],['c',-0.69,-0.42,-1.05,-0.93,-1.05,-1.47],['c',0.00,-0.39,0.12,-0.87,0.30,-1.23],['c',0.27,-0.57,0.78,-1.05,1.38,-1.35],['c',0.24,-0.12,0.63,-0.27,0.90,-0.30],['z']],w:6.632,h:8.758},
 		'z':{d:[['M',2.64,-7.95],['c',0.36,-0.09,0.81,-0.03,1.71,0.27],['c',0.78,0.21,0.96,0.27,1.74,0.30],['c',0.87,0.06,1.02,0.03,1.38,-0.21],['c',0.21,-0.15,0.33,-0.15,0.48,-0.06],['c',0.15,0.09,0.21,0.30,0.15,0.45],['c',-0.03,0.06,-1.26,1.26,-2.76,2.67],['l',-2.73,2.55],['l',0.54,0.03],['c',0.54,0.03,0.72,0.03,2.01,0.15],['c',0.36,0.03,0.90,0.06,1.20,0.09],['c',0.66,0.00,0.81,-0.03,1.02,-0.24],['c',0.30,-0.30,0.39,-0.72,0.27,-1.23],['c',-0.06,-0.27,-0.06,-0.27,-0.03,-0.39],['c',0.15,-0.30,0.54,-0.27,0.69,0.03],['c',0.15,0.33,0.27,1.02,0.27,1.50],['c',0.00,1.47,-1.11,2.70,-2.52,2.79],['c',-0.57,0.03,-1.02,-0.09,-2.01,-0.51],['c',-1.02,-0.42,-1.23,-0.48,-2.13,-0.54],['c',-0.81,-0.06,-0.96,-0.03,-1.26,0.18],['c',-0.12,0.06,-0.24,0.12,-0.27,0.12],['c',-0.27,0.00,-0.45,-0.30,-0.36,-0.51],['c',0.03,-0.06,1.32,-1.32,2.91,-2.79],['l',2.88,-2.73],['c',-0.03,0.00,-0.21,0.03,-0.42,0.06],['c',-0.21,0.03,-0.78,0.09,-1.23,0.12],['c',-1.11,0.12,-1.23,0.15,-1.95,0.27],['c',-0.72,0.15,-1.17,0.18,-1.29,0.09],['c',-0.27,-0.18,-0.21,-0.75,0.12,-1.26],['c',0.39,-0.60,0.93,-1.02,1.59,-1.20],['z']],w:8.573,h:8.743},
-		'+':{d:[['M',3.48,-11.19],['c',0.18,-0.09,0.36,-0.09,0.54,0.00],['c',0.18,0.09,0.24,0.15,0.33,0.30],['l',0.06,0.15],['l',0.00,1.29],['l',0.00,1.29],['l',1.29,0.00],['c',1.23,0.00,1.29,0.00,1.41,0.06],['c',0.06,0.03,0.15,0.09,0.18,0.12],['c',0.12,0.09,0.21,0.33,0.21,0.48],['c',0.00,0.15,-0.09,0.39,-0.21,0.48],['c',-0.03,0.03,-0.12,0.09,-0.18,0.12],['c',-0.12,0.06,-0.18,0.06,-1.41,0.06],['l',-1.29,0.00],['l',0.00,1.29],['c',0.00,1.23,0.00,1.29,-0.06,1.41],['c',-0.09,0.18,-0.15,0.24,-0.30,0.33],['c',-0.21,0.09,-0.39,0.09,-0.57,0.00],['c',-0.18,-0.09,-0.24,-0.15,-0.33,-0.33],['c',-0.06,-0.12,-0.06,-0.18,-0.06,-1.41],['l',0.00,-1.29],['l',-1.29,0.00],['c',-1.23,0.00,-1.29,0.00,-1.41,-0.06],['c',-0.18,-0.09,-0.24,-0.15,-0.33,-0.33],['c',-0.09,-0.18,-0.09,-0.36,0.00,-0.54],['c',0.09,-0.18,0.15,-0.24,0.33,-0.33],['l',0.15,-0.06],['l',1.26,0.00],['l',1.29,0.00],['l',0.00,-1.29],['c',0.00,-1.23,0.00,-1.29,0.06,-1.41],['c',0.09,-0.18,0.15,-0.24,0.33,-0.33],['z']],w:7.507,h:7.515},
+		'+':{d:[['M',3.48,-9.3],['c',0.18,-0.09,0.36,-0.09,0.54,0.00],['c',0.18,0.09,0.24,0.15,0.33,0.30],['l',0.06,0.15],['l',0.00,1.29],['l',0.00,1.29],['l',1.29,0.00],['c',1.23,0.00,1.29,0.00,1.41,0.06],['c',0.06,0.03,0.15,0.09,0.18,0.12],['c',0.12,0.09,0.21,0.33,0.21,0.48],['c',0.00,0.15,-0.09,0.39,-0.21,0.48],['c',-0.03,0.03,-0.12,0.09,-0.18,0.12],['c',-0.12,0.06,-0.18,0.06,-1.41,0.06],['l',-1.29,0.00],['l',0.00,1.29],['c',0.00,1.23,0.00,1.29,-0.06,1.41],['c',-0.09,0.18,-0.15,0.24,-0.30,0.33],['c',-0.21,0.09,-0.39,0.09,-0.57,0.00],['c',-0.18,-0.09,-0.24,-0.15,-0.33,-0.33],['c',-0.06,-0.12,-0.06,-0.18,-0.06,-1.41],['l',0.00,-1.29],['l',-1.29,0.00],['c',-1.23,0.00,-1.29,0.00,-1.41,-0.06],['c',-0.18,-0.09,-0.24,-0.15,-0.33,-0.33],['c',-0.09,-0.18,-0.09,-0.36,0.00,-0.54],['c',0.09,-0.18,0.15,-0.24,0.33,-0.33],['l',0.15,-0.06],['l',1.26,0.00],['l',1.29,0.00],['l',0.00,-1.29],['c',0.00,-1.23,0.00,-1.29,0.06,-1.41],['c',0.09,-0.18,0.15,-0.24,0.33,-0.33],['z']],w:7.507,h:7.515},
 		',':{d:[['M',1.32,-3.36],['c',0.57,-0.15,1.17,0.03,1.59,0.45],['c',0.45,0.45,0.60,0.96,0.51,1.89],['c',-0.09,1.23,-0.42,2.46,-0.99,3.93],['c',-0.30,0.72,-0.72,1.62,-0.78,1.68],['c',-0.18,0.21,-0.51,0.18,-0.66,-0.06],['c',-0.03,-0.06,-0.06,-0.15,-0.06,-0.18],['c',0.00,-0.06,0.12,-0.33,0.24,-0.63],['c',0.84,-1.80,1.02,-2.61,0.69,-3.24],['c',-0.12,-0.24,-0.27,-0.36,-0.75,-0.60],['c',-0.36,-0.15,-0.42,-0.21,-0.60,-0.39],['c',-0.69,-0.69,-0.69,-1.71,0.00,-2.40],['c',0.21,-0.21,0.51,-0.39,0.81,-0.45],['z']],w:3.452,h:8.143},
 		'-':{d:[['M',0.18,-5.34],['c',0.09,-0.06,0.15,-0.06,2.31,-0.06],['c',2.46,0.00,2.37,0.00,2.46,0.21],['c',0.12,0.21,0.03,0.42,-0.15,0.54],['c',-0.09,0.06,-0.15,0.06,-2.28,0.06],['c',-2.16,0.00,-2.22,0.00,-2.31,-0.06],['c',-0.27,-0.15,-0.27,-0.54,-0.03,-0.69],['z']],w:5.001,h:0.81},
 		'.':{d:[['M',1.32,-3.36],['c',1.05,-0.27,2.10,0.57,2.10,1.65],['c',0.00,1.08,-1.05,1.92,-2.10,1.65],['c',-0.90,-0.21,-1.50,-1.14,-1.26,-2.04],['c',0.12,-0.63,0.63,-1.11,1.26,-1.26],['z']],w:3.413,h:3.402},

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

@@ -102,7 +102,7 @@ ABCJS.write.RelativeElement.prototype.draw = function (renderer, bartop) {
 		case "debug":
 			this.graphelem = renderer.renderText(this.x, renderer.calcY(15), ""+this.c, "debugfont", 'debug-msg', 'start'); break;
 		case "barNumber":
-			this.graphelem = renderer.renderText(this.x, y, ""+this.c, "measurefont", 'bar-number', "start");
+			this.graphelem = renderer.renderText(this.x, y, ""+this.c, "measurefont", 'bar-number', "middle");
 			break;
 		case "lyric":
 			this.graphelem = renderer.renderText(this.x, y, this.c, "vocalfont", 'abc-lyric', "middle");

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

@@ -130,7 +130,7 @@ ABCJS.write.Renderer.prototype.setPadding = function(abctune) {
 			self.padding[paddingKey] = abctune.formatting[formattingKey];
 		else if (self.paddingOverride[paddingKey] !== undefined)
 			self.padding[paddingKey] = self.paddingOverride[paddingKey];
-		else if (abctune.media === 'print')
+		else if (self.isPrint)
 			self.padding[paddingKey] = printDefault;
 		else
 			self.padding[paddingKey] = screenDefault;
@@ -138,7 +138,7 @@ ABCJS.write.Renderer.prototype.setPadding = function(abctune) {
 	// 1cm x 0.393701in/cm x 72pt/in x 1.33px/pt = 38px
 	// 1.8cm x 0.393701in/cm x 72pt/in x 1.33px/pt = 68px
 	setPaddingVariable(this, 'top', 'topmargin', 38, 15);
-	setPaddingVariable(this, 'bottom', 'bottommargin', 38, 15);
+	setPaddingVariable(this, 'bottom', 'botmargin', 38, 15);
 	setPaddingVariable(this, 'left', 'leftmargin', 68, 15);
 	setPaddingVariable(this, 'right', 'rightmargin', 68, 15);
 };
@@ -367,14 +367,24 @@ ABCJS.write.Renderer.prototype.engraveExtraText = function(width, abctune) {
  * @param {array or string} text
  */
 ABCJS.write.Renderer.prototype.outputFreeText = function (text) {
-	if (typeof text === 'string')
+	if (text === "") {	// we do want to print out blank lines if they have been specified.
+		var hash = this.getFontAndAttr('textfont', 'defined-text');
+		this.moveY(hash.attr['font-size'] * 2); // move the distance of the line, plus the distance of the margin, which is also one line.
+	} else if (typeof text === 'string')
 		this.outputTextIf(this.padding.left, text, 'textfont', 'defined-text', 0, 1, "start");
 	else {
 		var str = "";
+		var isCentered = false; // The structure is wrong here: it requires an array to do centering, but it shouldn't have.
 		for (var i = 0; i < text.length; i++) {
-			str += " FONT " + text[i].text;
+			if (text[i].font)
+				str += "FONT(" + text[i].font + ")";
+			str += text[i].text;
+			if (text[i].center)
+				isCentered = true;
 		}
-		this.outputTextIf(this.padding.left, str, 'textfont', 'defined-text', 0, 1, "start");
+		var alignment = isCentered ? 'middle' : 'start';
+		var x = isCentered ? this.controller.width / 2 : this.padding.left;
+		this.outputTextIf(x, str, 'textfont', 'defined-text', 0, 1, alignment);
 	}
 };
 
@@ -548,7 +558,43 @@ ABCJS.write.Renderer.prototype.printPath = function (attrs) {
   return ret;
 };
 
-ABCJS.write.Renderer.prototype.drawArc = function(x1, x2, pitch1, pitch2, above) {
+ABCJS.write.Renderer.prototype.drawBrace = function(xLeft, yTop, yBottom) {//Tony
+	var yHeight = yBottom - yTop;
+
+	var xCurve = [7.5, -8, 21, 0, 18.5, -10.5, 7.5];
+	var yCurve = [0, yHeight/5.5, yHeight/3.14, yHeight/2, yHeight/2.93, yHeight/4.88, 0];
+
+	var pathString = ABCJS.write.sprintf("M %f %f C %f %f %f %f %f %f C %f %f %f %f %f %f z",
+		xLeft+xCurve[0], yTop+yCurve[0],
+		xLeft+xCurve[1], yTop+yCurve[1],
+		xLeft+xCurve[2], yTop+yCurve[2],
+		xLeft+xCurve[3], yTop+yCurve[3],
+		xLeft+xCurve[4], yTop+yCurve[4],
+		xLeft+xCurve[5], yTop+yCurve[5],
+		xLeft+xCurve[6], yTop+yCurve[6]);
+	var ret1 = this.paper.path().attr({path:pathString, stroke:"#000000", fill:"#000000", 'class': this.addClasses('brace')});
+
+	xCurve = [0, 17.5, -7.5, 6.6, -5, 20, 0];
+	yCurve = [yHeight/2, yHeight/1.46, yHeight/1.22, yHeight, yHeight/1.19, yHeight/1.42, yHeight/2];
+
+	pathString = ABCJS.write.sprintf("M %f %f C %f %f %f %f %f %f C %f %f %f %f %f %f z",
+		xLeft+xCurve[ 0], yTop+yCurve[0],
+		xLeft+xCurve[1], yTop+yCurve[1],
+		xLeft+xCurve[2], yTop+yCurve[2],
+		xLeft+xCurve[3], yTop+yCurve[3],
+		xLeft+xCurve[4], yTop+yCurve[4],
+		xLeft+xCurve[5], yTop+yCurve[5],
+		xLeft+xCurve[6], yTop+yCurve[6]);
+	var ret2 = this.paper.path().attr({path:pathString, stroke:"#000000", fill:"#000000", 'class': this.addClasses('brace')});
+
+	if (this.doRegression){
+		this.addToRegression(ret1);
+		this.addToRegression(ret2);
+	}
+	return ret1 + ret2;
+};
+
+ABCJS.write.Renderer.prototype.drawArc = function(x1, x2, pitch1, pitch2, above, klass) {
 
 
   x1 = x1 + 6;
@@ -576,7 +622,11 @@ ABCJS.write.Renderer.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", 'class': this.addClasses('slur')});
+	if (klass)
+		klass += ' slur';
+	else
+		klass = 'slur';
+  var ret = this.paper.path().attr({path:pathString, stroke:"none", fill:"#000000", 'class': this.addClasses(klass)});
   if (this.doRegression) this.addToRegression(ret);
 
   return ret;
@@ -622,7 +672,7 @@ ABCJS.write.Renderer.prototype.getFontAndAttr = function(type, klass) {
 	var font = this.abctune.formatting[type];
 	// Raphael deliberately changes the font units to pixels for some reason, so we need to change points to pixels here.
 	if (font)
-		font = { face: font.face, size: font.size*4/3, decoration: font.decoration, style: font.style, weight: font.weight };
+		font = { face: font.face, size: font.size*4/3, decoration: font.decoration, style: font.style, weight: font.weight, box: font.box };
 	else
 		font = { face: "Arial", size: 12*4/3, decoration: "underline", style: "normal", weight: "normal" };
 
@@ -637,6 +687,8 @@ ABCJS.write.Renderer.prototype.getTextSize = function(text, type, klass) {
 	var hash = this.getFontAndAttr(type, klass);
 	var el = this.paper.text(0,0, text).attr(hash.attr);
 	var size = el.getBBox();
+	if (isNaN(size.height)) // This can happen if the element isn't visible.
+		size = { width: 0, height: 0};
 	el.remove();
 	return size;
 };
@@ -651,9 +703,13 @@ ABCJS.write.Renderer.prototype.renderText = function(x, y, text, type, klass, an
 		// The text will be placed centered in vertical alignment, so we need to move the box down so that
 		// the top of the text is where we've requested.
 		var size = el.getBBox();
-		el.attr({ "y": y + size.height / 2 });
-		if (hash.font.box) {
-			this.paper.rect(size.x - 1, size.y - 1, size.width + 2, size.height + 2).attr({"stroke": "#cccccc"});
+		if (isNaN(size.height)) // This can happen if the element is hidden.
+			el.attr({ "y": y });
+		else {
+			el.attr({"y": y + size.height / 2});
+			if (hash.font.box) {
+				this.paper.rect(size.x - 1, size.y + size.height / 2 - 1, size.width + 2, size.height + 2).attr({"stroke": "#888888"});
+			}
 		}
 	}
 	if (type === 'debugfont') {
@@ -681,15 +737,31 @@ ABCJS.write.Renderer.prototype.outputTextIf = function(x, str, kind, klass, marg
 		if (marginTop)
 			this.moveY(marginTop);
 		var el = this.renderText(x, this.y, str, kind, klass, alignment);
+		var bb = el.getBBox(); // This can return NaN if the element isn't visible.
+		var width = isNaN(bb.width) ? 0 : bb.width;
+		var height = isNaN(bb.height) ? 0 : bb.height;
 		if (marginBottom !== null) {
 			var numLines = str.split("\n").length;
-			this.moveY(el.getBBox().height/numLines, (numLines + marginBottom));
+			if (!isNaN(bb.height))
+				this.moveY(height/numLines, (numLines + marginBottom));
 		}
-		return [el.getBBox().width, el.getBBox().height];
+		return [width, height];
 	}
 	return [0,0];
 };
 
+ABCJS.write.Renderer.prototype.addInvisibleMarker = function (className) {
+	var dy = 0.35;
+	var fill = "rgba(0,0,0,0)";
+	var y = this.y;
+	y = Math.round(y);
+	var x1 = 0;
+	var x2 = 100;
+	var pathString = ABCJS.write.sprintf("M %f %f L %f %f L %f %f L %f %f z", x1, y-dy, x1+x2, y-dy,
+		x2, y+dy, x1, y+dy);
+	this.paper.path().attr({path:pathString, stroke:"none", fill:fill, 'class': this.addClasses(className), 'data-vertical': y }).toBack();
+};
+
 // For debugging, it is sometimes useful to know where you are vertically.
 ABCJS.write.Renderer.prototype.printHorizontalLine = function (width, vertical, comment) {
 	var dy = 0.35;

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

@@ -52,6 +52,7 @@ if (!window.ABCJS.write)
 ABCJS.write.StaffGroupElement = function() {
 	this.voices = [];
 	this.staffs = [];
+	this.brace = undefined; //tony
 };
 
 ABCJS.write.StaffGroupElement.prototype.setLimit = function(member, voice) {
@@ -217,6 +218,11 @@ ABCJS.write.StaffGroupElement.prototype.layout = function(spacing, renderer, deb
 	}
 	x=x+voiceheaderw*1.1; // When there is no voice header, 110% of 0 is 0
 	this.startx=x;
+	if (this.brace) {
+		this.brace.setLocation(this.startx);
+		x += this.brace.getWidth();
+		this.startx = x;
+	}
 
 	var currentduration = 0;
 	if (debug) console.log("init layout");
@@ -342,6 +348,9 @@ ABCJS.write.StaffGroupElement.prototype.draw = function (renderer) {
 		};
 	}
 
+	// An invisible marker is useful to be able to find where each system starts.
+	renderer.addInvisibleMarker("abcjs-top-of-system");
+
 	var startY = renderer.y; // So that it can be restored after we're done.
 	// Set the absolute Y position for each staff here, so the voice drawing below can just use if.
 	for (var j = 0; j < this.staffs.length; j++) {
@@ -391,6 +400,13 @@ ABCJS.write.StaffGroupElement.prototype.draw = function (renderer) {
 //			if (staff.bottom < 0)
 //				renderer.moveY(ABCJS.write.spacing.STEP, -staff.bottom);
 		}
+		if(this.brace) {//Tony
+			if (i === this.brace.length - 1) {
+				if (this.brace) {
+					this.brace.draw(renderer, topLine, bottomLine); //tony
+				}
+			}
+		}
 	}
 	renderer.measureNumber = null;