abcjs-rails 1.1.1 → 1.3

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

@@ -53,15 +53,43 @@ ABCJS.TuneBook = function(book) {
 				directives += line + '\n';
 		});
 	}
+	This.header = directives;
+
 	// Now, the tune ends at a blank line, so truncate it if needed. There may be "intertune" stuff.
 	window.ABCJS.parse.each(This.tunes, function(tune) {
 		var end = tune.abc.indexOf('\n\n');
 		if (end > 0)
 			tune.abc = tune.abc.substring(0, end);
+		tune.pure = tune.abc;
 		tune.abc = directives + tune.abc;
+
+		// for the user's convenience, parse and store the title separately. The title is between the first T: and the next \n
+		var title = tune.pure.split("T:");
+		title = title[1].split("\n");
+		tune.title = title[0].replace(/^\s+|\s+$/g, '');;
+
+		// for the user's convenience, parse and store the id separately. The id is between the first X: and the next \n
+		var id = tune.pure.substring(2,tune.pure.indexOf("\n"));
+		tune.id = id.replace(/^\s+|\s+$/g, '');
 	});
 };
 
+ABCJS.TuneBook.prototype.getTuneById = function (id) {
+	for (var i = 0; i < this.tunes.length; i++) {
+		if (this.tunes[i].id === id)
+			return this.tunes[i];
+	}
+	return null;
+};
+
+ABCJS.TuneBook.prototype.getTuneByTitle = function (title) {
+	for (var i = 0; i < this.tunes.length; i++) {
+		if (this.tunes[i].title === title)
+			return this.tunes[i];
+	}
+	return null;
+};
+
 function renderEngine(callback, output, abc, parserParams, renderParams) {
 	var isArray = function(testObject) {
 		return testObject && !(testObject.propertyIsEnumerable('length')) && typeof testObject === 'object' && typeof testObject.length === 'number';

data/app/assets/javascripts/abcjs/data/abc_tune.js

@@ -168,6 +168,14 @@ window.ABCJS.data.Tune = function() {
 			}
 		}
 
+		// Remove the temporary working variables
+		for (i = 0; i < this.lines.length; i++) {
+			if (this.lines[i].staff) {
+				for (s = 0; s < this.lines[i].staff.length; s++)
+						delete this.lines[i].staff[s].workingClef;
+			}
+		}
+
 		function cleanUpSlursInLine(line) {
 			var currSlur = [];
 			var x;
@@ -403,11 +411,11 @@ window.ABCJS.data.Tune = function() {
 		var This = this;
 		var pushNote = function(hp) {
 			if (hp.pitches !== undefined) {
-				var mid = This.lines[This.lineNum].staff[This.staffNum].clef.verticalPos;
+				var mid = This.lines[This.lineNum].staff[This.staffNum].workingClef.verticalPos;
 				window.ABCJS.parse.each(hp.pitches, function(p) { p.verticalPos = p.pitch - mid; });
 			}
 			if (hp.gracenotes !== undefined) {
-				var mid2 = This.lines[This.lineNum].staff[This.staffNum].clef.verticalPos;
+				var mid2 = This.lines[This.lineNum].staff[This.staffNum].workingClef.verticalPos;
 				window.ABCJS.parse.each(hp.gracenotes, function(p) { p.verticalPos = p.pitch - mid2; });
 			}
 			This.lines[This.lineNum].staff[This.staffNum].voices[This.voiceNum].push(hp);
@@ -477,6 +485,9 @@ window.ABCJS.data.Tune = function() {
 
 	this.appendStartingElement = function(type, startChar, endChar, hashParams2)
 	{
+		// If we're in the middle of beaming, then end the beam.
+		this.closeLine();
+
 		// We only ever want implied naturals the first time.
 		var impliedNaturals;
 		if (type === 'key') {
@@ -487,6 +498,12 @@ window.ABCJS.data.Tune = function() {
 		// Clone the object because it will be sticking around for the next line and we don't want the extra fields in it.
 		var hashParams = window.ABCJS.parse.clone(hashParams2);
 
+		// If this is a clef type, then we replace the working clef on the line. This is kept separate from
+		// the clef in case there is an inline clef field. We need to know what the current position for
+		// the note is.
+		if (type === 'clef')
+			this.lines[this.lineNum].staff[this.staffNum].workingClef = hashParams;
+
 		// These elements should not be added twice, so if the element exists on this line without a note or bar before it, just replace the staff version.
 		var voice = this.lines[this.lineNum].staff[this.staffNum].voices[this.voiceNum];
 		for (var i = 0; i < voice.length; i++) {
@@ -607,7 +624,7 @@ window.ABCJS.data.Tune = function() {
 				This.appendElement('scale', null, null, { size: params.scale} );
 		};
 		var createStaff = function(params) {
-			This.lines[This.lineNum].staff[This.staffNum] = {voices: [ ], clef: params.clef, key: params.key};
+			This.lines[This.lineNum].staff[This.staffNum] = {voices: [ ], clef: params.clef, key: params.key, workingClef: params.clef };
 			if (params.vocalfont) This.lines[This.lineNum].staff[This.staffNum].vocalfont = params.vocalfont;
 			if (params.bracket) This.lines[This.lineNum].staff[This.staffNum].bracket = params.bracket;
 			if (params.brace) This.lines[This.lineNum].staff[This.staffNum].brace = params.brace;
@@ -683,4 +700,4 @@ window.ABCJS.data.Tune = function() {
 	this.addMetaTextObj = function(key, value) {
 		this.metaText[key] = value;
 	};
-}
+};

data/lib/abcjs-rails/version.rb

@@ -1,5 +1,5 @@
 module Abcjs
   module Rails
-    VERSION = "1.1.1"
+    VERSION = "1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abcjs-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: '1.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties