chordsheetjs 5.0.0 → 5.1.2

package/lib/chord_sheet/song.js

@@ -9,17 +9,17 @@ exports["default"] = void 0;
 
 var _line = _interopRequireDefault(require("./line"));
 
-var _tag = _interopRequireWildcard(require("./tag"));
-
 var _paragraph = _interopRequireDefault(require("./paragraph"));
 
 var _utilities = require("../utilities");
 
 var _metadata = _interopRequireDefault(require("./metadata"));
 
+var _parser_warning = _interopRequireDefault(require("../parser/parser_warning"));
+
 var _constants = require("../constants");
 
-var _parser_warning = _interopRequireDefault(require("../parser/parser_warning"));
+var _tag = _interopRequireWildcard(require("./tag"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -82,6 +82,7 @@ var Song = /*#__PURE__*/function () {
     this.currentParagraph = null;
     this.warnings = [];
     this.sectionType = _constants.NONE;
+    this.currentKey = null;
   }
 
   _createClass(Song, [{
@@ -150,6 +151,7 @@ var Song = /*#__PURE__*/function () {
       this.flushLine();
       this.currentLine = (0, _utilities.pushNew)(this.lines, _line["default"]);
       this.setCurrentLineType(this.sectionType);
+      this.currentLine.key = this.currentKey;
       return this.currentLine;
     }
   }, {
@@ -208,6 +210,8 @@ var Song = /*#__PURE__*/function () {
 
       if (tag.isMetaTag()) {
         this.setMetaData(tag.name, tag.value);
+      } else if (tag.name === _tag.TRANSPOSE) {
+        this.currentKey = tag.value;
       } else {
         this.setSectionTypeFromTag(tag);
       }

package/lib/chord_sheet/tag.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports._KEY = exports.YEAR = exports.TITLE = exports.TIME = exports.TEMPO = exports.SUBTITLE = exports.START_OF_VERSE = exports.START_OF_TAB = exports.START_OF_CHORUS = exports.READ_ONLY_TAGS = exports.META_TAGS = exports.LYRICIST = exports.KEY = exports.END_OF_VERSE = exports.END_OF_TAB = exports.END_OF_CHORUS = exports.DURATION = exports.COPYRIGHT = exports.COMPOSER = exports.COMMENT = exports.CAPO = exports.ARTIST = exports.ALBUM = void 0;
+exports["default"] = exports._KEY = exports.YEAR = exports.TRANSPOSE = exports.TITLE = exports.TIME = exports.TEMPO = exports.SUBTITLE = exports.START_OF_VERSE = exports.START_OF_TAB = exports.START_OF_CHORUS = exports.READ_ONLY_TAGS = exports.META_TAGS = exports.LYRICIST = exports.KEY = exports.END_OF_VERSE = exports.END_OF_TAB = exports.END_OF_CHORUS = exports.DURATION = exports.COPYRIGHT = exports.COMPOSER = exports.COMMENT = exports.CAPO = exports.ARTIST = exports.ALBUM = void 0;
 exports.isReadonlyTag = isReadonlyTag;
 
 var _ALIASES;
@@ -155,11 +155,18 @@ var TIME = 'time';
 exports.TIME = TIME;
 var TITLE = 'title';
 /**
- * Year meta directive. See https://www.chordpro.org/chordpro/directives-year/
+ * Transpose meta directive. See: https://www.chordpro.org/chordpro/directives-transpose/
  * @type {string}
  */
 
 exports.TITLE = TITLE;
+var TRANSPOSE = 'transpose';
+/**
+ * Year meta directive. See https://www.chordpro.org/chordpro/directives-year/
+ * @type {string}
+ */
+
+exports.TRANSPOSE = TRANSPOSE;
 var YEAR = 'year';
 exports.YEAR = YEAR;
 var TITLE_SHORT = 't';

package/lib/formatter/html_formatter.js

@@ -30,7 +30,8 @@ var HtmlFormatter = /*#__PURE__*/function () {
           bodyParagraphs: true,
           subtitle: true,
           title: true,
-          value: true
+          value: true,
+          key: true
         }
       });
     }

package/lib/formatter/templates/html_div_formatter.js

@@ -1,13 +1,11 @@
 "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); }
-
 var Handlebars = require("handlebars");
 
 var template = Handlebars.template,
     templates = Handlebars.templates = Handlebars.templates || {};
 templates['html_div_formatter'] = template({
-  "1": function _(container, depth0, helpers, partials, data, blockParams, depths) {
+  "1": function _(container, depth0, helpers, partials, data, blockParams) {
     var stack1,
         alias1 = depth0 != null ? depth0 : container.nullContext || {},
         lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -21,7 +19,7 @@ templates['html_div_formatter'] = template({
     return ((stack1 = lookupProperty(helpers, "if").call(alias1, depth0 != null ? lookupProperty(depth0, "title") : depth0, {
       "name": "if",
       "hash": {},
-      "fn": container.program(2, data, 0, blockParams, depths),
+      "fn": container.program(2, data, 0, blockParams),
       "inverse": container.noop,
       "data": data,
       "blockParams": blockParams,
@@ -38,7 +36,7 @@ templates['html_div_formatter'] = template({
     })) != null ? stack1 : "") + ((stack1 = lookupProperty(helpers, "if").call(alias1, depth0 != null ? lookupProperty(depth0, "subtitle") : depth0, {
       "name": "if",
       "hash": {},
-      "fn": container.program(4, data, 0, blockParams, depths),
+      "fn": container.program(4, data, 0, blockParams),
       "inverse": container.noop,
       "data": data,
       "blockParams": blockParams,
@@ -55,7 +53,7 @@ templates['html_div_formatter'] = template({
     })) != null ? stack1 : "") + "<div class=\"chord-sheet\">" + ((stack1 = lookupProperty(helpers, "each").call(alias1, depth0 != null ? lookupProperty(depth0, "bodyParagraphs") : depth0, {
       "name": "each",
       "hash": {},
-      "fn": container.program(6, data, 1, blockParams, depths),
+      "fn": container.program(6, data, 1, blockParams),
       "inverse": container.noop,
       "data": data,
       "blockParams": blockParams,
@@ -123,7 +121,7 @@ templates['html_div_formatter'] = template({
       }
     }) : helper)) + "</h2>";
   },
-  "6": function _(container, depth0, helpers, partials, data, blockParams, depths) {
+  "6": function _(container, depth0, helpers, partials, data, blockParams) {
     var stack1,
         alias1 = depth0 != null ? depth0 : container.nullContext || {},
         lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -152,7 +150,7 @@ templates['html_div_formatter'] = template({
     })) + "\">" + ((stack1 = lookupProperty(helpers, "each").call(alias1, depth0 != null ? lookupProperty(depth0, "lines") : depth0, {
       "name": "each",
       "hash": {},
-      "fn": container.program(7, data, 1, blockParams, depths),
+      "fn": container.program(7, data, 1, blockParams),
       "inverse": container.noop,
       "data": data,
       "blockParams": blockParams,
@@ -168,7 +166,7 @@ templates['html_div_formatter'] = template({
       }
     })) != null ? stack1 : "") + "</div>";
   },
-  "7": function _(container, depth0, helpers, partials, data, blockParams, depths) {
+  "7": function _(container, depth0, helpers, partials, data, blockParams) {
     var stack1,
         alias1 = depth0 != null ? depth0 : container.nullContext || {},
         lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -197,7 +195,7 @@ templates['html_div_formatter'] = template({
     }), {
       "name": "if",
       "hash": {},
-      "fn": container.program(8, data, 0, blockParams, depths),
+      "fn": container.program(8, data, 0, blockParams),
       "inverse": container.noop,
       "data": data,
       "blockParams": blockParams,
@@ -213,7 +211,7 @@ templates['html_div_formatter'] = template({
       }
     })) != null ? stack1 : "";
   },
-  "8": function _(container, depth0, helpers, partials, data, blockParams, depths) {
+  "8": function _(container, depth0, helpers, partials, data, blockParams) {
     var stack1,
         alias1 = depth0 != null ? depth0 : container.nullContext || {},
         lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -242,7 +240,7 @@ templates['html_div_formatter'] = template({
     })) + "\">" + ((stack1 = lookupProperty(helpers, "each").call(alias1, depth0 != null ? lookupProperty(depth0, "items") : depth0, {
       "name": "each",
       "hash": {},
-      "fn": container.program(9, data, 1, blockParams, depths),
+      "fn": container.program(9, data, 1, blockParams),
       "inverse": container.noop,
       "data": data,
       "blockParams": blockParams,
@@ -258,7 +256,7 @@ templates['html_div_formatter'] = template({
       }
     })) != null ? stack1 : "") + "</div>";
   },
-  "9": function _(container, depth0, helpers, partials, data, blockParams, depths) {
+  "9": function _(container, depth0, helpers, partials, data, blockParams) {
     var stack1,
         alias1 = depth0 != null ? depth0 : container.nullContext || {},
         lookupProperty = container.lookupProperty || function (parent, propertyName) {
@@ -287,7 +285,7 @@ templates['html_div_formatter'] = template({
     }), {
       "name": "if",
       "hash": {},
-      "fn": container.program(10, data, 0, blockParams, depths),
+      "fn": container.program(10, data, 0, blockParams),
       "inverse": container.noop,
       "data": data,
       "blockParams": blockParams,
@@ -319,7 +317,7 @@ templates['html_div_formatter'] = template({
     }), {
       "name": "if",
       "hash": {},
-      "fn": container.program(12, data, 0, blockParams, depths),
+      "fn": container.program(12, data, 0, blockParams),
       "inverse": container.noop,
       "data": data,
       "blockParams": blockParams,
@@ -351,7 +349,7 @@ templates['html_div_formatter'] = template({
     }), {
       "name": "if",
       "hash": {},
-      "fn": container.program(15, data, 0, blockParams, depths),
+      "fn": container.program(15, data, 0, blockParams),
       "inverse": container.noop,
       "data": data,
       "blockParams": blockParams,
@@ -367,12 +365,12 @@ templates['html_div_formatter'] = template({
       }
     })) != null ? stack1 : "");
   },
-  "10": function _(container, depth0, helpers, partials, data) {
-    var helper,
+  "10": function _(container, depth0, helpers, partials, data, blockParams) {
+    var stack1,
+        helper,
         alias1 = depth0 != null ? depth0 : container.nullContext || {},
         alias2 = container.hooks.helperMissing,
-        alias3 = "function",
-        alias4 = container.escapeExpression,
+        alias3 = container.escapeExpression,
         lookupProperty = container.lookupProperty || function (parent, propertyName) {
       if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
         return parent[propertyName];
@@ -381,10 +379,11 @@ templates['html_div_formatter'] = template({
       return undefined;
     };
 
-    return "<div class=\"column\"><div class=\"chord\">" + alias4((helper = (helper = lookupProperty(helpers, "chords") || (depth0 != null ? lookupProperty(depth0, "chords") : depth0)) != null ? helper : alias2, _typeof(helper) === alias3 ? helper.call(alias1, {
-      "name": "chords",
+    return "<div class=\"column\"><div class=\"chord\">" + alias3((lookupProperty(helpers, "renderChord") || depth0 && lookupProperty(depth0, "renderChord") || alias2).call(alias1, depth0 != null ? lookupProperty(depth0, "chords") : depth0, (stack1 = blockParams[3][0]) != null ? lookupProperty(stack1, "key") : stack1, (stack1 = (stack1 = data && lookupProperty(data, "root")) && lookupProperty(stack1, "song")) && lookupProperty(stack1, "key"), {
+      "name": "renderChord",
       "hash": {},
       "data": data,
+      "blockParams": blockParams,
       "loc": {
         "start": {
           "line": 18,
@@ -392,21 +391,22 @@ templates['html_div_formatter'] = template({
         },
         "end": {
           "line": 18,
-          "column": 67
+          "column": 103
         }
       }
-    }) : helper)) + "</div><div class=\"lyrics\">" + alias4((helper = (helper = lookupProperty(helpers, "lyrics") || (depth0 != null ? lookupProperty(depth0, "lyrics") : depth0)) != null ? helper : alias2, _typeof(helper) === alias3 ? helper.call(alias1, {
+    })) + "</div><div class=\"lyrics\">" + alias3((helper = (helper = lookupProperty(helpers, "lyrics") || (depth0 != null ? lookupProperty(depth0, "lyrics") : depth0)) != null ? helper : alias2, typeof helper === "function" ? helper.call(alias1, {
       "name": "lyrics",
       "hash": {},
       "data": data,
+      "blockParams": blockParams,
       "loc": {
         "start": {
           "line": 18,
-          "column": 93
+          "column": 129
         },
         "end": {
           "line": 18,
-          "column": 103
+          "column": 139
         }
       }
     }) : helper)) + "</div></div>";
@@ -482,7 +482,7 @@ templates['html_div_formatter'] = template({
       }
     }) : helper)) + "</div>";
   },
-  "15": function _(container, depth0, helpers, partials, data, blockParams, depths) {
+  "15": function _(container, depth0, helpers, partials, data, blockParams) {
     var stack1,
         lookupProperty = container.lookupProperty || function (parent, propertyName) {
       if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -492,7 +492,7 @@ templates['html_div_formatter'] = template({
       return undefined;
     };
 
-    return "<div class=\"column\"><div class=\"chord\"></div><div class=\"lyrics\">" + container.escapeExpression((lookupProperty(helpers, "evaluate") || depth0 && lookupProperty(depth0, "evaluate") || container.hooks.helperMissing).call(depth0 != null ? depth0 : container.nullContext || {}, blockParams[1][0], (stack1 = depths[4] != null ? lookupProperty(depths[4], "song") : depths[4]) != null ? lookupProperty(stack1, "metadata") : stack1, {
+    return "<div class=\"column\"><div class=\"chord\"></div><div class=\"lyrics\">" + container.escapeExpression((lookupProperty(helpers, "evaluate") || depth0 && lookupProperty(depth0, "evaluate") || container.hooks.helperMissing).call(depth0 != null ? depth0 : container.nullContext || {}, blockParams[1][0], (stack1 = (stack1 = data && lookupProperty(data, "root")) && lookupProperty(stack1, "song")) && lookupProperty(stack1, "metadata"), {
       "name": "evaluate",
       "hash": {},
       "data": data,
@@ -504,13 +504,13 @@ templates['html_div_formatter'] = template({
         },
         "end": {
           "line": 28,
-          "column": 126
+          "column": 120
         }
       }
     })) + "</div></div>";
   },
   "compiler": [8, ">= 4.3.0"],
-  "main": function main(container, depth0, helpers, partials, data, blockParams, depths) {
+  "main": function main(container, depth0, helpers, partials, data, blockParams) {
     var stack1,
         lookupProperty = container.lookupProperty || function (parent, propertyName) {
       if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -523,7 +523,7 @@ templates['html_div_formatter'] = template({
     return (stack1 = lookupProperty(helpers, "with").call(depth0 != null ? depth0 : container.nullContext || {}, depth0 != null ? lookupProperty(depth0, "song") : depth0, {
       "name": "with",
       "hash": {},
-      "fn": container.program(1, data, 0, blockParams, depths),
+      "fn": container.program(1, data, 0, blockParams),
       "inverse": container.noop,
       "data": data,
       "blockParams": blockParams,
@@ -540,6 +540,5 @@ templates['html_div_formatter'] = template({
     })) != null ? stack1 : "";
   },
   "useData": true,
-  "useDepths": true,
   "useBlockParams": true
 });

package/lib/formatter/templates/html_table_formatter.js

@@ -406,8 +406,8 @@ templates['html_table_formatter'] = template({
       }
     })) != null ? stack1 : "";
   },
-  "12": function _(container, depth0, helpers, partials, data) {
-    var helper,
+  "12": function _(container, depth0, helpers, partials, data, blockParams) {
+    var stack1,
         lookupProperty = container.lookupProperty || function (parent, propertyName) {
       if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
         return parent[propertyName];
@@ -416,10 +416,11 @@ templates['html_table_formatter'] = template({
       return undefined;
     };
 
-    return "<td class=\"chord\">" + container.escapeExpression((helper = (helper = lookupProperty(helpers, "chords") || (depth0 != null ? lookupProperty(depth0, "chords") : depth0)) != null ? helper : container.hooks.helperMissing, typeof helper === "function" ? helper.call(depth0 != null ? depth0 : container.nullContext || {}, {
-      "name": "chords",
+    return "<td class=\"chord\">" + container.escapeExpression((lookupProperty(helpers, "renderChord") || depth0 && lookupProperty(depth0, "renderChord") || container.hooks.helperMissing).call(depth0 != null ? depth0 : container.nullContext || {}, depth0 != null ? lookupProperty(depth0, "chords") : depth0, (stack1 = blockParams[4][0]) != null ? lookupProperty(stack1, "key") : stack1, (stack1 = (stack1 = data && lookupProperty(data, "root")) && lookupProperty(stack1, "song")) && lookupProperty(stack1, "key"), {
+      "name": "renderChord",
       "hash": {},
       "data": data,
+      "blockParams": blockParams,
       "loc": {
         "start": {
           "line": 21,
@@ -427,10 +428,10 @@ templates['html_table_formatter'] = template({
         },
         "end": {
           "line": 21,
-          "column": 52
+          "column": 88
         }
       }
-    }) : helper)) + "</td>";
+    })) + "</td>";
   },
   "14": function _(container, depth0, helpers, partials, data, blockParams, depths) {
     var stack1,

package/lib/formatter/text_formatter.js

@@ -9,6 +9,8 @@ var _chord_lyrics_pair = _interopRequireDefault(require("../chord_sheet/chord_ly
 
 var _tag = _interopRequireDefault(require("../chord_sheet/tag"));
 
+var _helpers = require("../helpers");
+
 var _utilities = require("../utilities");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -36,23 +38,26 @@ var TextFormatter = /*#__PURE__*/function () {
      * @returns {string} the chord sheet
      */
     function format(song) {
-      return [this.formatHeader(song), this.formatParagraphs(song)].join('');
+      this.song = song;
+      return [this.formatHeader(), this.formatParagraphs()].join('');
     }
   }, {
     key: "formatHeader",
-    value: function formatHeader(song) {
-      var title = song.title,
-          subtitle = song.subtitle;
+    value: function formatHeader() {
+      var _this$song = this.song,
+          title = _this$song.title,
+          subtitle = _this$song.subtitle;
       var separator = title || subtitle ? '\n' : '';
       return [this.formatTitle(title), this.formatSubTitle(subtitle), separator].join('');
     }
   }, {
     key: "formatParagraphs",
-    value: function formatParagraphs(song) {
+    value: function formatParagraphs() {
       var _this = this;
 
-      var bodyParagraphs = song.bodyParagraphs,
-          metadata = song.metadata;
+      var _this$song2 = this.song,
+          bodyParagraphs = _this$song2.bodyParagraphs,
+          metadata = _this$song2.metadata;
       return bodyParagraphs.map(function (paragraph) {
         return _this.formatParagraph(paragraph, metadata);
       }).join('\n\n');
@@ -107,9 +112,9 @@ var TextFormatter = /*#__PURE__*/function () {
     }
   }, {
     key: "chordLyricsPairLength",
-    value: function chordLyricsPairLength(chordLyricsPair) {
-      var chords = chordLyricsPair.chords,
-          lyrics = chordLyricsPair.lyrics;
+    value: function chordLyricsPairLength(chordLyricsPair, line) {
+      var chords = (0, _helpers.renderChord)(chordLyricsPair.chords, line.key, this.song.key);
+      var lyrics = chordLyricsPair.lyrics;
       var chordsLength = (chords || '').length;
       var lyricsLength = (lyrics || '').length;
 
@@ -121,13 +126,14 @@ var TextFormatter = /*#__PURE__*/function () {
     }
   }, {
     key: "formatItemTop",
-    value: function formatItemTop(item) {
+    value: function formatItemTop(item, metadata, line) {
       if (item instanceof _tag["default"] && item.isRenderable()) {
         return (0, _utilities.padLeft)('', item.value);
       }
 
       if (item instanceof _chord_lyrics_pair["default"]) {
-        return (0, _utilities.padLeft)(item.chords || '', this.chordLyricsPairLength(item));
+        var chords = (0, _helpers.renderChord)(item.chords, line.key, this.song.key);
+        return (0, _utilities.padLeft)(chords, this.chordLyricsPairLength(item, line));
       }
 
       return '';
@@ -147,18 +153,18 @@ var TextFormatter = /*#__PURE__*/function () {
       var _this3 = this;
 
       return line.items.map(function (item) {
-        return formatter.call(_this3, item, metadata);
+        return formatter.call(_this3, item, metadata, line);
       }).join('');
     }
   }, {
     key: "formatItemBottom",
-    value: function formatItemBottom(item, metadata) {
+    value: function formatItemBottom(item, metadata, line) {
       if (item instanceof _tag["default"] && item.isRenderable()) {
         return item.value;
       }
 
       if (item instanceof _chord_lyrics_pair["default"]) {
-        return (0, _utilities.padLeft)(item.lyrics, this.chordLyricsPairLength(item));
+        return (0, _utilities.padLeft)(item.lyrics, this.chordLyricsPairLength(item, line));
       }
 
       if (typeof item.evaluate === 'function') {

package/lib/handlebars_helpers.js

@@ -8,6 +8,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 }; }
@@ -76,4 +78,6 @@ _handlebars["default"].registerHelper('evaluate', function (item, metadata) {
   }
 
   return item.evaluate(metadata);
-});
+});
+
+_handlebars["default"].registerHelper('renderChord', _helpers.renderChord);

package/lib/helpers.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.renderChord = renderChord;
+
+var _chord = _interopRequireDefault(require("./chord"));
+
+var _utilities = require("./utilities");
+
+var _key = _interopRequireDefault(require("./key"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function transposeDistance(lineKey, songKey) {
+  if (/^\d+$/.test(lineKey)) {
+    return parseInt(lineKey, 10);
+  }
+
+  return _key["default"].distance(songKey, lineKey);
+}
+/* eslint import/prefer-default-export: 0 */
+
+
+function renderChord(chord, lineKey, songKey) {
+  if ((0, _utilities.presence)(chord) && (0, _utilities.presence)(lineKey) && (0, _utilities.presence)(songKey)) {
+    return _chord["default"].parse(chord).transpose(transposeDistance(lineKey, songKey)).useModifier(lineKey.modifier).toString();
+  }
+
+  return chord;
+}

package/lib/key.js

@@ -72,6 +72,20 @@ var Key = /*#__PURE__*/function () {
   }
 
   _createClass(Key, [{
+    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;
+      }
+
+      return delta;
+    }
+  }, {
     key: "clone",
     value: function clone() {
       return _classPrivateMethodGet(this, _set, _set2).call(this, {});
@@ -276,6 +290,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/utilities.js

@@ -9,12 +9,6 @@ exports.isEmptyString = isEmptyString;
 exports.pushNew = exports.presence = exports.padLeft = exports.isPresent = exports.isEvaluatable = void 0;
 exports.scopeCss = scopeCss;
 
-var _chord_lyrics_pair = _interopRequireDefault(require("./chord_sheet/chord_lyrics_pair"));
-
-var _tag = _interopRequireDefault(require("./chord_sheet/tag"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -39,7 +33,7 @@ exports.pushNew = pushNew;
 
 var hasChordContents = function hasChordContents(line) {
   return line.items.some(function (item) {
-    return item instanceof _chord_lyrics_pair["default"] && item.chords;
+    return !!item.chords;
   });
 };
 
@@ -51,9 +45,15 @@ var isEvaluatable = function isEvaluatable(item) {
 
 exports.isEvaluatable = isEvaluatable;
 
+function isInstanceOf(object, constructorName) {
+  var _object$constructor;
+
+  return (object === null || object === void 0 ? void 0 : (_object$constructor = object.constructor) === null || _object$constructor === void 0 ? void 0 : _object$constructor.name) === constructorName;
+}
+
 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() || isEvaluatable(item);
+    return isInstanceOf(item, 'ChordLyricsPair') && item.lyrics || isInstanceOf(item, 'Tag') && item.isRenderable() || isEvaluatable(item);
   });
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "chordsheetjs",
   "author": "Martijn Versluis",
-  "version": "5.0.0",
+  "version": "5.1.2",
   "description": "A JavaScript library for parsing and formatting chord sheets",
   "main": "lib/index.js",
   "repository": {
@@ -15,16 +15,17 @@
   "devDependencies": {
     "@babel/cli": "^7.10.1",
     "@babel/core": "^7.10.2",
+    "@babel/eslint-parser": "^7.16.3",
     "@babel/plugin-transform-runtime": "^7.10.1",
     "@babel/preset-env": "^7.10.2",
-    "babel-eslint": "^10.1.0",
     "babel-plugin-handlebars-inline-precompile": "^2.1.1",
-    "eslint": "^7.2.0",
+    "eslint": "^8.3.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.21.2",
     "jest": "^27.0.1",
     "jsdoc-to-markdown": "^7.1.0",
-    "pegjs": "^0.10.0"
+    "pegjs": "^0.10.0",
+    "print": "^1.2.0"
   },
   "scripts": {
     "jest": "jest",