abcjs-rails 2.0 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa42e9ce9d4ae382cdf01127928c52e1baaa8741
-  data.tar.gz: 146f81c567ee9aee005ceb00f5d29800a40fcb19
+  metadata.gz: fdcbdb9238f2f1f23907474b552d5de442640107
+  data.tar.gz: ad3934f6f67f4448a726395cb6c6bfe15fe99c47
 SHA512:
-  metadata.gz: 97b5c92b0832f98646268224d823fe88f7021dfbd90a1b8a5af0e2356ce39c63e58f2abfff49c363e6ef1cccdd44b555e9251e0e5263b603464f175434d89888
-  data.tar.gz: 4c060e9e01c5490e2b481636873881a0189c7748db272375e80e8c48e5066dc122223613b4ed39c4247c9572a91864f32cdc617992a0418a06dc1029485d4575
+  metadata.gz: f9731f7c7de5fffeef49346ee6f09355e892a7f830e6b11d117d0c6af05349328a7dcaed6b7d97ddee4cf57ad4652a451ad521551a35e6eb396b48dda1cc7531
+  data.tar.gz: 3310a61ea0d346f45f8b37e2a79cecf354bd009ea4bb83f5d3ca091d2ffb17d2d10ac05fb6a2cc63e6755c0fd7a32b3d506d351b453e4cb5be4f3987893d8034

data/app/assets/javascripts/abcjs/api/abc_animation.js

@@ -20,10 +20,7 @@ if (!window.ABCJS)
 	window.ABCJS = {};
 
 (function() {
-<<<<<<< HEAD
 	"use strict";
-=======
->>>>>>> origin/master
 
 	function hasClass(element, cls) {
 		var elClass = element.getAttribute("class");
@@ -83,10 +80,7 @@ if (!window.ABCJS)
 		if (options.showCursor) {
 			cursor = $('<div class="cursor" style="position: absolute;"></div>');
 			$(paper).append(cursor);
-<<<<<<< HEAD
 			$(paper).css({ position: "relative" });
-=======
->>>>>>> origin/master
 		}
 
 		stopNextTime = false;
@@ -136,7 +130,6 @@ if (!window.ABCJS)
 			for (var line=0;line<engraver.staffgroups.length; line++) {
 				var group = engraver.staffgroups[line];
 				var voices = group.voices;
-<<<<<<< HEAD
 				var firstStaff = group.staffs[0];
 				var middleC = firstStaff.absoluteY;
 				var top = middleC - firstStaff.top*ABCJS.write.spacing.STEP;
@@ -144,10 +137,6 @@ if (!window.ABCJS)
 				middleC = lastStaff.absoluteY;
 				var bottom = middleC - lastStaff.bottom*ABCJS.write.spacing.STEP;
 				var height = bottom - top;
-=======
-				var top = group.y;
-				var height = group.height;
->>>>>>> origin/master
 				var maxVoiceTime = 0;
 				// Put in the notes for all voices, then sort them, then remove duplicates
 				for (var v = 0; v < voices.length; v++) {
@@ -165,16 +154,12 @@ if (!window.ABCJS)
 								// If the note is tied on both sides it can just be ignored.
 							} else {
 								// the last note wasn't tied.
-<<<<<<< HEAD
 								if (!eventHash["event"+voiceTime])
 									eventHash["event"+voiceTime] = { type: "event", time: voiceTime, top: top, height: height, left: element.x, width: element.w };
 								else {
 									// If there is more than one voice then two notes can fall at the same time. Usually they would be lined up in the same place, but if it is a whole rest, then it is placed funny. In any case, the left most element wins.
 									eventHash["event"+voiceTime].left = Math.min(eventHash["event"+voiceTime].left, element.x);
 								}
-=======
-								eventHash["event"+voiceTime] = { type: "event", time: voiceTime, top: top, height: height, left: element.x, width: element.w };
->>>>>>> origin/master
 								if (isTiedToNext)
 									isTiedState = true;
 							}
@@ -218,13 +203,9 @@ if (!window.ABCJS)
 			if (currentNote.type === "bar") {
 				if (options.hideFinishedMeasures)
 					processMeasureHider(currentNote.lineNum, currentNote.measureNum);
-<<<<<<< HEAD
 				if (timingEvents.length > 0)
 					return timingEvents[0].time / beatLength;
 				return 0;
-=======
-				return processShowCursor();
->>>>>>> origin/master
 			}
 			if (options.showCursor)
 				cursor.css({ left: currentNote.left + "px", top: currentNote.top + "px", width: currentNote.width + "px", height: currentNote.height + "px" });

data/app/assets/javascripts/abcjs/api/abc_tunebook.js

@@ -156,13 +156,8 @@ if (!window.ABCJS)
 			/* jshint -W064 */ var paper = Raphael(div, width, 400); /* jshint +W064 */
 			if (engraverParams === undefined)
 				engraverParams = {};
-<<<<<<< HEAD
 			var engraver_controller = new ABCJS.write.EngraverController(paper, engraverParams);
 			engraver_controller.engraveABC(tune);
-=======
-			var engraver_controller = new ABCJS.write.Printer(paper, engraverParams);
-			engraver_controller.printABC(tune);
->>>>>>> origin/master
 			tune.engraver = engraver_controller;
 		}
 

data/app/assets/javascripts/abcjs/edit/abc_editor.js

@@ -241,13 +241,8 @@ window.ABCJS.Editor.prototype.renderTune = function(abc, params, div) {
   abcParser.parse(tunebook.tunes[0].abc, params); //TODO handle multiple tunes
   var tune = abcParser.getTune();
   var paper = Raphael(div, 800, 400);
-<<<<<<< HEAD
   var engraver_controller = new ABCJS.write.EngraverController(paper, this.engraverparams);
   engraver_controller.engraveABC(tune);
-=======
-  var engraver_controller = new ABCJS.write.Printer(paper, this.engraverparams);
-  engraver_controller.printABC(tune);
->>>>>>> origin/master
 };
 
 window.ABCJS.Editor.prototype.modelChanged = function() {
@@ -264,13 +259,8 @@ window.ABCJS.Editor.prototype.modelChanged = function() {
   this.timerId = null;
   this.div.innerHTML = "";
   var paper = Raphael(this.div, 800, 400);
-<<<<<<< HEAD
   this.engraver_controller = new ABCJS.write.EngraverController(paper, this.engraverparams);
   this.engraver_controller.engraveABC(this.tunes);
-=======
-  this.engraver_controller = new ABCJS.write.Printer(paper, this.engraverparams);
-  this.engraver_controller.printABC(this.tunes);
->>>>>>> origin/master
 	this.tunes[0].engraver = this.engraver_controller;	// TODO-PER: We actually want an output object for each tune, not the entire controller. When refactoring, don't save data in the controller.
   if (ABCJS.midi.MidiWriter && this.mididiv) {
     if (this.mididiv !== this.div)

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

@@ -642,7 +642,7 @@ window.ABCJS.parse.Parse = function() {
 						state = 'octave';
 						// At this point we have a valid note. The rest is optional. Set the duration in case we don't get one below
 						if (canHaveBrokenRhythm && multilineVars.next_note_duration !== 0) {
-							el.duration = multilineVars.next_note_duration;
+							el.duration = multilineVars.default_length * multilineVars.next_note_duration;
 							multilineVars.next_note_duration = 0;
 							durationSetByPreviousNote = true;
 						} else
@@ -681,7 +681,7 @@ window.ABCJS.parse.Parse = function() {
 							state = 'Zduration';
 						} else {
 							if (canHaveBrokenRhythm && multilineVars.next_note_duration !== 0) {
-								el.duration = multilineVars.next_note_duration;
+								el.duration = multilineVars.default_length * multilineVars.next_note_duration;
 								multilineVars.next_note_duration = 0;
 								durationSetByPreviousNote = true;
 							} else
@@ -704,7 +704,7 @@ window.ABCJS.parse.Parse = function() {
 				case '/':
 					if (state === 'octave' || state === 'duration') {
 						var fraction = tokenizer.getFraction(line, index);
-						if (!durationSetByPreviousNote)
+						//if (!durationSetByPreviousNote)
 							el.duration = el.duration * fraction.value;
 						// TODO-PER: We can test the returned duration here and give a warning if it isn't the one expected.
 						el.endChar = fraction.index;
@@ -772,7 +772,7 @@ window.ABCJS.parse.Parse = function() {
 						if (canHaveBrokenRhythm) {
 							var br2 = getBrokenRhythm(line, index);
 							index += br2[0] - 1;	// index gets incremented below, so we'll let that happen
-							multilineVars.next_note_duration = br2[2]*el.duration;
+							multilineVars.next_note_duration = br2[2];
 							el.duration = br2[1]*el.duration;
 							state = 'end_slur';
 						} else {
@@ -902,13 +902,6 @@ window.ABCJS.parse.Parse = function() {
 			}
 			if (gracenotes.length)
 				return [gra[0], gracenotes];
-//				for (var ret = letter_to_pitch(gra[1], ii); ret[0]>0 && ii<gra[1].length;
-//					ret = letter_to_pitch(gra[1], ii)) {
-//					//todo get other stuff that could be in a grace note
-//					ii += ret[0];
-//					gracenotes.push({el_type:"gracenote",pitch:ret[1]});
-//				}
-//				return [ gra[0], gracenotes ];
 		}
 		return [ 0 ];
 	};
@@ -996,17 +989,11 @@ window.ABCJS.parse.Parse = function() {
 
 		// Start with the standard staff, clef and key symbols on each line
 		var delayStartNewLine = multilineVars.start_new_line;
-//			if (multilineVars.start_new_line) {
-//				startNewLine();
-//			}
 		if (multilineVars.continueall === undefined)
 			multilineVars.start_new_line = true;
 		else
 			multilineVars.start_new_line = false;
 		var tripletNotesLeft = 0;
-		//var tripletMultiplier = 0;
-//		var inTie = false;
-//		var inTieChord = {};
 
 		// See if the line starts with a header field
 		var retHeader = header.letter_to_body_header(line, i);
@@ -1033,7 +1020,6 @@ window.ABCJS.parse.Parse = function() {
 					startNewLine();
 					delayStartNewLine = false;
 				}
-//					var el = { };
 
 				// We need to decide if the following characters are a bar-marking or a note-group.
 				// Unfortunately, that is ambiguous. Both can contain chord symbols and decorations.
@@ -1194,6 +1180,7 @@ window.ABCJS.parse.Parse = function() {
 
 					// handle chords.
 					if (line.charAt(i) === '[') {
+						var chordStartChar = i;
 						i++;
 						var chordDuration = null;
 
@@ -1232,9 +1219,6 @@ window.ABCJS.parse.Parse = function() {
 
 									if (multilineVars.next_note_duration !== 0) {
 										el.duration = el.duration * multilineVars.next_note_duration;
-//											window.ABCJS.parse.each(el.pitches, function(p) {
-//												p.duration = p.duration * multilineVars.next_note_duration;
-//											});
 										multilineVars.next_note_duration = 0;
 									}
 
@@ -1250,11 +1234,6 @@ window.ABCJS.parse.Parse = function() {
 										}
 									}
 
-//									if (el.startSlur !== undefined) {
-//										window.ABCJS.parse.each(el.pitches, function(pitch) { if (pitch.startSlur === undefined) pitch.startSlur = el.startSlur; else pitch.startSlur += el.startSlur; });
-//										delete el.startSlur;
-//									}
-
 									var postChordDone = false;
 									while (i < line.length && !postChordDone) {
 										switch (line.charAt(i)) {
@@ -1264,7 +1243,6 @@ window.ABCJS.parse.Parse = function() {
 												break;
 											case ')':
 												if (el.endSlur === undefined) el.endSlur = 1; else el.endSlur++;
-												//window.ABCJS.parse.each(el.pitches, function(pitch) { if (pitch.endSlur === undefined) pitch.endSlur = 1; else pitch.endSlur++; });
 												break;
 											case '-':
 												window.ABCJS.parse.each(el.pitches, function(pitch) { pitch.startTie = {}; });
@@ -1275,7 +1253,10 @@ window.ABCJS.parse.Parse = function() {
 												var br2 = getBrokenRhythm(line, i);
 												i += br2[0] - 1;	// index gets incremented below, so we'll let that happen
 												multilineVars.next_note_duration = br2[2];
-												chordDuration = br2[1];
+												if (chordDuration)
+													chordDuration = chordDuration * br2[1];
+												else
+													chordDuration = br2[1];
 												break;
 											case '1':
 											case '2':
@@ -1290,7 +1271,7 @@ window.ABCJS.parse.Parse = function() {
 												var fraction = tokenizer.getFraction(line, i);
 												chordDuration = fraction.value;
 												i = fraction.index;
-												if (line.charAt(i) === '-' || line.charAt(i) === ')')
+												if (line.charAt(i) === '-' || line.charAt(i) === ')' || line.charAt(i) === ' ' || line.charAt(i) === '<' || line.charAt(i) === '>')
 													i--; // Subtracting one because one is automatically added below
 												else
 													postChordDone = true;
@@ -1309,16 +1290,13 @@ window.ABCJS.parse.Parse = function() {
 								if (el.pitches !== undefined) {
 									if (chordDuration !== null) {
 										el.duration = el.duration * chordDuration;
-//											window.ABCJS.parse.each(el.pitches, function(p) {
-//												p.duration = p.duration * chordDuration;
-//											});
 									}
 									if (multilineVars.barNumOnNextNote) {
 										el.barNumber = multilineVars.barNumOnNextNote;
 										multilineVars.barNumOnNextNote = null;
 									}
 									multilineVars.addFormattingOptions(el, tune.formatting, 'note');
-									tune.appendElement('note', startOfLine+i, startOfLine+i, el);
+									tune.appendElement('note', startOfLine+chordStartChar, startOfLine+i, el);
 									multilineVars.measureNotEmpty = true;
 									el = {};
 								}
@@ -1348,7 +1326,6 @@ window.ABCJS.parse.Parse = function() {
 								if (core.endSlur !== undefined) el.endSlur = core.endSlur;
 								if (core.endTie !== undefined) el.rest.endTie = core.endTie;
 								if (core.startSlur !== undefined) el.startSlur = core.startSlur;
-								//if (el.startSlur !== undefined) el.startSlur = el.startSlur;
 								if (core.startTie !== undefined) el.rest.startTie = core.startTie;
 								if (el.startTie !== undefined) el.rest.startTie = el.startTie;
 							}
@@ -1400,7 +1377,6 @@ window.ABCJS.parse.Parse = function() {
 					if (i === startI) {	// don't know what this is, so ignore it.
 						if (line.charAt(i) !== ' ' && line.charAt(i) !== '`')
 							warn("Unknown character ignored", line, i);
-//							warn("Unknown character ignored (" + line.charCodeAt(i) + ")", line, i);
 						i++;
 					}
 				}

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

@@ -34,10 +34,7 @@ window.ABCJS.parse.parseDirective = {};
 		multilineVars.vocalfont  = { face: "\"Times New Roman\"", size: 13, weight: "bold", style: "normal", decoration: "none" };
 		multilineVars.wordsfont  = { face: "\"Times New Roman\"", size: 16, weight: "normal", style: "normal", decoration: "none" };
 
-<<<<<<< HEAD
 		// These fonts are global for the entire tune.
-=======
->>>>>>> origin/master
 		tune.formatting.composerfont  = { face: "\"Times New Roman\"", size: 14, weight: "normal", style: "italic", decoration: "none" };
 		tune.formatting.subtitlefont  = { face: "\"Times New Roman\"", size: 16, weight: "normal", style: "normal", decoration: "none" };
 		tune.formatting.tempofont  = { face: "\"Times New Roman\"", size: 15, weight: "bold", style: "normal", decoration: "none" };
@@ -45,7 +42,6 @@ window.ABCJS.parse.parseDirective = {};
 		tune.formatting.footerfont  = { face: "\"Times New Roman\"", size: 12, weight: "normal", style: "normal", decoration: "none" };
 		tune.formatting.headerfont  = { face: "\"Times New Roman\"", size: 12, weight: "normal", style: "normal", decoration: "none" };
 		tune.formatting.voicefont  = { face: "\"Times New Roman\"", size: 13, weight: "bold", style: "normal", decoration: "none" };
-<<<<<<< HEAD
 
 		// these are the default fonts for these element types. In the printer, these fonts might change as the tune progresses.
 		tune.formatting.annotationfont  = multilineVars.annotationfont;
@@ -58,8 +54,6 @@ window.ABCJS.parse.parseDirective = {};
 		tune.formatting.textfont  = multilineVars.textfont;
 		tune.formatting.vocalfont  = multilineVars.vocalfont;
 		tune.formatting.wordsfont  = multilineVars.wordsfont;
-=======
->>>>>>> origin/master
 	}
 
 	var fontTypeCanHaveBox = { gchordfont: true, measurefont: true, partsfont: true };
@@ -283,13 +277,8 @@ window.ABCJS.parse.parseDirective = {};
 			if (!currentSetting) {
 				warn("Must specify the size of the font since there is no default value.", str, position);
 				size = 12;
-<<<<<<< HEAD
 			} else
 				size = currentSetting.size;
-=======
-			}
-			size = currentSetting.size;
->>>>>>> origin/master
 		} else
 			size = parseFloat(size);
 
@@ -320,6 +309,8 @@ window.ABCJS.parse.parseDirective = {};
 		if (tokens.length === 0)
 			return "Directive \"" + cmd + "\" requires a font as a parameter.";
 		multilineVars[cmd] = getFontParameter(tokens, multilineVars[cmd], str, 0, cmd);
+		if (multilineVars.is_in_header) // If the font appears in the header, then it becomes the default font.
+			tune.formatting[cmd] = multilineVars[cmd];
 		return null;
 	};
 	var getGlobalFont = function(cmd, tokens, str) {
@@ -372,7 +363,6 @@ window.ABCJS.parse.parseDirective = {};
 		if (str !== null) return str;
 		multilineVars[key] = (multilineVars[key] === 1);
 		return null;
-<<<<<<< HEAD
 	};
 
 	var addMultilineVarOneParamChoice = function(key, cmd, tokens, choices) {
@@ -388,8 +378,6 @@ window.ABCJS.parse.parseDirective = {};
 			return "Directive \"" + cmd + "\" requires one of [ " + choices.join(", ") + " ] as a parameter.";
 		multilineVars[key] = choice;
 		return null;
-=======
->>>>>>> origin/master
 	};
 
 	window.ABCJS.parse.parseDirective.parseFontChangeLine = function(textstr) {
@@ -455,10 +443,6 @@ window.ABCJS.parse.parseDirective = {};
 			//					straightflags: { type: "boolean", optional: true },
 			//					stretchstaff: { type: "boolean", optional: true },
 			//					titleformat: { type: "string", optional: true },
-<<<<<<< HEAD
-=======
-			//					vocalabove: { type: "boolean", optional: true },
->>>>>>> origin/master
 			case "bagpipes":tune.formatting.bagpipes = true;break;
 			case "landscape":multilineVars.landscape = true;break;
 			case "papersize":multilineVars.papersize = restOfString;break;

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

@@ -105,6 +105,15 @@ ABCJS.write.AbsoluteElement.prototype.addRight = function (right) {
 	this.addChild(right);
 };
 
+ABCJS.write.AbsoluteElement.prototype.addCentered = function (elem) {
+	var half = elem.w/2;
+	if (-half<this.extraw) this.extraw = -half;
+	this.extra[this.extra.length] = elem;
+	if (elem.dx+half>this.w) this.w = elem.dx+half;
+	this.right[this.right.length] = elem;
+	this.addChild(elem);
+};
+
 ABCJS.write.AbsoluteElement.prototype.setLimit = function(member, child) {
 	if (!child[member]) return;
 	if (!this.specialY[member])
@@ -150,29 +159,22 @@ ABCJS.write.AbsoluteElement.prototype.pushBottom = function (bottom) {
 	}
 };
 
-<<<<<<< HEAD
 ABCJS.write.AbsoluteElement.prototype.setX = function (x) {
 	this.x = x;
 	for (var i=0; i<this.children.length; i++)
 		this.children[i].setX(x);
 };
 
-=======
->>>>>>> origin/master
 ABCJS.write.AbsoluteElement.prototype.draw = function (renderer, bartop) {
 	this.elemset = renderer.paper.set();
 	if (this.invisible) return;
 	renderer.beginGroup();
 	for (var i=0; i<this.children.length; i++) {
-<<<<<<< HEAD
 		if (ABCJS.write.debugPlacement) {
 			if (this.children[i].klass === 'ornament')
 				renderer.printShadedBox(this.x, renderer.calcY(this.children[i].top), this.w, renderer.calcY(this.children[i].bottom)-renderer.calcY(this.children[i].top), "rgba(0,0,200,0.3)");
 		}
 		this.elemset.push(this.children[i].draw(renderer,bartop));
-=======
-		this.elemset.push(this.children[i].draw(renderer,this.x, bartop));
->>>>>>> origin/master
 	}
 	this.elemset.push(renderer.endGroup(this.type));
 	if (this.klass)
@@ -180,7 +182,6 @@ ABCJS.write.AbsoluteElement.prototype.draw = function (renderer, bartop) {
 	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;
-<<<<<<< HEAD
 	var controller = renderer.controller;
 //	this.elemset.mouseup(function () {
 	target.mouseup(function () {
@@ -189,14 +190,6 @@ ABCJS.write.AbsoluteElement.prototype.draw = function (renderer, bartop) {
 	this.abcelem.abselem = this;
 
 	var spacing = ABCJS.write.spacing.STEP;
-=======
-	this.elemset.mouseup(function () {
-		renderer.notifySelect(self);
-	});
-	this.abcelem.abselem = this;
-
-	var spacing = ABCJS.write.spacing.STEP*renderer.scale;
->>>>>>> origin/master
 
 	var start = function () {
 			// storing original relative coordinates
@@ -210,7 +203,6 @@ ABCJS.write.AbsoluteElement.prototype.draw = function (renderer, bartop) {
 			this.translate(0,this.dy);
 		},
 		up = function () {
-<<<<<<< HEAD
 			if (self.abcelem.pitches) {
 				var delta = -Math.round(this.dy / spacing);
 				self.abcelem.pitches[0].pitch += delta;
@@ -219,14 +211,6 @@ ABCJS.write.AbsoluteElement.prototype.draw = function (renderer, bartop) {
 			}
 		};
 	if (this.abcelem.el_type==="note" && controller.editable)
-=======
-			var delta = -Math.round(this.dy/spacing);
-			self.abcelem.pitches[0].pitch += delta;
-			self.abcelem.pitches[0].verticalPos += delta;
-			renderer.notifyChange();
-		};
-	if (this.abcelem.el_type==="note" && renderer.editable)
->>>>>>> origin/master
 		this.elemset.drag(move, start, up);
 };