abcjs 6.0.0-beta.9 → 6.0.2

package/src/write/abc_triplet_element.js

@@ -1,27 +1,7 @@
 //    abc_triplet_element.js: Definition of the TripletElem 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 sprintf = require('./sprintf');
-
-var TripletElem;
-
-(function() {
-	"use strict";
-
-	TripletElem = function TripletElem(number, anchor1, options) {
+var TripletElem = function TripletElem(number, anchor1, options) {
+		this.type = "TripletElem";
 		this.anchor1 = anchor1; // must have a .x and a .parent property or be null (means starts at the "beginning" of the line - after key signature)
 		this.number = number;
 		this.durationClass = ('d'+(Math.round(anchor1.parent.durationClass*1000)/1000)).replace(/\./, '-');
@@ -30,7 +10,7 @@ var TripletElem;
 	};
 
 	TripletElem.prototype.isClosed = function() {
-		return this.anchor2;
+		return !!this.anchor2;
 	};
 
 	TripletElem.prototype.middleNote = function(elem) {
@@ -39,108 +19,10 @@ var TripletElem;
 
 	TripletElem.prototype.setCloseAnchor = function(anchor2) {
 		this.anchor2 = anchor2;
-		// TODO-PER: Unfortunately, I don't know if there is a beam above until after the vertical positioning is done,
-		// so I don't know whether to leave room for the number above. Therefore, If there is a beam on the first note, I'll leave room just in case.
-		if (this.anchor1.parent.beam)
+		// TODO-PER: This used to be just for beamed triplets but it looks like bracketed triplets need extra room, too. The only one that doesn't is stem down and beamed
+		//if (this.anchor1.parent.beam)
+		if (!this.anchor1.parent.beam || this.anchor1.stemDir === 'up')
 			this.endingHeightAbove = 4;
 	};
 
-	TripletElem.prototype.setUpperAndLowerElements = function(/*positionY*/) {
-	};
-
-	TripletElem.prototype.layout = function() {
-		// TODO end and beginning of line (PER: P.S. I'm not sure this can happen: I think the parser will always specify both the start and end points.)
-		if (this.anchor1 && this.anchor2) {
-			this.hasBeam = !!this.anchor1.parent.beam && this.anchor1.parent.beam === this.anchor2.parent.beam;
-
-			if (this.hasBeam) {
-				// If there is a beam then we don't need to draw anything except the text. The beam could either be above or below.
-				var beam = this.anchor1.parent.beam;
-				var left = beam.isAbove() ? this.anchor1.x + this.anchor1.w : this.anchor1.x;
-				this.yTextPos = beam.heightAtMidpoint(left,  this.anchor2.x);
-				this.yTextPos += beam.isAbove() ? 3 : -2; // This creates some space between the beam and the number.
-				this.top = this.yTextPos + 1;
-				this.bottom = this.yTextPos - 2;
-				if (beam.isAbove())
-					this.endingHeightAbove = 4;
-			} else {
-				// If there isn't a beam, then we need to draw the bracket and the text. The bracket is always above.
-				// The bracket is never lower than the 'a' line, but is 4 pitches above the first and last notes. If there is
-				// a tall note in the middle, the bracket is horizontal and above the highest note.
-				this.startNote = Math.max(this.anchor1.parent.top, 9) + 4;
-				this.endNote = Math.max(this.anchor2.parent.top, 9) + 4;
-				// If it starts or ends on a rest, make the beam horizontal
-				if (this.anchor1.parent.type === "rest" && this.anchor2.parent.type !== "rest")
-					this.startNote = this.endNote;
-				else if (this.anchor2.parent.type === "rest" && this.anchor1.parent.type !== "rest")
-					this.endNote = this.startNote;
-				// See if the middle note is really high.
-				var max = 0;
-				for (var i = 0; i < this.middleElems.length; i++) {
-					max = Math.max(max, this.middleElems[i].top);
-				}
-				max += 4;
-				if (max > this.startNote || max > this.endNote) {
-					this.startNote = max;
-					this.endNote = max;
-				}
-				if (this.flatBeams) {
-					this.startNote = Math.max(this.startNote, this.endNote);
-					this.endNote = Math.max(this.startNote, this.endNote);
-				}
-
-				this.yTextPos = this.startNote + (this.endNote - this.startNote) / 2;
-				this.top = this.yTextPos + 1;
-			}
-		}
-		delete this.middleElems;
-		delete this.flatBeams;
-	};
-
-	TripletElem.prototype.draw = function(renderer) {
-		var xTextPos;
-		renderer.controller.currentAbsEl = { tuneNumber: renderer.controller.engraver.tuneNumber, elemset: [], abcelem: { el_type: "triplet", startChar: -1, endChar: -1 }};
-		renderer.createElemSet({ klass: renderer.addClasses('triplet '+this.durationClass)});
-		if (this.hasBeam) {
-			var left = this.anchor1.parent.beam.isAbove() ? this.anchor1.x + this.anchor1.w : this.anchor1.x;
-			xTextPos = this.anchor1.parent.beam.xAtMidpoint(left, this.anchor2.x);
-		} else {
-			xTextPos = this.anchor1.x + (this.anchor2.x + this.anchor2.w - this.anchor1.x) / 2;
-			drawBracket(renderer, this.anchor1.x, this.startNote, this.anchor2.x + this.anchor2.w, this.endNote);
-		}
-		renderer.renderText({x: xTextPos, y: renderer.calcY(this.yTextPos), text: "" + this.number, type: 'tripletfont', anchor: "middle", centerVertically: true, history: 'ignore', noClass: true});
-		var g = renderer.closeElemSet();
-		renderer.controller.currentAbsEl.elemset.push(g);
-		renderer.controller.recordHistory(g, true);
-	};
-
-	function drawLine(renderer, l, t, r, b) {
-		return sprintf("M %f %f L %f %f", l, t, r, b);
-	}
-
-	function drawBracket(renderer, x1, y1, x2, y2) {
-		y1 = renderer.calcY(y1);
-		y2 = renderer.calcY(y2);
-		var bracketHeight = 5;
-
-		// Draw vertical lines at the beginning and end
-		var pathString = "";
-		pathString += drawLine(renderer, x1, y1, x1, y1 + bracketHeight);
-		pathString += drawLine(renderer, x2, y2, x2, y2 + bracketHeight);
-
-		// figure out midpoints to draw the broken line.
-		var midX = x1 + (x2-x1)/2;
-		//var midY = y1 + (y2-y1)/2;
-		var gapWidth = 8;
-		var slope = (y2 - y1) / (x2 - x1);
-		var leftEndX = midX - gapWidth;
-		var leftEndY = y1 + (leftEndX - x1) * slope;
-		pathString += drawLine(renderer, x1, y1, leftEndX, leftEndY);
-		var rightStartX = midX + gapWidth;
-		var rightStartY = y1 + (rightStartX - x1) * slope;
-		pathString += drawLine(renderer, rightStartX, rightStartY, x2, y2);
-		renderer.printPath({path: pathString, stroke: "#000000"});
-	}
-})();
-
 module.exports = TripletElem;

package/src/write/abc_voice_element.js

@@ -1,20 +1,4 @@
 //    abc_voice_element.js: Definition of the VoiceElement 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 parseCommon = require('../parse/abc_common');
 
 var VoiceElement = function VoiceElement(voicenumber, voicetotal) {
 	this.children = [];
@@ -42,8 +26,9 @@ var VoiceElement = function VoiceElement(voicenumber, voicetotal) {
 	};
 };
 
-VoiceElement.prototype.addChild = function (child) {
-	if (child.type === 'bar') {
+VoiceElement.prototype.addChild = function (absElem) {
+	// This is always passed an AbsoluteElement
+	if (absElem.type === 'bar') {
 		var firstItem = true;
 		for (var i = 0; firstItem && i < this.children.length; i++) {
 			if (this.children[i].type.indexOf("staff-extra") < 0 && this.children[i].type !== "tempo")
@@ -54,8 +39,8 @@ VoiceElement.prototype.addChild = function (child) {
 			this.otherchildren.push("bar");
 		}
 	}
-	this.children[this.children.length] = child;
-	this.setRange(child);
+	this.children[this.children.length] = absElem;
+	this.setRange(absElem);
 };
 
 VoiceElement.prototype.setLimit = function(member, child) {
@@ -71,29 +56,6 @@ VoiceElement.prototype.setLimit = function(member, child) {
 		this.specialY[member] = Math.max(this.specialY[member], specialY[member]);
 };
 
-VoiceElement.prototype.moveDecorations = function(beam) {
-	var padding = 1.5; // This is the vertical padding between elements, in pitches.
-	for (var ch = 0; ch < beam.elems.length; ch++) {
-		var child = beam.elems[ch];
-		if (child.top) {
-			// We now know where the ornaments should have been placed, so move them if they would overlap.
-			var top = beam.yAtNote(child);
-			for (var i = 0; i < child.children.length; i++) {
-				var el = child.children[i];
-				if (el.klass === 'ornament') {
-					if (el.bottom - padding < top) {
-						var distance = top - el.bottom + padding; // Find the distance that it needs to move and add a little margin so the element doesn't touch the beam.
-						el.bottom += distance;
-						el.top += distance;
-						el.pitch += distance;
-						top = child.top = el.top;
-					}
-				}
-			}
-		}
-	}
-};
-
 VoiceElement.prototype.adjustRange = function(child) {
 	if (child.bottom !== undefined)
 		this.bottom = Math.min(this.bottom, child.bottom);
@@ -116,19 +78,6 @@ VoiceElement.prototype.setRange = function(child) {
 	this.setLimit('dynamicHeightBelow', child);
 };
 
-VoiceElement.prototype.setUpperAndLowerElements = function(positionY) {
-	var i;
-	for (i = 0; i < this.children.length; i++) {
-		var abselem = this.children[i];
-		abselem.setUpperAndLowerElements(positionY);
-	}
-	for (i = 0; i < this.otherchildren.length; i++) {
-		var abselem = this.otherchildren[i];
-		if (typeof abselem !== 'string')
-			abselem.setUpperAndLowerElements(positionY);
-	}
-};
-
 VoiceElement.prototype.addOther = function (child) {
 	this.otherchildren.push(child);
 	this.setRange(child);
@@ -138,172 +87,8 @@ VoiceElement.prototype.addBeam = function (child) {
 	this.beams.push(child);
 };
 
-VoiceElement.prototype.updateIndices = function () {
-	if (!this.layoutEnded()) {
-		this.durationindex += this.children[this.i].duration;
-		if (this.children[this.i].type === 'bar') this.durationindex = Math.round(this.durationindex*64)/64; // everytime we meet a barline, do rounding to nearest 64th
-		this.i++;
-	}
-};
-
-VoiceElement.prototype.layoutEnded = function () {
-	return (this.i>=this.children.length);
-};
-
-VoiceElement.prototype.getDurationIndex = function () {
-	return this.durationindex - (this.children[this.i] && (this.children[this.i].duration>0)?0:0.0000005); // if the ith element doesn't have a duration (is not a note), its duration index is fractionally before. This enables CLEF KEYSIG TIMESIG PART, etc. to be laid out before we get to the first note of other voices
-};
-
-// number of spacing units expected for next positioning
-VoiceElement.prototype.getSpacingUnits = function () {
-	return Math.sqrt(this.spacingduration*8);
-	// TODO-PER: On short lines, this would never trigger, so the spacing was wrong. I just changed this line empirically, though, so I don't know if there are other ramifications.
-	//return (this.minx<this.nextx) ? Math.sqrt(this.spacingduration*8) : 0; // we haven't used any spacing units if we end up using minx
-};
-
-//
-VoiceElement.prototype.getNextX = function () {
-	return Math.max(this.minx, this.nextx);
-};
-
-VoiceElement.prototype.beginLayout = function (startx) {
-	this.i=0;
-	this.durationindex=0;
-	//this.ii=this.children.length;
-	this.startx=startx;
-	this.minx=startx; // furthest left to where negatively positioned elements are allowed to go
-	this.nextx=startx; // x position where the next element of this voice should be placed assuming no other voices and no fixed width constraints
-	this.spacingduration=0; // duration left to be laid out in current iteration (omitting additional spacing due to other aspects, such as bars, dots, sharps and flats)
-};
-
-// Try to layout the element at index this.i
-// x - position to try to layout the element at
-// spacing - base spacing
-// can't call this function more than once per iteration
-VoiceElement.prototype.layoutOneItem = function (x, spacing) {
-	var child = this.children[this.i];
-	if (!child) return 0;
-	var er = x - this.minx; // available extrawidth to the left
-	var extraWidth = child.getExtraWidth();
-	if (er<extraWidth) { // shift right by needed amount
-		// There's an exception if a bar element is after a Part element, there is no shift.
-		if (this.i === 0 || child.type !== 'bar' || (this.children[this.i-1].type !== 'part' && this.children[this.i-1].type !== 'tempo') )
-			x+=extraWidth-er;
-	}
-	child.setX(x);
-
-	this.spacingduration = child.duration;
-	//update minx
-	this.minx = x+child.getMinWidth(); // add necessary layout space
-	if (this.i!==this.children.length-1) this.minx+=child.minspacing; // add minimumspacing except on last elem
-
-	this.updateNextX(x, spacing);
-
-	// contribute to staff y position
-	//this.staff.top = Math.max(child.top,this.staff.top);
-	//this.staff.bottom = Math.min(child.bottom,this.staff.bottom);
-
-	return x; // where we end up having placed the child
-};
-
-// call when spacingduration has been updated
-VoiceElement.prototype.updateNextX = function (x, spacing) {
-	this.nextx= x + (spacing*Math.sqrt(this.spacingduration*8));
-};
-
-VoiceElement.prototype.shiftRight = function (dx) {
-	var child = this.children[this.i];
-	if (!child) return;
-	child.setX(child.x+dx);
-	this.minx+=dx;
-	this.nextx+=dx;
-};
-
-function isNonSpacerRest(elem) {
-	if (elem.type !== 'rest')
-		return false;
-	if (elem.abcelem && elem.abcelem.rest && elem.abcelem.rest.type !== 'spacer')
-		return true;
-	return false;
-}
-VoiceElement.prototype.draw = function (renderer, bartop) {
-	var width = this.w-1;
-	renderer.staffbottom = this.staff.bottom;
-	//this.barbottom = renderer.calcY(2);
-
-	renderer.measureNumber = null;
-	renderer.noteNumber = null;
-	if (this.header) { // print voice name
-		var textpitch = 14 - (this.voicenumber+1)*(12/(this.voicetotal+1));
-		var self = this;
-		renderer.wrapInAbsElem({ el_type: "voice-name", startChar: -1, endChar: -1, text: this.header }, 'meta-bottom extra-text', function() {
-			var textEl = renderer.renderText({x: renderer.padding.left, y: renderer.calcY(textpitch), text: self.header, type: 'voicefont', klass: 'staff-extra voice-name', anchor: 'start'});
-			return textEl;
-		});
-	}
-
-	for (var i=0, ii=this.children.length; i<ii; i++) {
-		var child = this.children[i];
-		var justInitializedMeasureNumber = false;
-		if (child.type !== 'staff-extra' && renderer.measureNumber === null) {
-			renderer.measureNumber = 0;
-			renderer.noteNumber = 0;
-			justInitializedMeasureNumber = true;
-		}
-		renderer.controller.currentAbsEl = child;
-		child.draw(renderer, (this.barto || i===ii-1)?bartop:0);
-		if (child.type === 'note' || isNonSpacerRest(child))
-			renderer.noteNumber++;
-		if (child.type === 'bar' && !justInitializedMeasureNumber) {
-			renderer.measureNumber++;
-			renderer.noteNumber = 0;
-		}
-	}
-
-	renderer.measureNumber = 0;
-	renderer.noteNumber = 0;
-	parseCommon.each(this.beams, function(beam) {
-		if (beam === 'bar') {
-			renderer.measureNumber++;
-			renderer.noteNumber = 0;
-		} else
-			beam.draw(renderer); // beams must be drawn first for proper printing of triplets, slurs and ties.
-	});
-
-	renderer.measureNumber = 0;
-	renderer.noteNumber = 0;
-	var self = this;
-	parseCommon.each(this.otherchildren, function(child) {
-		if (child === 'bar') {
-			renderer.measureNumber++;
-			renderer.noteNumber = 0;
-		} else
-			child.draw(renderer,self.startx+10,width);
-	});
-
-};
-
-VoiceElement.prototype.layoutBeams = function() {
-	for (var i = 0; i < this.beams.length; i++) {
-		if (this.beams[i].layout) {
-			this.beams[i].layout();
-			this.moveDecorations(this.beams[i]);
-			// The above will change the top and bottom of the abselem children, so see if we need to expand our range.
-			for (var j = 0; j < this.beams[i].elems.length; j++) {
-				this.adjustRange(this.beams[i].elems[j]);
-			}
-		}
-	}
-	// Now we can layout the triplets
-	for (i = 0; i < this.otherchildren.length; i++) {
-		var child = this.otherchildren[i];
-		if (child.layout) {
-			child.layout();
-			this.adjustRange(child);
-		}
-	}
-	this.staff.top = Math.max(this.staff.top, this.top);
-	this.staff.bottom = Math.min(this.staff.bottom, this.bottom);
+VoiceElement.prototype.setWidth = function (width) {
+	this.w = width;
 };
 
 module.exports = VoiceElement;

package/src/write/add-chord.js

@@ -0,0 +1,103 @@
+var RelativeElement = require('./abc_relative_element');
+var spacing = require('./abc_spacing');
+const formatJazzChord = require("./format-jazz-chord");
+
+var addChord = function (getTextSize, abselem, elem, roomTaken, roomTakenRight, noteheadWidth, jazzchords) {
+		for (var i = 0; i < elem.chord.length; i++) {
+			var pos = elem.chord[i].position;
+			var rel_position = elem.chord[i].rel_position;
+			var chords = elem.chord[i].name.split("\n");
+			for (var j = chords.length-1; j >= 0; j--) { // parse these in opposite order because we place them from bottom to top.
+				var chord = chords[j];
+				var x = 0;
+				var y;
+				var font;
+				var klass;
+				if (pos === "left" || pos === "right" || pos === "below" || pos === "above" || !!rel_position) {
+					font = 'annotationfont';
+					klass = "annotation";
+				} else {
+					font = 'gchordfont';
+					klass = "chord";
+					if (jazzchords)
+						chord = formatJazzChord(chord);
+				}
+				var attr = getTextSize.attr(font, klass);
+				var dim = getTextSize.calc(chord, font, klass);
+				var chordWidth = dim.width;
+				var chordHeight = dim.height / spacing.STEP;
+				switch (pos) {
+					case "left":
+						roomTaken += chordWidth + 7;
+						x = -roomTaken;        // TODO-PER: This is just a guess from trial and error
+						y = elem.averagepitch;
+						abselem.addExtra(new RelativeElement(chord, x, chordWidth + 4, y, {
+							type: "text",
+							height: chordHeight,
+							dim: attr,
+							position: "left"
+						}));
+						break;
+					case "right":
+						roomTakenRight += 4;
+						x = roomTakenRight;// TODO-PER: This is just a guess from trial and error
+						y = elem.averagepitch;
+						abselem.addRight(new RelativeElement(chord, x, chordWidth + 4, y, {
+							type: "text",
+							height: chordHeight,
+							dim: attr,
+							position: "right"
+						}));
+						break;
+					case "below":
+						// 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 RelativeElement(chord, 0, 0, undefined, {
+							type: "text",
+							position: "below",
+							height: chordHeight,
+							dim: attr,
+							realWidth: chordWidth
+						}));
+						break;
+					case "above":
+						// 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 RelativeElement(chord, 0, 0, undefined, {
+							type: "text",
+							position: "above",
+							height: chordHeight,
+							dim: attr,
+							realWidth: chordWidth
+						}));
+						break;
+					default:
+						if (rel_position) {
+							var relPositionY = rel_position.y + 3 * spacing.STEP; // TODO-PER: this is a fudge factor to make it line up with abcm2ps
+							abselem.addRight(new RelativeElement(chord, x + rel_position.x, 0, elem.minpitch + relPositionY / spacing.STEP, {
+								position: "relative",
+								type: "text",
+								height: chordHeight,
+								dim: attr
+							}));
+						} else {
+							// 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;
+
+							if (pos2 !== 'hidden') {
+								abselem.addCentered(new RelativeElement(chord, noteheadWidth/2, chordWidth, undefined, {
+									type: "chord",
+									position: pos2,
+									height: chordHeight,
+									dim: attr,
+									realWidth: chordWidth
+								}));
+							}
+						}
+				}
+			}
+		}
+		return {roomTaken: roomTaken, roomTakenRight: roomTakenRight};
+	};
+
+module.exports = addChord;

package/src/write/add-text-if.js

@@ -0,0 +1,33 @@
+function addTextIf(rows, params, getTextSize) {
+	if (!params.text)
+		return;
+	if (!params.marginLeft) params.marginLeft = 0;
+	if (!params.klass) params.klass = '';
+	if (!params.anchor) params.anchor = 'start';
+	if (!params.info) params.info = { startChar: -2, endChar: -2}
+
+	if (params.marginTop)
+		rows.push({move: params.marginTop});
+	var attr = {left: params.marginLeft, text: params.text, font: params.font, anchor: params.anchor, startChar: params.info.startChar, endChar: params.info.endChar};
+	if (params.absElemType)
+		attr.absElemType = params.absElemType;
+	if (!params.inGroup)
+		attr.klass = params.klass;
+	if (params.name)
+		attr.name = params.name;
+
+	rows.push(attr);
+	// If there are blank lines they won't be counted by getTextSize, so just get the height of one line and multiply
+	var size = getTextSize.calc("A", params.font, params.klass);
+	var numLines = params.text.split("\n").length;
+	if (params.text[params.text.length-1] === '\n')
+		numLines--; // If there is a new line at the end of the string, then an extra line will be counted.
+	if (!params.noMove) {
+		var h = (size.height * 1.1) * numLines;
+		rows.push({move: Math.round(h)});
+		if (params.marginBottom)
+			rows.push({move: params.marginBottom});
+	}
+}
+
+module.exports = addTextIf;

package/src/write/bottom-text.js

@@ -0,0 +1,79 @@
+const addTextIf = require("./add-text-if");
+
+function BottomText(metaText, width, isPrint, paddingLeft, spacing, getTextSize) {
+	this.rows = [];
+	if (metaText.unalignedWords && metaText.unalignedWords.length > 0)
+		this.unalignedWords(metaText.unalignedWords, paddingLeft, spacing, getTextSize);
+	this.extraText(metaText, paddingLeft, spacing, getTextSize);
+	if (metaText.footer && isPrint)
+		this.footer(metaText.footer, width, paddingLeft, getTextSize);
+}
+
+BottomText.prototype.unalignedWords = function (unalignedWords, paddingLeft, spacing, getTextSize) {
+	var indent = 50;
+	var klass = 'meta-bottom unaligned-words';
+	var defFont = 'wordsfont';
+	this.rows.push({startGroup: "unalignedWords", klass: 'abcjs-meta-bottom abcjs-unaligned-words', name: "words"});
+	var space = getTextSize.calc("i", defFont, klass);
+
+	this.rows.push({move: spacing.words});
+
+	for (var j = 0; j < unalignedWords.length; j++) {
+		if (unalignedWords[j] === '')
+			this.rows.push({move: space.height});
+		else if (typeof unalignedWords[j] === 'string') {
+			addTextIf(this.rows, { marginLeft: paddingLeft + indent, text: unalignedWords[j], font: defFont, klass: klass, inGroup: true, name: "words"}, getTextSize);
+		} else {
+			var largestY = 0;
+			var offsetX = 0;
+			for (var k = 0; k < unalignedWords[j].length; k++) {
+				var thisWord = unalignedWords[j][k];
+				var font = (thisWord.font) ? thisWord.font : defFont;
+				this.rows.push({
+					left: paddingLeft + indent + offsetX,
+					text: thisWord.text,
+					font: font,
+					anchor: 'start'
+				});
+				var size = getTextSize.calc(thisWord.text, defFont, klass);
+				largestY = Math.max(largestY, size.height);
+				offsetX += size.width;
+				// If the phrase ends in a space, then that is not counted in the width, so we need to add that in ourselves.
+				if (thisWord.text[thisWord.text.length - 1] === ' ') {
+					offsetX += space.width;
+				}
+			}
+			this.rows.push({move: largestY});
+		}
+	}
+	this.rows.push({move: space.height * 2});
+	this.rows.push({endGroup: "unalignedWords", absElemType: "unalignedWords", startChar: -1, endChar: -1, name: "unalignedWords"});
+}
+
+BottomText.prototype.extraText = function (metaText, marginLeft, spacing, getTextSize) {
+	var extraText = "";
+	if (metaText.book) extraText += "Book: " + metaText.book + "\n";
+	if (metaText.source) extraText += "Source: " + metaText.source + "\n";
+	if (metaText.discography) extraText += "Discography: " + metaText.discography + "\n";
+	if (metaText.notes) extraText += "Notes: " + metaText.notes + "\n";
+	if (metaText.transcription) extraText += "Transcription: " + metaText.transcription + "\n";
+	if (metaText.history) extraText += "History: " + metaText.history + "\n";
+	if (metaText['abc-copyright']) extraText += "Copyright: " + metaText['abc-copyright'] + "\n";
+	if (metaText['abc-creator']) extraText += "Creator: " + metaText['abc-creator'] + "\n";
+	if (metaText['abc-edited-by']) extraText += "Edited By: " + metaText['abc-edited-by'] + "\n";
+	if (extraText.length > 0) {
+			addTextIf(this.rows, { marginLeft: marginLeft, text: extraText, font: 'historyfont', klass: 'meta-bottom extra-text', marginTop: spacing.info, absElemType: "extraText", name: "description"}, getTextSize);
+	}
+}
+
+BottomText.prototype.footer = function (footer, width, paddingLeft, getTextSize) {
+	var klass = 'header meta-bottom';
+	var font = "footerfont";
+	this.rows.push({startGroup: "footer", klass: klass});
+	// Note: whether there is a footer or not doesn't change any other positioning, so this doesn't change the Y-coordinate.
+	addTextIf(this.rows, { marginLeft: paddingLeft, text: footer.left, font: font, klass: klass, name: "footer"}, getTextSize);
+	addTextIf(this.rows, { marginLeft: paddingLeft + width / 2, text: footer.center, font: font, klass: klass, anchor: 'middle', name: "footer"} , getTextSize);
+	addTextIf(this.rows, { marginLeft: paddingLeft + width, text: footer.right, font: font, klass: klass, anchor: 'end', name: "footer"}, getTextSize);
+}
+
+module.exports = BottomText;

package/src/write/calcHeight.js

@@ -0,0 +1,17 @@
+var calcHeight = function (staffGroup) {
+	// 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<staffGroup.voices.length;i++) {
+		var staff = staffGroup.voices[i].staff;
+		if (!staffGroup.voices[i].duplicate) {
+			height += staff.top;
+			//if (staff.bottom < 0)
+				height += -staff.bottom;
+		}
+	}
+	return height;
+};
+
+module.exports = calcHeight;
+