abcjs 6.1.8 → 6.2.0

package/src/write/draw/absolute.js

@@ -1,7 +1,7 @@
 var drawTempo = require('./tempo');
 var drawRelativeElement = require('./relative');
-var spacing = require('../abc_spacing');
-var setClass = require('../set-class');
+var spacing = require('../helpers/spacing');
+var setClass = require('../helpers/set-class');
 var elementGroup = require('./group-elements');
 
 function drawAbsolute(renderer, params, bartop, selectables, staffPos) {
@@ -9,7 +9,7 @@ function drawAbsolute(renderer, params, bartop, selectables, staffPos) {
 	var isTempo = params.children.length > 0 && params.children[0].type === "TempoElement";
 	params.elemset = [];
 	elementGroup.beginGroup(renderer.paper, renderer.controller);
-	for (var i=0; i<params.children.length; i++) {
+	for (var i = 0; i < params.children.length; i++) {
 		var child = params.children[i];
 		switch (child.type) {
 			case "TempoElement":
@@ -22,7 +22,7 @@ function drawAbsolute(renderer, params, bartop, selectables, staffPos) {
 	var klass = params.type;
 	if (params.type === 'note' || params.type === 'rest') {
 		params.counters = renderer.controller.classes.getCurrent();
-		klass += ' d' + Math.round(params.durationClass*1000)/1000;
+		klass += ' d' + Math.round(params.durationClass * 1000) / 1000;
 		klass = klass.replace(/\./g, '-');
 		if (params.abcelem.pitches) {
 			for (var j = 0; j < params.abcelem.pitches.length; j++) {
@@ -66,7 +66,7 @@ function drawAbsolute(renderer, params, bartop, selectables, staffPos) {
 		params.notePositions = [];
 		for (var jj = 0; jj < params.heads.length; jj++) {
 			params.notePositions.push({
-				x: params.heads[jj].x + params.heads[jj].w/2,
+				x: params.heads[jj].x + params.heads[jj].w / 2,
 				y: staffPos.zero - params.heads[jj].pitch * spacing.STEP
 			});
 		}

package/src/write/draw/beam.js

@@ -9,9 +9,9 @@ function drawBeam(renderer, params) {
 		var beam = params.beams[i];
 		if (beam.split) {
 			var slope = getSlope(renderer, beam.startX, beam.startY, beam.endX, beam.endY);
-			var xes = [ ];
-			for (var j = 0; j < beam.split.length; j+=2) {
-				xes.push([beam.split[j], beam.split[j+1]]);
+			var xes = [];
+			for (var j = 0; j < beam.split.length; j += 2) {
+				xes.push([beam.split[j], beam.split[j + 1]]);
 			}
 			for (j = 0; j < xes.length; j++) {
 				var y1 = getY(beam.startX, beam.startY, slope, xes[j][0]);
@@ -21,8 +21,8 @@ function drawBeam(renderer, params) {
 		} else
 			pathString += draw(renderer, beam.startX, beam.startY, beam.endX, beam.endY, beam.dy);
 	}
-	var durationClass = ("abcjs-d"+params.duration).replace(/\./g,"-");
-	var klasses = renderer.controller.classes.generate('beam-elem '+durationClass);
+	var durationClass = ("abcjs-d" + params.duration).replace(/\./g, "-");
+	var klasses = renderer.controller.classes.generate('beam-elem ' + durationClass);
 	var el = printPath(renderer, {
 		path: pathString,
 		stroke: "none",
@@ -38,8 +38,8 @@ function draw(renderer, startX, startY, endX, endY, dy) {
 	endY = roundNumber(renderer.calcY(endY));
 	startX = roundNumber(startX);
 	endX = roundNumber(endX);
-	var startY2 = roundNumber(startY+dy);
-	var endY2 = roundNumber(endY+dy);
+	var startY2 = roundNumber(startY + dy);
+	var endY2 = roundNumber(endY + dy);
 	return "M" + startX + " " + startY + " L" + endX + " " + endY +
 		"L" + endX + " " + endY2 + " L" + startX + " " + startY2 + "z";
 }
@@ -50,7 +50,7 @@ function getSlope(renderer, startX, startY, endX, endY) {
 
 function getY(startX, startY, slope, currentX) {
 	var x = currentX - startX;
-	return startY + x*slope;
+	return startY + x * slope;
 }
 
 module.exports = drawBeam;

package/src/write/draw/brace.js

@@ -1,51 +1,51 @@
 var sprintf = require('./sprintf');
-var spacing = require('../abc_spacing');
+var spacing = require('../helpers/spacing');
 var renderText = require('./text');
 
 function drawBrace(renderer, params, selectables) {
 	// The absoluteY number is the spot where the note on the first ledger line is drawn (i.e. middle C if treble clef)
 	// The STEP offset here moves it to the top and bottom lines
-	var startY = params.startVoice.staff.absoluteY - spacing.STEP*10;
+	var startY = params.startVoice.staff.absoluteY - spacing.STEP * 10;
 	if (params.endVoice && params.endVoice.staff)
-		params.endY = params.endVoice.staff.absoluteY - spacing.STEP*2;
+		params.endY = params.endVoice.staff.absoluteY - spacing.STEP * 2;
 	else if (params.lastContinuedVoice && params.lastContinuedVoice.staff)
-		params.endY = params.lastContinuedVoice.staff.absoluteY - spacing.STEP*2;
+		params.endY = params.lastContinuedVoice.staff.absoluteY - spacing.STEP * 2;
 	else
-		params.endY = params.startVoice.staff.absoluteY - spacing.STEP*2;
-	return draw(renderer, params.x,startY, params.endY, params.type, params.header, selectables);
+		params.endY = params.startVoice.staff.absoluteY - spacing.STEP * 2;
+	return draw(renderer, params.x, startY, params.endY, params.type, params.header, selectables);
 }
 
 function straightPath(renderer, xLeft, yTop, yBottom, type) {
 	xLeft += spacing.STEP;
-	var xLineWidth = spacing.STEP*0.75;
-	var yOverlap = spacing.STEP*0.75;
+	var xLineWidth = spacing.STEP * 0.75;
+	var yOverlap = spacing.STEP * 0.75;
 	var height = yBottom - yTop;
 	// Straight line
 	var pathString = sprintf("M %f %f l %f %f l %f %f l %f %f z",
-		xLeft, yTop-yOverlap, // top left line
-		0, height+yOverlap*2, // bottom left line
+		xLeft, yTop - yOverlap, // top left line
+		0, height + yOverlap * 2, // bottom left line
 		xLineWidth, 0, // bottom right line
-		0, - (height+yOverlap*2) // top right line
+		0, - (height + yOverlap * 2) // top right line
 	);
 	// Top arm
-	var wCurve = spacing.STEP*2;
+	var wCurve = spacing.STEP * 2;
 	var hCurve = spacing.STEP;
 	pathString += sprintf("M %f %f q %f %f %f %f q %f %f %f %f z",
-		xLeft+xLineWidth, yTop-yOverlap, // top left arm
-		wCurve*0.6, hCurve*0.2,
+		xLeft + xLineWidth, yTop - yOverlap, // top left arm
+		wCurve * 0.6, hCurve * 0.2,
 		wCurve, -hCurve, // right point
-		-wCurve*0.1, hCurve*0.3,
-		-wCurve, hCurve+spacing.STEP // left bottom
+		-wCurve * 0.1, hCurve * 0.3,
+		-wCurve, hCurve + spacing.STEP // left bottom
 	);
 	// Bottom arm
 	pathString += sprintf("M %f %f q %f %f %f %f q %f %f %f %f z",
-		xLeft+xLineWidth, yTop+yOverlap+height, // bottom left arm
-		wCurve*0.6, -hCurve*0.2,
+		xLeft + xLineWidth, yTop + yOverlap + height, // bottom left arm
+		wCurve * 0.6, -hCurve * 0.2,
 		wCurve, hCurve, // right point
-		-wCurve*0.1, -hCurve*0.3,
-		-wCurve, -hCurve-spacing.STEP // left bottom
+		-wCurve * 0.1, -hCurve * 0.3,
+		-wCurve, -hCurve - spacing.STEP // left bottom
 	);
-	return renderer.paper.path({path:pathString, stroke:renderer.foregroundColor, fill:renderer.foregroundColor, 'class': renderer.controller.classes.generate(type), "data-name": type});
+	return renderer.paper.path({ path: pathString, stroke: renderer.foregroundColor, fill: renderer.foregroundColor, 'class': renderer.controller.classes.generate(type), "data-name": type });
 }
 
 function curvyPath(renderer, xLeft, yTop, yBottom, type) {
@@ -54,31 +54,31 @@ function curvyPath(renderer, xLeft, yTop, yBottom, type) {
 	var pathString = curve(xLeft,
 		yTop,
 		[7.5, -8, 21, 0, 18.5, -10.5, 7.5],
-		[0, yHeight/5.5, yHeight/3.14, yHeight/2, yHeight/2.93, yHeight/4.88, 0]);
+		[0, yHeight / 5.5, yHeight / 3.14, yHeight / 2, yHeight / 2.93, yHeight / 4.88, 0]);
 
 	pathString += curve(xLeft,
 		yTop,
 		[0, 17.5, -7.5, 6.6, -5, 20, 0],
-		[yHeight/2, yHeight/1.46, yHeight/1.22, yHeight, yHeight/1.19, yHeight/1.42, yHeight/2]);
+		[yHeight / 2, yHeight / 1.46, yHeight / 1.22, yHeight, yHeight / 1.19, yHeight / 1.42, yHeight / 2]);
 
-	return renderer.paper.path({path:pathString, stroke:renderer.foregroundColor, fill:renderer.foregroundColor, 'class': renderer.controller.classes.generate(type), "data-name": type});
+	return renderer.paper.path({ path: pathString, stroke: renderer.foregroundColor, fill: renderer.foregroundColor, 'class': renderer.controller.classes.generate(type), "data-name": type });
 }
 
 function curve(xLeft, yTop, xCurve, yCurve) {
 	return sprintf("M %f %f C %f %f %f %f %f %f C %f %f %f %f %f %f z",
-		xLeft+xCurve[0], yTop+yCurve[0],
-		xLeft+xCurve[1], yTop+yCurve[1],
-		xLeft+xCurve[2], yTop+yCurve[2],
-		xLeft+xCurve[3], yTop+yCurve[3],
-		xLeft+xCurve[4], yTop+yCurve[4],
-		xLeft+xCurve[5], yTop+yCurve[5],
-		xLeft+xCurve[6], yTop+yCurve[6]);
+		xLeft + xCurve[0], yTop + yCurve[0],
+		xLeft + xCurve[1], yTop + yCurve[1],
+		xLeft + xCurve[2], yTop + yCurve[2],
+		xLeft + xCurve[3], yTop + yCurve[3],
+		xLeft + xCurve[4], yTop + yCurve[4],
+		xLeft + xCurve[5], yTop + yCurve[5],
+		xLeft + xCurve[6], yTop + yCurve[6]);
 }
 
 var draw = function (renderer, xLeft, yTop, yBottom, type, header, selectables) {//Tony
 	var ret;
 	if (header) {
-		renderer.paper.openGroup({klass: renderer.controller.classes.generate("staff-extra voice-name"), "data-name": type});
+		renderer.paper.openGroup({ klass: renderer.controller.classes.generate("staff-extra voice-name"), "data-name": type });
 		var position = yTop + (yBottom - yTop) / 2;
 		position = position - renderer.controller.getTextSize.baselineToCenter(header, "voicefont", 'staff-extra voice-name', 0, 1);
 
@@ -99,7 +99,7 @@ var draw = function (renderer, xLeft, yTop, yBottom, type, header, selectables)
 	if (header) {
 		ret = renderer.paper.closeGroup();
 	}
-	selectables.wrapSvgEl({el_type: type, startChar: -1, endChar: -1}, ret);
+	selectables.wrapSvgEl({ el_type: type, startChar: -1, endChar: -1 }, ret);
 
 	return ret;
 };

package/src/write/draw/crescendo.js

@@ -14,11 +14,11 @@ function drawCrescendo(renderer, params, selectables) {
 
 	var el;
 	if (params.dir === "<") {
-		el = drawLine(renderer, y+height/2, y, y+height/2, y+height, left, right);
+		el = drawLine(renderer, y + height / 2, y, y + height / 2, y + height, left, right);
 	} else {
-		el = drawLine(renderer, y, y+height/2, y+height, y+height/2, left, right);
+		el = drawLine(renderer, y, y + height / 2, y + height, y + height / 2, left, right);
 	}
-	selectables.wrapSvgEl({el_type: "dynamicDecoration", startChar: -1, endChar: -1}, el);
+	selectables.wrapSvgEl({ el_type: "dynamicDecoration", startChar: -1, endChar: -1 }, el);
 	return [el];
 }
 
@@ -32,7 +32,7 @@ var drawLine = function (renderer, y1, y2, y3, y4, left, right) {
 
 	var pathString = sprintf("M %f %f L %f %f M %f %f L %f %f",
 		left, y1, right, y2, left, y3, right, y4);
-	return printPath(renderer, {path:pathString, highlight: "stroke", stroke:renderer.foregroundColor, 'class': renderer.controller.classes.generate('dynamics decoration'), "data-name": "dynamics"});
+	return printPath(renderer, { path: pathString, highlight: "stroke", stroke: renderer.foregroundColor, 'class': renderer.controller.classes.generate('dynamics decoration'), "data-name": "dynamics" });
 };
 
 module.exports = drawCrescendo;

package/src/write/draw/debug-box.js

@@ -1,7 +1,7 @@
 function printDebugBox(renderer, attr, comment) {
 	var box = renderer.paper.rectBeneath(attr);
 	if (comment)
-		renderer.paper.text(comment, {x: 0, y: attr.y+7, "text-anchor": "start", "font-size":"14px", fill: "rgba(0,0,255,.4)", stroke: "rgba(0,0,255,.4)" });
+		renderer.paper.text(comment, { x: 0, y: attr.y + 7, "text-anchor": "start", "font-size": "14px", fill: "rgba(0,0,255,.4)", stroke: "rgba(0,0,255,.4)" });
 	return box;
 }
 

package/src/write/draw/draw.js

@@ -1,7 +1,7 @@
 var drawStaffGroup = require('./staff-group');
 var setPaperSize = require('./set-paper-size');
 var nonMusic = require('./non-music');
-var spacing = require('../abc_spacing');
+var spacing = require('../helpers/spacing');
 var Selectables = require('./selectables');
 
 function draw(renderer, classes, abcTune, width, maxWidth, responsive, scale, selectTypes, tuneNumber, lineOffset) {
@@ -22,8 +22,8 @@ function draw(renderer, classes, abcTune, width, maxWidth, responsive, scale, se
 			}
 			if (staffgroups.length >= 1)
 				addStaffPadding(renderer, renderer.spacing.staffSeparation, staffgroups[staffgroups.length - 1], abcLine.staffGroup);
-			var staffgroup = engraveStaffLine(renderer, abcLine.staffGroup, selectables,line);
-			staffgroup.line = lineOffset+line; // If there are non-music lines then the staffgroup array won't line up with the line array, so this keeps track.
+			var staffgroup = engraveStaffLine(renderer, abcLine.staffGroup, selectables, line);
+			staffgroup.line = lineOffset + line; // If there are non-music lines then the staffgroup array won't line up with the line array, so this keeps track.
 			staffgroups.push(staffgroup);
 			renderer.paper.closeGroup()
 		} else if (abcLine.nonMusic) {
@@ -44,21 +44,21 @@ function draw(renderer, classes, abcTune, width, maxWidth, responsive, scale, se
 	return { staffgroups: staffgroups, selectables: selectables.getElements() };
 }
 
-function engraveStaffLine(renderer, staffGroup, selectables,lineNumber) {
-	drawStaffGroup(renderer, staffGroup, selectables,lineNumber);
+function engraveStaffLine(renderer, staffGroup, selectables, lineNumber) {
+	drawStaffGroup(renderer, staffGroup, selectables, lineNumber);
 	var height = staffGroup.height * spacing.STEP;
 	renderer.y += height;
 	return staffGroup;
 }
 
 function addStaffPadding(renderer, staffSeparation, lastStaffGroup, thisStaffGroup) {
-	var lastStaff = lastStaffGroup.staffs[lastStaffGroup.staffs.length-1];
+	var lastStaff = lastStaffGroup.staffs[lastStaffGroup.staffs.length - 1];
 	var lastBottomLine = -(lastStaff.bottom - 2); // The 2 is because the scale goes to 2 below the last line.
 	var nextTopLine = thisStaffGroup.staffs[0].top - 10; // Because 10 represents the top line.
 	var naturalSeparation = nextTopLine + lastBottomLine; // This is how far apart they'd be without extra spacing
 	var separationInPixels = naturalSeparation * spacing.STEP;
 	if (separationInPixels < staffSeparation)
-		renderer.moveY(staffSeparation-separationInPixels);
+		renderer.moveY(staffSeparation - separationInPixels);
 }
 
 module.exports = draw;

package/src/write/draw/dynamics.js

@@ -9,11 +9,11 @@ function drawDynamics(renderer, params, selectables) {
 		scalex: scalex,
 		scaley: scaley,
 		klass: renderer.controller.classes.generate('decoration dynamics'),
-		fill:renderer.foregroundColor,
+		fill: renderer.foregroundColor,
 		stroke: "none",
 		name: "dynamics"
 	});
-	selectables.wrapSvgEl({el_type: "dynamicDecoration", startChar: -1, endChar: -1, decoration: params.dec}, el);
+	selectables.wrapSvgEl({ el_type: "dynamicDecoration", startChar: -1, endChar: -1, decoration: params.dec }, el);
 	return [el];
 }
 

package/src/write/draw/ending.js

@@ -11,22 +11,22 @@ function drawEnding(renderer, params, linestartx, lineendx, selectables) {
 	var pathString = '';
 
 	if (params.anchor1) {
-		linestartx = roundNumber(params.anchor1.x+params.anchor1.w);
+		linestartx = roundNumber(params.anchor1.x + params.anchor1.w);
 		pathString += sprintf("M %f %f L %f %f ",
-			linestartx, y, linestartx, roundNumber(y+height));
+			linestartx, y, linestartx, roundNumber(y + height));
 	}
 
 	if (params.anchor2) {
 		lineendx = roundNumber(params.anchor2.x);
 		pathString += sprintf("M %f %f L %f %f ",
-			lineendx, y, lineendx, roundNumber(y+height));
+			lineendx, y, lineendx, roundNumber(y + height));
 	}
 
 	pathString += sprintf("M %f %f L %f %f ",
 		linestartx, y, lineendx, y);
 
-	renderer.paper.openGroup({klass: renderer.controller.classes.generate("ending"), "data-name": "ending"});
-	printPath(renderer, {path: pathString, stroke: renderer.foregroundColor, fill: renderer.foregroundColor, "data-name": "line"});
+	renderer.paper.openGroup({ klass: renderer.controller.classes.generate("ending"), "data-name": "ending" });
+	printPath(renderer, { path: pathString, stroke: renderer.foregroundColor, fill: renderer.foregroundColor, "data-name": "line" });
 	if (params.anchor1)
 		renderText(renderer, {
 			x: roundNumber(linestartx + 5),
@@ -39,7 +39,7 @@ function drawEnding(renderer, params, linestartx, lineendx, selectables) {
 			name: params.text
 		});
 	var g = renderer.paper.closeGroup();
-	selectables.wrapSvgEl({el_type: "ending", startChar: -1, endChar: -1}, g);
+	selectables.wrapSvgEl({ el_type: "ending", startChar: -1, endChar: -1 }, g);
 	return [g];
 }
 

package/src/write/draw/glissando.js

@@ -9,18 +9,18 @@ function drawGlissando(renderer, params, selectables) {
 	var margin = 4;
 	var leftY = renderer.calcY(params.anchor1.heads[0].pitch)
 	var rightY = renderer.calcY(params.anchor2.heads[0].pitch)
-	var leftX = params.anchor1.x + params.anchor1.w/2
-	var rightX = params.anchor2.x + params.anchor2.w/2
+	var leftX = params.anchor1.x + params.anchor1.w / 2
+	var rightX = params.anchor2.x + params.anchor2.w / 2
 	var len = lineLength(leftX, leftY, rightX, rightY)
-	var marginLeft = params.anchor1.w/2 + margin
-	var marginRight = params.anchor2.w/2 + margin
+	var marginLeft = params.anchor1.w / 2 + margin
+	var marginRight = params.anchor2.w / 2 + margin
 	var s = slope(leftX, leftY, rightX, rightY)
 	var leftYAdj = getY(leftY, s, marginLeft)
 	var rightYAdj = getY(rightY, s, -marginRight)
-	var num = numSquigglies(len-marginLeft-marginRight)
+	var num = numSquigglies(len - marginLeft - marginRight)
 
-	var el = drawSquiggly(renderer, leftX+marginLeft, leftYAdj, num, s)
-	selectables.wrapSvgEl({el_type: "glissando", startChar: -1, endChar: -1}, el);
+	var el = drawSquiggly(renderer, leftX + marginLeft, leftYAdj, num, s)
+	selectables.wrapSvgEl({ el_type: "glissando", startChar: -1, endChar: -1 }, el);
 	return [el];
 }
 
@@ -28,20 +28,20 @@ function lineLength(leftX, leftY, rightX, rightY) {
 	// The length from notehead center to notehead center.
 	var w = rightX - leftX
 	var h = rightY - leftY
-	return Math.sqrt(w*w + h*h)
+	return Math.sqrt(w * w + h * h)
 }
 
 function slope(leftX, leftY, rightX, rightY) {
-	return (rightY-leftY) / (rightX - leftX)
+	return (rightY - leftY) / (rightX - leftX)
 }
 
 function getY(y, slope, xOfs) {
-	return roundNumber(y + (xOfs)*slope);
+	return roundNumber(y + (xOfs) * slope);
 }
 
 function numSquigglies(length) {
 	var endLen = 5; // The width of the end - that is, the non repeating part
-	return Math.max(2, Math.floor((length - endLen*2) / 6));
+	return Math.max(2, Math.floor((length - endLen * 2) / 6));
 }
 
 var leftStart = [[3.5, -4.8]]
@@ -58,18 +58,18 @@ function segment(arr, slope) {
 	return ret
 }
 
-var drawSquiggly = function(renderer, x, y, num, slope) {
+var drawSquiggly = function (renderer, x, y, num, slope) {
 	var p = sprintf("M %f %f", x, y);
 	p += segment(leftStart, slope)
 	var i
 	for (i = 0; i < num; i++) {
-		p+=segment(top, slope)
+		p += segment(top, slope)
 	}
 	p += segment(right, slope)
-	for ( i = 0; i < num; i++)
-		p+=segment(bottom, slope)
-	p+=segment(leftEnd, slope) + 'z'
-	return printPath(renderer, {path:p, highlight: "stroke", stroke:renderer.foregroundColor, 'class': renderer.controller.classes.generate('decoration'), "data-name": "glissando"});
+	for (i = 0; i < num; i++)
+		p += segment(bottom, slope)
+	p += segment(leftEnd, slope) + 'z'
+	return printPath(renderer, { path: p, highlight: "stroke", stroke: renderer.foregroundColor, 'class': renderer.controller.classes.generate('decoration'), "data-name": "glissando" });
 }
 
 module.exports = drawGlissando;

package/src/write/draw/group-elements.js

@@ -4,63 +4,63 @@
 
 var roundNumber = require("./round-number");
 
-	function Group() {
-		this.ingroup = false;
-	}
+function Group() {
+	this.ingroup = false;
+}
 
-	Group.prototype.beginGroup = function (paper, controller) {
-		this.paper = paper;
-		this.controller = controller;
-		this.path = [];
-		this.lastM = [0, 0];
-		this.ingroup = true;
-		this.paper.openGroup();
-	};
+Group.prototype.beginGroup = function (paper, controller) {
+	this.paper = paper;
+	this.controller = controller;
+	this.path = [];
+	this.lastM = [0, 0];
+	this.ingroup = true;
+	this.paper.openGroup();
+};
 
-	Group.prototype.isInGroup = function() {
-		return this.ingroup;
-	}
+Group.prototype.isInGroup = function () {
+	return this.ingroup;
+}
 
-	Group.prototype.addPath = function (path) {
-		path = path || [];
-		if (path.length === 0) return;
-		path[0][0] = "m";
-		path[0][1] = roundNumber(path[0][1] - this.lastM[0]);
-		path[0][2] = roundNumber(path[0][2] - this.lastM[1]);
-		this.lastM[0] += path[0][1];
-		this.lastM[1] += path[0][2];
-		this.path.push(path[0]);
-		for (var i = 1, ii = path.length; i < ii; i++) {
-			if (path[i][0] === "m") {
-				this.lastM[0] += path[i][1];
-				this.lastM[1] += path[i][2];
-			}
-			this.path.push(path[i]);
+Group.prototype.addPath = function (path) {
+	path = path || [];
+	if (path.length === 0) return;
+	path[0][0] = "m";
+	path[0][1] = roundNumber(path[0][1] - this.lastM[0]);
+	path[0][2] = roundNumber(path[0][2] - this.lastM[1]);
+	this.lastM[0] += path[0][1];
+	this.lastM[1] += path[0][2];
+	this.path.push(path[0]);
+	for (var i = 1, ii = path.length; i < ii; i++) {
+		if (path[i][0] === "m") {
+			this.lastM[0] += path[i][1];
+			this.lastM[1] += path[i][2];
 		}
-	};
+		this.path.push(path[i]);
+	}
+};
 
-	/**
-	 * End a group of glyphs that will always be moved, scaled and highlighted together
-	 */
-	Group.prototype.endGroup = function (klass, name) {
-		this.ingroup = false;
-		//if (this.path.length === 0) return null;
-		var path = "";
-		for (var i = 0; i < this.path.length; i++)
-			path += this.path[i].join(" ");
-		this.path = [];
+/**
+ * End a group of glyphs that will always be moved, scaled and highlighted together
+ */
+Group.prototype.endGroup = function (klass, name) {
+	this.ingroup = false;
+	//if (this.path.length === 0) return null;
+	var path = "";
+	for (var i = 0; i < this.path.length; i++)
+		path += this.path[i].join(" ");
+	this.path = [];
 
-		var ret = this.paper.closeGroup();
-		if (ret) {
-			ret.setAttribute("class", this.controller.classes.generate(klass))
-			ret.setAttribute("fill", this.controller.renderer.foregroundColor)
-			ret.setAttribute("stroke", "none")
-			ret.setAttribute("data-name", name)
-		}
-		return ret;
-	};
+	var ret = this.paper.closeGroup();
+	if (ret) {
+		ret.setAttribute("class", this.controller.classes.generate(klass))
+		ret.setAttribute("fill", this.controller.renderer.foregroundColor)
+		ret.setAttribute("stroke", "none")
+		ret.setAttribute("data-name", name)
+	}
+	return ret;
+};
 
-	// There is just a singleton of this object.
-	var elementGroup = new Group();
+// There is just a singleton of this object.
+var elementGroup = new Group();
 
 module.exports = elementGroup;

package/src/write/draw/horizontal-line.js

@@ -7,19 +7,19 @@ function printHorizontalLine(renderer, width, vertical, comment) {
 	var y = renderer.y;
 	if (vertical) y = vertical;
 	y = Math.round(y);
-	renderer.paper.text(""+Math.round(y), {x: 10, y: y, "text-anchor": "start", "font-size":"18px", fill: fill, stroke: fill });
+	renderer.paper.text("" + Math.round(y), { x: 10, y: y, "text-anchor": "start", "font-size": "18px", fill: fill, stroke: fill });
 	var x1 = 50;
 	var x2 = width;
-	var pathString = sprintf("M %f %f L %f %f L %f %f L %f %f z", x1, y-dy, x1+x2, y-dy,
-		x2, y+dy, x1, y+dy);
-	renderer.paper.pathToBack({path:pathString, stroke:"none", fill:fill, 'class': renderer.controller.classes.generate('staff')});
-	for (var i = 1; i < width/100; i++) {
-		pathString = sprintf("M %f %f L %f %f L %f %f L %f %f z", i*100-dy, y-5, i*100-dy, y+5,
-			i*100+dy, y-5, i*100+dy, y+5);
-		renderer.paper.pathToBack({path:pathString, stroke:"none", fill:fill, 'class': renderer.controller.classes.generate('staff')});
+	var pathString = sprintf("M %f %f L %f %f L %f %f L %f %f z", x1, y - dy, x1 + x2, y - dy,
+		x2, y + dy, x1, y + dy);
+	renderer.paper.pathToBack({ path: pathString, stroke: "none", fill: fill, 'class': renderer.controller.classes.generate('staff') });
+	for (var i = 1; i < width / 100; i++) {
+		pathString = sprintf("M %f %f L %f %f L %f %f L %f %f z", i * 100 - dy, y - 5, i * 100 - dy, y + 5,
+			i * 100 + dy, y - 5, i * 100 + dy, y + 5);
+		renderer.paper.pathToBack({ path: pathString, stroke: "none", fill: fill, 'class': renderer.controller.classes.generate('staff') });
 	}
 	if (comment)
-		renderer.paper.text(comment, {x: width+70, y: y, "text-anchor": "start", "font-size":"18px", fill: fill, stroke: fill });
+		renderer.paper.text(comment, { x: width + 70, y: y, "text-anchor": "start", "font-size": "18px", fill: fill, stroke: fill });
 }
 
 module.exports = printHorizontalLine;

package/src/write/draw/non-music.js

@@ -31,7 +31,7 @@ function nonMusic(renderer, obj, selectables) {
 		} else if (row.separator) {
 			drawSeparator(renderer, row.separator)
 		} else if (row.startGroup) {
-			renderer.paper.openGroup({klass: row.klass, "data-name": row.name});
+			renderer.paper.openGroup({ klass: row.klass, "data-name": row.name });
 		} else if (row.endGroup) {
 			// TODO-PER: also create a history element with the title "row.endGroup"
 			var g = renderer.paper.closeGroup();

package/src/write/draw/print-line.js

@@ -1,23 +1,22 @@
 var sprintf = require('./sprintf');
 var roundNumber = require("./round-number");
 
-function printLine(renderer, x1, x2, y , klass, name ,dy ) {
-  if (!dy ) dy = 0.35;
-  var fill = renderer.foregroundColor;
-  x1 = roundNumber(x1);
-  x2 = roundNumber(x2);
-  var y1 = roundNumber(y - dy);
-  var y2 = roundNumber(y + dy);
-  var pathString = sprintf("M %f %f L %f %f L %f %f L %f %f z", x1, y1, x2, y1,
-    x2, y2, x1, y2);
-  var options = { path: pathString, stroke: "none", fill: fill };
-  if (name)
-    options['data-name'] = name;
-  if (klass)
-    options['class'] = klass;
-  var ret = renderer.paper.pathToBack(options);
+function printLine(renderer, x1, x2, y, klass, name, dy) {
+	var fill = renderer.foregroundColor;
+	x1 = roundNumber(x1);
+	x2 = roundNumber(x2);
+	var y1 = roundNumber(y - dy);
+	var y2 = roundNumber(y + dy);
+	var pathString = sprintf("M %f %f L %f %f L %f %f L %f %f z", x1, y1, x2, y1,
+		x2, y2, x1, y2);
+	var options = { path: pathString, stroke: "none", fill: fill };
+	if (name)
+		options['data-name'] = name;
+	if (klass)
+		options['class'] = klass;
+	var ret = renderer.paper.pathToBack(options);
 
-  return ret;
+	return ret;
 }
 
 module.exports = printLine;

package/src/write/draw/print-stem.js

@@ -2,7 +2,7 @@ var elementGroup = require('./group-elements');
 var roundNumber = require("./round-number");
 
 function printStem(renderer, x, dx, y1, y2, klass, name) {
-	if (dx<0 || y1<y2) { // correct path "handedness" for intersection with other elements
+	if (dx < 0 || y1 < y2) { // correct path "handedness" for intersection with other elements
 		var tmp = roundNumber(y2);
 		y2 = roundNumber(y1);
 		y1 = tmp;
@@ -11,9 +11,9 @@ function printStem(renderer, x, dx, y1, y2, klass, name) {
 		y2 = roundNumber(y2);
 	}
 	x = roundNumber(x);
-	var x2 = roundNumber(x+dx);
-	var pathArray = [["M",x,y1],["L", x, y2],["L", x2, y2],["L",x2,y1],["z"]];
-	var attr = { path: ""};
+	var x2 = roundNumber(x + dx);
+	var pathArray = [["M", x, y1], ["L", x, y2], ["L", x2, y2], ["L", x2, y1], ["z"]];
+	var attr = { path: "" };
 	for (var i = 0; i < pathArray.length; i++)
 		attr.path += pathArray[i].join(" ");
 	if (klass)
@@ -21,7 +21,7 @@ function printStem(renderer, x, dx, y1, y2, klass, name) {
 	if (name)
 		attr['data-name'] = name;
 	if (!elementGroup.isInGroup()) {
-		attr.stroke ="none";
+		attr.stroke = "none";
 		attr.fill = renderer.foregroundColor;
 	}
 	return renderer.paper.pathToBack(attr);