no-chris · no-chris · Feb 14, 2023 · Jan 14, 2023 · Jan 15, 2023 · Jan 15, 2023
diff --git a/jest.config.base.js b/jest.config.base.js
@@ -22,7 +22,9 @@ module.exports = {
 		'\\.svg': 'jest-text-transformer',
 	},
 	// whitelisting local modules in the node_modules folder
-	transformIgnorePatterns: ['<rootDir>.*(node_modules)(?!.*chord-mark.*).*$'],
+	transformIgnorePatterns: [
+		'<rootDir>.*(node_modules)(?!.*chord-(symbol|mark).*).*$',
+	],
 
 	moduleNameMapper: {
 		'\\.(css|scss)$': '<rootDir>/tests/styleMock.js',

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "@size-limit/preset-app": "^8.1.0",
     "@size-limit/webpack": "^8.1.0",
     "babel-jest": "^29.2.1",
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^9.1.2",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.5.1",
@@ -41,7 +41,7 @@
     "terser-webpack-plugin": "^5.1.4",
     "webpack": "^5.36.2",
     "webpack-bundle-analyzer": "^4.4.2",
-    "webpack-cli": "^4.7.2",
+    "webpack-cli": "^5.0.1",
     "webpack-dev-server": "^4.7.2",
     "webpack-merge": "^5.8.0"
   },

diff --git a/packages/chord-chart-studio/SLOC b/packages/chord-chart-studio/SLOC
@@ -2,14 +2,14 @@ Source code:
 
 ---------- Result ------------
 
-            Physical :  6254
-              Source :  5180
+            Physical :  6245
+              Source :  5174
              Comment :  132
  Single-line comment :  63
        Block comment :  69
                Mixed :  9
  Empty block comment :  0
-               Empty :  951
+               Empty :  948
                To Do :  0
 
 Number of files read :  142
@@ -20,14 +20,14 @@ Tests:
 
 ---------- Result ------------
 
-            Physical :  7209
-              Source :  5926
+            Physical :  7156
+              Source :  5880
              Comment :  67
  Single-line comment :  60
        Block comment :  7
                Mixed :  10
  Empty block comment :  0
-               Empty :  1226
+               Empty :  1219
                To Do :  0
 
 Number of files read :  65
@@ -38,14 +38,14 @@ Total:
 
 ---------- Result ------------
 
-            Physical :  13463
-              Source :  11106
+            Physical :  13401
+              Source :  11054
              Comment :  199
  Single-line comment :  123
        Block comment :  76
                Mixed :  19
  Empty block comment :  0
-               Empty :  2177
+               Empty :  2167
                To Do :  0
 
 Number of files read :  207

diff --git a/packages/chord-chart-studio/build/css/main.3a60932e92db6c837452.css b/packages/chord-chart-studio/build/css/main.3a60932e92db6c837452.css
diff --git a/packages/chord-chart-studio/build/css/main.3a60932e92db6c837452.css.map b/packages/chord-chart-studio/build/css/main.3a60932e92db6c837452.css.map
diff --git a/packages/chord-chart-studio/build/css/main.6c2b09763d09b4b4339a.css b/packages/chord-chart-studio/build/css/main.6c2b09763d09b4b4339a.css
diff --git a/packages/chord-chart-studio/build/css/main.6c2b09763d09b4b4339a.css.map b/packages/chord-chart-studio/build/css/main.6c2b09763d09b4b4339a.css.map
diff --git a/packages/chord-chart-studio/build/index.html b/packages/chord-chart-studio/build/index.html
@@ -2,4 +2,4 @@
         function gtag(){dataLayer.push(arguments);}
         gtag('js', new Date());
 
-        gtag('config', 'G-EGKBT2J600');</script><link rel="icon" href="app/favicon.png"><script defer="defer" src="app/vendors.6c2b09763d09b4b4339a.js"></script><script defer="defer" src="app/main.6c2b09763d09b4b4339a.js"></script><link href="app/css/main.6c2b09763d09b4b4339a.css" rel="stylesheet"></head><body><div id="app" class="theme-dark"></div></body></html>
+        gtag('config', 'G-EGKBT2J600');</script><link rel="icon" href="app/favicon.png"><script defer="defer" src="app/vendors.3a60932e92db6c837452.js"></script><script defer="defer" src="app/main.3a60932e92db6c837452.js"></script><link href="app/css/main.3a60932e92db6c837452.css" rel="stylesheet"></head><body><div id="app" class="theme-dark"></div></body></html>
diff --git a/packages/chord-chart-studio/build/main.3a60932e92db6c837452.js b/packages/chord-chart-studio/build/main.3a60932e92db6c837452.js
diff --git a/.../main.6c2b09763d09b4b4339a.js.LICENSE.txt → .../main.3a60932e92db6c837452.js.LICENSE.txt b/.../main.6c2b09763d09b4b4339a.js.LICENSE.txt → .../main.3a60932e92db6c837452.js.LICENSE.txt
diff --git a/packages/chord-chart-studio/build/main.3a60932e92db6c837452.js.map b/packages/chord-chart-studio/build/main.3a60932e92db6c837452.js.map
diff --git a/packages/chord-chart-studio/build/main.6c2b09763d09b4b4339a.js b/packages/chord-chart-studio/build/main.6c2b09763d09b4b4339a.js
diff --git a/packages/chord-chart-studio/build/main.6c2b09763d09b4b4339a.js.map b/packages/chord-chart-studio/build/main.6c2b09763d09b4b4339a.js.map
diff --git a/packages/chord-chart-studio/build/vendors.3a60932e92db6c837452.js b/packages/chord-chart-studio/build/vendors.3a60932e92db6c837452.js
diff --git a/...ndors.6c2b09763d09b4b4339a.js.LICENSE.txt → ...ndors.3a60932e92db6c837452.js.LICENSE.txt b/...ndors.6c2b09763d09b4b4339a.js.LICENSE.txt → ...ndors.3a60932e92db6c837452.js.LICENSE.txt
@@ -13,9 +13,9 @@ See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
 
-/*! @license DOMPurify 2.3.4 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.3.4/LICENSE */
+/*! @license DOMPurify 2.4.4 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.4.4/LICENSE */
 
-/*! @license DOMPurify 2.4.0 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.4.0/LICENSE */
+/*! @license DOMPurify 3.0.0 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.0.0/LICENSE */
 
 /*! Universal Router | MIT License | https://www.kriasoft.com/universal-router/ */
 
@@ -84,7 +84,7 @@ and limitations under the License.
  *
  * @copyright 2022 Jason Mulligan <jason.mulligan@avoidwork.com>
  * @license BSD-3-Clause
- * @version 10.0.5
+ * @version 10.0.6
  */
 
 /** @license React v16.13.1

diff --git a/packages/chord-chart-studio/build/vendors.3a60932e92db6c837452.js.map b/packages/chord-chart-studio/build/vendors.3a60932e92db6c837452.js.map
diff --git a/packages/chord-chart-studio/build/vendors.6c2b09763d09b4b4339a.js b/packages/chord-chart-studio/build/vendors.6c2b09763d09b4b4339a.js
diff --git a/packages/chord-chart-studio/build/vendors.6c2b09763d09b4b4339a.js.map b/packages/chord-chart-studio/build/vendors.6c2b09763d09b4b4339a.js.map
diff --git a/packages/chord-chart-studio/package.json b/packages/chord-chart-studio/package.json
@@ -24,14 +24,14 @@
 		"react-test-renderer": "^18.2.0"
 	},
 	"dependencies": {
-		"chord-mark": "^0.12.0",
-		"chord-mark-converters": "^0.12.0",
-		"chord-mark-themes": "^0.12.0",
-		"chord-symbol": "^3.0.0",
-		"chord-symbol-ultimateguitar": "3.0.0",
+		"chord-mark": "^0.13.0",
+		"chord-mark-converters": "^0.13.0",
+		"chord-mark-themes": "^0.13.0",
+		"chord-symbol": "^4.0.0",
+		"chord-symbol-ultimateguitar": "^4.0.0",
 		"combine-section-reducers": "^1.0.6",
 		"core-js": "^3.20.2",
-		"dompurify": "^2.2.9",
+		"dompurify": "^3.0.0",
 		"file-saver": "^2.0.5",
 		"filesize": "^10.0.5",
 		"lodash": "^4.17.21",

diff --git a/packages/chord-chart-studio/scss/abstract/_colors.scss b/packages/chord-chart-studio/scss/abstract/_colors.scss
@@ -1,5 +1,5 @@
 // Dark theme
-// Source: https://coolors.co/f4f4f4-2e4052-303846-293132-fabf2b
+// Source: https://coolors.co/f4f4f4-2e4052-303846-293132-fabf2b-74f14e
 $whiteSmoke: rgba(244, 244, 244, 1);
 $onyx: rgba(48, 56, 70, 1);
 $charcoal: rgba(46, 64, 82, 1);

diff --git a/packages/chord-chart-studio/src/core/createGetVersions.js b/packages/chord-chart-studio/src/core/createGetVersions.js
@@ -3,20 +3,20 @@ const packageJson = require('../../package.json');
 const cmPackageJson = require('../../node_modules/chord-mark/package.json');
 const fs = require('fs');
 
-const chordChartStudioVersion = 'v' + packageJson.version;
+const chordChartStudioVersion = packageJson.version;
 const chordMarkVersion = packageJson.dependencies['chord-mark'].replace(
 	'^',
-	'v'
+	''
 );
 const chordSymbolVersion = cmPackageJson.dependencies['chord-symbol'].replace(
 	'^',
-	'v'
+	''
 );
 
 const version = {
-	'chord-chart-studio': chordChartStudioVersion,
-	'chord-symbol': chordSymbolVersion,
-	'chord-mark': chordMarkVersion,
+	'chord-chart-studio': 'v' + chordChartStudioVersion,
+	'chord-symbol': 'v' + chordSymbolVersion,
+	'chord-mark': 'v' + chordMarkVersion,
 };
 
 const serialized = JSON.stringify(version).replace(/"/g, "'");

diff --git a/packages/chord-chart-studio/src/core/getVersions.js b/packages/chord-chart-studio/src/core/getVersions.js
@@ -1 +1 @@
-export default () => ({'chord-chart-studio':'v0.13.0','chord-symbol':'3.0.0','chord-mark':'v0.12.0'});
+export default () => ({'chord-chart-studio':'v0.13.0','chord-symbol':'v4.0.0','chord-mark':'v0.13.0'});
diff --git a/packages/chord-chart-studio/src/core/renderSong.js b/packages/chord-chart-studio/src/core/renderSong.js
@@ -42,10 +42,15 @@ function render(songTxt, renderOptions, useChartFormat, outputFormat) {
 						customRenderer: chordMark2UltimateGuitar(),
 						printBarSeparators: 'grids',
 						printChordsDuration: 'never',
+						printSubBeatDelimiters: false,
+						printInlineTimeSignatures: false,
 						chordSymbolRenderer: chordRendererFactory({
 							customFilters: [chordSymbolUltimateGuitar()],
 							useShortNamings: true,
-							useFlats: renderOptions.accidentalsType === 'flat',
+							accidentalsType:
+								renderOptions.accidentalsType === 'auto'
+									? 'original'
+									: renderOptions.accidentalsType,
 							...renderOptions, // duh!
 						}),
 					}) +

diff --git a/packages/chord-chart-studio/src/db/options/editorModeOptions.js b/packages/chord-chart-studio/src/db/options/editorModeOptions.js
@@ -1,17 +1,11 @@
 const editorModeOptions = {
-	edit: [
-		'theme',
-
-		'transposeValue',
-		'harmonizeAccidentals',
-		'preferredAccidentals',
-	],
+	edit: ['theme', 'transposeValue', 'preferredAccidentals', 'symbolType'],
 	play: [
 		'theme',
 
 		'transposeValue',
-		'harmonizeAccidentals',
 		'preferredAccidentals',
+		'symbolType',
 
 		'chartType',
 		'alignChordsWithLyrics',
@@ -25,8 +19,8 @@ const editorModeOptions = {
 	],
 	print: [
 		'transposeValue',
-		'harmonizeAccidentals',
 		'preferredAccidentals',
+		'symbolType',
 
 		'chartType',
 		'alignChordsWithLyrics',
@@ -44,8 +38,8 @@ const editorModeOptions = {
 		'chartFormat',
 
 		'transposeValue',
-		'harmonizeAccidentals',
 		'preferredAccidentals',
+		'symbolType',
 
 		'chartType',
 		'alignChordsWithLyrics',

diff --git a/packages/chord-chart-studio/src/db/options/seed.js b/packages/chord-chart-studio/src/db/options/seed.js
@@ -16,13 +16,13 @@ export default {
 	songPreferences: {
 		values: {
 			transposeValue: 0,
-			harmonizeAccidentals: true,
 			preferredAccidentals: 'auto',
+			symbolType: 'chord',
 		},
 		defaults: {
 			transposeValue: 0,
-			harmonizeAccidentals: true,
 			preferredAccidentals: 'auto',
+			symbolType: 'chord',
 		},
 		//userDefaults: {},
 	},

diff --git a/packages/chord-chart-studio/src/fileManager/exportSelectedFileAsText.js b/packages/chord-chart-studio/src/fileManager/exportSelectedFileAsText.js
@@ -22,16 +22,12 @@ export default function exportSelectedFileAsText() {
 			'songPreferences',
 			'transposeValue'
 		),
-		harmonizeAccidentals: getOptionValue(
-			state,
-			'songPreferences',
-			'harmonizeAccidentals'
-		),
 		accidentalsType: getOptionValue(
 			state,
 			'songPreferences',
 			'accidentalsType'
 		),
+		symbolType: getOptionValue(state, 'songPreferences', 'symbolType'),
 
 		chartType: getOptionValue(state, 'songFormatting', 'chartType'),
 		alignChordsWithLyrics: getOptionValue(

diff --git a/packages/chord-chart-studio/src/gettingStarted.txt b/packages/chord-chart-studio/src/gettingStarted.txt
@@ -12,4 +12,4 @@ Where to start? You can either:
 - check the sample song on the left
 - read the user guide, by clicking the big yellow button in the top right corner
 
-Have fun!
+Have fun! 
diff --git a/packages/chord-chart-studio/src/optionsPanels/rendering/_state/selectors.js b/packages/chord-chart-studio/src/optionsPanels/rendering/_state/selectors.js
@@ -37,16 +37,6 @@ export const getNonInteractableWidgets = (state) => {
 		}
 	}
 
-	const harmonizeAccidentals = getOptionValue(
-		state,
-		'songPreferences',
-		'harmonizeAccidentals'
-	);
-
-	if (!harmonizeAccidentals) {
-		nonInteractableWidgets.push('preferredAccidentals');
-	}
-
 	return nonInteractableWidgets;
 };
 

diff --git a/packages/chord-chart-studio/src/optionsPanels/rendering/allWidgets.js b/packages/chord-chart-studio/src/optionsPanels/rendering/allWidgets.js
@@ -79,8 +79,8 @@ export default {
 
 			groupWidgetsOrder: [
 				'transposeValue',
-				'harmonizeAccidentals',
 				'preferredAccidentals',
+				'symbolType',
 			],
 			allGroupWidgets: {
 				transposeValue: {
@@ -97,15 +97,6 @@ export default {
 					},
 				},
 
-				harmonizeAccidentals: {
-					label: 'Harmonize accidentals',
-					type: 'toggle',
-					option: {
-						context: 'songPreferences',
-						key: 'harmonizeAccidentals',
-					},
-				},
-
 				preferredAccidentals: {
 					label: 'Preferred accidentals',
 					type: 'select',
@@ -133,6 +124,29 @@ export default {
 						key: 'preferredAccidentals',
 					},
 				},
+
+				symbolType: {
+					label: 'Symbols type',
+					type: 'select',
+					typeOptions: {
+						allChoices: [
+							{
+								id: 'symbolTypeChord',
+								label: 'Chord symbols',
+								value: 'chord',
+							},
+							{
+								id: 'symbolTypeRoman',
+								label: 'Roman numerals',
+								value: 'roman',
+							},
+						],
+					},
+					option: {
+						context: 'songPreferences',
+						key: 'symbolType',
+					},
+				},
 			},
 		},
 

diff --git a/packages/chord-chart-studio/src/songRenderers/_components/SongRenderer.js b/packages/chord-chart-studio/src/songRenderers/_components/SongRenderer.js
@@ -15,8 +15,8 @@ function SongRenderer(props) {
 		'chartFormat',
 
 		'transposeValue',
-		'harmonizeAccidentals',
 		'accidentalsType',
+		'symbolType',
 
 		'chartType',
 		'alignChordsWithLyrics',

diff --git a/packages/chord-chart-studio/src/songRenderers/_containers/SongRenderer.js b/packages/chord-chart-studio/src/songRenderers/_containers/SongRenderer.js
@@ -7,16 +7,12 @@ import SongRenderer from '../_components/SongRenderer';
 export default connect((state) => ({
 	// songPreferences
 	transposeValue: getOptionValue(state, 'songPreferences', 'transposeValue'),
-	harmonizeAccidentals: getOptionValue(
-		state,
-		'songPreferences',
-		'harmonizeAccidentals'
-	),
 	accidentalsType: getOptionValue(
 		state,
 		'songPreferences',
 		'preferredAccidentals'
 	),
+	symbolType: getOptionValue(state, 'songPreferences', 'symbolType'),
 
 	// songFormatting
 	chartFormat: getOptionValue(state, 'editorPreferences', 'chartFormat'),

diff --git a/packages/chord-chart-studio/src/songRenderers/printPreview/_components/PrintPreview.js b/packages/chord-chart-studio/src/songRenderers/printPreview/_components/PrintPreview.js
@@ -12,8 +12,8 @@ function PrintPreview(props) {
 
 	const renderOptions = _pick(props, [
 		'transposeValue',
-		'harmonizeAccidentals',
 		'accidentalsType',
+		'symbolType',
 
 		'chartType',
 		'alignChordsWithLyrics',

diff --git a/packages/chord-chart-studio/src/songRenderers/printPreview/_containers/PrintPreview.js b/packages/chord-chart-studio/src/songRenderers/printPreview/_containers/PrintPreview.js
@@ -6,17 +6,13 @@ import PrintPreview from '../_components/PrintPreview';
 
 export default connect((state) => ({
 	// songPreferences
-	harmonizeAccidentals: getOptionValue(
-		state,
-		'songPreferences',
-		'harmonizeAccidentals'
-	),
 	accidentalsType: getOptionValue(
 		state,
 		'songPreferences',
 		'preferredAccidentals'
 	),
 	transposeValue: getOptionValue(state, 'songPreferences', 'transposeValue'),
+	symbolType: getOptionValue(state, 'songPreferences', 'symbolType'),
 
 	// songFormatting
 	chartType: getOptionValue(state, 'songFormatting', 'chartType'),