abcjs-rails 1.11 → 2.0

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

@@ -0,0 +1,51 @@
+//    abc_create_time_signature.js
+//    Copyright (C) 2010,2015 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 = {};
+
+(function() {
+	"use strict";
+
+	ABCJS.write.createTimeSignature = function(elem) {
+		var abselem = new ABCJS.write.AbsoluteElement(elem,0,10, 'staff-extra');
+		if (elem.type === "specified") {
+			//TODO make the alignment for time signatures centered
+			for (var i = 0; i < elem.value.length; i++) {
+				if (i !== 0)
+					abselem.addRight(new ABCJS.write.RelativeElement('+', i*20-9, ABCJS.write.glyphs.getSymbolWidth("+"), 6, { thickness: ABCJS.write.glyphs.symbolHeightInPitches("+") }));
+				if (elem.value[i].den) {
+					// TODO-PER: get real widths here, also center the num and den.
+					abselem.addRight(new ABCJS.write.RelativeElement(elem.value[i].num, i*20, ABCJS.write.glyphs.getSymbolWidth(elem.value[i].num.charAt(0))*elem.value[i].num.length, 8, { thickness: ABCJS.write.glyphs.symbolHeightInPitches(elem.value[i].num.charAt(0)) }));
+					abselem.addRight(new ABCJS.write.RelativeElement(elem.value[i].den, i*20, ABCJS.write.glyphs.getSymbolWidth(elem.value[i].den.charAt(0))*elem.value[i].den.length, 4, { thickness: ABCJS.write.glyphs.symbolHeightInPitches(elem.value[i].den.charAt(0)) }));
+				} else {
+					abselem.addRight(new ABCJS.write.RelativeElement(elem.value[i].num, i*20, ABCJS.write.glyphs.getSymbolWidth(elem.value[i].num.charAt(0))*elem.value[i].num.length, 6, { thickness: ABCJS.write.glyphs.symbolHeightInPitches(elem.value[i].num.charAt(0)) }));
+				}
+			}
+		} else if (elem.type === "common_time") {
+			abselem.addRight(new ABCJS.write.RelativeElement("timesig.common", 0, ABCJS.write.glyphs.getSymbolWidth("timesig.common"), 6, { thickness: ABCJS.write.glyphs.symbolHeightInPitches("timesig.common") }));
+
+		} else if (elem.type === "cut_time") {
+			abselem.addRight(new ABCJS.write.RelativeElement("timesig.cut", 0, ABCJS.write.glyphs.getSymbolWidth("timesig.cut"), 6, { thickness: ABCJS.write.glyphs.symbolHeightInPitches("timesig.cut") }));
+		}
+		return abselem;
+	};
+})();

data/app/assets/javascripts/abcjs/write/{abc_cresendo_element.js → abc_crescendo_element.js}

@@ -22,12 +22,37 @@ if (!window.ABCJS)
 if (!window.ABCJS.write)
 	window.ABCJS.write = {};
 
-ABCJS.write.CrescendoElem = function(anchor1, anchor2, dir) {
+ABCJS.write.CrescendoElem = function(anchor1, anchor2, dir, positioning) {
 	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.dir = dir; // either "<" or ">"
+	if (positioning === 'above')
+		this.dynamicHeightAbove = 4;
+	else
+		this.dynamicHeightBelow = 4;
+	this.pitch = undefined; // This will be set later
 };
 
+<<<<<<< HEAD:write/abc_crescendo_element.js
+ABCJS.write.CrescendoElem.prototype.setUpperAndLowerElements = function(positionY) {
+	if (this.dynamicHeightAbove)
+		this.pitch = positionY.dynamicHeightAbove;
+	else
+		this.pitch = positionY.dynamicHeightBelow;
+};
+
+ABCJS.write.CrescendoElem.prototype.draw = function (renderer) {
+	if (this.pitch === undefined)
+		window.console.error("Crescendo Element y-coordinate not set.");
+	var y = renderer.calcY(this.pitch) + 4; // This is the top pixel to use (it is offset a little so that it looks good with the volume marks.)
+	var height = 8;
+	if (this.dir === "<") {
+		this.drawLine(renderer, y+height/2, y);
+		this.drawLine(renderer, y+height/2, y+height);
+	} else {
+		this.drawLine(renderer, y, y+height/2);
+		this.drawLine(renderer, y+height, y+height/2);
+=======
 ABCJS.write.CrescendoElem.prototype.draw = function (renderer) {
 	if (this.dir === "<") {
 		this.drawLine(renderer, 0, -4);
@@ -35,12 +60,18 @@ ABCJS.write.CrescendoElem.prototype.draw = function (renderer) {
 	} else {
 		this.drawLine(renderer, -4, 0);
 		this.drawLine(renderer, 4, 0);
+>>>>>>> origin/master:write/abc_cresendo_element.js
 	}
 };
 
 ABCJS.write.CrescendoElem.prototype.drawLine = function (renderer, y1, y2) {
+<<<<<<< HEAD:write/abc_crescendo_element.js
+	var pathString = ABCJS.write.sprintf("M %f %f L %f %f",
+		this.anchor1.x, y1, this.anchor2.x, y2);
+=======
 	var ypos = renderer.layouter.minY - 7;
 	var pathString = ABCJS.write.sprintf("M %f %f L %f %f",
 		this.anchor1.x, renderer.calcY(ypos)+y1-4, this.anchor2.x, renderer.calcY(ypos)+y2-4);
+>>>>>>> origin/master:write/abc_cresendo_element.js
 	renderer.printPath({path:pathString, stroke:"#000000", 'class': renderer.addClasses('decoration')});
 };

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

@@ -0,0 +1,321 @@
+// 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
+//
+// 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/>.
+
+/*global window, ABCJS */
+
+if (!window.ABCJS)
+	window.ABCJS = {};
+
+if (!window.ABCJS.write)
+	window.ABCJS.write = {};
+
+(function() {
+	"use strict";
+
+	ABCJS.write.Decoration = function() {
+		this.startDiminuendoX = undefined;
+		this.startCrescendoX = undefined;
+		this.minTop = 12;	// TODO-PER: this is assuming a 5-line staff. Pass that info in.
+		this.minBottom = 0;
+	};
+
+	var closeDecoration = function(voice, decoration, pitch, width, abselem, roomtaken, dir, minPitch) {
+		var yPos;
+		for (var i=0;i<decoration.length; i++) {
+			if (decoration[i]==="staccato" || decoration[i]==="tenuto" || decoration[i] === "accent") {
+				var symbol = "scripts." + decoration[i];
+				if (decoration[i] === "accent") symbol = "scripts.sforzato";
+				if (yPos === undefined)
+					yPos = (dir==="down") ? pitch+2:minPitch-2;
+				else
+					yPos = (dir==="down") ? yPos+2:yPos-2;
+				if (decoration[i] === "accent") {
+					// Always place the accent three pitches away, no matter whether that is a line or space.
+					if (dir === "up") yPos--;
+					else yPos++;
+				} else {
+					// don't place on a stave line. The stave lines are 2,4,6,8,10
+					switch (yPos) {
+						case 2:
+						case 4:
+						case 6:
+						case 8:
+						case 10:
+							if (dir === "up") yPos--;
+							else yPos++;
+							break;
+					}
+				}
+				if (pitch>9) yPos++; // take up some room of those that are above
+				var deltaX = width/2;
+				if (ABCJS.write.glyphs.getSymbolAlign(symbol)!=="center") {
+					deltaX -= (ABCJS.write.glyphs.getSymbolWidth(symbol)/2);
+				}
+				abselem.addChild(new ABCJS.write.RelativeElement(symbol, deltaX, ABCJS.write.glyphs.getSymbolWidth(symbol), yPos));
+			}
+			if (decoration[i]==="slide" && abselem.heads[0]) {
+				var yPos2 = abselem.heads[0].pitch;
+				yPos2 -= 2; // TODO-PER: not sure what this fudge factor is.
+				var blank1 = new ABCJS.write.RelativeElement("", -roomtaken-15, 0, yPos2-1);
+				var blank2 = new ABCJS.write.RelativeElement("", -roomtaken-5, 0, yPos2+1);
+				abselem.addChild(blank1);
+				abselem.addChild(blank2);
+				voice.addOther(new ABCJS.write.TieElem(blank1, blank2, false, false, false));
+			}
+		}
+		if (yPos === undefined)
+			yPos = pitch;
+
+		return { above: yPos, below: abselem.bottom };
+	};
+
+	var volumeDecoration = function(voice, decoration, abselem, positioning) {
+		for (var i=0;i<decoration.length; i++) {
+			switch(decoration[i]) {
+				case "p":
+				case "mp":
+				case "pp":
+				case "ppp":
+				case "pppp":
+				case "f":
+				case "ff":
+				case "fff":
+				case "ffff":
+				case "sfz":
+				case "mf":
+					var elem = new ABCJS.write.DynamicDecoration(abselem, decoration[i], positioning);
+					voice.addOther(elem);
+			}
+		}
+	};
+
+	var compoundDecoration = function(decoration, pitch, width, abselem, dir) {
+		function highestPitch() {
+			if (abselem.heads.length === 0)
+				return 10;	// TODO-PER: I don't know if this can happen, but we'll return the top of the staff if so.
+			var pitch = abselem.heads[0].pitch;
+			for (var i = 1; i < abselem.heads.length; i++)
+				pitch = Math.max(pitch, abselem.heads[i].pitch);
+			return pitch;
+		}
+		function lowestPitch() {
+			if (abselem.heads.length === 0)
+				return 2;	// TODO-PER: I don't know if this can happen, but we'll return the bottom of the staff if so.
+			var pitch = abselem.heads[0].pitch;
+			for (var i = 1; i < abselem.heads.length; i++)
+				pitch = Math.min(pitch, abselem.heads[i].pitch);
+			return pitch;
+		}
+		function compoundDecoration(symbol, count) {
+			var placement = (dir === 'down') ? lowestPitch()+1:highestPitch()+9;
+			var deltaX = width/2;
+			deltaX += (dir === 'down') ? -5 : 3;
+			for (var i = 0; i < count; i++) {
+				placement -= 1;
+				abselem.addChild(new ABCJS.write.RelativeElement(symbol, deltaX, ABCJS.write.glyphs.getSymbolWidth(symbol), placement));
+			}
+		}
+
+		for (var i=0;i<decoration.length; i++) {
+			switch(decoration[i]) {
+				case "/": compoundDecoration("flags.ugrace", 1); break;
+				case "//": compoundDecoration("flags.ugrace", 2); break;
+				case "///": compoundDecoration("flags.ugrace", 3); break;
+				case "////": compoundDecoration("flags.ugrace", 4); break;
+			}
+		}
+	};
+
+	var stackedDecoration = function(decoration, width, abselem, yPos, positioning, minTop, minBottom) {
+		function incrementPlacement(placement, height) {
+			if (placement === 'above')
+				yPos.above += height;
+			else
+				yPos.below -= height;
+		}
+		function getPlacement(placement) {
+			var y;
+			if (placement === 'above') {
+				y = yPos.above;
+				if (y < minTop)
+					y = minTop;
+			} else {
+				y = yPos.below;
+				if (y > minBottom)
+					y = minBottom;
+			}
+			return y;
+		}
+		function textDecoration(text, placement) {
+			var y = getPlacement(placement);
+			var textFudge = 2;
+			var textHeight = 5;
+			// TODO-PER: Get the height of the current font and use that for the thickness.
+			abselem.addChild(new ABCJS.write.RelativeElement(text, 0, 0, y+textFudge, {type:"decoration", klass: 'ornament', thickness: 3}));
+
+			incrementPlacement(placement, textHeight);
+		}
+		function symbolDecoration(symbol, placement) {
+			var deltaX = width/2;
+			if (ABCJS.write.glyphs.getSymbolAlign(symbol) !== "center") {
+				deltaX -= (ABCJS.write.glyphs.getSymbolWidth(symbol) / 2);
+			}
+			var height = ABCJS.write.glyphs.symbolHeightInPitches(symbol) + 1; // adding a little padding so nothing touches.
+			var y = getPlacement(placement);
+			y = (placement === 'above') ? y + height/2 : y - height/2;// Center the element vertically.
+			abselem.addChild(new ABCJS.write.RelativeElement(symbol, deltaX, ABCJS.write.glyphs.getSymbolWidth(symbol), y, { klass: 'ornament', thickness: ABCJS.write.glyphs.symbolHeightInPitches(symbol) }));
+
+			incrementPlacement(placement, height);
+		}
+
+		var symbolList = {
+			"+": "scripts.stopped",
+			"open": "scripts.open",
+			"snap": "scripts.snap",
+			"wedge": "scripts.wedge",
+			"thumb": "scripts.thumb",
+			"shortphrase": "scripts.shortphrase",
+			"mediumphrase": "scripts.mediumphrase",
+			"longphrase": "scripts.longphrase",
+			"trill": "scripts.trill",
+			"roll": "scripts.roll",
+			"irishroll": "scripts.roll",
+			"marcato": "scripts.umarcato",
+			"dmarcato": "scripts.dmarcato",
+			"umarcato": "scripts.umarcato",
+			"turn": "scripts.turn",
+			"uppermordent": "scripts.prall",
+			"pralltriller": "scripts.prall",
+			"mordent": "scripts.mordent",
+			"lowermordent": "scripts.mordent",
+			"downbow": "scripts.downbow",
+			"upbow": "scripts.upbow",
+			"fermata": "scripts.ufermata",
+			"invertedfermata": "scripts.dfermata",
+			"breath": ",",
+			"coda": "scripts.coda",
+			"segno": "scripts.segno"
+		};
+
+		var hasOne = false;
+		for (var i=0;i<decoration.length; i++) {
+			switch(decoration[i]) {
+				case "0":
+				case "1":
+				case "2":
+				case "3":
+				case "4":
+				case "5":
+				case "D.C.":
+				case "D.S.":
+					textDecoration(decoration[i], positioning);
+					hasOne = true;
+					break;
+				case "fine":
+					textDecoration("FINE", positioning);
+					hasOne = true;
+					break;
+				case "+":
+				case "open":
+				case "snap":
+				case "wedge":
+				case "thumb":
+				case "shortphrase":
+				case "mediumphrase":
+				case "longphrase":
+				case "trill":
+				case "roll":
+				case "irishroll":
+				case "marcato":
+				case "dmarcato":
+				case "turn":
+				case "uppermordent":
+				case "pralltriller":
+				case "mordent":
+				case "lowermordent":
+				case "downbow":
+				case "upbow":
+				case "fermata":
+				case "breath":
+				case "umarcato":
+				case "coda":
+				case "segno":
+					symbolDecoration(symbolList[decoration[i]], positioning);
+					hasOne = true;
+					break;
+				case "invertedfermata":
+					symbolDecoration(symbolList[decoration[i]], 'below');
+					hasOne = true;
+					break;
+				case "mark":
+					abselem.klass = "mark";
+					break;
+			}
+		}
+		return hasOne;
+	};
+
+	ABCJS.write.Decoration.prototype.dynamicDecoration = function(voice, decoration, abselem, positioning) {
+		var diminuendo;
+		var crescendo;
+		for (var i=0;i<decoration.length; i++) {
+			switch(decoration[i]) {
+				case "diminuendo(":
+					this.startDiminuendoX = abselem;
+					diminuendo = undefined;
+					break;
+				case "diminuendo)":
+					diminuendo = { start: this.startDiminuendoX, stop: abselem};
+					this.startDiminuendoX = undefined;
+					break;
+				case "crescendo(":
+					this.startCrescendoX = abselem;
+					crescendo = undefined;
+					break;
+				case "crescendo)":
+					crescendo = { start: this.startCrescendoX, stop: abselem};
+					this.startCrescendoX = undefined;
+					break;
+			}
+		}
+		if (diminuendo) {
+			voice.addOther(new ABCJS.write.CrescendoElem(diminuendo.start, diminuendo.stop, ">", positioning));
+		}
+		if (crescendo) {
+			voice.addOther(new ABCJS.write.CrescendoElem(crescendo.start, crescendo.stop, "<", positioning));
+		}
+	};
+
+	ABCJS.write.Decoration.prototype.createDecoration = function(voice, decoration, pitch, width, abselem, roomtaken, dir, minPitch, positioning, hasVocals) {
+		if (!positioning)
+			positioning = { ornamentPosition: 'above', volumePosition: hasVocals ? 'above' :'below', dynamicPosition: hasVocals ? 'above' : 'below' };
+		// These decorations don't affect the placement of other decorations
+		volumeDecoration(voice, decoration, abselem, positioning.volumePosition);
+		this.dynamicDecoration(voice, decoration, abselem, positioning.dynamicPosition);
+		compoundDecoration(decoration, pitch, width, abselem, dir);
+
+		// treat staccato, accent, and tenuto first (may need to shift other markers)
+		var yPos = closeDecoration(voice, decoration, pitch, width, abselem, roomtaken, dir, minPitch);
+		// yPos is an object containing 'above' and 'below'. That is the placement of the next symbol on either side.
+
+		var hasOne = stackedDecoration(decoration, width, abselem, yPos, positioning.ornamentPosition, this.minTop, this.minBottom);
+		if (hasOne) {
+			abselem.top = Math.max(yPos.above + 3, abselem.top); // TODO-PER: Not sure why we need this fudge factor.
+		}
+	};
+
+})();
+

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

@@ -22,15 +22,36 @@ if (!window.ABCJS)
 if (!window.ABCJS.write)
 	window.ABCJS.write = {};
 
-ABCJS.write.DynamicDecoration = function(anchor, dec) {
+ABCJS.write.DynamicDecoration = function(anchor, dec, position) {
 	this.anchor = anchor;
 	this.dec = dec;
+	if (position === 'below')
+		this.volumeHeightBelow = 5;
+	else
+		this.volumeHeightAbove = 5;
+	this.pitch = undefined; // This will be set later
 };
 
+<<<<<<< HEAD
+ABCJS.write.DynamicDecoration.prototype.setUpperAndLowerElements = function(positionY) {
+	if (this.volumeHeightAbove)
+		this.pitch = positionY.volumeHeightAbove;
+	else
+		this.pitch = positionY.volumeHeightBelow;
+};
+
+ABCJS.write.DynamicDecoration.prototype.draw = function(renderer, linestartx, lineendx) {
+	if (this.pitch === undefined)
+		window.console.error("Dynamic Element y-coordinate not set.");
+	var scalex = 1;
+	var scaley = 1;
+	renderer.printSymbol(this.anchor.x, this.pitch, this.dec, scalex, scaley, renderer.addClasses('decoration'));
+=======
 ABCJS.write.DynamicDecoration.prototype.draw = function(renderer, linestartx, lineendx) {
 	var ypos = renderer.layouter.minY - 7;
 	var scalex = 1; // TODO-PER: do the scaling
 	var scaley = 1;
 	renderer.printSymbol(this.anchor.x, ypos, this.dec, scalex, scaley, renderer.addClasses('decoration'));
+>>>>>>> origin/master
 };