abcjs 6.1.9 → 6.2.0

package/src/write/abc_triplet_element.js

@@ -1,28 +0,0 @@
-//    abc_triplet_element.js: Definition of the TripletElem class.
-
-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(/\./, '-');
-		this.middleElems = []; // This is to calculate the highest interior pitch. It is used to make sure that the drawn bracket never crosses a really high middle note.
-		this.flatBeams = options.flatBeams;
-	};
-
-	TripletElem.prototype.isClosed = function() {
-		return !!this.anchor2;
-	};
-
-	TripletElem.prototype.middleNote = function(elem) {
-		this.middleElems.push(elem);
-	};
-
-	TripletElem.prototype.setCloseAnchor = function(anchor2) {
-		this.anchor2 = anchor2;
-		// 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;
-	};
-
-module.exports = TripletElem;

package/src/write/add-chord.js

@@ -1,103 +0,0 @@
-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/format-jazz-chord.js

@@ -1,15 +0,0 @@
-function formatJazzChord(chordString) {
-	// This puts markers in the pieces of the chord that are read by the svg creator.
-	// After the main part of the chord (the letter, a sharp or flat, and "m") a marker is added. Before a slash a marker is added.
-	var lines = chordString.split("\n");
-	for (var i = 0; i < lines.length; i++) {
-		var chord = lines[i];
-		// If the chord isn't in a recognizable format then just skip the formatting.
-		var reg = chord.match(/^([ABCDEFG][♯♭]?)?([^\/]+)?(\/[ABCDEFG][#b♯♭]?)?/);
-		if (reg)
-			lines[i] = (reg[1]?reg[1]:'') + "\x03" + (reg[2]?reg[2]:'')  + "\x03" + (reg[3]?reg[3]:'');
-	}
-	return lines.join("\n");
-}
-
-module.exports = formatJazzChord;

package/src/write/free-text.js

@@ -1,41 +0,0 @@
-function FreeText(info, vskip, getFontAndAttr, paddingLeft, width, getTextSize) {
-	var text = info.text;
-	this.rows = [];
-	var size;
-	if (vskip)
-		this.rows.push({move: vskip});
-	var hash = getFontAndAttr.calc('textfont', 'defined-text');
-	if (text === "") {	// we do want to print out blank lines if they have been specified.
-		this.rows.push({move: hash.attr['font-size'] * 2}); // move the distance of the line, plus the distance of the margin, which is also one line.
-	} else if (typeof text === 'string') {
-		this.rows.push({move: hash.attr['font-size']/2}); // TODO-PER: move down some - the y location should be the top of the text, but we output text specifying the center line.
-		this.rows.push({left: paddingLeft, text: text, font: 'textfont', klass: 'defined-text', anchor: "start", startChar: info.startChar, endChar: info.endChar, absElemType: "freeText", name: "free-text"});
-		size = getTextSize.calc(text, 'textfont', 'defined-text');
-		this.rows.push({move: size.height});
-	} else if (text) {
-		var maxHeight = 0;
-		var leftSide = paddingLeft;
-		var currentFont = 'textfont';
-		for (var i = 0; i < text.length; i++) {
-			if (text[i].font) {
-				currentFont = text[i].font;
-			} else
-				currentFont = 'textfont';
-			this.rows.push({left: leftSide, text: text[i].text, font: currentFont, klass: 'defined-text', anchor: 'start', startChar: info.startChar, endChar: info.endChar, absElemType: "freeText", name: "free-text"});
-			size = getTextSize.calc(text[i].text, getFontAndAttr.calc(currentFont, 'defined-text').font, 'defined-text');
-			leftSide += size.width + size.height/2; // add a little padding to the right side. The height of the font is probably a close enough approximation.
-			maxHeight = Math.max(maxHeight, size.height)
-		}
-		this.rows.push({move: maxHeight});
-	} else {
-		// The structure is wrong here: it requires an array to do centering, but it shouldn't have.
-		if (info.length === 1) {
-			var x = width / 2;
-			this.rows.push({left: x, text: info[0].text, font: 'textfont', klass: 'defined-text', anchor: 'middle', startChar: info.startChar, endChar: info.endChar, absElemType: "freeText", name: "free-text"});
-			size = getTextSize.calc(info[0].text, 'textfont', 'defined-text');
-			this.rows.push({move: size.height});
-		}
-	}
-}
-
-module.exports = FreeText;