abcjs 6.0.0-beta.36 → 6.0.0-beta.37

package/dist/abcjs-plugin-min.js.LICENSE

@@ -1,5 +1,5 @@
 /**!
-Copyright (c) 2009-2021 Paul Rosen and Gregory Dyke
+Copyright (c) 2009-2022 Paul Rosen and Gregory Dyke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,5 +19,5 @@ 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.
 
-**This text is from: http://opensource.org/licenses/MIT**
+ **This text is from: http://opensource.org/licenses/MIT**
 !**/

package/index.js

@@ -1,4 +1,26 @@
-require('./license')
+/**!
+Copyright (c) 2009-2022 Paul Rosen and Gregory Dyke
+
+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.
+
+ **This text is from: http://opensource.org/licenses/MIT**
+!**/
 var version = require('./version');
 var animation = require('./src/api/abc_animation');
 var tuneBook = require('./src/api/abc_tunebook');

package/license.js

@@ -1,5 +1,5 @@
 /**!
-Copyright (c) 2009-2021 Paul Rosen and Gregory Dyke
+Copyright (c) 2009-2022 Paul Rosen and Gregory Dyke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abcjs",
-  "version": "6.0.0-beta.36",
+  "version": "6.0.0-beta.37",
   "description": "Renderer for abc music notation",
   "main": "index.js",
   "types": "types/index.d.ts",

package/plugin.js

@@ -1,4 +1,26 @@
-require('./license');
+/**!
+Copyright (c) 2009-2022 Paul Rosen and Gregory Dyke
+
+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.
+
+ **This text is from: http://opensource.org/licenses/MIT**
+!**/
 //    abc_plugin.js: Find everything which looks like abc and convert it
 
 /*global abcjs_is_user_script, abcjs_plugin_autostart */

package/src/api/abc_tunebook_svg.js

@@ -28,7 +28,7 @@ try {
     // if we aren't in a browser, this code will crash, but it is not needed then either.
 }
 
-function renderOne(div, tune, params, tuneNumber) {
+function renderOne(div, tune, params, tuneNumber, lineOffset) {
     if (params.viewportHorizontal) {
         // Create an inner div that holds the music, so that the passed in div will be the viewport.
         div.innerHTML = '<div class="abcjs-inner"></div>';
@@ -50,7 +50,7 @@ function renderOne(div, tune, params, tuneNumber) {
     else
 	    div.innerHTML = "";
     var engraver_controller = new EngraverController(div, params);
-    engraver_controller.engraveABC(tune, tuneNumber);
+    engraver_controller.engraveABC(tune, tuneNumber, lineOffset);
     tune.engraver = engraver_controller;
     if (params.viewportVertical || params.viewportHorizontal) {
         // If we added a wrapper around the div, then we need to size the wrapper, too.
@@ -113,6 +113,7 @@ function renderEachLineSeparately(div, tune, params, tuneNumber) {
     var currentScrollY = div.parentNode.scrollTop; // If there is scrolling it will be lost during the redraw so remember it.
     var currentScrollX = div.parentNode.scrollLeft;
     div.innerHTML = "";
+    var lineCount = 0;
     for (var k = 0; k < tunes.length; k++) {
         var lineEl = document.createElement("div");
         div.appendChild(lineEl);
@@ -132,7 +133,8 @@ function renderEachLineSeparately(div, tune, params, tuneNumber) {
             tunes[k].formatting = parseCommon.clone(tunes[k].formatting);
             tunes[k].formatting.stretchlast = true;
         }
-        renderOne(lineEl, tunes[k], ep, tuneNumber);
+        renderOne(lineEl, tunes[k], ep, tuneNumber, lineCount);
+        lineCount += tunes[k].lines.length;
         if (k === 0)
             tune.engraver = tunes[k].engraver;
         else {
@@ -213,7 +215,7 @@ var renderAbc = function(output, abc, parserParams, engraverParams, renderParams
 	        return tune;
         }
         else if (removeDiv || !params.oneSvgPerLine || tune.lines.length < 2)
-            renderOne(div, tune, params, tuneNumber);
+            renderOne(div, tune, params, tuneNumber, 0);
         else
             renderEachLineSeparately(div, tune, params, tuneNumber);
         if (removeDiv)
@@ -238,7 +240,7 @@ function doLineWrapping(div, tune, tuneNumber, abcString, params) {
             tune.warnings = warnings;
     }
     if (!params.oneSvgPerLine || tune.lines.length < 2)
-        renderOne(div, tune, ret.revisedParams, tuneNumber);
+        renderOne(div, tune, ret.revisedParams, tuneNumber, 0);
     else
         renderEachLineSeparately(div, tune, ret.revisedParams, tuneNumber);
 	tune.explanation = ret.explanation;

package/src/synth/create-synth.js

@@ -12,10 +12,10 @@ var soundsCache = require('./sounds-cache');
 // TODO-PER: remove the midi tests from here: I don't think the object can be constructed unless it passes.
 var notSupportedMessage = "MIDI is not supported in this browser.";
 
-var defaultSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/abcjs/";
+var originalSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/abcjs/";
 // These are the original soundfonts supplied. They will need a volume boost:
-var alternateSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/FluidR3_GM/";
-var alternateSoundFontUrl2 = "https://paulrosen.github.io/midi-js-soundfonts/MusyngKite/";
+var defaultSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/FluidR3_GM/";
+var alternateSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/MusyngKite/";
 
 function CreateSynth() {
 	var self = this;
@@ -45,18 +45,59 @@ function CreateSynth() {
 			self.soundFontUrl += '/';
 		if (params.soundFontVolumeMultiplier || params.soundFontVolumeMultiplier === 0)
 			self.soundFontVolumeMultiplier = params.soundFontVolumeMultiplier;
-		else if (self.soundFontUrl === alternateSoundFontUrl || self.soundFontUrl === alternateSoundFontUrl2)
-			self.soundFontVolumeMultiplier = 5.0;
-		else if (self.soundFontUrl === defaultSoundFontUrl)
-			self.soundFontVolumeMultiplier = 0.5;
+		else if (self.soundFontUrl === defaultSoundFontUrl || self.soundFontUrl === alternateSoundFontUrl)
+			self.soundFontVolumeMultiplier = 3.0;
+		else if (self.soundFontUrl === originalSoundFontUrl)
+			self.soundFontVolumeMultiplier = 0.4;
 		else
 			self.soundFontVolumeMultiplier = 1.0;
 		if (params.programOffsets)
 			self.programOffsets = params.programOffsets;
-		else if (self.soundFontUrl === defaultSoundFontUrl)
+		else if (self.soundFontUrl === originalSoundFontUrl)
 			self.programOffsets = {
-				"violin": 113,
-				"trombone": 200,
+				"bright_acoustic_piano": 20,
+				"honkytonk_piano": 20,
+				"electric_piano_1": 30,
+				"electric_piano_2": 30,
+				"harpsichord": 40,
+				"clavinet": 20,
+				"celesta": 20,
+				"glockenspiel": 40,
+				"vibraphone": 30,
+				"marimba": 35,
+				"xylophone": 30,
+				"tubular_bells": 35,
+				"dulcimer": 30,
+				"drawbar_organ": 20,
+				"percussive_organ": 25,
+				"rock_organ": 20,
+				"church_organ": 40,
+				"reed_organ": 40,
+				"accordion": 40,
+				"harmonica": 40,
+				"acoustic_guitar_nylon": 20,
+				"acoustic_guitar_steel": 30,
+				"electric_guitar_jazz": 25,
+				"electric_guitar_clean": 15,
+				"electric_guitar_muted": 35,
+				"overdriven_guitar": 25,
+				"distortion_guitar": 20,
+				"guitar_harmonics": 30,
+				"electric_bass_finger": 15,
+				"electric_bass_pick": 30,
+				"fretless_bass": 40,
+				"violin": 105,
+				"viola": 50,
+				"cello": 40,
+				"contrabass": 60,
+				"trumpet": 10,
+				"trombone": 90,
+				"alto_sax": 20,
+				"tenor_sax": 20,
+				"clarinet": 20,
+				"flute": 50,
+				"banjo": 50,
+				"woodblock": 20,
 			};
 		else
 			self.programOffsets = {};

package/src/write/abc_engraver_controller.js

@@ -88,7 +88,7 @@ EngraverController.prototype.reset = function() {
 /**
  * run the engraving process
  */
-EngraverController.prototype.engraveABC = function(abctunes, tuneNumber) {
+EngraverController.prototype.engraveABC = function(abctunes, tuneNumber, lineOffset) {
   if (abctunes[0]===undefined) {
     abctunes = [abctunes];
   }
@@ -99,7 +99,7 @@ EngraverController.prototype.engraveABC = function(abctunes, tuneNumber) {
       tuneNumber = i;
     this.getFontAndAttr = new GetFontAndAttr(abctunes[i].formatting, this.classes);
     this.getTextSize = new GetTextSize(this.getFontAndAttr, this.renderer.paper);
-    this.engraveTune(abctunes[i], tuneNumber);
+    this.engraveTune(abctunes[i], tuneNumber, lineOffset);
   }
 };
 
@@ -227,7 +227,7 @@ EngraverController.prototype.constructTuneElements = function (abcTune) {
 	abcTune.bottomText = new BottomText(abcTune.metaText, this.width, this.renderer.isPrint, this.renderer.padding.left, this.renderer.spacing, this.getTextSize);
 };
 
-EngraverController.prototype.engraveTune = function (abcTune, tuneNumber) {
+EngraverController.prototype.engraveTune = function (abcTune, tuneNumber, lineOffset) {
 	var scale = this.setupTune(abcTune, tuneNumber);
 
 	// Create all of the element objects that will appear on the page.
@@ -242,7 +242,7 @@ EngraverController.prototype.engraveTune = function (abcTune, tuneNumber) {
 	}
 
 	// Do all the writing to the SVG
-	var ret = draw(this.renderer, this.classes, abcTune, this.width, maxWidth, this.responsive, scale, this.selectTypes, tuneNumber);
+	var ret = draw(this.renderer, this.classes, abcTune, this.width, maxWidth, this.responsive, scale, this.selectTypes, tuneNumber, lineOffset);
 	this.staffgroups = ret.staffgroups;
 	this.selectables = ret.selectables;
 

package/src/write/draw/draw.js

@@ -4,7 +4,7 @@ var nonMusic = require('./non-music');
 var spacing = require('../abc_spacing');
 var Selectables = require('./selectables');
 
-function draw(renderer, classes, abcTune, width, maxWidth, responsive, scale, selectTypes, tuneNumber) {
+function draw(renderer, classes, abcTune, width, maxWidth, responsive, scale, selectTypes, tuneNumber, lineOffset) {
 	var selectables = new Selectables(renderer.paper, selectTypes, tuneNumber);
 	renderer.moveY(renderer.padding.top);
 	nonMusic(renderer, abcTune.topText, selectables);
@@ -20,7 +20,7 @@ function draw(renderer, classes, abcTune, width, maxWidth, responsive, scale, se
 			if (staffgroups.length >= 1)
 				addStaffPadding(renderer, renderer.spacing.staffSeparation, staffgroups[staffgroups.length - 1], abcLine.staffGroup);
 			var staffgroup = engraveStaffLine(renderer, abcLine.staffGroup, selectables,line);
-			staffgroup.line = line; // If there are non-music lines then the staffgroup array won't line up with the line array, so this keeps track.
+			staffgroup.line = lineOffset+line; // If there are non-music lines then the staffgroup array won't line up with the line array, so this keeps track.
 			staffgroups.push(staffgroup);
 		} else if (abcLine.nonMusic) {
 			nonMusic(renderer, abcLine.nonMusic, selectables);

package/test.js

@@ -1,3 +1,26 @@
+/**!
+Copyright (c) 2009-2022 Paul Rosen and Gregory Dyke
+
+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.
+
+ **This text is from: http://opensource.org/licenses/MIT**
+!**/
 var abcjs = require('./index');
 var version = require('./version');
 var Parse = require('./src/parse/abc_parse');

package/version.js

@@ -1,3 +1,3 @@
-var version = '6.0.0-beta.36';
+var version = '6.0.0-beta.37';
 
 module.exports = version;