abcjs 6.0.0-beta.7 → 6.0.0

package/src/write/abc_spacing.js

@@ -1,18 +1,3 @@
-//    Copyright (C) 2014-2020 Gregory Dyke (gregdyke at gmail dot com)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 var spacing = {};
 
 spacing.FONTEM = 360;

package/src/write/abc_staff_group_element.js

@@ -1,22 +1,4 @@
 //    abc_staff_group_element.js: Definition of the StaffGroupElement class.
-//    Copyright (C) 2010-2020 Gregory Dyke (gregdyke at gmail dot com) and Paul Rosen
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-/*globals console */
-
-var spacing = require('./abc_spacing');
 
 // StaffGroupElement contains all the elements that go together to make one line of music.
 // That might be multiple staves that are tied together, and it might be multiple voices on one staff.
@@ -44,8 +26,10 @@ var spacing = require('./abc_spacing');
 // TODO-PER: Where is that used? It looks like it might not be needed.
 // height: Set in the draw() method to the height actually used. Used by the calling function to know where to start the next staff group.
 // TODO-PER: This should actually be set in the layout method and passed back as a return value.
+var calcHeight = require('./calcHeight');
 
-var StaffGroupElement = function() {
+var StaffGroupElement = function(getTextSize) {
+	this.getTextSize = getTextSize;
 	this.voices = [];
 	this.staffs = [];
 	this.brace = undefined; //tony
@@ -91,6 +75,17 @@ StaffGroupElement.prototype.addVoice = function (voice, staffnumber, stafflines)
 	voice.staff = this.staffs[staffnumber];
 };
 
+StaffGroupElement.prototype.setHeight = function () {
+	this.height = calcHeight(this);
+};
+
+StaffGroupElement.prototype.setWidth = function (width) {
+	this.w = width;
+	for (var i=0;i<this.voices.length;i++) {
+		this.voices[i].setWidth(width);
+	}
+};
+
 StaffGroupElement.prototype.setStaffLimits = function (voice) {
 	voice.staff.top = Math.max(voice.staff.top, voice.top);
 	voice.staff.bottom = Math.min(voice.staff.bottom, voice.bottom);
@@ -107,334 +102,4 @@ StaffGroupElement.prototype.setStaffLimits = function (voice) {
 	this.setLimit('dynamicHeightBelow', voice);
 };
 
-StaffGroupElement.prototype.setUpperAndLowerElements = function(renderer) {
-	// Each staff already has the top and bottom set, now we see if there are elements that are always on top and bottom, and resolve their pitch.
-	// Also, get the overall height of all the staves in this group.
-	var lastStaffBottom;
-	for (var i = 0; i < this.staffs.length; i++) {
-		var staff = this.staffs[i];
-		// the vertical order of elements that are above is: tempo, part, volume/dynamic, ending/chord, lyric
-		// the vertical order of elements that are below is: lyric, chord, volume/dynamic
-		var positionY = {
-			tempoHeightAbove: 0,
-			partHeightAbove: 0,
-			volumeHeightAbove: 0,
-			dynamicHeightAbove: 0,
-			endingHeightAbove: 0,
-			chordHeightAbove: 0,
-			lyricHeightAbove: 0,
-
-			lyricHeightBelow: 0,
-			chordHeightBelow: 0,
-			volumeHeightBelow: 0,
-			dynamicHeightBelow: 0
-		};
-
-		if (/*ABCJS.write.debugPlacement*/false) {
-			staff.originalTop = staff.top; // This is just being stored for debugging purposes.
-			staff.originalBottom = staff.bottom; // This is just being stored for debugging purposes.
-		}
-
-		if (staff.specialY.lyricHeightAbove) { staff.top += staff.specialY.lyricHeightAbove; positionY.lyricHeightAbove = staff.top; }
-		if (staff.specialY.chordHeightAbove) { staff.top += staff.specialY.chordHeightAbove; positionY.chordHeightAbove = staff.top; }
-		if (staff.specialY.endingHeightAbove) {
-			if (staff.specialY.chordHeightAbove)
-				staff.top += 2;
-			else
-				staff.top += staff.specialY.endingHeightAbove;
-			positionY.endingHeightAbove = staff.top;
-		}
-		if (staff.specialY.dynamicHeightAbove && staff.specialY.volumeHeightAbove) {
-			staff.top += Math.max(staff.specialY.dynamicHeightAbove, staff.specialY.volumeHeightAbove);
-			positionY.dynamicHeightAbove = staff.top;
-			positionY.volumeHeightAbove = staff.top;
-		} else if (staff.specialY.dynamicHeightAbove) {
-			staff.top += staff.specialY.dynamicHeightAbove; positionY.dynamicHeightAbove = staff.top;
-		} else if (staff.specialY.volumeHeightAbove) { staff.top += staff.specialY.volumeHeightAbove; positionY.volumeHeightAbove = staff.top; }
-		if (staff.specialY.partHeightAbove) { staff.top += staff.specialY.partHeightAbove; positionY.partHeightAbove = staff.top; }
-		if (staff.specialY.tempoHeightAbove) { staff.top += staff.specialY.tempoHeightAbove; positionY.tempoHeightAbove = staff.top; }
-
-		if (staff.specialY.lyricHeightBelow) { positionY.lyricHeightBelow = staff.bottom; staff.bottom -= staff.specialY.lyricHeightBelow; }
-		if (staff.specialY.chordHeightBelow) { positionY.chordHeightBelow = staff.bottom; staff.bottom -= staff.specialY.chordHeightBelow; }
-		if (staff.specialY.volumeHeightBelow && staff.specialY.dynamicHeightBelow) {
-			positionY.volumeHeightBelow = staff.bottom;
-			positionY.dynamicHeightBelow = staff.bottom;
-			staff.bottom -= Math.max(staff.specialY.volumeHeightBelow, staff.specialY.dynamicHeightBelow);
-		} else if (staff.specialY.volumeHeightBelow) {
-			positionY.volumeHeightBelow = staff.bottom; staff.bottom -= staff.specialY.volumeHeightBelow;
-		} else if (staff.specialY.dynamicHeightBelow) {
-			positionY.dynamicHeightBelow = staff.bottom; staff.bottom -= staff.specialY.dynamicHeightBelow;
-		}
-
-		if (/*ABCJS.write.debugPlacement*/false)
-			staff.positionY = positionY; // This is just being stored for debugging purposes.
-
-		for (var j = 0; j < staff.voices.length; j++) {
-			var voice = this.voices[staff.voices[j]];
-			voice.setUpperAndLowerElements(positionY);
-		}
-		// We might need a little space in between staves if the staves haven't been pushed far enough apart by notes or extra vertical stuff.
-		// Only try to put in extra space if this isn't the top staff.
-		if (lastStaffBottom !== undefined) {
-			var thisStaffTop = staff.top - 10;
-			var forcedSpacingBetween = lastStaffBottom + thisStaffTop;
-			var minSpacingInPitches = renderer.spacing.systemStaffSeparation/spacing.STEP;
-			var addedSpace = minSpacingInPitches - forcedSpacingBetween;
-			if (addedSpace > 0)
-				staff.top += addedSpace;
-		}
-		lastStaffBottom = 2 - staff.bottom; // the staff starts at position 2 and the bottom variable is negative. Therefore to find out how large the bottom is, we reverse the sign of the bottom, and add the 2 in.
-
-		// Now we need a little margin on the top, so we'll just throw that in.
-		//staff.top += 4;
-		//console.log("Staff Y: ",i,heightInPitches,staff.top,staff.bottom);
-	}
-	//console.log("Staff Height: ",heightInPitches,this.height);
-};
-
-StaffGroupElement.prototype.finished = function() {
-	for (var i=0;i<this.voices.length;i++) {
-		if (!this.voices[i].layoutEnded()) return false;
-	}
-	return true;
-};
-
-function getLeftEdgeOfStaff(renderer, voices, brace, bracket) {
-	var x = renderer.padding.left;
-
-	// find out how much space will be taken up by voice headers
-	var voiceheaderw = 0;
-	for (var i=0;i<voices.length;i++) {
-		if(voices[i].header) {
-			var size = renderer.getTextSize(voices[i].header, 'voicefont', '');
-			voiceheaderw = Math.max(voiceheaderw,size.width);
-		}
-	}
-	if (voiceheaderw) {
-		// Give enough spacing to the right - we use the width of an A for the amount of spacing.
-		var sizeW = renderer.getTextSize("A", 'voicefont', '');
-		voiceheaderw += sizeW.width;
-	}
-	x += voiceheaderw;
-
-	var ofs = 0;
-	if (brace) {
-		brace.setLocation(x);
-		ofs = brace.getWidth();
-	}
-	if (bracket) {
-		bracket.setLocation(x);
-		ofs = Math.max(ofs, bracket.getWidth());
-	}
-	return x + ofs;
-}
-
-StaffGroupElement.prototype.layout = function(spacing, renderer, debug) {
-	var epsilon = 0.0000001; // Fudging for inexactness of floating point math.
-	var spacingunits = 0; // number of times we will have ended up using the spacing distance (as opposed to fixed width distances)
-	var minspace = 1000; // a big number to start off with - used to find out what the smallest space between two notes is -- GD 2014.1.7
-
-	var x = getLeftEdgeOfStaff(renderer, this.voices, this.brace, this.bracket);
-	this.startx=x;
-	var i;
-
-	var currentduration = 0;
-	if (debug) console.log("init layout", spacing);
-	for (i=0;i<this.voices.length;i++) {
-		this.voices[i].beginLayout(x);
-	}
-
-	var spacingunit = 0; // number of spacingunits coming from the previously laid out element to this one
-	while (!this.finished()) {
-		// find first duration level to be laid out among candidates across voices
-		currentduration= null; // candidate smallest duration level
-		for (i=0;i<this.voices.length;i++) {
-			if (!this.voices[i].layoutEnded() && (!currentduration || this.voices[i].getDurationIndex()<currentduration))
-				currentduration=this.voices[i].getDurationIndex();
-		}
-
-
-		// isolate voices at current duration level
-		var currentvoices = [];
-		var othervoices = [];
-		for (i=0;i<this.voices.length;i++) {
-			var durationIndex = this.voices[i].getDurationIndex();
-			// PER: Because of the inexactness of JS floating point math, we just get close.
-			if (durationIndex - currentduration > epsilon) {
-				othervoices.push(this.voices[i]);
-				//console.log("out: voice ",i);
-			} else {
-				currentvoices.push(this.voices[i]);
-				//if (debug) console.log("in: voice ",i);
-			}
-		}
-
-		// among the current duration level find the one which needs starting furthest right
-		spacingunit = 0; // number of spacingunits coming from the previously laid out element to this one
-		var spacingduration = 0;
-		for (i=0;i<currentvoices.length;i++) {
-			//console.log("greatest spacing unit", x, currentvoices[i].getNextX(), currentvoices[i].getSpacingUnits(), currentvoices[i].spacingduration);
-			if (currentvoices[i].getNextX()>x) {
-				x=currentvoices[i].getNextX();
-				spacingunit=currentvoices[i].getSpacingUnits();
-				spacingduration = currentvoices[i].spacingduration;
-			}
-		}
-		spacingunits+=spacingunit;
-		minspace = Math.min(minspace,spacingunit);
-		if (debug) console.log("currentduration: ",currentduration, spacingunits, minspace);
-
-		for (i=0;i<currentvoices.length;i++) {
-			var voicechildx = currentvoices[i].layoutOneItem(x,spacing);
-			var dx = voicechildx-x;
-			if (dx>0) {
-				x = voicechildx; //update x
-				for (var j=0;j<i;j++) { // shift over all previously laid out elements
-					currentvoices[j].shiftRight(dx);
-				}
-			}
-		}
-
-		// remove the value of already counted spacing units in other voices (e.g. if a voice had planned to use up 5 spacing units but is not in line to be laid out at this duration level - where we've used 2 spacing units - then we must use up 3 spacing units, not 5)
-		for (i=0;i<othervoices.length;i++) {
-			othervoices[i].spacingduration-=spacingduration;
-			othervoices[i].updateNextX(x,spacing); // adjust other voices expectations
-		}
-
-		// update indexes of currently laid out elems
-		for (i=0;i<currentvoices.length;i++) {
-			var voice = currentvoices[i];
-			voice.updateIndices();
-		}
-	} // finished laying out
-
-
-	// find the greatest remaining x as a base for the width
-	for (i=0;i<this.voices.length;i++) {
-		if (this.voices[i].getNextX()>x) {
-			x=this.voices[i].getNextX();
-			spacingunit=this.voices[i].getSpacingUnits();
-		}
-	}
-	//console.log("greatest remaining",spacingunit,x);
-	spacingunits+=spacingunit;
-	this.w = x;
-
-	for (i=0;i<this.voices.length;i++) {
-		this.voices[i].w=this.w;
-	}
-	return { spacingUnits: spacingunits, minSpace: minspace };
-};
-
-StaffGroupElement.prototype.calcHeight = function () {
-	// the height is calculated here in a parallel way to the drawing below in hopes that both of these functions will be modified together.
-	// TODO-PER: also add the space between staves. (That's systemStaffSeparation, which is the minimum distance between the staff LINES.)
-	var height = 0;
-	for (var i=0;i<this.voices.length;i++) {
-		var staff = this.voices[i].staff;
-		if (!this.voices[i].duplicate) {
-			height += staff.top;
-			if (staff.bottom < 0)
-				height += -staff.bottom;
-		}
-	}
-	return height;
-};
-
-StaffGroupElement.prototype.draw = function (renderer) {
-	// We enter this method with renderer.y pointing to the topmost coordinate that we're allowed to draw.
-	// All of the children that will be drawn have a relative "pitch" set, where zero is the first ledger line below the staff.
-	// renderer.y will be offset at the beginning of each staff by the amount required to make the relative pitch work.
-	// If there are multiple staves, then renderer.y will be incremented for each new staff.
-
-	var debugPrint;
-	var colorIndex;
-	if (/*ABCJS.write.debugPlacement*/false) {
-		var colors = [ "rgb(207,27,36)", "rgb(168,214,80)", "rgb(110,161,224)", "rgb(191,119,218)", "rgb(195,30,151)",
-			"rgb(31,170,177)", "rgb(220,166,142)" ];
-		debugPrint = function(staff, key) {
-			if (staff.positionY[key]) {
-				//renderer.printHorizontalLine(50, renderer.calcY(staff.positionY[key]), key.substr(0, 4) + " " + Math.round(staff.positionY[key]));
-				var height = staff.specialY[key] * spacing.STEP;
-				renderer.printShadedBox(renderer.padding.left, renderer.calcY(staff.positionY[key]), renderer.controller.width, height,colors[colorIndex], 0.4, key.substr(0, 4));
-				colorIndex += 1; if (colorIndex > 6) colorIndex = 0;
-			}
-		};
-	}
-
-	// An invisible marker is useful to be able to find where each system starts.
-	renderer.addInvisibleMarker("abcjs-top-of-system");
-
-	var startY = renderer.y; // So that it can be restored after we're done.
-	// Set the absolute Y position for each staff here, so the voice drawing below can just use if.
-	for (var j = 0; j < this.staffs.length; j++) {
-		var staff1 = this.staffs[j];
-		//renderer.printHorizontalLine(50, renderer.y, "start");
-		renderer.moveY(spacing.STEP, staff1.top);
-		staff1.absoluteY = renderer.y;
-		if (/*ABCJS.write.debugPlacement*/false) {
-			colorIndex = 0;
-			renderer.printShadedBox(renderer.padding.left, renderer.calcY(staff1.originalTop), renderer.controller.width, renderer.calcY(staff1.originalBottom)-renderer.calcY(staff1.originalTop), "#000000", 0.1);
-			debugPrint(staff1, 'chordHeightAbove');
-			debugPrint(staff1, 'chordHeightBelow');
-			debugPrint(staff1, 'dynamicHeightAbove');
-			debugPrint(staff1, 'dynamicHeightBelow');
-			debugPrint(staff1, 'endingHeightAbove');
-			debugPrint(staff1, 'lyricHeightAbove');
-			debugPrint(staff1, 'lyricHeightBelow');
-			debugPrint(staff1, 'partHeightAbove');
-			debugPrint(staff1, 'tempoHeightAbove');
-			debugPrint(staff1, 'volumeHeightAbove');
-			debugPrint(staff1, 'volumeHeightBelow');
-		}
-		if (staff1.bottom < 0)
-			renderer.moveY(spacing.STEP, -staff1.bottom);
-	}
-	var topLine; // these are to connect multiple staves. We need to remember where they are.
-	var bottomLine;
-
-	var bartop = 0;
-	renderer.measureNumber = null;
-	renderer.noteNumber = null;
-	for (var i=0;i<this.voices.length;i++) {
-		var staff = this.voices[i].staff;
-		renderer.y = staff.absoluteY;
-		renderer.voiceNumber = i;
-		//renderer.y = staff.y;
-		// offset for starting the counting at middle C
-		if (!this.voices[i].duplicate) {
-//			renderer.moveY(spacing.STEP, staff.top);
-			if (!topLine) topLine  = renderer.calcY(10);
-			bottomLine  = renderer.calcY(2);
-			if (staff.lines !== 0) {
-				renderer.measureNumber = null;
-				renderer.noteNumber = null;
-				renderer.printStave(this.startx, this.w, staff.lines);
-			}
-			if (this.brace && this.brace.isStartVoice(i)) {//Tony
-				this.brace.draw(renderer, topLine, bottomLine); //tony
-			}
-			if (this.bracket && this.bracket.isStartVoice(i)) {
-				this.bracket.draw(renderer, topLine, bottomLine);
-			}
-		}
-		this.voices[i].draw(renderer, bartop);
-		renderer.measureNumber = null;
-		renderer.noteNumber = null;
-		if (!this.voices[i].duplicate) {
-			bartop = renderer.calcY(2); // This connects the bar lines between two different staves.
-//			if (staff.bottom < 0)
-//				renderer.moveY(spacing.STEP, -staff.bottom);
-		}
-	}
-	renderer.measureNumber = null;
-	renderer.noteNumber = null;
-
-	// connect all the staves together with a vertical line
-	if (this.staffs.length>1) {
-		renderer.printStem(this.startx, 0.6, topLine, bottomLine);
-	}
-	renderer.y = startY;
-};
-
 module.exports = StaffGroupElement;

package/src/write/abc_tempo_element.js

@@ -1,57 +1,22 @@
 //    abc_tempo_element.js: Definition of the TempoElement class.
-//    Copyright (C) 2014-2020 Gregory Dyke (gregdyke at gmail dot com) and Paul Rosen
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var AbsoluteElement = require('./abc_absolute_element');
 var RelativeElement = require('./abc_relative_element');
 
-var TempoElement;
-(function() {
-	"use strict";
-	var totalHeightInPitches = 5;
-
-	TempoElement = function TempoElement(tempo, tuneNumber, createNoteHead) {
+var TempoElement = function TempoElement(tempo, tuneNumber, createNoteHead) {
+		this.type = "TempoElement";
 		this.tempo = tempo;
 		this.tempo.type = "tempo"; /// TODO-PER: this should be set earlier, in the parser, probably.
 		this.tuneNumber = tuneNumber;
-		this.tempoHeightAbove = totalHeightInPitches;
+		// TODO: can these two properties be merged?
+		this.totalHeightInPitches = 6;
+		this.tempoHeightAbove = this.totalHeightInPitches;
 		this.pitch = undefined; // This will be set later
 		if (this.tempo.duration && !this.tempo.suppressBpm) {
 			this.note = this.createNote(createNoteHead, tempo, tuneNumber);
 		}
 	};
 
-	TempoElement.prototype.setUpperAndLowerElements = function(positionY) { // TODO-PER: This might not be called.
-		this.pitch = positionY.tempoHeightAbove;
-		this.top = positionY.tempoHeightAbove;
-		this.bottom = positionY.tempoHeightAbove;
-		if (this.note) {
-			var tempoPitch = this.pitch - totalHeightInPitches + 1; // The pitch we receive is the top of the allotted area: change that to practically the bottom.
-			this.note.top = tempoPitch;
-			this.note.bottom = tempoPitch;
-			for (var i = 0; i < this.note.children.length; i++) {
-				var child = this.note.children[i];
-				child.top += tempoPitch;
-				child.bottom += tempoPitch;
-				child.pitch += tempoPitch;
-				if (child.pitch2 !== undefined)
-					child.pitch2 += tempoPitch;
-			}
-		}
-	};
-
 	TempoElement.prototype.setX = function (x) {
 		this.x = x;
 	};
@@ -79,93 +44,20 @@ var TempoElement;
 		else if (duration <= 2) { note = "noteheads.dbl"; dot = 0; }
 		else { note = "noteheads.dbl"; dot = 1; }
 
-		var ret = createNoteHead(absElem,
-			note,
-			{ verticalPos: 0}, // This is just temporary: we'll offset the vertical positioning when we get the actual vertical spot.
-			"up",
-			0,
-			0,
-			flag,
-			dot,
-			0,
-			temposcale,
-			[],
-			false
-		);
+		var ret = createNoteHead(absElem, note, { verticalPos: 0}, // This is just temporary: we'll offset the vertical positioning when we get the actual vertical spot.
+			{ dir: "up", flag: flag, dot: dot, scale: temposcale});
 		var tempoNote = ret.notehead;
 		absElem.addHead(tempoNote);
 		var stem;
 		if (note !== "noteheads.whole" && note !== "noteheads.dbl") {
 			var p1 = 1 / 3 * temposcale;
-			var p2 = 7 * temposcale;
+			var p2 = 5 * temposcale;
 			var dx = tempoNote.dx + tempoNote.w;
 			var width = -0.6;
 			stem = new RelativeElement(null, dx, 0, p1, {"type": "stem", "pitch2": p2, linewidth: width});
-			absElem.addExtra(stem);
+			absElem.addRight(stem);
 		}
 		return absElem;
 	};
 
-	TempoElement.prototype.draw = function(renderer) {
-		var x = this.x;
-		if (this.pitch === undefined)
-			window.console.error("Tempo Element y-coordinate not set.");
-
-		var self = this;
-		var tempoGroup;
-		renderer.wrapInAbsElem(this.tempo, "abcjs-tempo", function () {
-			renderer.createElemSet({klass: renderer.addClasses("tempo")});
-			var y = renderer.calcY(self.pitch);
-			var text;
-			if (self.tempo.preString) {
-				text = renderer.renderText({x:x, y: y, text: self.tempo.preString, type: 'tempofont', klass: 'abcjs-tempo', anchor: "start", noClass: true});
-				var size = renderer.getTextSize(self.tempo.preString, 'tempofont', 'tempo', text);
-				var preWidth = size.width;
-				var charWidth = preWidth / self.tempo.preString.length; // Just get some average number to increase the spacing.
-				x += preWidth + charWidth;
-			}
-			if (self.note) {
-				self.note.setX(x);
-				for (var i = 0; i < self.note.children.length; i++)
-					self.note.children[i].draw(renderer, x);
-				x += (self.note.w + 5);
-				var str = "= " + self.tempo.bpm;
-				text = renderer.renderText({x:x, y: y, text: str, type: 'tempofont', klass: 'abcjs-tempo', anchor: "start", noClass: true});
-				size = renderer.getTextSize(str, 'tempofont', 'tempo', text);
-				var postWidth = size.width;
-				var charWidth2 = postWidth / str.length; // Just get some average number to increase the spacing.
-				x += postWidth + charWidth2;
-			}
-			if (self.tempo.postString) {
-				renderer.renderText({x:x, y: y, text: self.tempo.postString, type: 'tempofont', klass: 'abcjs-tempo', anchor: "start", noClass: true});
-			}
-			tempoGroup = renderer.closeElemSet();
-		});
-		return tempoGroup;
-	};
-
-	TempoElement.prototype.adjustElements = function(renderer) {
-		// TODO-PER: This straightens out the tempo elements because they are written in the wrong order.
-		for (var i = renderer.controller.history.length - 1; i >= 0; i--) {
-			if (renderer.controller.history[i].absEl.abcelem.type !== "tempo")
-				break;
-		}
-		var group;
-		for (var ii = i+1; ii < renderer.controller.history.length; ii++) {
-			var hist = renderer.controller.history[ii];
-			var inGroup = hist.svgEl.parentNode.tagName.toLowerCase() === 'g';
-			if (inGroup)
-				group = hist.svgEl.parentNode;
-			else if (group) {
-				group.appendChild(hist.svgEl);
-			}
-			hist.svgEl.setAttribute("class", '');
-		}
-		var len = renderer.controller.history.length-i-1;
-		if (group && len > 1) {
-			renderer.controller.combineHistory(len, group);
-		}
-	};
-})();
-
 module.exports = TempoElement;

package/src/write/abc_tie_element.js

@@ -1,20 +1,7 @@
 //    abc_tie_element.js: Definition of the TieElement class.
-//    Copyright (C) 2010-2020 Gregory Dyke (gregdyke at gmail dot com) and Paul Rosen
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var TieElem = function TieElem(options) {
+	this.type = "TieElem";
 //	console.log("constructor", options.anchor1 ? options.anchor1.pitch : "N/A", options.anchor2 ? options.anchor2.pitch : "N/A", options.isTie, options.isGrace);
 	this.anchor1 = options.anchor1; // must have a .x and a .pitch, and a .parent property or be null (means starts at the "beginning" of the line - after keysig)
 	this.anchor2 = options.anchor2; // must have a .x and a .pitch property or be null (means ends at the end of the line)
@@ -26,6 +13,8 @@ var TieElem = function TieElem(options) {
 		this.stemDir = options.stemDir;
 	if (options.voiceNumber !== undefined)
 		this.voiceNumber = options.voiceNumber;
+	if (options.style !== undefined)
+		this.dotted = true;
 	this.internalNotes = [];
 };
 
@@ -51,10 +40,6 @@ TieElem.prototype.setHint = function () {
 	this.hint = true;
 };
 
-TieElem.prototype.setUpperAndLowerElements = function(positionY) {
-	// Doesn't depend on the highest and lowest, so there's nothing to do here.
-};
-
 TieElem.prototype.calcTieDirection = function () {
 	// The rules:
 	// 1) If it is in a grace note group, then the direction is always BELOW.
@@ -128,6 +113,8 @@ TieElem.prototype.calcX = function (lineStartX, lineEndX) {
 		this.startX = this.startLimitX.x+this.startLimitX.w; // if there is no start element, but there is a repeat mark before the start of the line.
 	else
 		this.startX = lineStartX; // There is no element and no repeat mark: extend to the beginning of the line.
+	if (!this.anchor1 && this.dotted)
+		this.startX -= 3; // The arc needs to be long enough to tell that it is dotted.
 
 	if (this.anchor2)
 		this.endX = this.anchor2.x; // The normal case where there is a starting element to attach to.
@@ -200,54 +187,4 @@ TieElem.prototype.avoidCollisionAbove = function () {
 	}
 };
 
-TieElem.prototype.layout = function (lineStartX, lineEndX) {
-	// We now have all of the input variables set, so we can figure out the start and ending x,y coordinates, and finalize the direction of the arc.
-
-	// Ties and slurs are handled a little differently, so do calculations for them separately.
-	if (!this.anchor1 || !this.anchor2)
-		this.isTie = true; // if the slur goes off the end of the line, then draw it like a tie
-	else if (this.anchor1.pitch === this.anchor2.pitch && this.internalNotes.length === 0)
-		this.isTie = true;
-	else
-		this.isTie = false;
-
-	// TODO-PER: Not sure why this would be needed, but it would be better to figure out a way to have the anchors be immutable here anyway.
-	// if (this.isTie) {
-	// 	if (this.anchor1) // this can happen if the tie comes from the previous line.
-	// 		this.anchor1.isTie = true;
-	// 	if (this.anchor2) // this can happen if the tie does not go to the next line.
-	// 		this.anchor2.isTie = true;
-	// }
-
-	if (this.isTie) {
-		this.calcTieDirection();
-		// TODO-PER: Not sure why this would be needed, but it would be better to figure out a way to have the anchors be immutable here anyway.
-		// if (this.anchor1) // this can happen if the tie comes from the previous line.
-		// 	this.anchor1.tieAbove = this.above;
-		// if (this.anchor2) // this can happen if the tie goes to the next line.
-		// 	this.anchor2.tieAbove = this.above;
-		this.calcX(lineStartX, lineEndX);
-		this.calcTieY();
-
-	} else {
-		this.calcSlurDirection();
-		this.calcX(lineStartX, lineEndX);
-		this.calcSlurY();
-	}
-	this.avoidCollisionAbove();
-};
-
-TieElem.prototype.draw = function (renderer, linestartx, lineendx) {
-	this.layout(linestartx, lineendx);
-
-	var klass;
-	if (this.hint)
-			klass = "abcjs-hint";
-	var fudgeY =  this.fixedY ? 1.5 : 0; // TODO-PER: This just compensates for drawArc, which contains too much knowledge of ties and slurs.
-	renderer.controller.currentAbsEl = { tuneNumber: renderer.controller.engraver.tuneNumber, elemset: [], abcelem: { el_type: "slur", startChar: -1, endChar: -1 }};
-	var el = renderer.drawArc(this.startX, this.endX, this.startY+fudgeY, this.endY+fudgeY,  this.above, klass, this.isTie);
-	renderer.controller.currentAbsEl.elemset.push(el);
-
-};
-
 module.exports = TieElem;