abcjs-rails 2.0 → 2.1

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

@@ -247,7 +247,8 @@ ABCJS.write.AbstractEngraver.prototype.createABCElement = function() {
     break;
   case "part":
     var abselem = new ABCJS.write.AbsoluteElement(elem,0,0, 'part');
-    abselem.addChild(new ABCJS.write.RelativeElement(elem.title, 0, 0, undefined, {type:"part"}));
+	  var dim = this.renderer.getTextSize(elem.title, 'partsfont', "part");
+    abselem.addChild(new ABCJS.write.RelativeElement(elem.title, 0, 0, undefined, {type:"part", height: dim.height/ABCJS.write.spacing.STEP}));
     elemset[0] = abselem;
     break;
   case "tempo":
@@ -530,9 +531,9 @@ ABCJS.write.AbstractEngraver.prototype.createNote = function(elem, nostem, dontD
          window.ABCJS.parse.each(elem.lyric, function(ly) {
          lyricStr += ly.syllable + ly.divider + "\n";
       });
-	  // TODO-PER: get the width of the lyric and use that for "0, lyricStr.length*5" below.
+	  var lyricDim = this.renderer.getTextSize(lyricStr, 'vocalfont', "abc-lyric");
 	  var position = elem.positioning ? elem.positioning.vocalPosition : 'below';
-    abselem.addRight(new ABCJS.write.RelativeElement(lyricStr, 0, lyricStr.length*5, undefined, {type:"lyric", position: position }));
+    abselem.addCentered(new ABCJS.write.RelativeElement(lyricStr, 0, lyricDim.width, undefined, {type:"lyric", position: position, height: lyricDim.height / ABCJS.write.spacing.STEP }));
   }
   
   if (!dontDraw && elem.gracenotes !== undefined) {
@@ -613,48 +614,52 @@ ABCJS.write.AbstractEngraver.prototype.createNote = function(elem, nostem, dontD
     if (dir === 'down') ofs = -ofs;
     abselem.addChild(new ABCJS.write.RelativeElement(null, ofs-2, ABCJS.write.glyphs.getSymbolWidth(c)+4, additionalLedgers[i], {type:"ledger"}));
   }
-
+	var chordMargin = 8; // If there are chords next to each other, this is how close they can get.
   if (elem.chord !== undefined) {
     for (i = 0; i < elem.chord.length; i++) {
       var x = 0;
       var y;
+		var dim = this.renderer.getTextSize(elem.chord[i].name, 'annotationfont', "annotation");
+		var chordWidth = dim.width;
+		var chordHeight = dim.height / ABCJS.write.spacing.STEP;
       switch (elem.chord[i].position) {
       case "left":
-        this.roomtaken+=7;
+        this.roomtaken+=chordWidth+7;
         x = -this.roomtaken;        // TODO-PER: This is just a guess from trial and error
         y = elem.averagepitch;
-		  // TODO-PER: get the width of the lyric and use that for "0, lyricStr.length*5" below.
-        abselem.addExtra(new ABCJS.write.RelativeElement(elem.chord[i].name, x, ABCJS.write.glyphs.getSymbolWidth(elem.chord[i].name[0])+4, y, {type:"text"}));
+        abselem.addExtra(new ABCJS.write.RelativeElement(elem.chord[i].name, x, chordWidth+4, y, {type:"text", height: chordHeight}));
         break;
       case "right":
         this.roomtakenright+=4;
         x = this.roomtakenright;// TODO-PER: This is just a guess from trial and error
         y = elem.averagepitch;
-		  // TODO-PER: get the width of the lyric and use that for "0, lyricStr.length*5" below.
-        abselem.addRight(new ABCJS.write.RelativeElement(elem.chord[i].name, x, ABCJS.write.glyphs.getSymbolWidth(elem.chord[i].name[0])+4, y, {type:"text"}));
+        abselem.addRight(new ABCJS.write.RelativeElement(elem.chord[i].name, x, chordWidth+4, y, {type:"text", height: chordHeight}));
         break;
       case "below":
-		  // setting the y-coordinate to undefined for now: it will be overwritten later one, after we figure out what the highest element on the line is.
+		  // setting the y-coordinate to undefined for now: it will be overwritten later on, after we figure out what the highest element on the line is.
                          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, undefined, {type:"text", position: "below"}));
+                                abselem.addRight(new ABCJS.write.RelativeElement(eachLine[ii], x, chordWidth+chordMargin, undefined, {type:"text", position: "below", height: chordHeight}));
                          }
     break;
 		case "above":
-			// setting the y-coordinate to undefined for now: it will be overwritten later one, after we figure out what the highest element on the line is.
-			abselem.addChild(new ABCJS.write.RelativeElement(elem.chord[i].name, x, 0, undefined, {type: "text"}));
+			// setting the y-coordinate to undefined for now: it will be overwritten later on, after we figure out what the highest element on the line is.
+			abselem.addRight(new ABCJS.write.RelativeElement(elem.chord[i].name, 0, chordWidth+chordMargin, undefined, {type: "text", height: chordHeight}));
 			break;
       default:
 		if (elem.chord[i].rel_position) {
 			var relPositionY = elem.chord[i].rel_position.y + 3*ABCJS.write.spacing.STEP; // TODO-PER: this is a fudge factor to make it line up with abcm2ps
-			abselem.addChild(new ABCJS.write.RelativeElement(elem.chord[i].name, x + elem.chord[i].rel_position.x, 0, elem.minpitch + relPositionY / ABCJS.write.spacing.STEP, {type: "text"}));
+			abselem.addChild(new ABCJS.write.RelativeElement(elem.chord[i].name, x + elem.chord[i].rel_position.x, 0, elem.minpitch + relPositionY / ABCJS.write.spacing.STEP, {type: "text", height: chordHeight}));
 		} else {
-			// setting the y-coordinate to undefined for now: it will be overwritten later one, after we figure out what the highest element on the line is.
+			// setting the y-coordinate to undefined for now: it will be overwritten later on, after we figure out what the highest element on the line is.
 			var pos2 = 'above';
 			if (elem.positioning && elem.positioning.chordPosition)
 				pos2 = elem.positioning.chordPosition;
 
-			abselem.addChild(new ABCJS.write.RelativeElement(elem.chord[i].name, x, 0, undefined, {type: "chord", position: pos2 }));
+			dim = this.renderer.getTextSize(elem.chord[i].name, 'gchordfont', "chord");
+			chordHeight = dim.height / ABCJS.write.spacing.STEP;
+			chordWidth = dim.width; // Since the chord is centered, we only use half the width.
+			abselem.addCentered(new ABCJS.write.RelativeElement(elem.chord[i].name, x, chordWidth, undefined, {type: "chord", position: pos2, height: chordHeight }));
 		}
       }
     }

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

@@ -116,6 +116,11 @@ if (!window.ABCJS.write)
 		return getBarYAt(beam.startX, beam.startY, beam.endX, beam.endY, midPoint);
 	};
 
+	ABCJS.write.BeamElem.prototype.yAtNote = function(element) {
+		var beam = this.beams[0];
+		return getBarYAt(beam.startX, beam.startY, beam.endX, beam.endY, element.x);
+	};
+
 	ABCJS.write.BeamElem.prototype.xAtMidpoint = function(startX, endX) {
 		return startX + (endX - startX)/2;
 	};
@@ -177,7 +182,6 @@ if (!window.ABCJS.write)
 			'class': renderer.addClasses('beam-elem')
 		});
 	}
-<<<<<<< HEAD
 
 	function calcXPos(asc, firstElement, lastElement) {
 		var starthead = firstElement.heads[asc ? 0 : firstElement.heads.length - 1];
@@ -207,83 +211,6 @@ if (!window.ABCJS.write)
 			} else if (!asc && pos > 6) {
 				startY = 6;
 				endY = 6;
-=======
-};
-
-ABCJS.write.BeamElem.prototype.draw = function(renderer) {
-	if (this.elems.length === 0 || this.allrests) return;
-	this.drawBeam(renderer);
-	this.drawStems(renderer);
-};
-
-ABCJS.write.BeamElem.prototype.calcDir = function() {
-	var average = this.average();
-	//	var barpos = (this.isgrace)? 5:7;
-	this.asc = (this.forceup || this.isgrace || average<6) && (!this.forcedown); // hardcoded 6 is B
-	return this.asc;
-};
-
-ABCJS.write.BeamElem.prototype.drawBeam = function(renderer) {
-	var average = this.average();
-	var barpos = (this.isgrace)? 5:7;
-	this.calcDir();
-
-	var barminpos = this.asc ? 5 : 8;	//PER: I just bumped up the minimum height for notes with descending stems to clear a rest in the middle of them.
-	this.pos = Math.round(this.asc ? Math.max(average+barpos,this.max+barminpos) : Math.min(average-barpos,this.min-barminpos));
-	var slant = this.elems[0].abcelem.averagepitch-this.elems[this.elems.length-1].abcelem.averagepitch;
-	if (this.isflat) slant=0;
-	var maxslant = this.elems.length/2;
-
-	if (slant>maxslant) slant = maxslant;
-	if (slant<-maxslant) slant = -maxslant;
-	this.starty = renderer.calcY(this.pos+Math.floor(slant/2));
-	this.endy = renderer.calcY(this.pos+Math.floor(-slant/2));
-
-	var starthead = this.elems[0].heads[(this.asc)? 0: this.elems[0].heads.length-1];
-	var endhead = this.elems[this.elems.length-1].heads[(this.asc)? 0: this.elems[this.elems.length-1].heads.length-1];
-	this.startx = starthead.x;
-	if(this.asc) this.startx+=starthead.w-0.6;
-	this.endx = endhead.x;
-	if(this.asc) this.endx+=endhead.w;
-
-	// PER: if the notes are too high or too low, make the beam go down to the middle
-	if (this.asc && this.pos < 6) {
-		this.starty = renderer.calcY(6);
-		this.endy = renderer.calcY(6);
-	} else if (!this.asc && this.pos > 6) {
-		this.starty = renderer.calcY(6);
-		this.endy = renderer.calcY(6);
-	}
-
-	var pathString = "M"+this.startx+" "+this.starty+" L"+this.endx+" "+this.endy+
-		"L"+this.endx+" "+(this.endy+this.dy) +" L"+this.startx+" "+(this.starty+this.dy)+"z";
-	renderer.printPath({path:pathString, stroke:"none", fill:"#000000", 'class': renderer.addClasses('beam-elem')});
-};
-
-ABCJS.write.BeamElem.prototype.drawStems = function(renderer) {
-	var auxbeams = [];  // auxbeam will be {x, y, durlog, single} auxbeam[0] should match with durlog=-4 (16th) (j=-4-durlog)
-	renderer.beginGroup();
-	for (var i=0,ii=this.elems.length; i<ii; i++) {
-		if (this.elems[i].abcelem.rest)
-			continue;
-		var furthesthead = this.elems[i].heads[(this.asc)? 0: this.elems[i].heads.length-1];
-		var ovaldelta = (this.isgrace)?1/3:1/5;
-		var pitch = furthesthead.pitch + ((this.asc) ? ovaldelta : -ovaldelta);
-		var y = renderer.calcY(pitch);
-		var x = furthesthead.x + ((this.asc) ? furthesthead.w: 0);
-		var bary=this.getBarYAt(x);
-		var dx = (this.asc) ? -0.6 : 0.6;
-		renderer.printStem(x,dx,y,bary);
-
-		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].abcelem.duration); durlog<-3; durlog++) { // get the duration via abcelem because of triplets
-			if (auxbeams[-4-durlog]) {
-				auxbeams[-4-durlog].single = false;
-			} else {
-				auxbeams[-4-durlog] = {x:x+((this.asc)?-0.6:0), y:bary+sy*(-4-durlog+1),
-					durlog:durlog, single:true};
->>>>>>> origin/master
 			}
 		}
 
@@ -351,7 +278,6 @@ ABCJS.write.BeamElem.prototype.drawStems = function(renderer) {
 				}
 			}
 
-<<<<<<< HEAD
 			for (var j = auxBeams.length - 1; j >= 0; j--) {
 				if (i === elems.length - 1 || ABCJS.write.getDurlog(elems[i + 1].abcelem.duration) > (-j - 4)) {
 
@@ -366,23 +292,8 @@ ABCJS.write.BeamElem.prototype.drawStems = function(renderer) {
 					beams.push({ startX: auxBeams[j].x, endX: auxBeamEndX, startY: auxBeams[j].y, endY: auxBeamEndY, dy: dy });
 					auxBeams = auxBeams.slice(0, j);
 				}
-=======
-				var pathString ="M"+auxbeams[j].x+" "+auxbeams[j].y+" L"+auxbeamendx+" "+auxbeamendy+
-					"L"+auxbeamendx+" "+(auxbeamendy+this.dy) +" L"+auxbeams[j].x+" "+(auxbeams[j].y+this.dy)+"z";
-				renderer.printPath({path:pathString, stroke:"none", fill:"#000000", 'class': renderer.addClasses('beam-elem')});
-				auxbeams = auxbeams.slice(0,j);
->>>>>>> origin/master
 			}
 		}
 		return beams;
 	}
-<<<<<<< HEAD
 })();
-=======
-	renderer.endGroup('beam-elem');
-};
-
-ABCJS.write.BeamElem.prototype.getBarYAt = function(x) {
-	return this.starty + (this.endy-this.starty)/(this.endx-this.startx)*(x-this.startx);
-};
->>>>>>> origin/master

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

@@ -33,7 +33,6 @@ ABCJS.write.CrescendoElem = function(anchor1, anchor2, dir, positioning) {
 	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;
@@ -52,26 +51,11 @@ ABCJS.write.CrescendoElem.prototype.draw = function (renderer) {
 	} 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);
-		this.drawLine(renderer, 0, 4);
-	} 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

@@ -164,7 +164,7 @@ if (!window.ABCJS.write)
 			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}));
+			abselem.addChild(new ABCJS.write.RelativeElement(text, width/2, 0, y+textFudge, {type:"decoration", klass: 'ornament', thickness: 3}));
 
 			incrementPlacement(placement, textHeight);
 		}
@@ -311,9 +311,10 @@ if (!window.ABCJS.write)
 		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.
 
+		yPos.above = Math.max(yPos.above, this.minTop);
 		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.
+//			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

@@ -32,7 +32,6 @@ ABCJS.write.DynamicDecoration = function(anchor, dec, position) {
 	this.pitch = undefined; // This will be set later
 };
 
-<<<<<<< HEAD
 ABCJS.write.DynamicDecoration.prototype.setUpperAndLowerElements = function(positionY) {
 	if (this.volumeHeightAbove)
 		this.pitch = positionY.volumeHeightAbove;
@@ -46,12 +45,5 @@ ABCJS.write.DynamicDecoration.prototype.draw = function(renderer, linestartx, li
 	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
 };
 

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

@@ -30,7 +30,6 @@ ABCJS.write.EndingElem = function(text, anchor1, anchor2) {
 	this.pitch = undefined; // This will be set later
 };
 
-<<<<<<< HEAD
 ABCJS.write.EndingElem.prototype.setUpperAndLowerElements = function(positionY) {
 	this.pitch = positionY.endingHeightAbove;
 };
@@ -40,44 +39,25 @@ ABCJS.write.EndingElem.prototype.draw = function (renderer, linestartx, lineendx
 		window.console.error("Ending Element y-coordinate not set.");
 	var y = renderer.calcY(this.pitch);
 	var height = 20;
-=======
-ABCJS.write.EndingElem.prototype.draw = function (renderer, linestartx, lineendx) {
->>>>>>> origin/master
 	var pathString;
 	if (this.anchor1) {
 		linestartx = this.anchor1.x+this.anchor1.w;
 		pathString = ABCJS.write.sprintf("M %f %f L %f %f",
-<<<<<<< HEAD
 			linestartx, y, linestartx, y+height);
 		renderer.printPath({path:pathString, stroke:"#000000", fill:"#000000", 'class': renderer.addClasses('ending')});
 		renderer.renderText(linestartx+5, renderer.calcY(this.pitch-0.5), this.text, 'repeatfont', 'ending',"start");
-=======
-			linestartx, renderer.y, linestartx, renderer.y+10);
-		renderer.printPath({path:pathString, stroke:"#000000", fill:"#000000", 'class': renderer.addClasses('ending')}); //TODO scale
-		renderer.renderText(linestartx+5, renderer.calcY(18.5), this.text, 'repeatfont', 'ending',"start");
->>>>>>> origin/master
 	}
 
 	if (this.anchor2) {
 		lineendx = this.anchor2.x;
 		pathString = ABCJS.write.sprintf("M %f %f L %f %f",
-<<<<<<< HEAD
 			lineendx, y, lineendx, y+height);
 		renderer.printPath({path:pathString, stroke:"#000000", fill:"#000000", 'class': renderer.addClasses('ending')});
-=======
-			lineendx, renderer.y, lineendx, renderer.y+10);
-		renderer.printPath({path:pathString, stroke:"#000000", fill:"#000000", 'class': renderer.addClasses('ending')}); // TODO scale
->>>>>>> origin/master
 	}
 
 
 	pathString = ABCJS.write.sprintf("M %f %f L %f %f",
-<<<<<<< HEAD
 		linestartx, y, lineendx, y);
 	renderer.printPath({path:pathString, stroke:"#000000", fill:"#000000", 'class': renderer.addClasses('ending')});
-=======
-		linestartx, renderer.y, lineendx, renderer.y);
-	renderer.printPath({path:pathString, stroke:"#000000", fill:"#000000", 'class': renderer.addClasses('ending')});  // TODO scale
->>>>>>> origin/master
 };
 

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

@@ -234,7 +234,7 @@ function calcHorizontalSpacing(isLastLine, stretchLast, targetWidth, lineWidth,
  */
 ABCJS.write.EngraverController.prototype.setXSpacing = function (staffGroup, formatting, isLastLine) {
    var newspace = this.space;
-  for (var it = 0; it < 3; it++) { // TODO shouldn't need this triple pass any more
+  for (var it = 0; it < 3; it++) { // TODO-PER: shouldn't need this triple pass any more, but it does slightly affect the coordinates.
 	  staffGroup.layout(newspace, this.renderer, false);
 	  var stretchLast = formatting.stretchlast ? formatting.stretchlast : false;
 		newspace = calcHorizontalSpacing(isLastLine, stretchLast, this.width+this.renderer.padding.left, staffGroup.w, newspace, staffGroup.spacingunits, staffGroup.minspace);

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

@@ -54,46 +54,38 @@ ABCJS.write.RelativeElement = function(c, dx, w, pitch, opt) {
 	//	this.top += offset;
 	//	this.bottom += offset;
 	//}
+	var height = opt.height ? opt.height : 4; // The +1 is to give a little bit of padding.
 	this.centerVertically = false;
-	// TODO-PER: this should use the current font to determine the height. That requires the font to be passed in here, so refactor to store the font now instead of resolving it at draw time. This will allow the font to be changed mid-line, too.
-	var multiplier;
 	switch (this.type) {
 		case "debug":
-			this.chordHeightAbove = 3;
+			this.chordHeightAbove = height;
 			break;
 		case "lyric":
-			multiplier = this.c.split("\n").length;
 			if (opt.position && opt.position === 'below')
-				this.lyricHeightBelow = 3*multiplier;
+				this.lyricHeightBelow = height;
 			else
-				this.lyricHeightAbove = 3*multiplier;
+				this.lyricHeightAbove = height;
 			break;
 		case "chord":
-			multiplier = this.c.split("\n").length;
 			if (opt.position && opt.position === 'below')
-				this.chordHeightBelow = 4*multiplier;
+				this.chordHeightBelow = height;
 			else
-				this.chordHeightAbove = 4*multiplier;
+				this.chordHeightAbove = height;
 			break;
 		case "text":
-			multiplier = this.c.split("\n").length;
 			if (this.pitch === undefined) {
 				if (opt.position && opt.position === 'below')
-					this.chordHeightBelow = 4*multiplier;
+					this.chordHeightBelow = height;
 				else
-					this.chordHeightAbove = 4*multiplier;
+					this.chordHeightAbove = height;
 			} else
 				this.centerVertically = true;
 			break;
-		case "part": this.partHeightAbove = 6; break;
+		case "part": this.partHeightAbove = height; break;
 	}
 };
 
-<<<<<<< HEAD
 ABCJS.write.RelativeElement.prototype.setX = function (x) {
-=======
-ABCJS.write.RelativeElement.prototype.draw = function (renderer, x, bartop) {
->>>>>>> origin/master
 	this.x = x+this.dx;
 };
 
@@ -104,7 +96,6 @@ ABCJS.write.RelativeElement.prototype.draw = function (renderer, bartop) {
 	switch(this.type) {
 		case "symbol":
 			if (this.c===null) return null;
-<<<<<<< HEAD
 			var klass = "symbol";
 			if (this.klass) klass += " " + this.klass;
 			this.graphelem = renderer.printSymbol(this.x, this.pitch, this.c, this.scalex, this.scaley, renderer.addClasses(klass)); break;
@@ -132,39 +123,11 @@ ABCJS.write.RelativeElement.prototype.draw = function (renderer, bartop) {
 			this.graphelem = renderer.printStem(this.x, this.linewidth, y, (bartop)?bartop:renderer.calcY(this.pitch2)); break; // bartop can't be 0
 		case "stem":
 			this.graphelem = renderer.printStem(this.x, this.linewidth, y, renderer.calcY(this.pitch2)); break;
-=======
-			this.graphelem = renderer.printSymbol(this.x, this.pitch, this.c, this.scalex, this.scaley, renderer.addClasses('symbol')); break;
-		case "debug":
-			this.graphelem = renderer.renderText(this.x, this.y, this.c, "debugfont", 'debug-msg', 'start'); break;
-		case "barNumber":
-			this.graphelem = renderer.renderText(this.x, renderer.calcY(this.pitch), this.c, "measurefont", 'bar-number', "start");
-			break;
-		case "lyric":
-			this.graphelem = renderer.renderText(this.x, renderer.calcY(renderer.layouter.minY-7), this.c, "vocalfont", 'abc-lyric');
-			break;
-		case "chord":
-			this.graphelem = renderer.renderText(this.x, renderer.calcY(this.pitch), this.c, 'gchordfont', "start", "chord");
-			break;
-		case "text":
-			this.graphelem = renderer.renderText(this.x, renderer.calcY(this.pitch), this.c, 'annotationfont', "start", "annotation");
-			break;
-		case "bar":
-			this.graphelem = renderer.printStem(this.x, this.linewidth, renderer.calcY(this.pitch), (bartop)?bartop:renderer.calcY(this.pitch2)); break; // bartop can't be 0
-		case "stem":
-			this.graphelem = renderer.printStem(this.x, this.linewidth, renderer.calcY(this.pitch), renderer.calcY(this.pitch2)); break;
->>>>>>> origin/master
 		case "ledger":
 			this.graphelem = renderer.printStaveLine(this.x, this.x+this.w, this.pitch); break;
 	}
 	if (this.scalex!==1 && this.graphelem) {
-<<<<<<< HEAD
 		this.graphelem.scale(this.scalex, this.scaley, this.x, y);
-=======
-		this.graphelem.scale(this.scalex, this.scaley, this.x, renderer.calcY(this.pitch));
-	}
-	if (this.attributes) {
-		this.graphelem.attr(this.attributes);
->>>>>>> origin/master
 	}
 	return this.graphelem;
 };