chordsheetjs 6.0.2 → 6.1.0

package/README.md

@@ -1,4 +1,4 @@
-# ChordSheetJS [![Build Status](https://travis-ci.org/martijnversluis/ChordSheetJS.svg?branch=master)](https://travis-ci.org/martijnversluis/ChordSheetJS) [![npm version](https://badge.fury.io/js/chordsheetjs.svg)](https://badge.fury.io/js/chordsheetjs) [![Code Climate](https://codeclimate.com/github/martijnversluis/ChordSheetJS/badges/gpa.svg)](https://codeclimate.com/github/martijnversluis/ChordSheetJS)
+# ChordChartJS [![Code Climate](https://codeclimate.com/github/PraiseCharts/ChordChartJS/badges/gpa.svg)](https://codeclimate.com/github/PraiseCharts/ChordChartJS)
 
 A JavaScript library for parsing and formatting chord sheets
 
@@ -469,6 +469,9 @@ Inherits from <a href="#ChordSheetParser">ChordSheetParser</a></p>
 <dt><a href="#TRANSPOSE">TRANSPOSE</a> : <code>string</code></dt>
 <dd><p>Transpose meta directive. See: <a href="https://www.chordpro.org/chordpro/directives-transpose/">https://www.chordpro.org/chordpro/directives-transpose/</a></p>
 </dd>
+<dt><a href="#NEW_KEY">NEW_KEY</a> : <code>string</code></dt>
+<dd><p>New Key meta directive. See: <a href="https://github.com/PraiseCharts/ChordChartJS/issues/53">https://github.com/PraiseCharts/ChordChartJS/issues/53</a></p>
+</dd>
 <dt><a href="#YEAR">YEAR</a> : <code>string</code></dt>
 <dd><p>Year meta directive. See <a href="https://www.chordpro.org/chordpro/directives-year/">https://www.chordpro.org/chordpro/directives-year/</a></p>
 </dd>
@@ -756,6 +759,8 @@ Represents a song in a chord sheet. Currently a chord sheet can only have one so
     * [.bodyParagraphs](#Song+bodyParagraphs) ⇒ [<code>Array.&lt;Paragraph&gt;</code>](#Paragraph)
     * ~~[.metaData](#Song+metaData) ⇒~~
     * [.clone()](#Song+clone) ⇒ [<code>Song</code>](#Song)
+    * [.setCapo(capo)](#Song+setCapo) ⇒ [<code>Song</code>](#Song)
+    * [.setKey(key)](#Song+setKey) ⇒ [<code>Song</code>](#Song)
 
 <a name="new_Song_new"></a>
 
@@ -818,6 +823,35 @@ Returns a deep clone of the song
 
 **Kind**: instance method of [<code>Song</code>](#Song)  
 **Returns**: [<code>Song</code>](#Song) - The cloned song  
+<a name="Song+setCapo"></a>
+
+### song.setCapo(capo) ⇒ [<code>Song</code>](#Song)
+Returns a copy of the song with the capo value set to the specified capo. It changes:
+- the value for `capo` in the `metadata` set
+- any existing `capo` directive)
+
+**Kind**: instance method of [<code>Song</code>](#Song)  
+**Returns**: [<code>Song</code>](#Song) - The changed song  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| capo | <code>number</code> \| <code>null</code> | the capo. Passing `null` will: - remove the current key from `metadata` - remove any `capo` directive |
+
+<a name="Song+setKey"></a>
+
+### song.setKey(key) ⇒ [<code>Song</code>](#Song)
+Returns a copy of the song with the key set to the specified key. It changes:
+- the value for `key` in the `metadata` set
+- any existing `key` directive
+- all chords, those are transposed according to the distance between the current and the new key
+
+**Kind**: instance method of [<code>Song</code>](#Song)  
+**Returns**: [<code>Song</code>](#Song) - The changed song  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| key | <code>string</code> | The new key. |
+
 <a name="Tag"></a>
 
 ## Tag
@@ -1530,6 +1564,12 @@ Title meta directive. See https://www.chordpro.org/chordpro/directives-title/
 ## TRANSPOSE : <code>string</code>
 Transpose meta directive. See: https://www.chordpro.org/chordpro/directives-transpose/
 
+**Kind**: global constant  
+<a name="NEW_KEY"></a>
+
+## NEW\_KEY : <code>string</code>
+New Key meta directive. See: https://github.com/PraiseCharts/ChordChartJS/issues/53
+
 **Kind**: global constant  
 <a name="YEAR"></a>
 

package/lib/chord_sheet/chord_lyrics_pair.js

@@ -66,6 +66,11 @@ var ChordLyricsPair = /*#__PURE__*/function () {
     value: function toString() {
       return "ChordLyricsPair(chords=".concat(this.chords, ", lyrics=").concat(this.lyrics, ")");
     }
+  }, {
+    key: "set",
+    value: function set(properties) {
+      return new this.constructor(properties.chords || this.chords, properties.lyrics || this.lyrics);
+    }
   }]);
 
   return ChordLyricsPair;

package/lib/chord_sheet/line.js

@@ -15,6 +15,12 @@ var _constants = require("../constants");
 
 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); 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); } }
@@ -93,9 +99,17 @@ var Line = /*#__PURE__*/function () {
   }, {
     key: "clone",
     value: function clone() {
+      return this.mapItems(null);
+    }
+  }, {
+    key: "mapItems",
+    value: function mapItems(func) {
       var clonedLine = new Line();
       clonedLine.items = this.items.map(function (item) {
-        return item.clone();
+        var clonedItem = item.clone();
+        return func ? func(clonedItem) : clonedItem;
+      }).filter(function (item) {
+        return item;
       });
       clonedLine.type = this.type;
       return clonedLine;
@@ -176,6 +190,14 @@ var Line = /*#__PURE__*/function () {
       this.items.push(comment);
       return comment;
     }
+  }, {
+    key: "set",
+    value: function set(properties) {
+      return new this.constructor(_objectSpread({
+        type: this.type,
+        items: this.items
+      }, properties));
+    }
   }]);
 
   return Line;

package/lib/chord_sheet/metadata.js

@@ -74,6 +74,11 @@ var Metadata = /*#__PURE__*/function () {
   }
 
   _createClass(Metadata, [{
+    key: "contains",
+    value: function contains(key) {
+      return key in this;
+    }
+  }, {
     key: "add",
     value: function add(key, value) {
       if ((0, _tag.isReadonlyTag)(key)) {
@@ -98,6 +103,15 @@ var Metadata = /*#__PURE__*/function () {
 
       this[key] = [currentValue, value];
     }
+  }, {
+    key: "set",
+    value: function set(key, value) {
+      if (value) {
+        this[key] = value;
+      } else {
+        delete this[key];
+      }
+    }
     /**
      * Reads a metadata value by key. This method supports simple value lookup, as fetching single array values.
      *

package/lib/chord_sheet/song.js

@@ -11,6 +11,12 @@ var _line = _interopRequireDefault(require("./line"));
 
 var _paragraph = _interopRequireDefault(require("./paragraph"));
 
+var _key = _interopRequireDefault(require("../key"));
+
+var _chord = _interopRequireDefault(require("../chord"));
+
+var _chord_lyrics_pair = _interopRequireDefault(require("./chord_lyrics_pair"));
+
 var _utilities = require("../utilities");
 
 var _metadata = _interopRequireDefault(require("./metadata"));
@@ -45,6 +51,22 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 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 _insertDirective = /*#__PURE__*/new WeakSet();
+
+var _mapItems = /*#__PURE__*/new WeakSet();
+
+var _mapLines = /*#__PURE__*/new WeakSet();
+
+var _updateItem = /*#__PURE__*/new WeakSet();
+
+var _removeItem = /*#__PURE__*/new WeakSet();
+
 /**
  * Represents a song in a chord sheet. Currently a chord sheet can only have one song.
  */
@@ -58,16 +80,24 @@ var Song = /*#__PURE__*/function () {
 
     _classCallCheck(this, Song);
 
+    _classPrivateMethodInitSpec(this, _removeItem);
+
+    _classPrivateMethodInitSpec(this, _updateItem);
+
+    _classPrivateMethodInitSpec(this, _mapLines);
+
+    _classPrivateMethodInitSpec(this, _mapItems);
+
+    _classPrivateMethodInitSpec(this, _insertDirective);
+
     /**
      * The {@link Line} items of which the song consists
-     * @member
-     * @type {Array<Line>}
+     * @member {Array<Line>}
      */
     this.lines = [];
     /**
      * The {@link Paragraph} items of which the song consists
-     * @member
-     * @type {Paragraph[]}
+     * @member {Paragraph[]}
      */
 
     this.paragraphs = [];
@@ -83,6 +113,7 @@ var Song = /*#__PURE__*/function () {
     this.warnings = [];
     this.sectionType = _constants.NONE;
     this.currentKey = null;
+    this.transposeKey = null;
   }
 
   _createClass(Song, [{
@@ -147,11 +178,14 @@ var Song = /*#__PURE__*/function () {
   }, {
     key: "addLine",
     value: function addLine() {
+      var _this$transposeKey;
+
       this.ensureParagraph();
       this.flushLine();
       this.currentLine = (0, _utilities.pushNew)(this.lines, _line["default"]);
       this.setCurrentLineType(this.sectionType);
-      this.currentLine.key = this.currentKey;
+      this.currentLine.transposeKey = (_this$transposeKey = this.transposeKey) !== null && _this$transposeKey !== void 0 ? _this$transposeKey : this.currentKey;
+      this.currentLine.key = this.currentKey || this.key;
       return this.currentLine;
     }
   }, {
@@ -211,6 +245,8 @@ var Song = /*#__PURE__*/function () {
       if (tag.isMetaTag()) {
         this.setMetaData(tag.name, tag.value);
       } else if (tag.name === _tag.TRANSPOSE) {
+        this.transposeKey = tag.value;
+      } else if (tag.name === _tag.NEW_KEY) {
         this.currentKey = tag.value;
       } else {
         this.setSectionTypeFromTag(tag);
@@ -304,12 +340,7 @@ var Song = /*#__PURE__*/function () {
   }, {
     key: "clone",
     value: function clone() {
-      var clonedSong = new Song();
-      clonedSong.lines = this.lines.map(function (line) {
-        return line.clone();
-      });
-      clonedSong.metadata = this.metadata.clone();
-      return clonedSong;
+      return _classPrivateMethodGet(this, _mapItems, _mapItems2).call(this, null);
     }
   }, {
     key: "setMetaData",
@@ -333,11 +364,158 @@ var Song = /*#__PURE__*/function () {
     value: function getMetaData(name) {
       return this.metadata[name] || null;
     }
+    /**
+     * Returns a copy of the song with the capo value set to the specified capo. It changes:
+     * - the value for `capo` in the `metadata` set
+     * - any existing `capo` directive)
+     * @param {number|null} capo the capo. Passing `null` will:
+     * - remove the current key from `metadata`
+     * - remove any `capo` directive
+     * @returns {Song} The changed song
+     */
+
+  }, {
+    key: "setCapo",
+    value: function setCapo(capo) {
+      var updatedSong;
+
+      if (capo === null) {
+        updatedSong = _classPrivateMethodGet(this, _removeItem, _removeItem2).call(this, function (item) {
+          return item instanceof _tag["default"] && item.name === _tag.CAPO;
+        });
+      } else {
+        updatedSong = _classPrivateMethodGet(this, _updateItem, _updateItem2).call(this, function (item) {
+          return item instanceof _tag["default"] && item.name === _tag.CAPO;
+        }, function (item) {
+          return item.set({
+            value: capo
+          });
+        }, function (song) {
+          return _classPrivateMethodGet(song, _insertDirective, _insertDirective2).call(song, _tag.CAPO, capo);
+        });
+      }
+
+      updatedSong.metadata.set('capo', capo);
+      return updatedSong;
+    }
+    /**
+     * Returns a copy of the song with the key set to the specified key. It changes:
+     * - the value for `key` in the `metadata` set
+     * - any existing `key` directive
+     * - all chords, those are transposed according to the distance between the current and the new key
+     * @param {string} key The new key.
+     * @returns {Song} The changed song
+     */
+
+  }, {
+    key: "setKey",
+    value: function setKey(key) {
+      var transpose = _key["default"].distance(this.key, key);
+
+      var updatedSong = _classPrivateMethodGet(this, _mapItems, _mapItems2).call(this, function (item) {
+        if (item instanceof _tag["default"] && item.name === _tag.KEY) {
+          return item.set({
+            value: key
+          });
+        }
+
+        if (item instanceof _chord_lyrics_pair["default"]) {
+          var chordObj = _chord["default"].parse(item.chords);
+
+          if (chordObj) {
+            return item.set({
+              chords: chordObj.transpose(transpose).normalize(key)
+            });
+          }
+        }
+
+        return item;
+      });
+
+      updatedSong.metadata.set('key', key);
+      return updatedSong;
+    }
   }]);
 
   return Song;
 }();
 
+function _insertDirective2(name, value) {
+  var _ref2 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      _ref2$after = _ref2.after,
+      after = _ref2$after === void 0 ? null : _ref2$after;
+
+  var insertIndex = this.lines.findIndex(function (line) {
+    return line.items.some(function (item) {
+      return !(item instanceof _tag["default"]) || after && item instanceof _tag["default"] && item.name === after;
+    });
+  });
+  var newLine = new _line["default"]();
+  newLine.addTag(name, value);
+  var clonedSong = this.clone();
+  var lines = clonedSong.lines;
+  clonedSong.lines = [].concat(_toConsumableArray(lines.slice(0, insertIndex)), [newLine], _toConsumableArray(lines.slice(insertIndex)));
+  return clonedSong;
+}
+
+function _mapItems2(func) {
+  var clonedSong = new Song();
+  clonedSong.lines = this.lines.map(function (line) {
+    return line.mapItems(func);
+  });
+  clonedSong.metadata = this.metadata.clone();
+  return clonedSong;
+}
+
+function _mapLines2(func) {
+  var clonedSong = new Song();
+  clonedSong.lines = this.lines.map(function (line) {
+    return func(line.clone());
+  }).filter(function (line) {
+    return line;
+  });
+  clonedSong.metadata = this.metadata.clone();
+  return clonedSong;
+}
+
+function _updateItem2(findCallback, updateCallback, notFoundCallback) {
+  var found = false;
+
+  var updatedSong = _classPrivateMethodGet(this, _mapItems, _mapItems2).call(this, function (item) {
+    if (findCallback(item)) {
+      found = true;
+      return updateCallback(item);
+    }
+
+    return item;
+  });
+
+  if (!found) {
+    return notFoundCallback(updatedSong);
+  }
+
+  return updatedSong;
+}
+
+function _removeItem2(callback) {
+  return _classPrivateMethodGet(this, _mapLines, _mapLines2).call(this, function (line) {
+    var items = line.items;
+    var index = items.findIndex(callback);
+
+    if (index === -1) {
+      return line;
+    }
+
+    if (items.length === 1) {
+      return null;
+    }
+
+    return line.set({
+      items: [].concat(_toConsumableArray(items.slice(0, index)), _toConsumableArray(items.slice(index + 1)))
+    });
+  });
+}
+
 var defineProperty = Object.defineProperty;
 var songPrototype = Song.prototype;
 

package/lib/chord_sheet/tag.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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["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.NEW_KEY = 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;
@@ -162,11 +162,18 @@ var TITLE = 'title';
 exports.TITLE = TITLE;
 var TRANSPOSE = 'transpose';
 /**
- * Year meta directive. See https://www.chordpro.org/chordpro/directives-year/
+ * New Key meta directive. See: https://github.com/PraiseCharts/ChordChartJS/issues/53
  * @type {string}
  */
 
 exports.TRANSPOSE = TRANSPOSE;
+var NEW_KEY = 'new_key';
+/**
+ * Year meta directive. See https://www.chordpro.org/chordpro/directives-year/
+ * @type {string}
+ */
+
+exports.NEW_KEY = NEW_KEY;
 var YEAR = 'year';
 exports.YEAR = YEAR;
 var TITLE_SHORT = 't';
@@ -176,12 +183,13 @@ var START_OF_CHORUS_SHORT = 'soc';
 var END_OF_CHORUS_SHORT = 'eoc';
 var START_OF_TAB_SHORT = 'sot';
 var END_OF_TAB_SHORT = 'eot';
+var NEW_KEY_SHORT = 'nk';
 var RENDERABLE_TAGS = [COMMENT];
 var META_TAGS = [ALBUM, ARTIST, CAPO, COMPOSER, COPYRIGHT, DURATION, KEY, LYRICIST, TEMPO, TIME, TITLE, SUBTITLE, YEAR];
 exports.META_TAGS = META_TAGS;
 var READ_ONLY_TAGS = [_KEY];
 exports.READ_ONLY_TAGS = READ_ONLY_TAGS;
-var ALIASES = (_ALIASES = {}, _defineProperty(_ALIASES, TITLE_SHORT, TITLE), _defineProperty(_ALIASES, SUBTITLE_SHORT, SUBTITLE), _defineProperty(_ALIASES, COMMENT_SHORT, COMMENT), _defineProperty(_ALIASES, START_OF_CHORUS_SHORT, START_OF_CHORUS), _defineProperty(_ALIASES, END_OF_CHORUS_SHORT, END_OF_CHORUS), _defineProperty(_ALIASES, START_OF_TAB_SHORT, START_OF_TAB), _defineProperty(_ALIASES, END_OF_TAB_SHORT, END_OF_TAB), _ALIASES);
+var ALIASES = (_ALIASES = {}, _defineProperty(_ALIASES, TITLE_SHORT, TITLE), _defineProperty(_ALIASES, SUBTITLE_SHORT, SUBTITLE), _defineProperty(_ALIASES, COMMENT_SHORT, COMMENT), _defineProperty(_ALIASES, START_OF_CHORUS_SHORT, START_OF_CHORUS), _defineProperty(_ALIASES, END_OF_CHORUS_SHORT, END_OF_CHORUS), _defineProperty(_ALIASES, START_OF_TAB_SHORT, START_OF_TAB), _defineProperty(_ALIASES, END_OF_TAB_SHORT, END_OF_TAB), _defineProperty(_ALIASES, NEW_KEY_SHORT, NEW_KEY), _ALIASES);
 var META_TAG_REGEX = /^meta:\s*([^:\s]+)(\s*(.+))?$/;
 var TAG_REGEX = /^([^:\s]+)(:?\s*(.+))?$/;
 var CUSTOM_META_TAG_NAME_REGEX = /^x_(.+)$/;
@@ -263,7 +271,7 @@ var Tag = /*#__PURE__*/function () {
      */
     function get() {
       if (this._value) {
-        return this._value.trim();
+        return "".concat(this._value).trim();
       }
 
       return this._value || null;
@@ -309,13 +317,19 @@ var Tag = /*#__PURE__*/function () {
   }, {
     key: "clone",
     value: function clone() {
-      return new Tag(this.name, this.value);
+      return new Tag(this._originalName, this.value);
     }
   }, {
     key: "toString",
     value: function toString() {
       return "Tag(name=".concat(this.name, ", value=").concat(this.name, ")");
     }
+  }, {
+    key: "set",
+    value: function set(_ref2) {
+      var value = _ref2.value;
+      return new Tag(this._originalName, value);
+    }
   }], [{
     key: "parse",
     value: function parse(tag) {

package/lib/formatter/templates/html_div_formatter.js

@@ -379,7 +379,7 @@ templates['html_div_formatter'] = template({
       return undefined;
     };
 
-    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"), {
+    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 = blockParams[3][0]) != null ? lookupProperty(stack1, "transposeKey") : stack1, (stack1 = data && lookupProperty(data, "root")) && lookupProperty(stack1, "song"), {
       "name": "renderChord",
       "hash": {},
       "data": data,
@@ -391,7 +391,7 @@ templates['html_div_formatter'] = template({
         },
         "end": {
           "line": 18,
-          "column": 103
+          "column": 117
         }
       }
     })) + "</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, {
@@ -402,11 +402,11 @@ templates['html_div_formatter'] = template({
       "loc": {
         "start": {
           "line": 18,
-          "column": 129
+          "column": 143
         },
         "end": {
           "line": 18,
-          "column": 139
+          "column": 153
         }
       }
     }) : helper)) + "</div></div>";

package/lib/formatter/templates/html_table_formatter.js

@@ -416,7 +416,7 @@ templates['html_table_formatter'] = template({
       return undefined;
     };
 
-    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"), {
+    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 = blockParams[4][0]) != null ? lookupProperty(stack1, "transposeKey") : stack1, (stack1 = data && lookupProperty(data, "root")) && lookupProperty(stack1, "song"), {
       "name": "renderChord",
       "hash": {},
       "data": data,
@@ -428,7 +428,7 @@ templates['html_table_formatter'] = template({
         },
         "end": {
           "line": 21,
-          "column": 88
+          "column": 102
         }
       }
     })) + "</td>";

package/lib/formatter/text_formatter.js

@@ -115,7 +115,7 @@ var TextFormatter = /*#__PURE__*/function () {
   }, {
     key: "chordLyricsPairLength",
     value: function chordLyricsPairLength(chordLyricsPair, line) {
-      var chords = (0, _helpers.renderChord)(chordLyricsPair.chords, line.key, this.song.key);
+      var chords = (0, _helpers.renderChord)(chordLyricsPair.chords, line.key, line.transposeKey, this.song);
       var lyrics = chordLyricsPair.lyrics;
       var chordsLength = (chords || '').length;
       var lyricsLength = (lyrics || '').length;
@@ -134,7 +134,7 @@ var TextFormatter = /*#__PURE__*/function () {
       }
 
       if (item instanceof _chord_lyrics_pair["default"]) {
-        var chords = (0, _helpers.renderChord)(item.chords, line.key, this.song.key);
+        var chords = (0, _helpers.renderChord)(item.chords, line.key, line.transposeKey, this.song);
         return (0, _utilities.padLeft)(chords, this.chordLyricsPairLength(item, line));
       }
 

package/lib/helpers.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.renderChord = renderChord;
+exports.transposeDistance = transposeDistance;
 
 var _chord = _interopRequireDefault(require("./chord"));
 
@@ -13,20 +14,43 @@ 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);
+function transposeDistance(transposeKey, songKey) {
+  if (/^\d+$/.test(transposeKey)) {
+    return parseInt(transposeKey, 10);
   }
 
-  return _key["default"].distance(songKey, lineKey);
+  return _key["default"].distance(songKey, transposeKey);
 }
-/* eslint import/prefer-default-export: 0 */
 
+function chordTransposeDistance(capo, transposeKey, songKey) {
+  var transpose = -1 * (capo || 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();
+  if ((0, _utilities.isPresent)(transposeKey) && (0, _utilities.isPresent)(songKey)) {
+    transpose += transposeDistance(transposeKey, songKey);
   }
 
-  return chord;
+  return transpose;
+}
+
+function renderChord(chord, lineKey, transposeKey, song) {
+  var chordObj = _chord["default"].parse(chord);
+
+  var capo = song.capo,
+      songKey = song.key;
+
+  if (!chordObj) {
+    return chord;
+  }
+
+  chordObj = chordObj.transpose(chordTransposeDistance(capo, transposeKey, songKey));
+
+  if ((0, _utilities.isPresent)(transposeKey)) {
+    chordObj = chordObj.useModifier(transposeKey.modifier);
+  }
+
+  if ((0, _utilities.isPresent)(lineKey)) {
+    chordObj = chordObj.normalize(lineKey);
+  }
+
+  return chordObj.toString();
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "chordsheetjs",
   "author": "Martijn Versluis",
-  "version": "6.0.2",
+  "version": "6.1.0",
   "description": "A JavaScript library for parsing and formatting chord sheets",
   "main": "lib/index.js",
   "license": "GPL-2.0-only",
@@ -27,7 +27,7 @@
     "jest": "^27.0.1",
     "jsdoc-to-markdown": "^7.1.0",
     "pegjs": "^0.10.0",
-    "pinst": "^2.1.6",
+    "pinst": "^3.0.0",
     "print": "^1.2.0"
   },
   "scripts": {