abcjs 6.1.9 → 6.2.1

package/src/tablatures/tab-absolute-elements.js

@@ -1,9 +1,8 @@
 /**
  * Tablature Absolute elements factory
  */
-var AbsoluteElement = require('../write/abc_absolute_element');
-var RelativeElement = require('../write/abc_relative_element');
-var Transposer = require('./transposer');
+var AbsoluteElement = require('../write/creation/elements/absolute-element');
+var RelativeElement = require('../write/creation/elements/relative-element');
 
 function isObject(a) { return a != null && a.constructor === Object; }
 function cloneObject(dest, src) {
@@ -144,20 +143,6 @@ function graceInRest( absElem ) {
   return null;
 }
 
-function checkTransposition(plugin, transposer ,pitches, graceNotes) {
-  if (plugin.transpose) {
-    //transposer.transpose(plugin.transpose);
-    for (var jj = 0; jj < pitches.length; jj++) {
-      pitches[jj] = transposer.transposeNote(pitches[jj]);
-    }
-    if (graceNotes) {
-      for (var kk = 0; kk < graceNotes.length; kk++) {
-        graceNotes[kk] = transposer.transposeNote(graceNotes[kk]);
-      }
-    }
-  }
-}
-
 function convertToNumber(plugin, pitches, graceNotes) {
   var tabPos = plugin.semantics.notesToNumber(pitches, graceNotes);
   if (tabPos.error) {
@@ -196,7 +181,6 @@ TabAbsoluteElements.prototype.build = function (plugin,
   var staffSize = getInitialStaffSize(staffAbsolute);
   var source = staffAbsolute[staffIndex+voiceIndex];
   var dest = staffAbsolute[staffSize+staffIndex+voiceIndex];
-  var transposer = null;
   var tabPos = null;
   var defNote = null;
   if (source.children[0].abcelem.el_type != 'clef') {
@@ -214,18 +198,14 @@ TabAbsoluteElements.prototype.build = function (plugin,
     // }
     if ( (absChild.isClef) ) {
       dest.children.push(buildTabAbsolute(plugin, absX, relX));
+      if (absChild.abcelem.type.indexOf('-8') >= 0) plugin.semantics.strings.clefTranspose = -12
+      if (absChild.abcelem.type.indexOf('+8') >= 0) plugin.semantics.strings.clefTranspose = 12
     }
     switch (absChild.type) {
       case 'staff-extra key-signature':
         // refresh key accidentals
         this.accidentals = absChild.abcelem.accidentals;
         plugin.semantics.strings.accidentals = this.accidentals;
-        if (plugin.transpose) {
-          transposer = new Transposer(
-            absChild.abcelem.accidentals,
-            plugin.transpose 
-          );
-        }
         break;
       case 'bar':
         plugin.semantics.strings.measureAccidentals = {}
@@ -258,8 +238,6 @@ TabAbsoluteElements.prototype.build = function (plugin,
       case 'rest':
         var restGraces = graceInRest(absChild);
         if (restGraces) {
-          // check transpose
-          checkTransposition(plugin, transposer, null, restGraces);
           // to number conversion 
           tabPos = convertToNumber(plugin, null, restGraces);
           if (tabPos.error) return;
@@ -274,9 +252,7 @@ TabAbsoluteElements.prototype.build = function (plugin,
         abs.lyricDim = lyricsDim(absChild);
         var pitches = absChild.abcelem.pitches;
         var graceNotes = absChild.abcelem.gracenotes;
-        // check transpose
         abs.type = 'tabNumber';
-        checkTransposition(plugin, transposer, pitches, graceNotes);
         // to number conversion 
         tabPos = convertToNumber(plugin, pitches, graceNotes);   
         if (tabPos.error) return;
@@ -302,9 +278,11 @@ TabAbsoluteElements.prototype.build = function (plugin,
           var tabNoteRelative = buildRelativeTabNote(plugin, abs.x+absChild.heads[ll].dx, defNote, curNote, false);
           abs.children.push(tabNoteRelative);
         }
-        defNote.abselem = abs;
-        tabVoice.push(defNote);
-        dest.children.push(abs);
+        if (defNote.notes.length > 0) {
+          defNote.abselem = abs;
+          tabVoice.push(defNote);
+          dest.children.push(abs);
+        }
         break;
     }
   }

package/src/tablatures/tab-renderer.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-debugger */
-var VoiceElement = require('../write/abc_voice_element');
+var VoiceElement = require('../write/creation/elements/voice-element');
 var TabAbsoluteElements = require('./tab-absolute-elements');
-var spacing = require('../write/abc_spacing');
+var spacing = require('../write/helpers/spacing');
 
 function initSpecialY() {
   return {

package/src/test/abc_parser_lint.js

@@ -318,7 +318,7 @@ var ParserLint = function() {
 	var midiProperties = {
 		cmd: { type: 'string', Enum: [
 			"nobarlines", "barlines", "beataccents", "nobeataccents", "droneon", "droneoff", "noportamento", "channel", "c",
-			"drumon", "drumoff", "fermatafixed", "fermataproportional", "gchordon", "gchordoff", "bassvol", "chordvol",
+			"drumon", "drumoff", "fermatafixed", "fermataproportional", "gchordon", "gchordoff", "bassvol", "chordvol", "bassprog", "chordprog",
 			"controlcombo", "temperamentnormal", "gchord", "ptstress", "beatmod", "deltaloudness", "drumbars", "pitchbend",
 			"gracedivider", "makechordchannels", "randomchordattack", "chordattack", "stressmodel", "transpose",
 			"rtranspose", "volinc", "program", "ratio", "snt", "bendvelocity", "control", "temperamentlinear", "beat", "beatstring",
@@ -335,6 +335,7 @@ var ParserLint = function() {
 		field: "el_type",
 		types: [
 			{ value: "clef", properties: appendPositioning(clefProperties) },
+			{ value: "color", properties: { color: {type: "string", optional: true } } },
 			{ value: "bar", properties: prependPositioning(barProperties) },
 			{ value: "gap", properties: { type: "number", optional: true } },	// staffbreak
 			{ value: "key", properties: appendPositioning(keyProperties) },
@@ -462,9 +463,11 @@ var ParserLint = function() {
 			infospace: { type: "number", optional: true },
 //					landscape: { type: "boolean", optional: true },
 			jazzchords: { type: "boolean", optional: true },
+			germanAlphabet: { type: "boolean", optional: true },
 			leftmargin: { type: "number", optional: true },
 			linesep: { type: "number", optional: true },
 			lineskipfac: { type: "number", optional: true },
+			lineThickness: { type: "number", optional: true },
 			map: { type: "string", optional: true },
 			maxshrink: { type: "number", optional: true },
 			maxstaffsep: { type: "number", optional: true },
@@ -741,14 +744,14 @@ var ParserLint = function() {
 	this.lint = function(tune, warnings) {
 		var ret = JSONSchema.validate(tune, musicSchema);
 		var err = "";
-		parseCommon.each(ret.errors, function(e) {
+		ret.errors.forEach(function(e) {
 			err += e.property + ": " + e.message + "\n";
 		});
 		var out = ret.output.join("\n");
 
 		var warn = warnings === undefined ? "No errors" : warnings.join('\n');
-		warn = parseCommon.gsub(warn, '<span style="text-decoration:underline;font-size:1.3em;font-weight:bold;">', '$$$$');
-		warn = parseCommon.gsub(warn, '</span>', '$$$$');
+		warn = warn.replace(/<span style="text-decoration:underline;font-size:1.3em;font-weight:bold;">/g, '$$$$$$$$');
+		warn = warn.replace(/<\/span>/g, '$$$$$$$$');
 		return "Error:------\n" + err + "\nObj:-------\n" + out + "\nWarn:------\n" + warn;
 	};
 };

package/src/write/README.md

@@ -0,0 +1,31 @@
+# Architecture of the engraver
+
+The engraver code is handled here. This accepts the output of the parser and does three things:
+
+* Creates an SVG
+* Adds data to the parser input
+* Makes the visual elements interactive
+
+## Steps
+
+There are separate passes and sub-passes to the processing. The separate passes match the subfolder organization here.
+
+They are:
+
+### Element Creation
+
+The structure passed in from the parser is traversed and all elements are created. An element consists of two parts:
+
+* The Absolute Element: a visual piece of music that is always moved together. For instance, in the key signature of D, the absolute element is an object that contains two sharp symbols. The absolute element has an X- and Y- position in the SVG, and an array of Relative Elements.
+
+* Relative Element: These are always attached to an absolute element. They have a relative position to the absolute element and consist of all the glyphs needed. For instance, a dotted eighth note of Bb that is trilled is an absolute element that contains an array of relative elements consisting of a trill, a flat sign, a filled note head, a stem, a flag, and a dot.
+
+Each of these elements is a separate object, created with `new` and placed in the structure passed in from the parser.
+
+### Layout
+
+After all the elements are created the size of all of them are known, so the layout process begins. There are separate layout algorithms for the horizontal and the vertical positioning. 
+
+### Drawing
+
+After the layout is finished, it is a rote process to draw the music. All decisions have been made. The structure is then traversed and each element is created in the SVG.