Fix key signature glyph placement

karma.conf.js

@@ -146,6 +146,7 @@ module.exports = function (config) {
             output: {
                 format: 'iife',
                 name: 'alphaTab',
+                file: 'dist/lib.test/test.bundle.js',
                 sourcemap: false
             }
         }

package.json

@@ -72,10 +72,10 @@
         "lodash": "^4.17.21",
         "multer": "^1.4.4",
         "rimraf": "^3.0.2",
-        "rollup": "^2.74.1",
+        "rollup": "^2.75.1",
         "rollup-plugin-copy": "^3.4.0",
-        "rollup-plugin-dts": "^4.2.1",
-        "rollup-plugin-license": "^2.7.0",
+        "rollup-plugin-dts": "^4.2.2",
+        "rollup-plugin-license": "^2.8.0",
         "rollup-plugin-serve": "^1.1.0",
         "rollup-plugin-terser": "^7.0.2",
         "terser": "^5.13.1",

src/rendering/ScoreBarRenderer.ts

@@ -836,13 +836,13 @@ export class ScoreBarRenderer extends BarRendererBase {
                 offsetClef = 1;
                 break;
             case Clef.F4:
-                offsetClef = 2;
+                offsetClef = 3;
                 break;
             case Clef.C3:
-                offsetClef = -1;
+                offsetClef = 2;
                 break;
             case Clef.C4:
-                offsetClef = 1;
+                offsetClef = 0;
                 break;
         }
         let newLines: Map<number, boolean> = new Map<number, boolean>();

test/visualTests/features/MusicNotation.test.ts

@@ -20,6 +20,36 @@ describe('MusicNotationTests', () => {
         await VisualTestHelper.runVisualTest('music-notation/clefs.gp', settings);
     });
 
+    it('key-signatures-mixed', async () => {
+        let settings: Settings = new Settings();
+        settings.display.staveProfile = StaveProfile.Score;
+        await VisualTestHelper.runVisualTest('music-notation/key-signatures-mixed.gp', settings, [0, 1, 2, 3]);
+    });
+
+    it('key-signatures-c3', async () => {
+        let settings: Settings = new Settings();
+        settings.display.staveProfile = StaveProfile.Score;
+        await VisualTestHelper.runVisualTest('music-notation/key-signatures-c3.gp', settings);
+    });
+
+    it('key-signatures-c4', async () => {
+        let settings: Settings = new Settings();
+        settings.display.staveProfile = StaveProfile.Score;
+        await VisualTestHelper.runVisualTest('music-notation/key-signatures-c4.gp', settings);
+    });
+
+    it('key-signatures-f4', async () => {
+        let settings: Settings = new Settings();
+        settings.display.staveProfile = StaveProfile.Score;
+        await VisualTestHelper.runVisualTest('music-notation/key-signatures-f4.gp', settings);
+    });
+
+    it('key-signatures-g2', async () => {
+        let settings: Settings = new Settings();
+        settings.display.staveProfile = StaveProfile.Score;
+        await VisualTestHelper.runVisualTest('music-notation/key-signatures-g2.gp', settings);
+    });
+
     it('key-signatures', async () => {
         let settings: Settings = new Settings();
         settings.display.staveProfile = StaveProfile.Score;
@@ -55,7 +85,7 @@ describe('MusicNotationTests', () => {
         settings.display.barsPerRow = 4;
         await VisualTestHelper.runVisualTest('music-notation/beams-advanced.gp', settings);
     });
-    
+
     it('rest-collisions', async () => {
         await VisualTestHelper.runVisualTest('music-notation/rest-collisions.gp');
     });