From 6377378a3de2b70cf799a6dc3f288f703e7a458b Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Sun, 23 Jul 2023 13:31:47 +0200 Subject: [PATCH] sort by topnote and then by bottom note (easier to track diffs) --- packages/tonal/ireal.mjs | 289 ++++++++++++++++++++++----------------- 1 file changed, 161 insertions(+), 128 deletions(-) diff --git a/packages/tonal/ireal.mjs b/packages/tonal/ireal.mjs index ae4438c8..71a51fe9 100644 --- a/packages/tonal/ireal.mjs +++ b/packages/tonal/ireal.mjs @@ -2,13 +2,13 @@ // scraped via: https://codesandbox.io/s/ireal-midi-scraper-forked-kpqnzf?file=/src/index.js export const simple = { - 2: ['1P 5P 8P 9M', '5P 8P 9M 12P', '1P 5P 8P 9M 12P'], + 2: ['1P 5P 8P 9M', '1P 5P 8P 9M 12P', '5P 8P 9M 12P'], 5: ['1P 5P 8P 12P', '5P 8P 12P 15P'], - 6: ['1P 5P 6M 8P 10M', '5P 8P 10M 12P 13M', '3M 5P 8P 10M 13M', '1P 5P 8P 10M 13M'], + 6: ['1P 5P 6M 8P 10M', '1P 5P 8P 10M 13M', '3M 5P 8P 10M 13M', '5P 8P 10M 12P 13M'], 7: [ '1P 5P 7m 8P 10M', - '3M 7m 8P 10M 12P', '1P 7m 8P 10M 12P', + '3M 7m 8P 10M 12P', '3M 7m 8P 10M 14m', '3M 7m 10M 12P 15P', '7m 10M 12P 14m 15P', @@ -16,55 +16,55 @@ export const simple = { ], 9: [ '1P 5P 7m 9M 10M', - '3M 7m 8P 9M 12P', '1P 7m 9M 10M 12P', + '3M 7m 8P 9M 12P', '7m 9M 10M 14m 15P', '3M 7m 8P 12P 16M', '7m 10M 12P 15P 16M', ], - 11: ['5P 7m 8P 9M 11P', '1P 5P 7m 9M 11P', '7m 8P 9M 11P 12P', '7m 8P 11P 12P 16M'], - 13: ['1P 6M 7m 9M 10M', '7m 8P 9M 10M 13M', '3M 7m 8P 9M 13M', '1P 7m 9M 10M 13M', '7m 9M 10M 13M 15P'], - 69: ['1P 5P 6M 9M 10M', '5P 8P 9M 10M 13M', '3M 5P 8P 9M 13M', '1P 5P 9M 10M 13M'], - add9: ['1P 5P 8P 9M 10M', '3M 8P 9M 10M 12P', '1P 5P 9M 10M 12P', '3M 8P 9M 12P 15P', '5P 8P 9M 12P 17M'], + 11: ['1P 5P 7m 9M 11P', '5P 7m 8P 9M 11P', '7m 8P 9M 11P 12P', '7m 8P 11P 12P 16M'], + 13: ['1P 6M 7m 9M 10M', '1P 7m 9M 10M 13M', '3M 7m 8P 9M 13M', '7m 8P 9M 10M 13M', '7m 9M 10M 13M 15P'], + 69: ['1P 5P 6M 9M 10M', '1P 5P 9M 10M 13M', '3M 5P 8P 9M 13M', '5P 8P 9M 10M 13M'], + add9: ['1P 5P 8P 9M 10M', '1P 5P 9M 10M 12P', '3M 8P 9M 10M 12P', '3M 8P 9M 12P 15P', '5P 8P 9M 12P 17M'], '+': [ '1P 3M 6m 8P 10M', - '3M 6m 8P 10M 13m', '1P 6m 8P 10M 13m', + '3M 6m 8P 10M 13m', '3M 8P 10M 13m 15P', '6m 8P 10M 13m 15P', '6m 10M 13m 15P 17M', ], - o: ['1P 5d 8P 10m 12d', '5d 8P 10m 12d 15P', '3m 8P 10m 12d 15P'], + o: ['1P 5d 8P 10m 12d', '3m 8P 10m 12d 15P', '5d 8P 10m 12d 15P'], h: [ '3m 5d 7m 8P 10m', '3m 7m 8P 10m 12d', - '1P 7m 10m 12d', - '5d 7m 8P 10m 14m', '3m 7m 8P 12d 14m', - '5d 8P 10m 12d 14m', + '5d 7m 8P 10m 14m', '7m 10m 12d 14m 15P', '5d 8P 10m 14m 17m', ], sus: ['1P 4P 5P 8P', '1P 4P 5P 8P 11P', '5P 8P 11P 12P', '5P 8P 11P 12P 15P'], - '^': ['1P 5P 8P 10M', '3M 5P 8P 10M 12P', '1P 5P 8P 10M 12P', '5P 8P 10M 12P 15P', '3M 8P 10M 12P 15P'], - '-': ['1P 3m 5P 8P 10m', '3m 5P 8P 10m 12P', '1P 5P 8P 10m 12P', '5P 8P 10m 12P 15P'], - '^7': ['1P 5P 7M 10M 12P', '5P 8P 10M 12P 14M', '3M 8P 10M 12P 14M', '1P 10M 12P 14M', '5P 8P 10M 14M 17M'], + '^': ['1P 5P 8P 10M', '1P 5P 8P 10M 12P', '3M 5P 8P 10M 12P', '3M 8P 10M 12P 15P', '5P 8P 10M 12P 15P'], + '-': ['1P 3m 5P 8P 10m', '1P 5P 8P 10m 12P', '3m 5P 8P 10m 12P', '5P 8P 10m 12P 15P'], + '^7': ['1P 5P 7M 10M 12P', '1P 10M 12P 14M', '3M 8P 10M 12P 14M', '5P 8P 10M 12P 14M', '5P 8P 10M 14M 17M'], '-7': [ '1P 3m 5P 7m 10m', - '3m 7m 8P 10m 12P', '1P 5P 7m 10m 12P', - '5P 7m 8P 10m 14m', + '3m 7m 8P 10m 12P', '3m 7m 8P 10m 14m', + '5P 7m 8P 10m 14m', '7m 10m 12P 14m 15P', - '7m 10m 12P 15P 17m', '5P 8P 10m 14m 17m', + '7m 10m 12P 15P 17m', ], '7sus': ['1P 5P 7m 8P 11P', '5P 8P 11P 12P 14m', '7m 8P 11P 12P 14m', '7m 11P 12P 14m 18P'], h7: [ '3m 5d 7m 8P 10m', + '1P 5d 7m 10m 12d', + '1P 7m 10m 12d', '3m 7m 8P 10m 12d', - '5d 7m 8P 10m 14m', '3m 7m 8P 12d 14m', + '5d 7m 8P 10m 14m', '5d 8P 10m 12d 14m', '7m 10m 12d 14m 15P', '5d 8P 10m 14m 17m', @@ -73,56 +73,56 @@ export const simple = { '1P 6M 8P 10m 12d', '1P 6M 10m 12d 13M', '3m 8P 10m 12d 13M', - '5d 10m 12d 13M 15P', '3m 8P 12d 13M 15P', - '6M 12d 13M 15P 17m', + '5d 10m 12d 13M 15P', '5d 10m 13M 15P 17m', + '6M 12d 13M 15P 17m', '6M 12d 15P 17m 19d', ], '^9': [ '1P 5P 7M 9M 10M', - '3M 7M 8P 9M 12P', '1P 7M 9M 10M 12P', + '3M 7M 8P 9M 12P', '3M 7M 8P 12P 16M', - '7M 8P 10M 12P 16M', '5P 8P 10M 14M 16M', + '7M 8P 10M 12P 16M', ], - '^13': ['1P 6M 7M 9M 10M', '3M 7M 8P 9M 13M', '1P 7M 9M 10M 13M', '3M 7M 8P 13M 16M', '7M 8P 10M 13M 16M'], - '^7#11': ['3M 7M 8P 10M 12d', '1P 5P 7M 10M 12d', '5P 8P 10M 12d 14M', '3M 7M 8P 12d 14M'], - '^9#11': ['1P 3M 5d 7M 9M', '3M 7M 8P 9M 12d', '1P 7M 9M 10M 12d', '3M 8P 9M 12d 14M'], - '^7#5': ['6m 7M 8P 10M 13m', '3M 7M 8P 10M 13m', '1P 6m 7M 10M 13m'], + '^13': ['1P 6M 7M 9M 10M', '1P 7M 9M 10M 13M', '3M 7M 8P 9M 13M', '3M 7M 8P 13M 16M', '7M 8P 10M 13M 16M'], + '^7#11': ['1P 5P 7M 10M 12d', '3M 7M 8P 10M 12d', '3M 7M 8P 12d 14M', '5P 8P 10M 12d 14M'], + '^9#11': ['1P 3M 5d 7M 9M', '1P 7M 9M 10M 12d', '3M 7M 8P 9M 12d', '3M 8P 9M 12d 14M'], + '^7#5': ['1P 6m 7M 10M 13m', '3M 7M 8P 10M 13m', '6m 7M 8P 10M 13m'], '-6': [ '1P 3m 5P 6M 8P', - '3m 5P 6M 8P 10m', '1P 5P 6M 8P 10m', - '5P 8P 10m 12P 13M', - '3m 5P 8P 10m 13M', + '3m 5P 6M 8P 10m', '1P 5P 8P 10m 13M', + '3m 5P 8P 10m 13M', + '5P 8P 10m 12P 13M', '5P 8P 10m 13M 15P', ], '-69': [ - '3m 5P 6M 8P 9M', '1P 3m 5P 6M 9M', + '3m 5P 6M 8P 9M', '3m 6M 9M 10m 12P', - '5P 8P 9M 10m 13M', - '3m 5P 8P 9M 13M', '1P 5P 9M 10m 13M', + '3m 5P 8P 9M 13M', + '5P 8P 9M 10m 13M', '5P 8P 10m 13M 16M', ], - '-^7': ['1P 3m 5P 7M 10m', '3m 7M 8P 10m 12P', '1P 5P 7M 10m 12P', '5P 7M 8P 10m 14M', '5P 8P 10m 14M 17m'], - '-^9': ['1P 3m 5P 7M 9M', '3m 7M 8P 9M 12P', '1P 7M 9M 10m 12P', '5P 8P 9M 10m 14M'], + '-^7': ['1P 3m 5P 7M 10m', '1P 5P 7M 10m 12P', '3m 7M 8P 10m 12P', '5P 7M 8P 10m 14M', '5P 8P 10m 14M 17m'], + '-^9': ['1P 3m 5P 7M 9M', '1P 7M 9M 10m 12P', '3m 7M 8P 9M 12P', '5P 8P 9M 10m 14M'], '-9': [ - '3m 5P 7m 8P 9M', '1P 3m 5P 7m 9M', + '3m 5P 7m 8P 9M', '3m 7m 8P 9M 12P', '5P 8P 9M 10m 14m', '3m 7m 9M 12P 15P', '7m 10m 12P 15P 16M', ], - '-add9': ['1P 2M 3m 5P 8P', '1P 3m 5P 9M', '5P 8P 9M 10m 12P', '3m 5P 8P 9M 12P'], + '-add9': ['1P 2M 3m 5P 8P', '1P 3m 5P 9M', '3m 5P 8P 9M 12P', '5P 8P 9M 10m 12P'], '-11': [ - '3m 7m 8P 9M 11P', '1P 3m 7m 9M 11P', + '3m 7m 8P 9M 11P', '1P 4P 7m 10m 12P', '5P 8P 11P 14m', '3m 7m 9M 11P 15P', @@ -131,58 +131,62 @@ export const simple = { ], '-7b5': [ '3m 5d 7m 8P 10m', - '3m 7m 8P 10m 12d', + '1P 7m 10m 12d', '1P 5d 7m 10m 12d', - '5d 7m 8P 10m 14m', + '3m 7m 8P 10m 12d', '3m 7m 8P 12d 14m', + '5d 7m 8P 10m 14m', + '5d 8P 10m 12d 14m', '7m 10m 12d 14m 15P', '5d 8P 10m 14m 17m', ], - h9: ['3m 7m 8P 9M 12d', '1P 7m 9M 10m 12d', '5d 8P 9M 10m 14m', '7m 10m 12d 15P 16M'], - '-b6': ['1P 5P 6m 8P 10m', '5P 8P 10m 13m', '3m 5P 8P 10m 13m', '1P 5P 8P 10m 13m', '5P 8P 10m 13m 15P'], - '-#5': ['3m 6m 8P 10m 13m', '1P 6m 8P 10m 13m', '6m 8P 10m 13m 15P'], + h9: ['1P 7m 9M 10m 12d', '3m 7m 8P 9M 12d', '5d 8P 9M 10m 14m', '7m 10m 12d 15P 16M'], + '-b6': ['1P 5P 6m 8P 10m', '1P 5P 8P 10m 13m', '3m 5P 8P 10m 13m', '5P 8P 10m 13m', '5P 8P 10m 13m 15P'], + '-#5': ['1P 6m 8P 10m 13m', '3m 6m 8P 10m 13m', '6m 8P 10m 13m 15P'], '7b9': ['1P 3M 7m 9m 10M', '3M 7m 8P 9m 10M', '3M 7m 8P 9m 14m', '7m 9m 10M 14m 15P'], '7#9': ['1P 3M 7m 10m', '3M 7m 8P 10m 14m', '7m 10m 10M 14m 15P'], - '7#11': ['3M 7m 8P 10M 12d', '1P 3M 7m 10M 12d', '7m 10M 12d 14m 15P'], - '7b5': ['3M 7m 8P 10M 12d', '1P 3M 7m 10M 12d', '7m 10M 12d 14m 15P'], - '7#5': ['3M 7m 8P 10M 13m', '1P 3M 7m 10M 13m', '3M 7m 8P 13m 14m', '7m 10M 13m 14m 15P'], - '9#11': ['3M 7m 8P 9M 12d', '1P 7m 9M 10M 12d', '7m 10M 12d 15P 16M'], - '9b5': ['3M 7m 8P 9M 12d', '1P 7m 9M 10M 12d', '7m 10M 12d 15P 16M'], - '9#5': ['3M 7m 9M 10M 13m', '1P 7m 9M 10M 13m', '3M 7m 9M 13m 14m', '7m 10M 13m 14m 16M', '7m 10M 13m 16M 17M'], - '7b13': ['3M 7m 8P 10M 13m', '1P 3M 7m 10M 13m', '3M 7m 8P 13m 14m', '7m 10M 13m 14m 15P'], + '7#11': ['1P 3M 7m 10M 12d', '3M 7m 8P 10M 12d', '7m 10M 12d 14m 15P'], + '7b5': ['1P 3M 7m 10M 12d', '3M 7m 8P 10M 12d', '7m 10M 12d 14m 15P'], + '7#5': ['1P 3M 7m 10M 13m', '3M 7m 8P 10M 13m', '3M 7m 8P 13m 14m', '7m 10M 13m 14m 15P'], + '9#11': ['1P 7m 9M 10M 12d', '3M 7m 8P 9M 12d', '7m 10M 12d 15P 16M'], + '9b5': ['1P 7m 9M 10M 12d', '3M 7m 8P 9M 12d', '7m 10M 12d 15P 16M'], + '9#5': ['1P 7m 9M 10M 13m', '3M 7m 9M 10M 13m', '3M 7m 9M 13m 14m', '7m 10M 13m 14m 16M', '7m 10M 13m 16M 17M'], + '7b13': ['1P 3M 7m 10M 13m', '3M 7m 8P 10M 13m', '3M 7m 8P 13m 14m', '7m 10M 13m 14m 15P'], '7#9#5': ['1P 3M 7m 10m 13m', '3M 7m 10m 13m 15P', '7m 10M 13m 15P 17m'], '7#9b5': ['1P 3M 7m 10m 12d', '3M 7m 10m 12d 15P', '7m 10M 12d 15P 17m'], '7#9#11': ['1P 3M 7m 10m 12d', '3M 7m 10m 12d 15P', '7m 10M 12d 15P 17m'], - '7b9#11': ['3M 7m 8P 9m 12d', '1P 7m 9m 10M 12d', '7m 8P 10M 12d 16m'], - '7b9b5': ['3M 7m 8P 9m 12d', '1P 7m 9m 10M 12d', '7m 8P 10M 12d 16m'], - '7b9#5': ['3M 7m 8P 9m 13m', '1P 7m 9m 10M 13m', '7m 9m 10M 13m 15P'], - '7b9#9': ['3M 7m 8P 9m 10m', '1P 3M 7m 9m 10m', '7m 8P 10M 16m 17m'], - '7b9b13': ['3M 7m 8P 9m 13m', '1P 7m 9m 10M 13m', '7m 9m 10M 13m 15P'], + '7b9#11': ['1P 7m 9m 10M 12d', '3M 7m 8P 9m 12d', '7m 8P 10M 12d 16m'], + '7b9b5': ['1P 7m 9m 10M 12d', '3M 7m 8P 9m 12d', '7m 8P 10M 12d 16m'], + '7b9#5': ['1P 7m 9m 10M 13m', '3M 7m 8P 9m 13m', '7m 9m 10M 13m 15P'], + '7b9#9': ['1P 3M 7m 9m 10m', '3M 7m 8P 9m 10m', '7m 8P 10M 16m 17m'], + '7b9b13': ['1P 7m 9m 10M 13m', '3M 7m 8P 9m 13m', '7m 9m 10M 13m 15P'], '7alt': [ '3M 7m 8P 9m 12d', - '3M 7m 8P 10m 13m', '1P 7m 10m 10M 13m', + '3M 7m 8P 10m 13m', '3M 7m 9m 12d 15P', '3M 7m 10m 13m 15P', '7m 10M 12d 15P 17m', + '7m 10M 13m 15P 17m', ], '13#11': ['1P 6M 7m 10M 12d', '3M 7m 9M 12d 13M', '7m 10M 12d 13M 16M'], '13b9': ['1P 3M 6M 7m 9m', '1P 6M 7m 9m 10M', '3M 7m 9m 10M 13M', '3M 7m 10M 13M 16m', '7m 10M 13M 16m 17M'], '13#9': ['1P 3M 6M 7m 10m', '3M 7m 8P 10m 13M', '7m 10M 13M 14m 17m'], - '7b9sus': ['5P 7m 8P 9m 11P', '1P 5P 7m 9m 11P', '7m 8P 11P 14m 16m'], + '7b9sus': ['1P 5P 7m 9m 11P', '5P 7m 8P 9m 11P', '7m 8P 11P 14m 16m'], '7susadd3': ['1P 4P 5P 7m 10M', '5P 8P 10M 11P 14m', '7m 11P 12P 15P 17M'], - '9sus': ['5P 7m 8P 9M 11P', '1P 5P 7m 9M 11P', '7m 8P 9M 11P 12P', '7m 8P 11P 12P 16M'], - '13sus': ['1P 4P 6M 7m 9M', '5P 7m 9M 11P 13M', '1P 7m 9M 11P 13M', '7m 9M 11P 13M 15P'], - '7b13sus': ['5P 7m 8P 11P 13m', '1P 5P 7m 11P 13m', '7m 11P 13m 14m 15P'], + '9sus': ['1P 5P 7m 9M 11P', '5P 7m 8P 9M 11P', '7m 8P 9M 11P 12P', '7m 8P 11P 12P 16M'], + '13sus': ['1P 4P 6M 7m 9M', '1P 7m 9M 11P 13M', '5P 7m 9M 11P 13M', '7m 9M 11P 13M 15P'], + '7b13sus': ['1P 5P 7m 11P 13m', '5P 7m 8P 11P 13m', '7m 11P 13m 14m 15P'], }; export const complex = { 2: ['1P 5P 6M 8P 9M', '1P 5P 8P 9M 12P', '5P 8P 9M 12P 13M', '5P 8P 9M 12P 15P'], 5: ['1P 5P 8P 12P', '1P 5P 8P 9M 12P', '5P 8P 12P 15P', '5P 8P 12P 15P 16M'], - 6: ['1P 5P 6M 9M 10M', '3M 5P 9M 10M 13M', '5P 8P 9M 10M 13M', '1P 5P 9M 10M 13M', '3M 6M 9M 12P 15P'], + 6: ['1P 5P 6M 9M 10M', '1P 5P 9M 10M 13M', '3M 5P 9M 10M 13M', '5P 8P 9M 10M 13M', '3M 6M 9M 12P 15P'], 7: [ - '3M 7m 8P 10M 12P', + '1P 5P 7m 8P 10M', '1P 7m 8P 10M 12P', + '3M 7m 8P 10M 12P', '3M 7m 8P 10M 14m', '3M 7m 10M 12P 15P', '7m 10M 12P 14m 15P', @@ -192,14 +196,21 @@ export const complex = { 9: [ '1P 6M 7m 9M 10M', '3M 7m 9M 10M 12P', - '3M 7m 9M 10M 13M', '1P 7m 9M 10M 13M', + '3M 7m 9M 10M 13M', '3M 7m 9M 12P 15P', '7m 10M 12P 13M 16M', '7m 10M 13M 16M 17M', '7m 10M 13M 16M 19P', ], - 11: ['4P 6M 7m 9M 11P', '1P 5P 7m 9M 11P', '5P 8P 9M 11P 14m', '7m 9M 11P 13M 15P', '7m 11P 12P 14m 18P'], + 11: [ + '1P 4P 6M 7m 9M', + '1P 5P 7m 9M 11P', + '4P 6M 7m 9M 11P', + '5P 8P 9M 11P 14m', + '7m 9M 11P 13M 15P', + '7m 11P 12P 14m 18P', + ], 13: [ '3M 7m 9M 10M 13M', '3M 7m 9M 13M 15P', @@ -208,19 +219,19 @@ export const complex = { '7m 10M 13M 16M 17M', '7m 10M 13M 16M 19P', ], - 69: ['1P 5P 6M 9M 10M', '3M 5P 9M 10M 13M', '1P 5P 9M 10M 13M', '3M 6M 9M 12P 15P'], + 69: ['1P 5P 6M 9M 10M', '1P 5P 9M 10M 13M', '3M 5P 9M 10M 13M', '5P 8P 9M 10M 13M', '3M 6M 9M 12P 15P'], add9: [ '1P 5P 8P 9M 10M', '1P 5P 9M 10M 12P', '3M 8P 9M 10M 12P', - '5P 8P 9M 10M 15P', '3M 8P 9M 12P 15P', + '5P 8P 9M 10M 15P', '5P 8P 9M 12P 17M', ], '+': [ '1P 6m 8P 9M 10M', - '3M 8P 9M 10M 13m', '1P 6m 8P 10M 13m', + '3M 8P 9M 10M 13m', '3M 8P 10M 13m 15P', '6m 10M 13m 15P 16M', '6m 10M 13m 15P 17M', @@ -229,53 +240,54 @@ export const complex = { '1P 6M 8P 10m 12d', '1P 6M 10m 12d 13M', '3m 8P 10m 12d 13M', - '5d 10m 12d 13M 15P', '3m 8P 12d 13M 15P', - '6M 12d 13M 15P 17m', + '5d 10m 12d 13M 15P', '5d 10m 13M 15P 17m', + '6M 12d 13M 15P 17m', '6M 12d 15P 17m 19d', ], h: [ - '5d 7m 8P 10m 11P', - '3m 5d 7m 8P 11P', '1P 5d 7m 10m 11P', + '3m 5d 7m 8P 11P', + '5d 7m 8P 10m 11P', '1P 7m 10m 12d', - '5d 8P 10m 11P 14m', '3m 7m 8P 12d 14m', + '5d 8P 10m 11P 14m', + '7m 10m 11P 12d 14m', '7m 10m 12d 14m 15P', '5d 8P 10m 14m 17m', ], sus: [ '1P 4P 5P 8P 9M', - '1P 5P 8P 9M 11P', '1P 4P 5P 8P 11P', + '1P 5P 8P 9M 11P', '5P 8P 9M 11P 12P', '5P 8P 11P 12P 13M', '5P 8P 11P 13M 15P', ], '^': [ '1P 3M 5P 6M 9M', - '3M 5P 9M 10M 12P', '1P 5P 8P 10M 12P', + '3M 5P 9M 10M 12P', '1P 5P 8P 10M 13M', - '5P 9M 10M 12P 15P', '3M 8P 10M 13M 15P', + '5P 9M 10M 12P 15P', ], '-': [ '1P 3m 5P 8P 10m', - '5P 8P 9M 10m 11P', - '3m 5P 8P 9M 11P', '1P 3m 5P 9M 11P', - '3m 5P 8P 10m 12P', + '3m 5P 8P 9M 11P', + '5P 8P 9M 10m 11P', '1P 5P 9M 10m 12P', + '3m 5P 8P 10m 12P', '5P 8P 10m 12P 15P', ], '^7': [ '1P 6M 7M 9M 10M', '3M 7M 9M 10M 12P', + '1P 7M 9M 10M 13M', '3M 7M 9M 10M 13M', '3M 7M 9M 12P 13M', - '1P 7M 9M 10M 13M', '3M 7M 9M 13M 14M', '3M 7M 10M 13M 16M', '7M 10M 13M 14M 16M', @@ -285,48 +297,51 @@ export const complex = { '-7': [ '1P 3m 5P 7m 9M', '1P 3m 5P 7m 10m', - '3m 7m 8P 10m 11P', '1P 5P 7m 10m 11P', - '3m 7m 9M 10m 12P', + '3m 7m 8P 10m 11P', '1P 5P 7m 10m 12P', - '5P 7m 9M 10m 14m', + '3m 7m 9M 10m 12P', '3m 7m 8P 10m 14m', + '5P 7m 9M 10m 14m', + '7m 10m 11P 14m 15P', '7m 10m 12P 15P 16M', '5P 8P 11P 14m 17m', ], '7sus': [ '1P 4P 6M 7m 9M', - '4P 6M 7m 9M 11P', '1P 5P 7m 9M 11P', + '4P 6M 7m 9M 11P', '5P 8P 9M 11P 14m', '7m 9M 11P 13M 15P', '7m 11P 12P 14m 18P', ], h7: [ - '5d 7m 8P 10m 11P', - '3m 5d 7m 8P 11P', '1P 5d 7m 10m 11P', + '3m 5d 7m 8P 11P', + '5d 7m 8P 10m 11P', '1P 7m 10m 12d', - '5d 8P 10m 11P 14m', + '3m 7m 8P 10m 12d', '3m 7m 8P 12d 14m', + '5d 8P 10m 11P 14m', + '7m 10m 11P 12d 14m', '7m 10m 12d 14m 15P', '5d 8P 10m 14m 17m', ], o7: [ '1P 6M 8P 10m 12d', - '3m 8P 10m 12d 13M', '1P 6M 10m 12d 13M', - '5d 10m 12d 13M 15P', + '3m 8P 10m 12d 13M', '3m 8P 12d 13M 15P', - '6M 12d 13M 15P 17m', + '5d 10m 12d 13M 15P', '5d 10m 13M 15P 17m', + '6M 12d 13M 15P 17m', '6M 12d 15P 17m 19d', ], '^9': [ '1P 6M 7M 9M 10M', - '3M 7M 9M 12P 13M', - '3M 7M 9M 10M 13M', '1P 7M 9M 10M 13M', + '3M 7M 9M 10M 13M', + '3M 7M 9M 12P 13M', '3M 7M 9M 13M 14M', '3M 7M 10M 13M 16M', '7M 10M 13M 14M 16M', @@ -335,8 +350,10 @@ export const complex = { ], '^13': [ '1P 6M 7M 9M 10M', - '3M 7M 9M 10M 13M', '1P 7M 9M 10M 13M', + '3M 7M 9M 12P 13M', + '3M 7M 9M 10M 13M', + '3M 7M 8P 9M 13M', '3M 7M 9M 13M 14M', '3M 7M 10M 13M 16M', '7M 10M 13M 14M 16M', @@ -344,8 +361,9 @@ export const complex = { '7M 10M 13M 16M 19P', ], '^7#11': [ - '3M 7M 9M 10M 12d', + '1P 3M 5d 7M 9M', '1P 7M 9M 10M 12d', + '3M 7M 9M 10M 12d', '3M 7M 9M 12d 13M', '3M 7M 10M 12d 14M', '7M 10M 12d 13M 14M', @@ -354,34 +372,37 @@ export const complex = { ], '^9#11': [ '1P 3M 5d 7M 9M', - '3M 7M 9M 10M 12d', '1P 7M 9M 10M 12d', + '3M 7M 9M 10M 12d', '3M 7M 9M 12d 13M', '3M 7M 9M 12d 14M', + '7M 10M 12d 14M 16M', '7M 10M 12d 13M 16M', ], - '^7#5': ['3M 7M 9M 10M 13m', '1P 6m 7M 10M 13m', '3M 7M 10M 13m 14M', '7M 10M 13m 14M 16M', '7M 10M 13m 14M 17M'], + '^7#5': ['1P 6m 7M 10M 13m', '3M 7M 9M 10M 13m', '3M 7M 10M 13m 14M', '7M 10M 13m 14M 16M', '7M 10M 13m 14M 17M'], '-6': [ - '3m 5P 6M 8P 9M', '1P 3m 5P 6M 9M', + '3m 5P 6M 8P 9M', + '1P 5P 6M 10m 11P', '3m 5P 6M 8P 11P', - '5P 8P 10m 11P 13M', + '1P 5P 9M 10m 13M', '3m 5P 8P 9M 13M', + '5P 8P 10m 11P 13M', '5P 8P 10m 13M 16M', ], '-69': [ - '3m 5P 6M 8P 9M', '1P 3m 5P 6M 9M', + '3m 5P 6M 8P 9M', '3m 6M 9M 10m 12P', - '5P 8P 9M 10m 13M', - '3m 5P 8P 9M 13M', '1P 5P 9M 10m 13M', + '3m 5P 8P 9M 13M', + '5P 8P 9M 10m 13M', '5P 8P 10m 13M 16M', ], '-^7': [ '1P 3m 5P 7M 9M', - '3m 7M 9M 10m 11P', '1P 5P 7M 10m 11P', + '3m 7M 9M 10m 11P', '3m 7M 9M 10m 12P', '3m 7M 9M 12P 14M', '7M 10m 11P 12P 14M', @@ -389,94 +410,106 @@ export const complex = { ], '-^9': [ '1P 3m 5P 7M 9M', - '3m 7M 9M 10m 11P', '1P 5P 7M 10m 11P', + '3m 7M 9M 10m 11P', '3m 7M 9M 10m 12P', '3m 7M 9M 12P 14M', '7M 10m 11P 12P 14M', '7M 10m 12P 14M 16M', ], '-9': [ - '3m 7m 9M 10m 11P', '1P 3m 7m 9M 11P', + '3m 7m 9M 10m 11P', '3m 7m 9M 10m 12P', '3m 7m 9M 10m 14m', '3m 7m 9M 12P 15P', '7m 10m 11P 14m 16M', '7m 10m 12P 16M 18P', ], - '-add9': ['1P 2M 3m 5P 8P', '1P 3m 5P 9M', '5P 8P 9M 10m 12P', '3m 5P 8P 9M 12P'], + '-add9': ['1P 2M 3m 5P 8P', '1P 3m 5P 9M', '3m 5P 8P 9M 12P', '5P 8P 9M 10m 12P'], '-11': [ - '7m 9M 10m 11P', '3m 5P 7m 9M 11P', - '3m 7m 9M 11P 12P', + '7m 9M 10m 11P', '1P 4P 7m 10m 12P', + '3m 7m 9M 11P 12P', '7m 9M 10m 11P 12P', - '5P 8P 11P 14m', '3m 7m 9M 11P 14m', + '4P 10m 12P 14m', + '5P 8P 11P 14m', '5P 8P 11P 14m 16M', '7m 10m 12P 16M 18P', '7m 10m 11P 16M 21m', ], '-7b5': [ - '5d 7m 8P 10m 11P', - '3m 5d 7m 8P 11P', '1P 5d 7m 10m 11P', + '3m 5d 7m 8P 11P', + '5d 7m 8P 10m 11P', '1P 7m 10m 12d', - '5d 8P 10m 11P 14m', + '3m 7m 8P 10m 12d', '3m 7m 8P 12d 14m', + '5d 8P 10m 11P 14m', + '7m 10m 11P 12d 14m', '7m 10m 12d 14m 15P', '5d 8P 10m 14m 17m', ], h9: [ '3m 5d 7m 9M 11P', '1P 7m 9M 10m 12d', - '5d 8P 9M 10m 14m', '3m 7m 9M 12d 14m', + '5d 8P 9M 10m 14m', '7m 10m 11P 12d 14m', '7m 10m 12d 14m 16M', ], - '-b6': ['1P 3m 5P 6m 8P', '5P 8P 10m 11P 13m', '3m 5P 8P 11P 13m'], - '-#5': ['3m 6m 8P 11P 13m', '1P 6m 8P 10m 13m', '6m 8P 10m 13m 15P'], - '7b9': ['3M 7m 8P 9m 10M', '1P 3M 7m 9m 10M', '3M 7m 8P 9m 14m', '7m 9m 10M 14m 15P'], + '-b6': ['1P 3m 5P 6m 8P', '3m 5P 8P 11P 13m', '5P 8P 10m 11P 13m'], + '-#5': ['1P 6m 8P 10m 13m', '3m 6m 8P 11P 13m', '6m 8P 10m 13m 15P'], + '7b9': ['1P 3M 7m 9m 10M', '3M 7m 8P 9m 10M', '3M 7m 8P 9m 14m', '7m 9m 10M 14m 15P'], '7#9': ['1P 3M 7m 10m', '3M 7m 10m 10M 12P', '3M 7m 10m 12P 14m', '7m 10M 12P 14m 17m'], '7#11': ['1P 3M 7m 9M 12d', '3M 7m 9M 12d 13M', '7m 10M 12d 13M 16M'], '7b5': ['1P 3M 7m 9M 12d', '3M 7m 9M 12d 13M', '7m 10M 12d 13M 16M'], - '7#5': ['3M 7m 8P 10M 13m', '1P 3M 7m 10M 13m', '3M 7m 8P 13m 14m', '7m 10M 13m 14m 15P', '7m 10M 13m 14m 17M'], - '9#11': ['3M 7m 8P 9M 12d', '1P 7m 9M 10M 12d', '7m 10M 12d 15P 16M'], - '9b5': ['3M 7m 8P 9M 12d', '1P 7m 9M 10M 12d', '7m 10M 12d 15P 16M'], - '9#5': ['3M 7m 9M 10M 13m', '1P 7m 9M 10M 13m', '3M 7m 9M 13m 14m', '7m 10M 13m 14m 16M', '7m 10M 13m 16M 17M'], - '7b13': ['3M 7m 8P 10M 13m', '1P 3M 7m 10M 13m', '3M 7m 8P 13m 14m', '7m 10M 13m 14m 15P', '7m 10M 13m 14m 17M'], + '7#5': ['1P 3M 7m 10M 13m', '3M 7m 8P 10M 13m', '3M 7m 8P 13m 14m', '7m 10M 13m 14m 15P', '7m 10M 13m 14m 17M'], + '9#11': ['1P 7m 9M 10M 12d', '3M 7m 8P 9M 12d', '7m 10M 12d 15P 16M'], + '9b5': ['1P 7m 9M 10M 12d', '3M 7m 8P 9M 12d', '7m 10M 12d 15P 16M'], + '9#5': ['1P 7m 9M 10M 13m', '3M 7m 9M 10M 13m', '3M 7m 9M 13m 14m', '7m 10M 13m 14m 16M', '7m 10M 13m 16M 17M'], + '7b13': ['1P 3M 7m 10M 13m', '3M 7m 8P 10M 13m', '3M 7m 8P 13m 14m', '7m 10M 13m 14m 15P', '7m 10M 13m 14m 17M'], '7#9#5': ['3M 7m 10m 10M 13m', '3M 7m 10m 13m 14m', '7m 10M 13m 14m 17m'], '7#9b5': ['3M 7m 10m 10M 12d', '3M 7m 10m 12d 14m', '7m 10M 12d 14m 17m'], '7#9#11': ['3M 7m 10m 10M 12d', '3M 7m 10m 12d 14m', '7m 10M 12d 14m 17m'], - '7b9#11': ['3M 7m 9m 10M 12d', '3M 7m 9m 12d 14m', '7m 10M 12d 14m 16m', '7m 8P 10M 12d 16m'], + '7b9#11': ['3M 7m 9m 10M 12d', '3M 7m 9m 12d 14m', '7m 8P 10M 12d 16m', '7m 10M 12d 14m 16m'], '7b9b5': ['3M 7m 9m 10M 12d', '3M 7m 9m 12d 14m', '7m 8P 10M 12d 16m', '7m 10M 12d 14m 16m'], - '7b9#5': ['3M 7m 9m 10M 13m', '1P 7m 9m 10M 13m', '3M 7m 10M 13m 16m', '7m 10M 13m 14m 16m', '7m 10M 13m 16m 17M'], + '7b9#5': ['1P 7m 9m 10M 13m', '3M 7m 9m 10M 13m', '3M 7m 10M 13m 16m', '7m 10M 13m 14m 16m', '7m 10M 13m 16m 17M'], '7b9#9': ['1P 3M 7m 9m 10m', '3M 7m 10m 13m 16m', '7m 10M 13m 16m 17m'], - '7b9b13': ['3M 7m 9m 10M 13m', '1P 7m 9m 10M 13m', '3M 7m 10M 13m 16m', '7m 10M 13m 14m 16m', '7m 10M 13m 16m 17M'], + '7b9b13': ['1P 7m 9m 10M 13m', '3M 7m 9m 10M 13m', '3M 7m 10M 13m 16m', '7m 10M 13m 14m 16m', '7m 10M 13m 16m 17M'], '7alt': [ '3M 7m 8P 10m 13m', - '3M 7m 9m 10m 13m', + '3M 7m 9m 12d 13m', + '3M 7m 10m 13m 14m', '3M 7m 9m 12d 14m', '3M 7m 10m 13m 15P', '7m 10M 12d 14m 16m', + '7m 10M 12d 13m 16m', '7m 10M 13m 15P 17m', '7m 10M 13m 16m 19d', ], '13#11': ['3M 7m 9M 12d 13M', '7m 10M 12d 13M 16M'], '13b9': ['3M 7m 9m 10M 13M', '3M 7m 10M 13M 16m', '7m 10M 13M 16m 17M'], '13#9': ['3M 7m 10m 10M 13M', '7m 10M 13M 14m 17m'], - '7b9sus': ['5P 7m 8P 9m 11P', '1P 5P 7m 9m 11P', '7m 8P 11P 14m 16m'], + '7b9sus': ['1P 5P 7m 9m 11P', '5P 7m 8P 9m 11P', '7m 8P 11P 14m 16m'], '7susadd3': ['1P 4P 5P 7m 10M', '5P 8P 10M 11P 14m', '7m 11P 12P 15P 17M'], '9sus': [ '1P 4P 6M 7m 9M', - '4P 6M 7m 9M 11P', '1P 5P 7m 9M 11P', + '4P 6M 7m 9M 11P', '5P 8P 9M 11P 14m', '7m 9M 11P 13M 15P', '7m 11P 12P 14m 18P', ], - '13sus': ['4P 7m 9M 11P 13M', '1P 7m 9M 11P 13M', '7m 9M 11P 13M 15P', '7m 11P 13M 14m 16M', '7m 11P 13M 16M 18P'], - '7b13sus': ['5P 7m 8P 11P 13m', '1P 5P 7m 11P 13m', '7m 11P 13m 14m 15P'], + '13sus': [ + '1P 4P 6M 7m 9M', + '1P 7m 9M 11P 13M', + '4P 7m 9M 11P 13M', + '7m 9M 11P 13M 15P', + '7m 11P 13M 14m 16M', + '7m 11P 13M 16M 18P', + ], + '7b13sus': ['1P 5P 7m 11P 13m', '5P 7m 8P 11P 13m', '7m 11P 13m 14m 15P'], };