abcjs 6.0.0-beta.9 → 6.0.2

package/src/write/abc_abstract_engraver.js

@@ -1,24 +1,11 @@
 // abc_abstract_engraver.js: Creates a data structure suitable for printing a line of abc
-// Copyright (C) 2010-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 AbsoluteElement = require('./abc_absolute_element');
 var BeamElem = require('./abc_beam_element');
 var BraceElem = require('./abc_brace_element');
 var createClef = require('./abc_create_clef');
 var createKeySignature = require('./abc_create_key_signature');
+var createNoteHead = require('./abc_create_note_head');
 var createTimeSignature = require('./abc_create_time_signature');
 var Decoration = require('./abc_decoration');
 var EndingElem = require('./abc_ending_element');
@@ -30,14 +17,11 @@ var TempoElement = require('./abc_tempo_element');
 var TieElem = require('./abc_tie_element');
 var TripletElem = require('./abc_triplet_element');
 var VoiceElement = require('./abc_voice_element');
+var addChord = require('./add-chord');
+var pitchesToPerc = require('../synth/pitches-to-perc')
 
 var parseCommon = require('../parse/abc_common');
 
-var AbstractEngraver;
-
-(function() {
-	"use strict";
-
 var getDuration = function(elem) {
   var d = 0;
   if (elem.duration) {
@@ -54,16 +38,21 @@ var hint = false;
 		rhythm:{"-1": "noteheads.slash.whole", 0:"noteheads.slash.whole", 1:"noteheads.slash.whole", 2:"noteheads.slash.quarter", 3:"noteheads.slash.quarter", 4:"noteheads.slash.quarter", 5:"noteheads.slash.quarter", 6:"noteheads.slash.quarter", 7:"noteheads.slash.quarter", nostem: "noteheads.slash.nostem"},
 		x:{"-1": "noteheads.indeterminate", 0:"noteheads.indeterminate", 1:"noteheads.indeterminate", 2:"noteheads.indeterminate", 3:"noteheads.indeterminate", 4:"noteheads.indeterminate", 5:"noteheads.indeterminate", 6:"noteheads.indeterminate", 7:"noteheads.indeterminate", nostem: "noteheads.indeterminate"},
 		harmonic:{"-1": "noteheads.harmonic.quarter", 0:"noteheads.harmonic.quarter", 1:"noteheads.harmonic.quarter", 2:"noteheads.harmonic.quarter", 3:"noteheads.harmonic.quarter", 4:"noteheads.harmonic.quarter", 5:"noteheads.harmonic.quarter", 6:"noteheads.harmonic.quarter", 7:"noteheads.harmonic.quarter", nostem: "noteheads.harmonic.quarter"},
+		triangle:{"-1": "noteheads.triangle.quarter", 0:"noteheads.triangle.quarter", 1:"noteheads.triangle.quarter", 2:"noteheads.triangle.quarter", 3:"noteheads.triangle.quarter", 4:"noteheads.triangle.quarter", 5:"noteheads.triangle.quarter", 6:"noteheads.triangle.quarter", 7:"noteheads.triangle.quarter", nostem: "noteheads.triangle.quarter"},
 		uflags:{3:"flags.u8th", 4:"flags.u16th", 5:"flags.u32nd", 6:"flags.u64th"},
 		dflags:{3:"flags.d8th", 4:"flags.d16th", 5:"flags.d32nd", 6:"flags.d64th"}
 	};
 
-AbstractEngraver = function(renderer, tuneNumber, options) {
+var AbstractEngraver = function(getTextSize, tuneNumber, options) {
 	this.decoration = new Decoration();
-	this.renderer = renderer;
+	this.getTextSize = getTextSize;
 	this.tuneNumber = tuneNumber;
 	this.isBagpipes = options.bagpipes;
 	this.flatBeams = options.flatbeams;
+	this.graceSlurs = options.graceSlurs;
+	this.percmap = options.percmap;
+	this.initialClef = options.initialClef
+	this.jazzchords = !!options.jazzchords
 	this.reset();
 };
 
@@ -127,23 +116,24 @@ AbstractEngraver.prototype.popCrossLineElems = function(s,v) {
 		}
 	};
 
-AbstractEngraver.prototype.createABCLine = function(staffs, tempo) {
+AbstractEngraver.prototype.createABCLine = function(staffs, tempo, l) {
     this.minY = 2; // PER: This will be the lowest that any note reaches. It will be used to set the dynamics row.
 	// See if there are any lyrics on this line.
 	this.containsLyrics(staffs);
-  var staffgroup = new StaffGroupElement();
+  var staffgroup = new StaffGroupElement(this.getTextSize);
 	this.tempoSet = false;
   for (var s = 0; s < staffs.length; s++) {
 	  if (hint)
 		  this.restoreState();
 	  hint = false;
-    this.createABCStaff(staffgroup, staffs[s], tempo, s);
+    this.createABCStaff(staffgroup, staffs[s], tempo, s, l);
   }
   return staffgroup;
 };
 
-AbstractEngraver.prototype.createABCStaff = function(staffgroup, abcstaff, tempo, s) {
+AbstractEngraver.prototype.createABCStaff = function(staffgroup, abcstaff, tempo, s, l) {
 // If the tempo is passed in, then the first element should get the tempo attached to it.
+	staffgroup.getTextSize.updateFonts(abcstaff);
   for (var v = 0; v < abcstaff.voices.length; v++) {
     var voice = new VoiceElement(v,abcstaff.voices.length);
     if (v===0) {
@@ -152,13 +142,19 @@ AbstractEngraver.prototype.createABCStaff = function(staffgroup, abcstaff, tempo
     } else {
 	    voice.duplicate = true; // bar lines and other duplicate info need not be created
     }
-    if (abcstaff.title && abcstaff.title[v]) voice.header=abcstaff.title[v];
-	  var clef = createClef(abcstaff.clef, this.tuneNumber);
+    if (abcstaff.title && abcstaff.title[v]) {
+    	voice.header=abcstaff.title[v].replace(/\\n/g, "\n");
+    	voice.headerPosition = 6 + staffgroup.getTextSize.baselineToCenter(voice.header, "voicefont", 'staff-extra voice-name', v, abcstaff.voices.length)/spacing.STEP;
+	}
+    if (abcstaff.clef && abcstaff.clef.type === "perc")
+    	voice.isPercussion = true;
+	  var clef = (!this.initialClef || l === 0) && createClef(abcstaff.clef, this.tuneNumber);
 	  if (clef) {
 		  if (v ===0 && abcstaff.barNumber) {
 			  this.addMeasureNumber(abcstaff.barNumber, clef);
 		  }
 		  voice.addChild(clef);
+		  this.startlimitelem = clef; // limit ties here
 	  }
 	  var keySig = createKeySignature(abcstaff.key, this.tuneNumber);
 	  if (keySig) {
@@ -181,22 +177,27 @@ AbstractEngraver.prototype.createABCStaff = function(staffgroup, abcstaff, tempo
 	  var isSingleLineStaff = staffLines === 1;
 	  this.createABCVoice(abcstaff.voices[v],tempo, s, v, isSingleLineStaff, voice);
 	  staffgroup.setStaffLimits(voice);
-			if(abcstaff.brace === "start" || (!staffgroup.brace && abcstaff.brace)){
-				staffgroup.brace = new BraceElem(voice.staff, "brace");
-			}
-			else if(abcstaff.brace === "end" && staffgroup.brace) {
-				staffgroup.brace.setBottomStaff(voice.staff);
-			} else if(abcstaff.brace === "continue" && staffgroup.brace) {
-				staffgroup.brace.continuing(voice.staff);
-			}
-			if(abcstaff.bracket === "start" || (!staffgroup.bracket && abcstaff.bracket)){
-				staffgroup.bracket = new BraceElem(voice.staff, "bracket");
-			}
-			else if(abcstaff.bracket === "end" && staffgroup.bracket) {
-				staffgroup.bracket.setBottomStaff(voice.staff);
-			} else if(abcstaff.bracket === "continue" && staffgroup.bracket) {
-				staffgroup.bracket.continuing(voice.staff);
-			}
+	  if (v === 0) {
+		  // only do brace and bracket processing on the first voice, otherwise it would be done twice.
+		  if (abcstaff.brace === "start" || (!staffgroup.brace && abcstaff.brace)) {
+			  if (!staffgroup.brace)
+				  staffgroup.brace = [];
+			  staffgroup.brace.push(new BraceElem(voice, "brace"));
+		  } else if (abcstaff.brace === "end" && staffgroup.brace) {
+			  staffgroup.brace[staffgroup.brace.length - 1].setBottomStaff(voice);
+		  } else if (abcstaff.brace === "continue" && staffgroup.brace) {
+			  staffgroup.brace[staffgroup.brace.length - 1].continuing(voice);
+		  }
+		  if (abcstaff.bracket === "start" || (!staffgroup.bracket && abcstaff.bracket)) {
+			  if (!staffgroup.bracket)
+				  staffgroup.bracket = [];
+			  staffgroup.bracket.push(new BraceElem(voice, "bracket"));
+		  } else if (abcstaff.bracket === "end" && staffgroup.bracket) {
+			  staffgroup.bracket[staffgroup.bracket.length - 1].setBottomStaff(voice);
+		  } else if (abcstaff.bracket === "continue" && staffgroup.bracket) {
+			  staffgroup.bracket[staffgroup.bracket.length - 1].continuing(voice);
+		  }
+	  }
   }
 };
 
@@ -228,14 +229,14 @@ AbstractEngraver.prototype.createABCVoice = function(abcline, tempo, s, v, isSin
   for (var slur in this.slurs) {
     if (this.slurs.hasOwnProperty(slur)) {
 	    // this is already a slur element, but it was created for the last line, so recreate it.
-      this.slurs[slur]= new TieElem({force: this.slurs[slur].force, voiceNumber: voiceNumber, stemDir: this.slurs[slur].stemDir});
+      this.slurs[slur]= new TieElem({force: this.slurs[slur].force, voiceNumber: voiceNumber, stemDir: this.slurs[slur].stemDir, style: this.slurs[slur].dotted});
 		if (hint) this.slurs[slur].setHint();
 	    voice.addOther(this.slurs[slur]);
     }
   }
   for (var i=0; i<this.ties.length; i++) {
   	// this is already a tie element, but it was created for the last line, so recreate it.
-    this.ties[i]=new TieElem({ force: this.ties[i].force, stemDir: this.ties[i].stemDir, voiceNumber: voiceNumber });
+    this.ties[i]=new TieElem({ force: this.ties[i].force, stemDir: this.ties[i].stemDir, voiceNumber: voiceNumber, style: this.ties[i].dotted });
 	  if (hint) this.ties[i].setHint();
 	  voice.addOther(this.ties[i]);
   }
@@ -254,8 +255,8 @@ AbstractEngraver.prototype.createABCVoice = function(abcline, tempo, s, v, isSin
 			for (i = 0; i < abselems.length; i++) {
 				if (!this.tempoSet && tempo && !tempo.suppress) {
 					this.tempoSet = true;
-					var tempoElement = new AbsoluteElement(ret.elem, 0, 0, "tempo", this.tuneNumber, {});
-					tempoElement.addChild(new TempoElement(tempo, this.tuneNumber, createNoteHead));
+					var tempoElement = new AbsoluteElement(tempo, 0, 0, "tempo", this.tuneNumber, {});
+					tempoElement.addFixedX(new TempoElement(tempo, this.tuneNumber, createNoteHead));
 					voice.addChild(tempoElement);
 				}
 				voice.addChild(abselems[i]);
@@ -331,17 +332,17 @@ AbstractEngraver.prototype.createABCElement = function(isFirstStaff, isSingleLin
     if (voice.duplicate && elemset.length > 0) elemset[0].invisible = true;
     break;
   case "stem":
-    this.stemdir=elem.direction;
+    this.stemdir=elem.direction === "auto" ? undefined : elem.direction;
     break;
   case "part":
     var abselem = new AbsoluteElement(elem,0,0, 'part', this.tuneNumber);
-	  var dim = this.renderer.getTextSize(elem.title, 'partsfont', "part");
-    abselem.addChild(new RelativeElement(elem.title, 0, 0, undefined, {type:"part", height: dim.height/spacing.STEP}));
+	  var dim = this.getTextSize.calc(elem.title, 'partsfont', "part");
+    abselem.addFixedX(new RelativeElement(elem.title, 0, 0, undefined, {type:"part", height: dim.height/spacing.STEP}));
     elemset[0] = abselem;
     break;
   case "tempo":
     var abselem3 = new AbsoluteElement(elem,0,0, 'tempo', this.tuneNumber);
-    abselem3.addChild(new TempoElement(elem, this.tuneNumber, createNoteHead));
+    abselem3.addFixedX(new TempoElement(elem, this.tuneNumber, createNoteHead));
     elemset[0] = abselem3;
     break;
 	  case "style":
@@ -363,7 +364,7 @@ AbstractEngraver.prototype.createABCElement = function(isFirstStaff, isSingleLin
 
   default:
     var abselem2 = new AbsoluteElement(elem,0,0, 'unsupported', this.tuneNumber);
-    abselem2.addChild(new RelativeElement("element type "+elem.el_type, 0, 0, undefined, {type:"debug"}));
+    abselem2.addFixed(new RelativeElement("element type "+elem.el_type, 0, 0, undefined, {type:"debug"}));
     elemset[0] = abselem2;
   }
 
@@ -383,26 +384,11 @@ AbstractEngraver.prototype.createABCElement = function(isFirstStaff, isSingleLin
 		}
 	}
 
-	AbstractEngraver.prototype.calcBeamDir = function (isSingleLineStaff, voice, elems) {
-		if (this.stemdir) // If the user or voice is forcing the stem direction, we already know the answer.
-			return this.stemdir;
-		var beamelem = new BeamElem(this.stemHeight * this.voiceScale, this.stemdir, this.flatBeams);
-		for (var i = 0; i < elems.length; i++) {
-			beamelem.add({abcelem: elems[i]}); // This is a hack to call beam elem with just a minimum of processing: for our purposes, we don't need to construct the whole note.
-		}
-
-		var dir = beamelem.calcDir();
-		return dir ? "up" : "down";
-	};
-
 	AbstractEngraver.prototype.createBeam = function (isSingleLineStaff, voice, elems) {
 		var abselemset = [];
 
-		var dir = this.calcBeamDir(isSingleLineStaff, voice, elems);
-		var beamelem = new BeamElem(this.stemHeight * this.voiceScale, dir, this.flatBeams, elems[0]);
+		var beamelem = new BeamElem(this.stemHeight * this.voiceScale, this.stemdir, this.flatBeams, elems[0]);
 		if (hint) beamelem.setHint();
-		var oldDir = this.stemdir;
-		this.stemdir = dir;
 		for (var i = 0; i < elems.length; i++) {
 			var elem = elems[i];
 			var abselem = this.createNote(elem, true, isSingleLineStaff, voice);
@@ -414,7 +400,7 @@ AbstractEngraver.prototype.createABCElement = function(isFirstStaff, isSingleLin
 				this.tripletmultiplier = 1;
 			}
 		}
-		this.stemdir = oldDir;
+		beamelem.calcDir();
 		voice.addBeam(beamelem);
 		return abselemset;
 	};
@@ -437,20 +423,20 @@ var sortPitch = function(elem) {
 var ledgerLines = function(abselem, minPitch, maxPitch, isRest, symbolWidth, additionalLedgers, dir, dx, scale) {
 	for (var i=maxPitch; i>11; i--) {
 		if (i%2===0 && !isRest) {
-			abselem.addChild(new RelativeElement(null, dx, (symbolWidth+4)*scale, i, {type:"ledger"}));
+			abselem.addFixed(new RelativeElement(null, dx, (symbolWidth+4)*scale, i, {type:"ledger"}));
 		}
 	}
 
 	for (i=minPitch; i<1; i++) {
 		if (i%2===0 && !isRest) {
-			abselem.addChild(new RelativeElement(null, dx, (symbolWidth+4)*scale, i, {type:"ledger"}));
+			abselem.addFixed(new RelativeElement(null, dx, (symbolWidth+4)*scale, i, {type:"ledger"}));
 		}
 	}
 
 	for (i = 0; i < additionalLedgers.length; i++) { // PER: draw additional ledgers
 		var ofs = symbolWidth;
 		if (dir === 'down') ofs = -ofs;
-		abselem.addChild(new RelativeElement(null, ofs+dx, (symbolWidth+4)*scale, additionalLedgers[i], {type:"ledger"}));
+		abselem.addFixed(new RelativeElement(null, ofs+dx, (symbolWidth+4)*scale, additionalLedgers[i], {type:"ledger"}));
 	}
 };
 
@@ -467,6 +453,7 @@ var ledgerLines = function(abselem, minPitch, maxPitch, isRest, symbolWidth, add
 			gracebeam.mainNote = abselem;	// this gives us a reference back to the note this is attached to so that the stems can be attached somewhere.
 		}
 
+		var i;
 		var graceoffsets = [];
 		for (i = elem.gracenotes.length - 1; i >= 0; i--) { // figure out where to place each gracenote
 			roomtaken += 10;
@@ -476,13 +463,13 @@ var ledgerLines = function(abselem, minPitch, maxPitch, isRest, symbolWidth, add
 			}
 		}
 
-		var i;
 		for (i = 0; i < elem.gracenotes.length; i++) {
 			var gracepitch = elem.gracenotes[i].verticalPos;
 
 			flag = (gracebeam) ? null : chartable.uflags[(isBagpipes) ? 5 : 3];
 			var accidentalSlot = [];
-			var ret = createNoteHead(abselem, "noteheads.quarter", elem.gracenotes[i], "up", -graceoffsets[i], -graceoffsets[i], flag, 0, 0, gracescale*this.voiceScale, accidentalSlot, false);
+			var ret = createNoteHead(abselem, "noteheads.quarter", elem.gracenotes[i],
+				{dir: "up", headx: -graceoffsets[i], extrax: -graceoffsets[i], flag: flag, scale: gracescale*this.voiceScale, accidentalSlot: accidentalSlot});
 			ret.notehead.highestVert = ret.notehead.pitch + stemHeight;
 			var grace = ret.notehead;
 			this.addSlursAndTies(abselem, elem.gracenotes[i], grace, voice, "up", true);
@@ -511,14 +498,19 @@ var ledgerLines = function(abselem, minPitch, maxPitch, isRest, symbolWidth, add
 			}
 			ledgerLines(abselem, gracepitch, gracepitch, false, glyphs.getSymbolWidth("noteheads.quarter"), [], true, grace.dx - 1, 0.6);
 
-			if (i === 0 && !isBagpipes && !(elem.rest && (elem.rest.type === "spacer" || elem.rest.type === "invisible"))) {
+			// if this is the first grace note, we might want to start a slur.
+			// there is a slur if graceSlurs is specifically set.
+			// there is no slur if it is bagpipes.
+			// there is not a slur if the element is a spacer or invisible rest.
+			var isInvisibleRest = elem.rest && (elem.rest.type === "spacer" || elem.rest.type === "invisible");
+			if (i === 0 && !isBagpipes && this.graceSlurs && !isInvisibleRest) {
 				// This is the overall slur that is under the grace notes.
-				var isTie = (elem.gracenotes.length === 1 && grace.pitch === notehead.pitch);
 				voice.addOther(new TieElem({ anchor1: grace, anchor2: notehead, isGrace: true}));
 			}
 		}
 
 		if (gracebeam) {
+			gracebeam.calcDir();
 			voice.addBeam(gracebeam);
 		}
 		return roomtaken;
@@ -563,6 +555,7 @@ var ledgerLines = function(abselem, minPitch, maxPitch, isRest, symbolWidth, add
 				elem.maxpitch = restpitch;
 				break;
 			case "invisible":
+			case "invisible-multimeasure":
 			case "spacer":
 				c = "";
 				elem.averagepitch = restpitch;
@@ -576,12 +569,13 @@ var ledgerLines = function(abselem, minPitch, maxPitch, isRest, symbolWidth, add
 				elem.maxpitch = restpitch;
 				dot = 0;
 				var mmWidth = glyphs.getSymbolWidth(c);
-				abselem.addHead(new RelativeElement(c, -mmWidth, mmWidth * 2, 7));
-				var numMeasures = new RelativeElement("" + elem.duration, 0, mmWidth, 16, {type: "multimeasure-text"});
+				abselem.addHead(new RelativeElement(c, mmWidth, mmWidth * 2, 7));
+				var numMeasures = new RelativeElement("" + elem.rest.text, mmWidth, mmWidth, 16, {type: "multimeasure-text"});
 				abselem.addExtra(numMeasures);
 		}
-		if (elem.rest.type !== "multimeasure") {
-			var ret = createNoteHead(abselem, c, {verticalPos: restpitch}, null, 0, 0, null, dot, 0, voiceScale, [], false);
+		if (elem.rest.type.indexOf("multimeasure") < 0 && elem.rest.type !== "invisible") {
+			var ret = createNoteHead(abselem, c, {verticalPos: restpitch},
+				{ dot: dot, scale: voiceScale});
 			noteHead = ret.notehead;
 			if (noteHead) {
 				abselem.addHead(noteHead);
@@ -661,6 +655,13 @@ var ledgerLines = function(abselem, minPitch, maxPitch, isRest, symbolWidth, add
 			var c;
 			if (elem.pitches[p].style) { // There is a style for the whole group of pitches, but there could also be an override for a particular pitch.
 				c = chartable[elem.pitches[p].style][-durlog];
+			} else if (voice.isPercussion && this.percmap) {
+				c = noteSymbol;
+				var percHead = this.percmap[pitchesToPerc(elem.pitches[p])];
+				if (percHead && percHead.noteHead) {
+					if (chartable[percHead.noteHead])
+						c = chartable[percHead.noteHead][-durlog];
+				}
 			} else
 				c = noteSymbol;
 			// The highest position for the sake of placing slurs is itself if the slur is internal. It is the highest position possible if the slur is for the whole chord.
@@ -694,7 +695,8 @@ var ledgerLines = function(abselem, minPitch, maxPitch, isRest, symbolWidth, add
 			}
 
 			var hasStem = !nostem && durlog<=-1;
-			var ret = createNoteHead(abselem, c, elem.pitches[p], dir, 0, -roomTaken, flag, dot, dotshiftx, this.voiceScale, accidentalSlot, !stemdir);
+			var ret = createNoteHead(abselem, c, elem.pitches[p],
+				{dir: dir, extrax: -roomTaken, flag: flag, dot: dot, dotshiftx: dotshiftx, scale: this.voiceScale, accidentalSlot: accidentalSlot, shouldExtendStem: !stemdir, printAccidentals: !voice.isPercussion});
 			symbolWidth = Math.max(glyphs.getSymbolWidth(c), symbolWidth);
 			abselem.extraw -= ret.extraLeft;
 			noteHead = ret.notehead;
@@ -721,13 +723,13 @@ var ledgerLines = function(abselem, minPitch, maxPitch, isRest, symbolWidth, add
 			var dx = (dir==="down" || abselem.heads.length === 0)?0:abselem.heads[0].w;
 			var width = (dir==="down")?1:-1;
 			// TODO-PER-HACK: One type of note head has a different placement of the stem. This should be more generically calculated:
-			if (noteHead.c === 'noteheads.slash.quarter') {
+			if (noteHead && noteHead.c === 'noteheads.slash.quarter') {
 				if (dir === 'down')
 					p2 -= 1;
 				else
 					p1 += 1;
 			}
-			abselem.addExtra(new RelativeElement(null, dx, 0, p1, {"type": "stem", "pitch2":p2, linewidth: width}));
+			abselem.addRight(new RelativeElement(null, dx, 0, p1, {"type": "stem", "pitch2":p2, linewidth: width, bottom: p1-1}));
 			//var RelativeElement = function RelativeElement(c, dx, w, pitch, opt) {
 			min = Math.min(p1, p2);
 		}
@@ -740,65 +742,9 @@ var ledgerLines = function(abselem, minPitch, maxPitch, isRest, symbolWidth, add
 			var div = ly.divider === ' ' ? "" : ly.divider;
 			lyricStr += ly.syllable + div + "\n";
 		});
-		var lyricDim = this.renderer.getTextSize(lyricStr, 'vocalfont', "lyric");
+		var lyricDim = this.getTextSize.calc(lyricStr, 'vocalfont', "lyric");
 		var position = elem.positioning ? elem.positioning.vocalPosition : 'below';
-		abselem.addCentered(new RelativeElement(lyricStr, 0, lyricDim.width, undefined, {type:"lyric", position: position, height: lyricDim.height / spacing.STEP }));
-	};
-
-	AbstractEngraver.prototype.addChord = function(abselem, elem, roomTaken, roomTakenRight) {
-		var chordMargin = 8; // If there are chords next to each other, this is how close they can get.
-		for (var i = 0; i < elem.chord.length; i++) {
-			var chord = elem.chord[i];
-			var x = 0;
-			var y;
-			var font;
-			var klass;
-			if (chord.position === "left" || chord.position === "right" || chord.position === "below" || chord.position === "above") {
-				font = 'annotationfont';
-				klass = "annotation";
-			} else {
-				font = 'gchordfont';
-				klass = "chord";
-			}
-			var dim = this.renderer.getTextSize(chord.name, 'annotationfont', "annotation");
-			var chordWidth = dim.width;
-			var chordHeight = dim.height / spacing.STEP;
-			switch (chord.position) {
-				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.name, x, chordWidth+4, y, {type:"text", height: chordHeight}));
-					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.name, x, chordWidth+4, y, {type:"text", height: chordHeight}));
-					break;
-				case "below":
-					// setting the y-coordinate to undefined for now: it will be overwritten later on, after we figure out what the highest element on the line is.
-					abselem.addRight(new RelativeElement(chord.name, 0, chordWidth+chordMargin, undefined, {type: "text", position: "below", height: chordHeight}));
-					break;
-				case "above":
-					// setting the y-coordinate to undefined for now: it will be overwritten later on, after we figure out what the highest element on the line is.
-					abselem.addRight(new RelativeElement(chord.name, 0, chordWidth+chordMargin, undefined, {type: "text", height: chordHeight}));
-					break;
-				default:
-					if (chord.rel_position) {
-						var relPositionY = chord.rel_position.y + 3*spacing.STEP; // TODO-PER: this is a fudge factor to make it line up with abcm2ps
-						abselem.addChild(new RelativeElement(chord.name, x + chord.rel_position.x, 0, elem.minpitch + relPositionY / spacing.STEP, {type: "text", height: chordHeight}));
-					} 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;
-
-						abselem.addCentered(new RelativeElement(chord.name, x, chordWidth, undefined, {type: "chord", position: pos2, height: chordHeight }));
-					}
-			}
-		}
-		return { roomTaken: roomTaken, roomTakenRight: roomTakenRight };
+		abselem.addCentered(new RelativeElement(lyricStr, 0, lyricDim.width, undefined, {type:"lyric", position: position, height: lyricDim.height / spacing.STEP, dim: this.getTextSize.attr('vocalfont', "lyric") }));
 	};
 
 AbstractEngraver.prototype.createNote = function(elem, nostem, isSingleLineStaff, voice) { //stem presence: true for drawing stemless notehead
@@ -808,7 +754,6 @@ AbstractEngraver.prototype.createNote = function(elem, nostem, isSingleLineStaff
   var symbolWidth = 0;
   var additionalLedgers = []; // PER: handle the case of [bc'], where the b doesn't have a ledger line
 
-  var i;
   var dir;
 
 	var duration = getDuration(elem);
@@ -827,12 +772,14 @@ AbstractEngraver.prototype.createNote = function(elem, nostem, isSingleLineStaff
   var durationForSpacing = duration * this.tripletmultiplier;
   if (elem.rest && elem.rest.type === 'multimeasure')
   	durationForSpacing = 1;
+  if (elem.rest && elem.rest.type === 'invisible-multimeasure')
+  	durationForSpacing = this.measureLength*elem.rest.text;
   var absType = elem.rest ? "rest" : "note";
   var abselem = new AbsoluteElement(elem, durationForSpacing, 1, absType, this.tuneNumber, { durationClassOveride: elem.duration * this.tripletmultiplier});
   if (hint) abselem.setHint();
 
   if (elem.rest) {
-  	if (this.measureLength === duration && elem.rest.type !== 'invisible' && elem.rest.type !== 'spacer')
+  	if (this.measureLength === duration && elem.rest.type !== 'invisible' && elem.rest.type !== 'spacer' && elem.rest.type.indexOf('multimeasure') < 0)
 	    elem.rest.type = 'whole'; // If the rest is exactly a measure, always use a whole rest
 	  var ret1 = addRestToAbsElement(abselem, elem, duration, dot, voice.voicetotal > 1, this.stemdir, isSingleLineStaff, durlog, this.voiceScale);
 	  notehead = ret1.noteHead;
@@ -863,19 +810,18 @@ AbstractEngraver.prototype.createNote = function(elem, nostem, isSingleLineStaff
   }
 
   if (elem.barNumber) {
-    abselem.addChild(new RelativeElement(elem.barNumber, -10, 0, 0, {type:"barNumber"}));
+    abselem.addFixed(new RelativeElement(elem.barNumber, -10, 0, 0, {type:"barNumber"}));
   }
 
   // ledger lines
 	ledgerLines(abselem, elem.minpitch, elem.maxpitch, elem.rest, symbolWidth, additionalLedgers, dir, -2, 1);
 
   if (elem.chord !== undefined) {
-  	var ret3 = this.addChord(abselem, elem, roomtaken, roomtakenright);
+ 	var ret3 = addChord(this.getTextSize, abselem, elem, roomtaken, roomtakenright, symbolWidth, this.jazzchords);
 	  roomtaken = ret3.roomTaken;
 	  roomtakenright = ret3.roomTakenRight;
   }
 
-
   if (elem.startTriplet) {
     this.triplet = new TripletElem(elem.startTriplet, notehead, { flatBeams: this.flatBeams }); // above is opposite from case of slurs
   }
@@ -884,108 +830,13 @@ AbstractEngraver.prototype.createNote = function(elem, nostem, isSingleLineStaff
     this.triplet.setCloseAnchor(notehead);
   }
 
-  if (this.triplet && !elem.startTriplet && !elem.endTriplet) {
+  if (this.triplet && !elem.startTriplet && !elem.endTriplet && !(elem.rest && elem.rest.type === "spacer")) {
   	this.triplet.middleNote(notehead);
   }
 
-
   return abselem;
 };
 
-
-
-
-var createNoteHead = function(abselem, c, pitchelem, dir, headx, extrax, flag, dot, dotshiftx, scale, accidentalSlot, shouldExtendStem) {
-  // TODO scale the dot as well
-  var pitch = pitchelem.verticalPos;
-  var notehead;
-  var i;
-  var accidentalshiftx = 0;
-  var newDotShiftX = 0;
-  var extraLeft = 0;
-  if (c === undefined)
-    abselem.addChild(new RelativeElement("pitch is undefined", 0, 0, 0, {type:"debug"}));
-  else if (c==="") {
-    notehead = new RelativeElement(null, 0, 0, pitch);
-  } else {
-    var shiftheadx = headx;
-    if (pitchelem.printer_shift) {
-      var adjust = (pitchelem.printer_shift==="same")?1:0;
-      shiftheadx = (dir==="down")?-glyphs.getSymbolWidth(c)*scale+adjust:glyphs.getSymbolWidth(c)*scale-adjust;
-    }
-	  var opts = {scalex:scale, scaley: scale, thickness: glyphs.symbolHeightInPitches(c)*scale };
-    notehead = new RelativeElement(c, shiftheadx, glyphs.getSymbolWidth(c)*scale, pitch, opts);
-    notehead.stemDir = dir;
-    if (flag) {
-      var pos = pitch+((dir==="down")?-7:7)*scale;
-      // if this is a regular note, (not grace or tempo indicator) then the stem will have been stretched to the middle line if it is far from the center.
-	    if (shouldExtendStem) {
-	    	if (dir==="down" && pos > 6)
-	    		pos = 6;
-	    	if (dir==="up" && pos < 6)
-	    		pos = 6;
-	    }
-      //if (scale===1 && (dir==="down")?(pos>6):(pos<6)) pos=6;
-      var xdelta = (dir==="down")?headx:headx+notehead.w-0.6;
-      abselem.addRight(new RelativeElement(flag, xdelta, glyphs.getSymbolWidth(flag)*scale, pos, {scalex:scale, scaley: scale}));
-    }
-	  newDotShiftX = notehead.w+dotshiftx-2+5*dot;
-    for (;dot>0;dot--) {
-      var dotadjusty = (1-Math.abs(pitch)%2); //PER: take abs value of the pitch. And the shift still happens on ledger lines.
-      abselem.addRight(new RelativeElement("dots.dot", notehead.w+dotshiftx-2+5*dot, glyphs.getSymbolWidth("dots.dot"), pitch+dotadjusty));
-    }
-  }
-        if (notehead)
-                notehead.highestVert = pitchelem.highestVert;
-
-  if (pitchelem.accidental) {
-    var symb;
-    switch (pitchelem.accidental) {
-    case "quartersharp":
-      symb = "accidentals.halfsharp";
-        break;
-    case "dblsharp":
-      symb = "accidentals.dblsharp";
-      break;
-    case "sharp":
-      symb = "accidentals.sharp";
-      break;
-    case "quarterflat":
-      symb = "accidentals.halfflat";
-      break;
-    case "flat":
-      symb = "accidentals.flat";
-      break;
-    case "dblflat":
-      symb = "accidentals.dblflat";
-      break;
-    case "natural":
-      symb = "accidentals.nat";
-    }
-         // if a note is at least a sixth away, it can share a slot with another accidental
-         var accSlotFound = false;
-         var accPlace = extrax;
-         for (var j = 0; j < accidentalSlot.length; j++) {
-                 if (pitch - accidentalSlot[j][0] >= 6) {
-                         accidentalSlot[j][0] = pitch;
-                         accPlace = accidentalSlot[j][1];
-                         accSlotFound = true;
-                         break;
-                 }
-         }
-         if (accSlotFound === false) {
-                 accPlace -= (glyphs.getSymbolWidth(symb)*scale+2);
-                 accidentalSlot.push([pitch,accPlace]);
-                 accidentalshiftx = (glyphs.getSymbolWidth(symb)*scale+2);
-         }
-    abselem.addExtra(new RelativeElement(symb, accPlace, glyphs.getSymbolWidth(symb), pitch, {scalex:scale, scaley: scale}));
-	  extraLeft = glyphs.getSymbolWidth(symb) / 2; // TODO-PER: We need a little extra width if there is an accidental, but I'm not sure why it isn't the full width of the accidental.
-  }
-
-  return { notehead: notehead, accidentalshiftx: accidentalshiftx, dotshiftx: newDotShiftX, extraLeft: extraLeft };
-
-};
-
 	AbstractEngraver.prototype.addSlursAndTies = function(abselem, pitchelem, notehead, voice, dir, isGrace) {
 		if (pitchelem.endTie) {
 			if (this.ties.length > 0) {
@@ -1008,7 +859,7 @@ var createNoteHead = function(abselem, c, pitchelem, dir, headx, extrax, flag, d
 
 		var voiceNumber = voice.voicetotal < 2 ? -1 : voice.voicenumber;
 		if (pitchelem.startTie) {
-			var tie = new TieElem({ anchor1: notehead, force: (this.stemdir==="down" || this.stemdir==="up"), stemDir: this.stemdir, isGrace: isGrace, voiceNumber: voiceNumber});
+			var tie = new TieElem({ anchor1: notehead, force: (this.stemdir==="down" || this.stemdir==="up"), stemDir: this.stemdir, isGrace: isGrace, voiceNumber: voiceNumber, style: pitchelem.startTie.style });
 			if (hint) tie.setHint();
 
 			this.ties[this.ties.length]=tie;
@@ -1019,10 +870,11 @@ var createNoteHead = function(abselem, c, pitchelem, dir, headx, extrax, flag, d
 			abselem.startTie = true;
 		}
 
+		var slur;
+		var slurid;
 		if (pitchelem.endSlur) {
 			for (var i=0; i<pitchelem.endSlur.length; i++) {
-				var slurid = pitchelem.endSlur[i];
-				var slur;
+				slurid = pitchelem.endSlur[i];
 				if (this.slurs[slurid]) {
 					slur = this.slurs[slurid];
 					slur.setEndAnchor(notehead);
@@ -1046,8 +898,8 @@ var createNoteHead = function(abselem, c, pitchelem, dir, headx, extrax, flag, d
 
 		if (pitchelem.startSlur) {
 			for (i=0; i<pitchelem.startSlur.length; i++) {
-				var slurid = pitchelem.startSlur[i].label;
-				var slur = new TieElem({ anchor1: notehead, stemDir: this.stemdir, voiceNumber: voiceNumber});
+				slurid = pitchelem.startSlur[i].label;
+				slur = new TieElem({ anchor1: notehead, stemDir: this.stemdir, voiceNumber: voiceNumber, style: pitchelem.startSlur[i].style});
 				if (hint) slur.setHint();
 				this.slurs[slurid]=slur;
 				voice.addOther(slur);
@@ -1056,9 +908,9 @@ var createNoteHead = function(abselem, c, pitchelem, dir, headx, extrax, flag, d
 	};
 
 AbstractEngraver.prototype.addMeasureNumber = function (number, abselem) {
-	var measureNumDim = this.renderer.getTextSize(number, "measurefont", 'bar-number');
+	var measureNumDim = this.getTextSize.calc(number, "measurefont", 'bar-number');
 	var dx = measureNumDim.width > 18 && abselem.abcelem.type === "treble" ? -7 : 0;
-	abselem.addChild(new RelativeElement(number, dx, measureNumDim.width, 11+measureNumDim.height / spacing.STEP, {type:"barNumber"}));
+	abselem.addFixed(new RelativeElement(number, dx, measureNumDim.width, 11+measureNumDim.height / spacing.STEP, {type:"barNumber", dim: this.getTextSize.attr("measurefont", 'bar-number')}));
 };
 
 AbstractEngraver.prototype.createBarLine = function (voice, elem, isFirstStaff) {
@@ -1140,7 +992,7 @@ AbstractEngraver.prototype.createBarLine = function (voice, elem, isFirstStaff)
   } // 2 is hardcoded
 
   if (elem.startEnding && isFirstStaff) { // only put the first & second ending marks on the first staff
-	  var textWidth = this.renderer.getTextSize(elem.startEnding, "repeatfont", '').width;
+	  var textWidth = this.getTextSize.calc(elem.startEnding, "repeatfont", '').width;
 	  abselem.minspacing += textWidth + 10; // Give plenty of room for the ending number.
     this.partstartelem = new EndingElem(elem.startEnding, anchor, null);
 	  voice.addOther(this.partstartelem);
@@ -1153,7 +1005,4 @@ AbstractEngraver.prototype.createBarLine = function (voice, elem, isFirstStaff)
 
 };
 
-
-})();
-
 module.exports = AbstractEngraver;