chordsheetjs 5.0.0 → 5.3.0

package/lib/key.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -15,15 +15,15 @@ var _MODIFIER_TRANSPOSITI;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
 
@@ -31,9 +31,9 @@ function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollect
 
 function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 
-function _wrapRegExp() { _wrapRegExp = function _wrapRegExp(re, groups) { return new BabelRegExp(re, undefined, groups); }; var _super = RegExp.prototype; var _groups = new WeakMap(); function BabelRegExp(re, flags, groups) { var _this = new RegExp(re, flags); _groups.set(_this, groups || _groups.get(re)); return _setPrototypeOf(_this, BabelRegExp.prototype); } _inherits(BabelRegExp, RegExp); BabelRegExp.prototype.exec = function (str) { var result = _super.exec.call(this, str); if (result) result.groups = buildGroups(result, this); return result; }; BabelRegExp.prototype[Symbol.replace] = function (str, substitution) { if (typeof substitution === "string") { var groups = _groups.get(this); return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) { return "$" + groups[name]; })); } else if (typeof substitution === "function") { var _this = this; return _super[Symbol.replace].call(this, str, function () { var args = arguments; if (_typeof(args[args.length - 1]) !== "object") { args = [].slice.call(args); args.push(buildGroups(args, _this)); } return substitution.apply(this, args); }); } else { return _super[Symbol.replace].call(this, str, substitution); } }; function buildGroups(result, re) { var g = _groups.get(re); return Object.keys(g).reduce(function (groups, name) { groups[name] = result[g[name]]; return groups; }, Object.create(null)); } return _wrapRegExp.apply(this, arguments); }
+function _wrapRegExp() { _wrapRegExp = function _wrapRegExp(re, groups) { return new BabelRegExp(re, void 0, groups); }; var _super = RegExp.prototype, _groups = new WeakMap(); function BabelRegExp(re, flags, groups) { var _this = new RegExp(re, flags); return _groups.set(_this, groups || _groups.get(re)), _setPrototypeOf(_this, BabelRegExp.prototype); } function buildGroups(result, re) { var g = _groups.get(re); return Object.keys(g).reduce(function (groups, name) { return groups[name] = result[g[name]], groups; }, Object.create(null)); } return _inherits(BabelRegExp, RegExp), BabelRegExp.prototype.exec = function (str) { var result = _super.exec.call(this, str); return result && (result.groups = buildGroups(result, this)), result; }, BabelRegExp.prototype[Symbol.replace] = function (str, substitution) { if ("string" == typeof substitution) { var groups = _groups.get(this); return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) { return "$" + groups[name]; })); } if ("function" == typeof substitution) { var _this = this; return _super[Symbol.replace].call(this, str, function () { var args = arguments; return "object" != _typeof(args[args.length - 1]) && (args = [].slice.call(args)).push(buildGroups(args, _this)), substitution.apply(this, args); }); } return _super[Symbol.replace].call(this, str, substitution); }, _wrapRegExp.apply(this, arguments); }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
@@ -53,7 +53,12 @@ var numericKeyRegex = /*#__PURE__*/_wrapRegExp(/^(#|b)?([1-7])$/, {
   note: 2
 });
 
-var regexes = [symbolKeyRegex, numericKeyRegex];
+var numeralKeyRegex = /*#__PURE__*/_wrapRegExp(/^(#|b)?(I{1,3}|IV|VI{0,2}|i{1,3}|iv|vi{0,2})$/, {
+  modifier: 1,
+  note: 2
+});
+
+var regexes = [symbolKeyRegex, numericKeyRegex, numeralKeyRegex];
 
 var _set = /*#__PURE__*/new WeakSet();
 
@@ -67,29 +72,33 @@ var Key = /*#__PURE__*/function () {
 
     _classPrivateMethodInitSpec(this, _set);
 
-    this.note = note instanceof _note["default"] ? note : new _note["default"](note);
+    this.note = note instanceof _note["default"] ? note : _note["default"].parse(note);
     this.modifier = modifier || null;
   }
 
   _createClass(Key, [{
-    key: "clone",
-    value: function clone() {
-      return _classPrivateMethodGet(this, _set, _set2).call(this, {});
-    }
-  }, {
-    key: "toChordSymbol",
-    value: function toChordSymbol(key) {
-      if (this.is(_constants.SYMBOL)) {
-        return this.clone();
+    key: "distanceTo",
+    value: function distanceTo(otherKey) {
+      var otherKeyObj = Key.wrap(otherKey);
+      var key = this.useModifier(otherKeyObj.modifier);
+      var delta = 0;
+
+      while (!key.equals(otherKeyObj) && delta < 20) {
+        key = key.transposeUp().useModifier(otherKeyObj.modifier);
+        delta += 1;
       }
 
-      var transposeDistance = this.note.getTransposeDistance() + (MODIFIER_TRANSPOSITION[this.modifier] || 0);
-      return key.transpose(transposeDistance).normalize().useModifier(key.modifier);
+      return delta;
     }
   }, {
-    key: "toChordSymbolString",
-    value: function toChordSymbolString(key) {
-      return this.toChordSymbol(key).toString();
+    key: "isMinor",
+    value: function isMinor() {
+      return this.note.isMinor();
+    }
+  }, {
+    key: "clone",
+    value: function clone() {
+      return _classPrivateMethodGet(this, _set, _set2).call(this, {});
     }
   }, {
     key: "is",
@@ -106,6 +115,33 @@ var Key = /*#__PURE__*/function () {
     value: function isChordSymbol() {
       return this.is(_constants.SYMBOL);
     }
+  }, {
+    key: "isNumeral",
+    value: function isNumeral() {
+      return this.is(_constants.NUMERAL);
+    }
+  }, {
+    key: "equals",
+    value: function equals(_ref2) {
+      var note = _ref2.note,
+          modifier = _ref2.modifier;
+      return this.note.equals(note) && this.modifier === modifier;
+    }
+  }, {
+    key: "toChordSymbol",
+    value: function toChordSymbol(key) {
+      if (this.is(_constants.SYMBOL)) {
+        return this.clone();
+      }
+
+      var transposeDistance = this.note.getTransposeDistance() + (MODIFIER_TRANSPOSITION[this.modifier] || 0);
+      return key.transpose(transposeDistance).normalize().useModifier(key.modifier);
+    }
+  }, {
+    key: "toChordSymbolString",
+    value: function toChordSymbolString(key) {
+      return this.toChordSymbol(key).toString();
+    }
   }, {
     key: "toNumeric",
     value: function toNumeric(key) {
@@ -113,6 +149,12 @@ var Key = /*#__PURE__*/function () {
         return this.clone();
       }
 
+      if (this.isNumeral()) {
+        return _classPrivateMethodGet(this, _set, _set2).call(this, {
+          note: this.note.toNumeric()
+        });
+      }
+
       var numericKey = new Key({
         note: 1
       });
@@ -126,26 +168,50 @@ var Key = /*#__PURE__*/function () {
 
       return numericKey;
     }
-  }, {
-    key: "equals",
-    value: function equals(_ref2) {
-      var note = _ref2.note,
-          modifier = _ref2.modifier;
-      return this.note.equals(note) && this.modifier === modifier;
-    }
   }, {
     key: "toNumericString",
     value: function toNumericString(key) {
       return this.toNumeric(key).toString();
     }
+  }, {
+    key: "toNumeral",
+    value: function toNumeral(key) {
+      if (this.isNumeral()) {
+        return this.clone();
+      }
+
+      if (this.isNumeric()) {
+        return _classPrivateMethodGet(this, _set, _set2).call(this, {
+          note: this.note.toNumeral()
+        });
+      }
+
+      var numeralKey = new Key({
+        note: 'I'
+      });
+      var symbolKey = key.clone();
+      var reference = this.clone().normalize().useModifier(key.modifier);
+
+      while (!symbolKey.equals(reference)) {
+        numeralKey = numeralKey.transposeUp().useModifier(key.modifier);
+        symbolKey = symbolKey.transposeUp().normalize().useModifier(key.modifier);
+      }
+
+      return numeralKey;
+    }
+  }, {
+    key: "toNumeralString",
+    value: function toNumeralString(key) {
+      return this.toNumeral(key).toString();
+    }
   }, {
     key: "toString",
     value: function toString() {
-      if (this.is(_constants.NUMERIC)) {
-        return "".concat(this.modifier || '').concat(this.note);
+      if (this.isChordSymbol()) {
+        return "".concat(this.note).concat(this.modifier || '');
       }
 
-      return "".concat(this.note).concat(this.modifier || '');
+      return "".concat(this.modifier || '').concat(this.note);
     }
   }, {
     key: "transpose",
@@ -276,6 +342,11 @@ var Key = /*#__PURE__*/function () {
 
       return this.parse(keyStringOrObject);
     }
+  }, {
+    key: "distance",
+    value: function distance(oneKey, otherKey) {
+      return this.wrap(oneKey).distanceTo(otherKey);
+    }
   }]);
 
   return Key;

package/lib/note.js

@@ -7,11 +7,23 @@ exports["default"] = void 0;
 
 var _constants = require("./constants");
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
+
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+
+function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 
 var A = 'A'.charCodeAt(0);
 var G = 'G'.charCodeAt(0);
@@ -33,30 +45,84 @@ function clamp(note, min, max) {
   return newNote;
 }
 
+function numeralToNumber(numeral) {
+  for (var i = 0, count = _constants.ROMAN_NUMERALS.length; i < count; i += 1) {
+    var romanNumeral = _constants.ROMAN_NUMERALS[i];
+
+    if (romanNumeral === numeral || romanNumeral.toLowerCase() === numeral) {
+      return i + 1;
+    }
+  }
+
+  return null;
+}
+
+function numberToNumeral(number) {
+  return _constants.ROMAN_NUMERALS[number - 1];
+}
+
+var _set = /*#__PURE__*/new WeakSet();
+
 var Note = /*#__PURE__*/function () {
-  function Note(note) {
+  function Note(_ref) {
+    var note = _ref.note,
+        type = _ref.type,
+        _ref$minor = _ref.minor,
+        minor = _ref$minor === void 0 ? false : _ref$minor;
+
     _classCallCheck(this, Note);
 
-    if (/^[A-Ga-g]$/.test(note)) {
-      this.note = note.toUpperCase();
-      this.type = _constants.SYMBOL;
-    } else if (/^[1-7]$/.test(note)) {
-      this.note = parseInt(note, 10);
-      this.type = _constants.NUMERIC;
-    } else {
-      throw new Error("Invalid note ".concat(note));
-    }
+    _classPrivateMethodInitSpec(this, _set);
+
+    this._note = note;
+    this.type = type;
+    this.minor = minor;
   }
 
   _createClass(Note, [{
+    key: "toNumeral",
+    value: function toNumeral() {
+      if (this.isNumeral()) {
+        return this.clone();
+      }
+
+      if (this.isNumeric()) {
+        return _classPrivateMethodGet(this, _set, _set2).call(this, {
+          type: _constants.NUMERAL
+        });
+      }
+
+      throw new Error("Converting a ".concat(this.type, " note to numeral is not supported"));
+    }
+  }, {
+    key: "toNumeric",
+    value: function toNumeric() {
+      if (this.isNumeric()) {
+        return this.clone();
+      }
+
+      if (this.isNumeral()) {
+        return _classPrivateMethodGet(this, _set, _set2).call(this, {
+          type: _constants.NUMERIC
+        });
+      }
+
+      throw new Error("Converting a ".concat(this.type, " note to numeric is not supported"));
+    }
+  }, {
+    key: "isMinor",
+    value: function isMinor() {
+      return this.minor;
+    }
+  }, {
     key: "equals",
     value: function equals(otherNote) {
-      return this.note === otherNote.note && this.type === otherNote.type;
+      return this._note === otherNote._note && this.type === otherNote.type && this.minor === otherNote.minor;
     }
   }, {
     key: "clone",
     value: function clone() {
-      return new this.constructor(this.note);
+      return _classPrivateMethodGet(this, _set, _set2).call(this, {});
     }
   }, {
     key: "up",
@@ -75,7 +141,7 @@ var Note = /*#__PURE__*/function () {
         options[_key] = arguments[_key];
       }
 
-      return options.includes(this.note);
+      return options.includes(this._note);
     }
   }, {
     key: "isNumeric",
@@ -87,6 +153,11 @@ var Note = /*#__PURE__*/function () {
     value: function isChordSymbol() {
       return this.is(_constants.SYMBOL);
     }
+  }, {
+    key: "isNumeral",
+    value: function isNumeral() {
+      return this.is(_constants.NUMERAL);
+    }
   }, {
     key: "is",
     value: function is(noteType) {
@@ -95,38 +166,94 @@ var Note = /*#__PURE__*/function () {
   }, {
     key: "getTransposeDistance",
     value: function getTransposeDistance() {
-      return TRANSPOSE_DISTANCE[this.note];
+      return TRANSPOSE_DISTANCE[this._note];
     }
   }, {
     key: "change",
     value: function change(delta) {
-      if (this.isNumeric()) {
-        var newNote = clamp(this.note + delta, 1, 7);
+      if (this.isChordSymbol()) {
+        var charCode;
+        charCode = keyToCharCode(this._note);
+        charCode += delta;
+        charCode = clamp(charCode, A, G);
+        return _classPrivateMethodGet(this, _set, _set2).call(this, {
+          note: String.fromCharCode(charCode)
+        });
+      }
+
+      var newNote = clamp(this._note + delta, 1, 7);
+
+      if (newNote < 1) {
+        newNote += 7;
+      } else if (newNote > 7) {
+        newNote -= 7;
+      }
 
-        if (newNote < 1) {
-          newNote += 7;
-        } else if (newNote > 7) {
-          newNote -= 7;
+      return _classPrivateMethodGet(this, _set, _set2).call(this, {
+        note: newNote
+      });
+    }
+  }, {
+    key: "note",
+    get: function get() {
+      if (this.isNumeral()) {
+        var numeral = numberToNumeral(this._note);
+
+        if (this.isMinor()) {
+          return numeral.toLowerCase();
         }
 
-        return new Note(newNote);
+        return numeral;
       }
 
-      var charCode;
-      charCode = keyToCharCode(this.note);
-      charCode += delta;
-      charCode = clamp(charCode, A, G);
-      return new Note(String.fromCharCode(charCode));
+      return this._note;
     }
   }, {
     key: "toString",
     value: function toString() {
       return "".concat(this.note);
     }
+  }], [{
+    key: "parse",
+    value: function parse(note) {
+      if (/^[A-Ga-g]$/.test(note)) {
+        return new Note({
+          note: note.toUpperCase(),
+          type: _constants.SYMBOL
+        });
+      }
+
+      if (/^[1-7]$/.test(note)) {
+        return new Note({
+          note: parseInt(note, 10),
+          type: _constants.NUMERIC
+        });
+      }
+
+      var romanNumeralValue = numeralToNumber(note);
+
+      if (romanNumeralValue) {
+        return new Note({
+          note: romanNumeralValue,
+          type: _constants.NUMERAL,
+          minor: note.toLowerCase() === note
+        });
+      }
+
+      throw new Error("Invalid note ".concat(note));
+    }
   }]);
 
   return Note;
 }();
 
+function _set2(attributes) {
+  return new this.constructor(_objectSpread({
+    note: this._note,
+    type: this.type,
+    minor: this.minor
+  }, attributes));
+}
+
 var _default = Note;
 exports["default"] = _default;

package/lib/parser/chord_pro_parser.js

@@ -15,7 +15,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 /**
  * Parses a ChordPro chord sheet

package/lib/parser/chord_pro_peg_parser.js

@@ -5,9 +5,9 @@
  */
 "use strict";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -529,7 +529,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseLine() {
-    var s0, s1, s2, s3, s4;
+    var s0, s1, s2, s3, s4, s5, s6;
     s0 = peg$currPos;
     s1 = peg$parseLyrics();
 
@@ -561,9 +561,22 @@ function peg$parse(input, options) {
           }
 
           if (s4 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s1 = peg$c2(s1, s2, s3, s4);
-            s0 = s1;
+            s5 = [];
+            s6 = peg$parseSpace();
+
+            while (s6 !== peg$FAILED) {
+              s5.push(s6);
+              s6 = peg$parseSpace();
+            }
+
+            if (s5 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$c2(s1, s2, s3, s4);
+              s0 = s1;
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -1714,13 +1727,9 @@ function peg$parse(input, options) {
     s0 = [];
     s1 = peg$parseTagValueChar();
 
-    if (s1 !== peg$FAILED) {
-      while (s1 !== peg$FAILED) {
-        s0.push(s1);
-        s1 = peg$parseTagValueChar();
-      }
-    } else {
-      s0 = peg$FAILED;
+    while (s1 !== peg$FAILED) {
+      s0.push(s1);
+      s1 = peg$parseTagValueChar();
     }
 
     return s0;

package/lib/parser/chord_sheet_parser.js

@@ -13,7 +13,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 var WHITE_SPACE = /\s/;
 var CHORD_LINE_REGEX = /^\s*((([A-G])(#|b)?([^/\s]*)(\/([A-G])(#|b)?)?)(\s|$)+)+(\s|$)+/;

package/lib/parser/parser_warning.js

@@ -9,7 +9,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 /**
  * Represents a parser warning, currently only used by ChordProParser.

package/lib/parser/ultimate_guitar_parser.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -25,13 +25,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 

package/lib/{handlebars_helpers.js → template_helpers.js}

@@ -1,5 +1,10 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasTextContents = void 0;
+
 var _handlebars = _interopRequireDefault(require("handlebars"));
 
 var _chord_lyrics_pair = _interopRequireDefault(require("./chord_sheet/chord_lyrics_pair"));
@@ -8,6 +13,8 @@ var _tag = _interopRequireDefault(require("./chord_sheet/tag"));
 
 var _constants = require("./constants");
 
+var _helpers = require("./helpers");
+
 var _utilities = require("./utilities");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -17,6 +24,16 @@ var lineHasContents = function lineHasContents(line) {
     return item.isRenderable();
   });
 };
+/* eslint import/prefer-default-export: 0 */
+
+
+var hasTextContents = function hasTextContents(line) {
+  return line.items.some(function (item) {
+    return item instanceof _chord_lyrics_pair["default"] && item.lyrics || item instanceof _tag["default"] && item.isRenderable() || (0, _utilities.isEvaluatable)(item);
+  });
+};
+
+exports.hasTextContents = hasTextContents;
 
 _handlebars["default"].registerHelper('isChordLyricsPair', function (item) {
   return item instanceof _chord_lyrics_pair["default"];
@@ -40,7 +57,7 @@ _handlebars["default"].registerHelper('shouldRenderLine', function (line, option
 
 _handlebars["default"].registerHelper('hasChordContents', _utilities.hasChordContents);
 
-_handlebars["default"].registerHelper('hasTextContents', _utilities.hasTextContents);
+_handlebars["default"].registerHelper('hasTextContents', hasTextContents);
 
 _handlebars["default"].registerHelper('lineHasContents', lineHasContents);
 
@@ -76,4 +93,6 @@ _handlebars["default"].registerHelper('evaluate', function (item, metadata) {
   }
 
   return item.evaluate(metadata);
-});
+});
+
+_handlebars["default"].registerHelper('renderChord', _helpers.renderChord);