abcjs-rails 2.3 → 3.0

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

@@ -26,8 +26,9 @@ if (!window.ABCJS.write)
 	"use strict";
 	var totalHeightInPitches = 5;
 
-	ABCJS.write.TempoElement = function(tempo) {
+	ABCJS.write.TempoElement = function(tempo, tuneNumber) {
 		this.tempo = tempo;
+		this.tuneNumber = tuneNumber;
 		this.tempoHeightAbove = totalHeightInPitches;
 		this.pitch = undefined; // This will be set later
 	};
@@ -57,14 +58,35 @@ if (!window.ABCJS.write)
 			var temposcale = 0.75;
 			var tempopitch = this.pitch - totalHeightInPitches + 1; // The pitch we receive is the top of the allotted area: change that to practically the bottom.
 			var duration = this.tempo.duration[0]; // TODO when multiple durations
-			var abselem = new ABCJS.write.AbsoluteElement(this.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);
-			var c = renderer.engraver.chartable.note[-durlog];
-			var flag = renderer.engraver.chartable.uflags[-durlog];
+			var abselem = new ABCJS.write.AbsoluteElement(this.tempo, duration, 1, 'tempo', this.tuneNumber);
+			// There aren't an infinite number of note values, but we are passed a float, so just in case something is off upstream,
+			// merge all of the in between points.
+			var dot;
+			var flag;
+			var note;
+			if (duration <= 1/32) { note = "noteheads.quarter"; flag = "flags.u32nd"; dot = 0; }
+			else if (duration <= 1/16) { note = "noteheads.quarter"; flag = "flags.u16th"; dot = 0; }
+			else if (duration <= 3/32) { note = "noteheads.quarter"; flag = "flags.u32nd"; dot = 1; }
+			else if (duration <= 1/8) { note = "noteheads.quarter"; flag = "flags.u8th"; dot = 0; }
+			else if (duration <= 3/16) { note = "noteheads.quarter"; flag = "flags.u16th"; dot = 1; }
+			else if (duration <= 1/4) { note = "noteheads.quarter"; dot = 0; }
+			else if (duration <= 3/8) { note = "noteheads.quarter"; flag = "flags.u8th"; dot = 1; }
+			else if (duration <= 1/2) { note = "noteheads.half"; dot = 0; }
+			else if (duration <= 3/4) { note = "noteheads.quarter"; dot = 1; }
+			else if (duration <= 1) { note = "noteheads.whole"; dot = 0; }
+			else if (duration <= 1.5) { note = "noteheads.half"; dot = 1; }
+			else if (duration <= 2) { note = "noteheads.dbl"; dot = 0; }
+			else if (duration <= 3) { note = "noteheads.whole"; dot = 1; }
+			else { note = "noteheads.dbl"; dot = 1; }
+
+			// TODO-PER: the following had a bug in it when there are dotted notes - so the above code brute forces it.
+			// 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);
+			// var note = renderer.engraver.chartable.note[-durlog];
+			// var flag = renderer.engraver.chartable.uflags[-durlog];
 			var temponote = renderer.engraver.createNoteHead(abselem, // TODO-PER: This seems late to be creating this element. Shouldn't it happen before draw?
-				c,
+				note,
 				{verticalPos: tempopitch},
 				"up",
 				0,
@@ -76,7 +98,7 @@ if (!window.ABCJS.write)
 			);
 			abselem.addHead(temponote);
 			var stem;
-			if (duration < 1) {
+			if (note !== "noteheads.whole" && note !== "noteheads.dbl") {
 				var p1 = tempopitch + 1 / 3 * temposcale;
 				var p2 = tempopitch + 7 * temposcale;
 				var dx = temponote.dx + temponote.w;
@@ -88,8 +110,6 @@ if (!window.ABCJS.write)
 			abselem.setX(x);
 			for (var i = 0; i < abselem.children.length; i++)
 				abselem.children[i].draw(renderer, x);
-			//if (stem)
-			//	stem.draw(renderer, x);
 			x += (abselem.w + 5);
 			var str = "= " + this.tempo.bpm;
 			text = renderer.renderText(x, y, str, 'tempofont', 'tempo', "start");

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

@@ -43,6 +43,10 @@ ABCJS.write.TieElem.prototype.setEndX = function(endLimitElem) {
 	this.endLimitX = endLimitElem;
 };
 
+ABCJS.write.TieElem.prototype.setHint = function () {
+	this.hint = true;
+};
+
 ABCJS.write.TieElem.prototype.setUpperAndLowerElements = function(positionY) {
 	// Doesn't depend on the highest and lowest, so there's nothing to do here.
 };
@@ -101,6 +105,9 @@ ABCJS.write.TieElem.prototype.layout = function (lineStartX, lineEndX) {
 ABCJS.write.TieElem.prototype.draw = function (renderer, linestartx, lineendx) {
 	this.layout(linestartx, lineendx);
 
-	renderer.drawArc(this.startX, this.endX, this.startY, this.endY,  this.above);
+	var klass;
+	if (this.hint)
+			klass = "abcjs-hint";
+	renderer.drawArc(this.startX, this.endX, this.startY, this.endY,  this.above, klass);
 
 };

data/lib/abcjs-rails/version.rb

@@ -1,5 +1,5 @@
 module Abcjs
   module Rails
-    VERSION = "2.3"
+    VERSION = "3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abcjs-rails
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: '3.0'
 platform: ruby
 authors:
 - Paul Rosen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -38,8 +38,10 @@ files:
 - app/assets/javascripts/abcjs/api/abc_tunebook.js
 - app/assets/javascripts/abcjs/data/abc_tune.js
 - app/assets/javascripts/abcjs/edit/abc_editor.js
+- app/assets/javascripts/abcjs/midi/abc_midi_controls.js
 - app/assets/javascripts/abcjs/midi/abc_midi_create.js
 - app/assets/javascripts/abcjs/midi/abc_midi_flattener.js
+- app/assets/javascripts/abcjs/midi/abc_midi_js_preparer.js
 - app/assets/javascripts/abcjs/midi/abc_midi_renderer.js
 - app/assets/javascripts/abcjs/midi/abc_midi_sequencer.js
 - app/assets/javascripts/abcjs/parse/abc_common.js
@@ -52,6 +54,7 @@ files:
 - app/assets/javascripts/abcjs/write/abc_absolute_element.js
 - app/assets/javascripts/abcjs/write/abc_abstract_engraver.js
 - app/assets/javascripts/abcjs/write/abc_beam_element.js
+- app/assets/javascripts/abcjs/write/abc_brace_element.js
 - app/assets/javascripts/abcjs/write/abc_create_clef.js
 - app/assets/javascripts/abcjs/write/abc_create_key_signature.js
 - app/assets/javascripts/abcjs/write/abc_create_time_signature.js
@@ -90,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: This packages the abcjs javascript files in a gem for easy reuse in Rails