abcjs 6.0.0-beta.9 → 6.0.2

package/src/parse/abc_tokenizer.js

@@ -1,18 +1,4 @@
 //    abc_tokenizer.js: tokenizes an ABC Music Notation string to support abc_parse.
-//    Copyright (C) 2010-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    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('./abc_common');
 
@@ -20,7 +6,11 @@ var parseCommon = require('./abc_common');
 // the return is the number of characters consumed, so 0 means that the element wasn't found.
 // also returned is the element found. This may be a different length because spaces may be consumed that aren't part of the string.
 // The return structure for most calls is { len: num_chars_consumed, token: str }
-var Tokenizer = function() {
+var Tokenizer = function(lines, multilineVars) {
+	this.lineIndex = 0
+	this.lines = lines
+	this.multilineVars = multilineVars;
+
 	this.skipWhiteSpace = function(str) {
 		for (var i = 0; i < str.length; i++) {
 		  if (!this.isWhiteSpace(str.charAt(i)))
@@ -752,4 +742,20 @@ var Tokenizer = function() {
 	};
 };
 
+Tokenizer.prototype.peekLine = function() {
+	return this.lines[this.lineIndex]
+}
+
+Tokenizer.prototype.nextLine = function() {
+	if (this.lineIndex > 0) {
+		this.multilineVars.iChar += this.lines[this.lineIndex-1].length + 1;
+	}
+	if (this.lineIndex < this.lines.length) {
+		var result = this.lines[this.lineIndex]
+		this.lineIndex++
+		return result
+	}
+	return null
+}
+
 module.exports = Tokenizer;

package/src/parse/abc_transpose.js

@@ -1,18 +1,4 @@
 //    abc_transpose.js: Handles the automatic transposition of key signatures, chord symbols, and notes.
-//    Copyright (C) 2010-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    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 transpose = {};
 
@@ -39,6 +25,8 @@ var newKey = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'F#', 'G', 'Ab', 'A', 'Bb', 'B'];
 var newKeyMinor = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'Bb', 'B'];
 
 transpose.keySignature = function(multilineVars, keys, keyName, root, acc, localTranspose) {
+	if (multilineVars.clef.type === "perc")
+		return { accidentals: keys[keyName], root: root, acc: acc };
 	if (!localTranspose) localTranspose = 0;
 	multilineVars.localTransposeVerticalMovement = 0;
 	multilineVars.localTransposePreferFlats = false;
@@ -212,7 +200,7 @@ transpose.note = function(multilineVars, el) {
 	// the "el" that is passed in has el.accidental, and el.pitch. "pitch" is the vertical position (0=middle C)
 	// localTranspose is the number of half steps
 	// localTransposeVerticalMovement is the vertical distance to move.
-	if (!multilineVars.localTranspose)
+	if (!multilineVars.localTranspose || multilineVars.clef.type === "perc")
 		return;
 	var origPitch = el.pitch;
 	el.pitch = el.pitch + multilineVars.localTransposeVerticalMovement;