abcjs 6.1.7 → 6.1.9

package/dist/abcjs-basic.js

@@ -1628,6 +1628,7 @@ var Tune = function Tune() {
         var height = bottom - top;
         var voices = group.voices;
         for (var v = 0; v < voices.length; v++) {
+          if (voices[v].staff && voices[v].staff.isTabStaff) continue;
           var noteFound = false;
           if (!voicesArr[v]) voicesArr[v] = [];
           if (measureNumber[v] === undefined) measureNumber[v] = 0;
@@ -2542,8 +2543,14 @@ var create;
           case 'program':
             var pan = 0;
             if (options.pan && options.pan.length > i) pan = options.pan[i];
-            midi.setChannel(event.channel, pan);
-            midi.setInstrument(event.instrument);
+            if (event.instrument === 128) {
+              // If we're using the percussion voice, change to Channel 10
+              midi.setChannel(9, pan);
+              midi.setInstrument(0);
+            } else {
+              midi.setChannel(event.channel, pan);
+              midi.setInstrument(event.instrument);
+            }
             break;
           case 'note':
             var gapLengthInBeats = event.gap * beatsPerSecond;
@@ -2787,6 +2794,7 @@ var Parse = function Parse() {
         type: 'treble',
         verticalPos: 0
       };
+      this.octave = 0;
       this.next_note_duration = 0;
       this.start_new_line = true;
       this.is_in_header = true;
@@ -5949,6 +5957,28 @@ var parseKeyVoice = {};
           multilineVars.clef.staffscale = tokens[0].floatt;
           tokens.shift();
           break;
+        case "octave":
+          tokens.shift();
+          if (tokens.length === 0) {
+            warn("Expected = after octave", str, 0);
+            return ret;
+          }
+          token = tokens.shift();
+          if (token.token !== "=") {
+            warn("Expected = after octave", str, token.start);
+            break;
+          }
+          if (tokens.length === 0) {
+            warn("Expected parameter after octave=", str, 0);
+            return ret;
+          }
+          if (tokens[0].type !== 'number') {
+            warn("Expected number after octave", str, tokens[0].start);
+            break;
+          }
+          multilineVars.octave = tokens[0].intt;
+          tokens.shift();
+          break;
         case "style":
           tokens.shift();
           if (tokens.length === 0) {
@@ -6250,7 +6280,6 @@ var parseKeyVoice = {};
             addNextTokenToVoiceInfo(id, 'staffscale', 'number');
             break;
           case 'octave':
-            // TODO-PER: This is accepted, but not implemented, yet.
             addNextTokenToVoiceInfo(id, 'octave', 'number');
             break;
           case 'volume':
@@ -6955,7 +6984,7 @@ function durationOfMeasure(multilineVars) {
   if (!meter.value || meter.value.length === 0) return 1;
   return parseInt(meter.value[0].num, 10) / parseInt(meter.value[0].den, 10);
 }
-var legalAccents = ["trill", "lowermordent", "uppermordent", "mordent", "pralltriller", "accent", "fermata", "invertedfermata", "tenuto", "0", "1", "2", "3", "4", "5", "+", "wedge", "open", "thumb", "snap", "turn", "roll", "breath", "shortphrase", "mediumphrase", "longphrase", "segno", "coda", "D.S.", "D.C.", "fine", "beambr1", "beambr2", "slide", "marcato", "upbow", "downbow", "/", "//", "///", "////", "trem1", "trem2", "trem3", "trem4", "turnx", "invertedturn", "invertedturnx", "trill(", "trill)", "arpeggio", "xstem", "mark", "umarcato", "style=normal", "style=harmonic", "style=rhythm", "style=x", "style=triangle"];
+var legalAccents = ["trill", "lowermordent", "uppermordent", "mordent", "pralltriller", "accent", "fermata", "invertedfermata", "tenuto", "0", "1", "2", "3", "4", "5", "+", "wedge", "open", "thumb", "snap", "turn", "roll", "breath", "shortphrase", "mediumphrase", "longphrase", "segno", "coda", "D.S.", "D.C.", "fine", "beambr1", "beambr2", "slide", "marcato", "upbow", "downbow", "/", "//", "///", "////", "trem1", "trem2", "trem3", "trem4", "turnx", "invertedturn", "invertedturnx", "trill(", "trill)", "arpeggio", "xstem", "mark", "umarcato", "style=normal", "style=harmonic", "style=rhythm", "style=x", "style=triangle", "D.C.alcoda", "D.C.alfine", "D.S.alcoda", "D.S.alfine", "editorial", "courtesy"];
 var volumeDecorations = ["p", "pp", "f", "ff", "mf", "mp", "ppp", "pppp", "fff", "ffff", "sfz"];
 var dynamicDecorations = ["crescendo(", "crescendo)", "diminuendo(", "diminuendo)", "glissando(", "glissando)"];
 var accentPseudonyms = [["<", "accent"], [">", "accent"], ["tr", "trill"], ["plus", "+"], ["emphasis", "accent"], ["^", "umarcato"], ["marcato", "umarcato"]];
@@ -7352,6 +7381,7 @@ var getCoreNote = function getCoreNote(line, index, el, canHaveBrokenRhythm) {
       case 'g':
         if (state === 'startSlur' || state === 'sharp2' || state === 'flat2' || state === 'pitch') {
           el.pitch = pitches[line.charAt(index)];
+          el.pitch += 7 * (multilineVars.currentVoice && multilineVars.currentVoice.octave !== undefined ? multilineVars.currentVoice.octave : multilineVars.octave);
           el.name = line.charAt(index);
           if (el.accidental) el.name = accMap[el.accidental] + el.name;
           transpose.note(multilineVars, el);
@@ -8908,7 +8938,15 @@ transpose.keySignature = function (multilineVars, keyName, root, acc, localTrans
     baseKey += keyName[1];
     keyName = keyName.substr(2);
   } else keyName = keyName.substr(1);
-  var index = keyIndex[baseKey] + multilineVars.localTranspose;
+  var thisKeyIndex = keyIndex[baseKey];
+  var recognized = thisKeyIndex !== undefined;
+  if (!recognized) {
+    // Either the key sig is "none" or we don't recognize it. Either way we don't change it, and we assume key of C for the purposes of this calculation.
+    thisKeyIndex = 0;
+    baseKey = "C";
+    keyName = "";
+  }
+  var index = thisKeyIndex + multilineVars.localTranspose;
   while (index < 0) {
     index += 12;
   }
@@ -8935,10 +8973,14 @@ transpose.keySignature = function (multilineVars, keyName, root, acc, localTrans
     }
   }
   if (multilineVars.localTranspose > 0) multilineVars.localTransposeVerticalMovement = distance + Math.floor(multilineVars.localTranspose / 12) * 7;else multilineVars.localTransposeVerticalMovement = distance + Math.ceil(multilineVars.localTranspose / 12) * 7;
-  return {
+  if (recognized) return {
     accidentals: newKeySig,
     root: newKeyName[0],
     acc: newKeyName.length > 1 ? newKeyName[1] : ""
+  };else return {
+    accidentals: [],
+    root: root,
+    acc: acc
   };
 };
 transpose.chordName = function (multilineVars, chord) {
@@ -8990,7 +9032,7 @@ var accidentals3 = {
   "1": "^",
   "2": "^^"
 };
-var count = 0;
+//var count = 0
 transpose.note = function (multilineVars, el) {
   // the "el" that is passed in has el.name, el.accidental, and el.pitch. "pitch" is the vertical position (0=middle C)
   // localTranspose is the number of half steps
@@ -12668,7 +12710,7 @@ var parseCommon = __webpack_require__(/*! ../parse/abc_common */ "./src/parse/ab
 (function () {
   "use strict";
 
-  var measureLength;
+  var measureLength = 1; // This should be set by the meter, but just in case that is missing, we'll take a guess.
   // The abc is provided to us line by line. It might have repeats in it. We want to re arrange the elements to
   // be an array of voices with all the repeats embedded, and no lines. Then it is trivial to go through the events
   // one at a time and turn it into midi.
@@ -14589,7 +14631,19 @@ var pitchMap = {
   f13: "_b",
   n13: "=b",
   s13: "^b",
-  x13: "b"
+  x13: "b",
+  f14: "_c'",
+  n14: "=c'",
+  s14: "^c'",
+  x14: "c'",
+  f15: "_d'",
+  n15: "=d'",
+  s15: "^d'",
+  x15: "d'",
+  f16: "_e'",
+  n16: "=e'",
+  s16: "^e'",
+  x16: "e'"
 };
 function pitchesToPerc(pitchObj) {
   var pitch = (pitchObj.accidental ? pitchObj.accidental[0] : 'x') + pitchObj.verticalPos;
@@ -15330,7 +15384,7 @@ function handleChordNotes(self, notes) {
 }
 function noteToNumber(self, note, stringNumber, secondPosition, firstSize) {
   var strings = self.strings;
-  note.checkKeyAccidentals(self.accidentals);
+  note.checkKeyAccidentals(self.accidentals, self.measureAccidentals);
   if (secondPosition) {
     strings = secondPosition;
   }
@@ -15357,6 +15411,15 @@ function noteToNumber(self, note, stringNumber, secondPosition, firstSize) {
   return null;
 }
 function toNumber(self, note) {
+  if (note.isAltered || note.natural) {
+    var acc;
+    if (note.isFlat) {
+      if (note.isDouble) acc = "__";else acc = "_";
+    } else if (note.isSharp) {
+      if (note.isDouble) acc = "^^";else acc = "^";
+    } else if (note.natural) acc = "=";
+    self.measureAccidentals[note.name.toUpperCase()] = acc;
+  }
   var num = null;
   var str = 0;
   var lowestString = self.strings[self.strings.length - 1];
@@ -15475,6 +15538,7 @@ function StringPatterns(plugin) {
     // override default
     this.highestNote = highestNote;
   }
+  this.measureAccidentals = {};
   this.capo = 0;
   if (capo) {
     this.capo = capo;
@@ -15668,7 +15732,27 @@ TabNote.prototype.isLowerThan = function (note) {
   if (noteComparator.indexOf(thisName) < noteComparator.indexOf(noteName)) return true;
   return false;
 };
-TabNote.prototype.checkKeyAccidentals = function (accidentals) {
+TabNote.prototype.checkKeyAccidentals = function (accidentals, measureAccidentals) {
+  if (this.isAltered || this.natural) return;
+  if (measureAccidentals[this.name.toUpperCase()]) {
+    switch (measureAccidentals[this.name.toUpperCase()]) {
+      case "__":
+        this.acc = -2;
+        return;
+      case "_":
+        this.acc = -1;
+        return;
+      case "=":
+        this.acc = 0;
+        return;
+      case "^":
+        this.acc = 1;
+        return;
+      case "^^":
+        this.acc = 2;
+        return;
+    }
+  }
   if (accidentals) {
     var curNote = this.name;
     for (var iii = 0; iii < accidentals.length; iii++) {
@@ -16008,6 +16092,8 @@ function cloneAbsolute(absSrc) {
     cloneObject(returned.abcelem, absSrc.abcelem);
     if (returned.abcelem.el_type === "note") returned.abcelem.el_type = 'tabNumber';
   }
+  // TODO-PER: This fixes the classes because the element isn't created at the right time.
+  absSrc.cloned = returned;
   return returned;
 }
 function cloneAbsoluteAndRelatives(absSrc, plugin) {
@@ -16199,6 +16285,7 @@ TabAbsoluteElements.prototype.build = function (plugin, staffAbsolute, tabVoice,
         }
         break;
       case 'bar':
+        plugin.semantics.strings.measureAccidentals = {};
         var lastBar = false;
         if (ii === source.children.length - 1) {
           // used for final line bar drawing
@@ -16552,6 +16639,7 @@ TabRenderer.prototype.doLayout = function () {
   for (var ii = 0; ii < nbVoices; ii++) {
     var tabVoice = new VoiceElement(0, 0);
     var nameHeight = buildTabName(this, tabVoice) / spacing.STEP;
+    nameHeight = Math.max(nameHeight, 1); // If there is no label for the tab line, then there needs to be a little padding
     staffGroup.staffs[this.staffIndex].top += nameHeight;
     staffGroup.height += nameHeight * spacing.STEP;
     tabVoice.staff = staffGroupInfos;
@@ -18759,7 +18847,7 @@ var stackedDecoration = function stackedDecoration(decoration, width, abselem, y
     }
     return y;
   }
-  function textDecoration(text, placement) {
+  function textDecoration(text, placement, anchor) {
     var y = getPlacement(placement);
     var textFudge = 2;
     var textHeight = 5;
@@ -18767,7 +18855,8 @@ var stackedDecoration = function stackedDecoration(decoration, width, abselem, y
     abselem.addFixedX(new RelativeElement(text, width / 2, 0, y + textFudge, {
       type: "decoration",
       klass: 'ornament',
-      thickness: 3
+      thickness: 3,
+      anchor: anchor
     }));
     incrementPlacement(placement, textHeight);
   }
@@ -18824,11 +18913,27 @@ var stackedDecoration = function stackedDecoration(decoration, width, abselem, y
       case "5":
       case "D.C.":
       case "D.S.":
-        textDecoration(decoration[i], positioning);
+        textDecoration(decoration[i], positioning, 'middle');
+        hasOne = true;
+        break;
+      case "D.C.alcoda":
+        textDecoration("D.C. al coda", positioning, 'left');
+        hasOne = true;
+        break;
+      case "D.C.alfine":
+        textDecoration("D.C. al fine", positioning, 'left');
+        hasOne = true;
+        break;
+      case "D.S.alcoda":
+        textDecoration("D.S. al coda", positioning, 'left');
+        hasOne = true;
+        break;
+      case "D.S.alfine":
+        textDecoration("D.S. al fine", positioning, 'left');
         hasOne = true;
         break;
       case "fine":
-        textDecoration("FINE", positioning);
+        textDecoration("FINE", positioning, 'middle');
         hasOne = true;
         break;
       case "+":
@@ -19979,6 +20084,7 @@ var RelativeElement = function RelativeElement(c, dx, w, pitch, opt) {
   this.pitch2 = opt.pitch2;
   this.linewidth = opt.linewidth;
   this.klass = opt.klass;
+  this.anchor = opt.anchor ? opt.anchor : 'middle';
   this.top = pitch;
   if (this.pitch2 !== undefined && this.pitch2 > this.top) this.top = this.pitch2;
   this.bottom = pitch;
@@ -21118,6 +21224,10 @@ Classes.prototype.generate = function (c) {
   if (!this.shouldAddClasses) return "";
   var ret = [];
   if (c && c.length > 0) ret.push(c);
+  if (c === "tab-number")
+    // TODO-PER-HACK! straighten out the tablature
+    return ret.join(' ');
+  if (c === "text instrument-name") return "abcjs-text abcjs-instrument-name";
   if (this.lineNumber !== null) ret.push("l" + this.lineNumber);
   if (this.measureNumber !== null) ret.push("m" + this.measureNumber);
   if (this.measureNumber !== null) ret.push("mm" + this.measureTotal()); // measureNumber is null between measures so this is still the test for measureTotal
@@ -21178,6 +21288,14 @@ function drawAbsolute(renderer, params, bartop, selectables, staffPos) {
   }
   var g = elementGroup.endGroup(klass, params.type);
   if (g) {
+    // TODO-PER-HACK! This corrects the classes because the tablature is not being created at the right time.
+    if (params.cloned) {
+      params.cloned.overrideClasses = g.className.baseVal;
+    }
+    if (params.overrideClasses) {
+      var type = g.classList && g.classList.length > 0 ? g.classList[0] + ' ' : '';
+      g.setAttribute("class", type + params.overrideClasses);
+    }
     if (isTempo) {
       params.startChar = params.abcelem.startChar;
       params.endChar = params.abcelem.endChar;
@@ -22089,7 +22207,7 @@ function drawRelativeElement(renderer, params, bartop) {
         text: params.c,
         type: 'annotationfont',
         klass: renderer.controller.classes.generate("annotation"),
-        anchor: "middle",
+        anchor: params.anchor,
         centerVertically: true,
         dim: params.dim
       }, false);
@@ -24484,9 +24602,15 @@ function setupSelection(engraver, svgs) {
     }
   }
   for (var i = 0; i < svgs.length; i++) {
-    svgs[i].addEventListener('touchstart', mouseDown.bind(engraver));
-    svgs[i].addEventListener('touchmove', mouseMove.bind(engraver));
-    svgs[i].addEventListener('touchend', mouseUp.bind(engraver));
+    svgs[i].addEventListener('touchstart', mouseDown.bind(engraver), {
+      passive: true
+    });
+    svgs[i].addEventListener('touchmove', mouseMove.bind(engraver), {
+      passive: true
+    });
+    svgs[i].addEventListener('touchend', mouseUp.bind(engraver), {
+      passive: true
+    });
     svgs[i].addEventListener('mousedown', mouseDown.bind(engraver));
     svgs[i].addEventListener('mousemove', mouseMove.bind(engraver));
     svgs[i].addEventListener('mouseup', mouseUp.bind(engraver));
@@ -25448,7 +25572,7 @@ module.exports = unhighlight;
   \********************/
 /***/ (function(module) {
 
-var version = '6.1.7';
+var version = '6.1.9';
 module.exports = version;
 
 /***/ })