abcjs-rails 1.3 → 1.4

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

@@ -65,8 +65,11 @@ ABCJS.TuneBook = function(book) {
 
 		// 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, '');;
+		if (title.length > 1) {
+			title = title[1].split("\n");
+			tune.title = title[0].replace(/^\s+|\s+$/g, '');;
+		} else
+			tune.title = "";
 
 		// 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"));

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

@@ -302,38 +302,39 @@ window.ABCJS.data.Tune = function() {
 
 		// TODO-PER: This could be done faster as we go instead of as the last step.
 		function fixClefPlacement(el) {
+			window.ABCJS.parse.parseKeyVoice.fixClef(el);
 			//if (el.el_type === 'clef') {
-				var min = -2;
-				var max = 5;
-				switch(el.type) {
-					case 'treble+8':
-					case 'treble-8':
-						break;
-					case 'bass':
-					case 'bass+8':
-					case 'bass-8':
-						el.verticalPos = 20 + el.verticalPos; min += 6; max += 6;
-						break;
-					case 'tenor':
-					case 'tenor+8':
-					case 'tenor-8':
-						el.verticalPos = - el.verticalPos; min = -40; max = 40;
-//						el.verticalPos+=2; min += 6; max += 6;
-						break;
-					case 'alto':
-					case 'alto+8':
-					case 'alto-8':
-						el.verticalPos = - el.verticalPos; min = -40; max = 40;
-//						el.verticalPos-=2; min += 4; max += 4;
-						break;
-				}
-				if (el.verticalPos < min) {
-					while (el.verticalPos < min)
-						el.verticalPos += 7;
-				} else if (el.verticalPos > max) {
-					while (el.verticalPos > max)
-						el.verticalPos -= 7;
-				}
+//				var min = -2;
+//				var max = 5;
+//				switch(el.type) {
+//					case 'treble+8':
+//					case 'treble-8':
+//						break;
+//					case 'bass':
+//					case 'bass+8':
+//					case 'bass-8':
+//						el.verticalPos = 20 + el.verticalPos; min += 6; max += 6;
+//						break;
+//					case 'tenor':
+//					case 'tenor+8':
+//					case 'tenor-8':
+//						el.verticalPos = - el.verticalPos; min = -40; max = 40;
+////						el.verticalPos+=2; min += 6; max += 6;
+//						break;
+//					case 'alto':
+//					case 'alto+8':
+//					case 'alto-8':
+//						el.verticalPos = - el.verticalPos; min = -40; max = 40;
+////						el.verticalPos-=2; min += 4; max += 4;
+//						break;
+//				}
+//				if (el.verticalPos < min) {
+//					while (el.verticalPos < min)
+//						el.verticalPos += 7;
+//				} else if (el.verticalPos > max) {
+//					while (el.verticalPos > max)
+//						el.verticalPos -= 7;
+//				}
 			//}
 		}
 
@@ -504,6 +505,16 @@ window.ABCJS.data.Tune = function() {
 		if (type === 'clef')
 			this.lines[this.lineNum].staff[this.staffNum].workingClef = hashParams;
 
+		// If this is the first item in this staff, then we might have to initialize the staff, first.
+		if (this.lines[this.lineNum].staff.length <= this.staffNum) {
+			this.lines[this.lineNum].staff[this.staffNum] = {};
+			this.lines[this.lineNum].staff[this.staffNum].clef = window.ABCJS.parse.clone(this.lines[this.lineNum].staff[0].clef);
+			this.lines[this.lineNum].staff[this.staffNum].key = window.ABCJS.parse.clone(this.lines[this.lineNum].staff[0].key);
+			this.lines[this.lineNum].staff[this.staffNum].meter = window.ABCJS.parse.clone(this.lines[this.lineNum].staff[0].meter);
+			this.lines[this.lineNum].staff[this.staffNum].workingClef = window.ABCJS.parse.clone(this.lines[this.lineNum].staff[0].workingClef);
+			this.lines[this.lineNum].staff[this.staffNum].voices = [[]];
+		}
+
 		// 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++) {

data/app/assets/javascripts/abcjs/midi/abc_midiwriter.js

@@ -567,7 +567,10 @@ ABCJS.midi.MidiWriter.prototype.writeABCElement = function(elem) {
 ABCJS.midi.MidiWriter.prototype.writeNote = function(elem) {
 
   if (elem.startTriplet) {
-    this.multiplier=2/3;
+	  if (elem.startTriplet === 2)
+		  this.multiplier = 3/2;
+	  else
+	    this.multiplier=(elem.startTriplet-1)/elem.startTriplet;
   }
 
   var mididuration = elem.duration*this.baseduration*this.multiplier;

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

@@ -1313,6 +1313,8 @@ window.ABCJS.parse.Parse = function() {
 		if (switches && switches.print)
 			tune.media = 'print';
 		multilineVars.reset();
+		header.reset(tokenizer, warn, multilineVars, tune);
+
 		// Take care of whatever line endings come our way
 		strTune = window.ABCJS.parse.gsub(strTune, '\r\n', '\n');
 		strTune = window.ABCJS.parse.gsub(strTune, '\r', '\n');

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

@@ -23,9 +23,11 @@ if (!window.ABCJS.parse)
 	window.ABCJS.parse = {};
 
 window.ABCJS.parse.ParseHeader = function(tokenizer, warn, multilineVars, tune) {
-	window.ABCJS.parse.parseKeyVoice.initialize(tokenizer, warn, multilineVars, tune);
-	window.ABCJS.parse.parseDirective.initialize(tokenizer, warn, multilineVars, tune);
-
+	this.reset = function(tokenizer, warn, multilineVars, tune) {
+		window.ABCJS.parse.parseKeyVoice.initialize(tokenizer, warn, multilineVars, tune);
+		window.ABCJS.parse.parseDirective.initialize(tokenizer, warn, multilineVars, tune);
+	};
+	this.reset(tokenizer, warn, multilineVars, tune);
 
 	this.setTitle = function(title) {
 		if (multilineVars.hasMainTitle)

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

@@ -170,37 +170,57 @@ window.ABCJS.parse.parseKeyVoice = {};
 		return keys[keyName];
 	};
 
+	var clefLines = {
+		'treble': { clef: 'treble', pitch: 4, mid: 0 },
+		'treble+8': { clef: 'treble+8', pitch: 4, mid: 0 },
+		'treble-8': { clef: 'treble-8', pitch: 4, mid: 0 },
+		'treble1': { clef: 'treble', pitch: 2, mid: 2 },
+		'treble2': { clef: 'treble', pitch: 4, mid: 0 },
+		'treble3': { clef: 'treble', pitch: 6, mid: -2 },
+		'treble4': { clef: 'treble', pitch: 8, mid: -4 },
+		'treble5': { clef: 'treble', pitch: 10, mid: -6 },
+		'perc': { clef: 'perc', pitch: 6, mid: 0 },
+		'none': { clef: 'none', mid: 0 },
+		'bass': { clef: 'bass', pitch: 8, mid: -12 },
+		'bass+8': { clef: 'bass+8', pitch: 8, mid: -12 },
+		'bass-8': { clef: 'bass-8', pitch: 8, mid: -12 },
+		'bass+16': { clef: 'bass', pitch: 8, mid: -12 },
+		'bass-16': { clef: 'bass', pitch: 8, mid: -12 },
+		'bass1': { clef: 'bass', pitch: 2, mid: -6 },
+		'bass2': { clef: 'bass', pitch: 4, mid: -8 },
+		'bass3': { clef: 'bass', pitch: 6, mid: -10 },
+		'bass4': { clef: 'bass', pitch: 8, mid: -12 },
+		'bass5': { clef: 'bass', pitch: 10, mid: -14 },
+		'tenor': { clef: 'alto', pitch: 8, mid: -8 },
+		'tenor1': { clef: 'alto', pitch: 2, mid: -2 },
+		'tenor2': { clef: 'alto', pitch: 4, mid: -4 },
+		'tenor3': { clef: 'alto', pitch: 6, mid: -6 },
+		'tenor4': { clef: 'alto', pitch: 8, mid: -8 },
+		'tenor5': { clef: 'alto', pitch: 10, mid: -10 },
+		'alto': { clef: 'alto', pitch: 6, mid: -6 },
+		'alto1': { clef: 'alto', pitch: 2, mid: -2 },
+		'alto2': { clef: 'alto', pitch: 4, mid: -4 },
+		'alto3': { clef: 'alto', pitch: 6, mid: -6 },
+		'alto4': { clef: 'alto', pitch: 8, mid: -8 },
+		'alto5': { clef: 'alto', pitch: 10, mid: -10 },
+		'alto+8': { clef: 'alto+8', pitch: 6, mid: -6 },
+		'alto-8': { clef: 'alto-8', pitch: 6, mid: -6 }
+	};
+
 	var calcMiddle = function(clef, oct) {
-		var mid = 0;
-		switch(clef) {
-			case 'treble':
-			case 'perc':
-			case 'none':
-			case 'treble+8':
-			case 'treble-8':
-				break;
-			case 'bass3':
-			case 'bass':
-			case 'bass+8':
-			case 'bass-8':
-			case 'bass+16':
-			case 'bass-16':
-				mid = -12;
-				break;
-			case 'tenor':
-				mid = -8;
-				break;
-			case 'alto2':
-			case 'alto1':
-			case 'alto':
-			case 'alto+8':
-			case 'alto-8':
-				mid = -6;
-				break;
-		}
+		var value = clefLines[clef];
+		var mid = value ? value.mid : 0;
 		return mid+oct;
 	};
 
+	window.ABCJS.parse.parseKeyVoice.fixClef = function(clef) {
+		var value = clefLines[clef.type];
+		if (value) {
+			clef.clefPos = value.pitch;
+			clef.type = value.clef;
+		}
+	};
+
 	window.ABCJS.parse.parseKeyVoice.deepCopyKey = function(key) {
 		var ret = { accidentals: [], root: key.root, acc: key.acc, mode: key.mode };
 		window.ABCJS.parse.each(key.accidentals, function(k) {

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

@@ -44,7 +44,7 @@ ABCJS.write.StaffGroupElement.prototype.finished = function() {
   return true;
 };
 
-ABCJS.write.StaffGroupElement.prototype.layout = function(spacing, printer) {
+ABCJS.write.StaffGroupElement.prototype.layout = function(spacing, printer, debug) {
   this.spacingunits = 0; // number of space units taken up (as opposed to fixed width). Layout engine then decides how many a pixels a space unit should be
   this.minspace = 1000; // a big number to start off with
   var x = printer.paddingleft;
@@ -62,6 +62,7 @@ ABCJS.write.StaffGroupElement.prototype.layout = function(spacing, printer) {
   this.startx=x;
 
   var currentduration = 0;
+  if (debug) console.log("init layout");
   for (i=0;i<this.voices.length;i++) {
     this.voices[i].beginLayout(x);
   }
@@ -73,6 +74,8 @@ ABCJS.write.StaffGroupElement.prototype.layout = function(spacing, printer) {
       if (!this.voices[i].layoutEnded() && (!currentduration || this.voices[i].getDurationIndex()<currentduration)) 
 	currentduration=this.voices[i].getDurationIndex();
     }
+    if (debug) console.log("currentduration: ",currentduration);
+
 
     // isolate voices at current duration level
     var currentvoices = [];
@@ -80,8 +83,10 @@ ABCJS.write.StaffGroupElement.prototype.layout = function(spacing, printer) {
     for (i=0;i<this.voices.length;i++) {
       if (this.voices[i].getDurationIndex() !== currentduration) {
 	othervoices.push(this.voices[i]);
+	//console.log("out: voice ",i);
       } else {
 	currentvoices.push(this.voices[i]);
+	if (debug) console.log("in: voice ",i);
       }
     }
 
@@ -200,6 +205,7 @@ ABCJS.write.VoiceElement.prototype.addOther = function (child) {
 ABCJS.write.VoiceElement.prototype.updateIndices = function () {
   if (!this.layoutEnded()) {
     this.durationindex += this.children[this.i].duration;
+    if (this.children[this.i].duration===0) this.durationindex = Math.round(this.durationindex*64)/64; // everytime we meet a barline, do rounding to nearest 64th
     this.i++;
     this.minx = this.nextminx;
   }
@@ -282,8 +288,9 @@ ABCJS.write.VoiceElement.prototype.draw = function (printer, bartop) {
 
 };
 
-
-ABCJS.write.AbsoluteElement = function(abcelem, duration, minspacing) { // spacing which must be taken on top of the width
+// duration - actual musical duration - different from notehead duration in triplets. refer to abcelem to get the notehead duration
+// minspacing - spacing which must be taken on top of the width defined by the duration
+ABCJS.write.AbsoluteElement = function(abcelem, duration, minspacing) { 
   this.abcelem = abcelem;
   this.duration = duration;
   this.minspacing = minspacing || 0;
@@ -744,7 +751,7 @@ ABCJS.write.BeamElem.prototype.drawStems = function(printer) {
 
     var sy = (this.asc) ? 1.5*ABCJS.write.spacing.STEP: -1.5*ABCJS.write.spacing.STEP;
     if (this.isgrace) sy = sy*2/3;
-    for (var durlog=ABCJS.write.getDurlog(this.elems[i].duration); durlog<-3; durlog++) {
+    for (var durlog=ABCJS.write.getDurlog(this.elems[i].abcelem.duration); durlog<-3; durlog++) { // get the duration via abcelem because of triplets
       if (auxbeams[-4-durlog]) {
 	auxbeams[-4-durlog].single = false;
       } else {
@@ -754,7 +761,7 @@ ABCJS.write.BeamElem.prototype.drawStems = function(printer) {
     }
     
     for (var j=auxbeams.length-1;j>=0;j--) {
-      if (i===ii-1 || ABCJS.write.getDurlog(this.elems[i+1].duration)>(-j-4)) {
+      if (i===ii-1 || ABCJS.write.getDurlog(this.elems[i+1].abcelem.duration)>(-j-4)) {
 	
 	var auxbeamendx = x;
 	var auxbeamendy = bary + sy*(j+1);

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

@@ -49,6 +49,7 @@ ABCJS.write.Layout = function(glyphs, bagpipes) {
   this.s = 0; // current staff number
   this.v = 0; // current voice number on current staff
   this.stafflines = 5;
+  this.tripletmultiplier = 1;
 };
 
 ABCJS.write.Layout.prototype.getCurrentVoiceId = function() {
@@ -255,14 +256,24 @@ ABCJS.write.Layout.prototype.printNote = function(elem, nostem, dontDraw) { //st
   var width, p1, p2, dx;
 
   var duration = ABCJS.write.getDuration(elem);
-  var durlog = Math.floor(Math.log(duration)/Math.log(2));
+  if (duration === 0) { duration = 0.25; nostem = true; }	//PER: zero duration will draw a quarter note head.
+  var durlog = Math.floor(Math.log(duration)/Math.log(2));  //TODO use getDurlog
   var dot=0;
 
   for (var tot = Math.pow(2,durlog), inc=tot/2; tot<duration; dot++,tot+=inc,inc/=2);
   
-  var abselem = new ABCJS.write.AbsoluteElement(elem, duration, 1);
+  
+  if (elem.startTriplet) {
+	  if (elem.startTriplet === 2)
+	    this.tripletmultiplier = 3/2;
+	  else
+	    this.tripletmultiplier=(elem.startTriplet-1)/elem.startTriplet;
+  }
+  
 
+  var abselem = new ABCJS.write.AbsoluteElement(elem, duration * this.tripletmultiplier, 1);
   
+
   if (elem.rest) {
     var restpitch = 7;
     if (this.stemdir==="down") restpitch = 3;
@@ -306,8 +317,8 @@ ABCJS.write.Layout.prototype.printNote = function(elem, nostem, dontDraw) { //st
       var delta = (dir==="down")?prev.pitch-curr.pitch:curr.pitch-prev.pitch;
       if (delta<=1 && !prev.printer_shift) {
         curr.printer_shift=(delta)?"different":"same";
-        if (curr.pitch > 11 || curr.pitch < 1) {	// PER: add extra ledger line
-          additionalLedgers.push(curr.pitch - (curr.pitch%2));
+        if (curr.verticalPos > 11 || curr.verticalPos < 1) {	// PER: add extra ledger line
+          additionalLedgers.push(curr.verticalPos - (curr.verticalPos%2));
         }
 	if (dir==="down") {
 	  this.roomtaken = this.glyphs.getSymbolWidth(this.chartable.note[-durlog])+2;
@@ -495,11 +506,19 @@ ABCJS.write.Layout.prototype.printNote = function(elem, nostem, dontDraw) { //st
 	abselem.addRight(new ABCJS.write.RelativeElement(elem.chord[i].name, x, this.glyphs.getSymbolWidth(elem.chord[i].name[0])+4, y, {type:"text"}));
 	break;
       case "below":
-	y = -3;
-    abselem.addChild(new ABCJS.write.RelativeElement(elem.chord[i].name, x, 0, y, {type:"text"}));
+	y = elem.minpitch-4;
+			  if (y > -3) y = -3;
+			  var eachLine = elem.chord[i].name.split("\n");
+			  for (var ii = 0; ii < eachLine.length; ii++) {
+				abselem.addChild(new ABCJS.write.RelativeElement(eachLine[ii], x, 0, y, {type:"text"}));
+				  y -= 3;	// TODO-PER: This should actually be based on the font height.
+			  }
     break;
       default:
-	abselem.addChild(new ABCJS.write.RelativeElement(elem.chord[i].name, x, 0, y, {type:"text"}));
+			  if (elem.chord[i].rel_position)
+				  abselem.addChild(new ABCJS.write.RelativeElement(elem.chord[i].name, x+elem.chord[i].rel_position.x, 0, elem.minpitch+elem.chord[i].rel_position.y/ABCJS.write.spacing.STEP, {type:"text"}));
+			  else
+				  abselem.addChild(new ABCJS.write.RelativeElement(elem.chord[i].name, x, 0, y, {type:"text"}));
       }
     }
   }
@@ -514,6 +533,7 @@ ABCJS.write.Layout.prototype.printNote = function(elem, nostem, dontDraw) { //st
   if (elem.endTriplet && this.triplet) {
     this.triplet.anchor2 = notehead;
     this.triplet = null;
+    this.tripletmultiplier = 1;
   }
 
   return abselem;
@@ -767,9 +787,9 @@ ABCJS.write.Layout.prototype.printDecoration = function(decoration, pitch, width
     abselem.addChild(new ABCJS.write.RelativeElement(dec, deltax, this.glyphs.getSymbolWidth(dec), ypos));
   }
   if (compoundDec) {	// PER: added new decorations
-	  ypos = (dir) ? pitch+1:pitch+9;
+	  ypos = (dir === 'down') ? pitch+1:pitch+9;
 	  deltax = width/2;
-	  deltax += (dir) ? -5 : 3;
+	  deltax += (dir === 'down') ? -5 : 3;
 	  for (var xx = 0; xx < compoundDec[1]; xx++) {
 		  ypos -= 1;
 		  abselem.addChild(new ABCJS.write.RelativeElement(compoundDec[0], deltax, this.glyphs.getSymbolWidth(compoundDec[0]), ypos));
@@ -875,32 +895,30 @@ ABCJS.write.Layout.prototype.printBarLine = function (elem) {
 ABCJS.write.Layout.prototype.printClef = function(elem) {
   var clef = "clefs.G";
   var octave = 0;
-  var pitch = 4;
   var abselem = new ABCJS.write.AbsoluteElement(elem,0,10);
   switch (elem.type) {
   case "treble": break;
-  case "tenor": clef="clefs.C"; pitch=8; break;
-  case "alto": clef="clefs.C"; pitch=6; break;
-  case "bass": clef="clefs.F"; pitch=8; break;
+  case "tenor": clef="clefs.C"; break;
+  case "alto": clef="clefs.C"; break;
+  case "bass": clef="clefs.F"; break;
   case 'treble+8': octave = 1; break;
-  case 'tenor+8':clef="clefs.C"; pitch=8; break;
-  case 'bass+8': clef="clefs.F"; pitch=8; break;
-  case 'alto+8': clef="clefs.C"; pitch=6; break;
+  case 'tenor+8':clef="clefs.C"; octave = 1; break;
+  case 'bass+8': clef="clefs.F"; octave = 1; break;
+  case 'alto+8': clef="clefs.C"; octave = 1; break;
   case 'treble-8': octave = -1; break;
-  case 'tenor-8':clef="clefs.C"; pitch=8; break;
-  case 'bass-8': clef="clefs.F"; pitch=8; break;
-  case 'alto-8': clef="clefs.C"; pitch=6; break;
+  case 'tenor-8':clef="clefs.C"; octave = -1; break;
+  case 'bass-8': clef="clefs.F"; octave = -1; break;
+  case 'alto-8': clef="clefs.C"; octave = -1; break;
   case 'none': clef=""; break;
-  case 'perc': clef="clefs.perc"; pitch=6; break;
+  case 'perc': clef="clefs.perc"; break;
   default: abselem.addChild(new ABCJS.write.RelativeElement("clef="+elem.type, 0, 0, 0, {type:"debug"}));
   }    
-  if (elem.verticalPos) {
-    pitch = elem.verticalPos;
-  }
-  
+//  if (elem.verticalPos) {
+//    pitch = elem.verticalPos;
+//  }
   var dx =10;
   if (clef!=="") {
-    abselem.addRight(new ABCJS.write.RelativeElement(clef, dx, this.glyphs.getSymbolWidth(clef), pitch));
+    abselem.addRight(new ABCJS.write.RelativeElement(clef, dx, this.glyphs.getSymbolWidth(clef), elem.clefPos));
   }
   if (octave!==0) {
     var scale= 2/3;

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

@@ -411,8 +411,8 @@ ABCJS.write.Printer.prototype.printTune = function (abctune) {
     if (abcline.staff) {
       var staffgroup = this.layouter.printABCLine(abcline.staff);
       var newspace = this.space;
-      for (var it=0;it<3;it++) {
-	staffgroup.layout(newspace,this);
+      for (var it=0;it<3;it++) { // TODO shouldn't need this triple pass any more
+	staffgroup.layout(newspace,this, false);
 	if (line && line===abctune.lines.length-1 && staffgroup.w/this.width<0.66 && !abctune.formatting.stretchlast) break; // don't stretch last line too much unless it is 1st
 	var relspace = staffgroup.spacingunits*newspace;
 	var constspace = staffgroup.w-relspace;
@@ -426,7 +426,7 @@ ABCJS.write.Printer.prototype.printTune = function (abctune) {
       staffgroup.draw(this,this.y);
       if (staffgroup.w>maxwidth) maxwidth = staffgroup.w;
       this.staffgroups[this.staffgroups.length] = staffgroup;
-      this.y = staffgroup.y+staffgroup.height; 
+      this.y = staffgroup.y+staffgroup.height;
       this.y+=ABCJS.write.spacing.STAVEHEIGHT*0.2;
     } else if (abcline.subtitle && line!==0) {
       this.printSubtitleLine(abcline);

data/lib/abcjs-rails/version.rb

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

metadata

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