Incorrect masking behind pitch name noteheads when they revert to default

[davidstephengrant]

Issue type

Engraving bug (incorrect score rendering)

Description with steps to reproduce

Pitch name noteheads are slightly larger than the default notehead. When one of the pitch name notehead schemes has been selected and a pitch is insupported (double sharp/double flat, etc.), the notehead is drawn using the default notehead glyph. When this happens, the white masking behind the note still takes its size from a pitch name notehead, and therefore becomes visible.

Supporting files, videos and screenshots

Masking coloured green for visibility:

In which versions of MuseScore Studio is this issue present?

Latest nightly

Regression

No.

Operating system

macOS 26.5.2

Additional context

No response

Checklist

• This report follows the guidelines for reporting bugs and issues
• I have verified that this issue has not been logged before, by searching the issue tracker for similar issues
• I have attached all requested files and information to this report
• I have attempted to identify the root problem as concisely as possible, and have used minimal reproducible examples where possible

[Jojo-Schmitz]

Maybe it could just fall back to the new "Note name, without accidental" in that case? Much better than falling back to a normal notehead, isn't it?

Something like this (here for 3.x, but shouldn't be much different in 4.7 or main):

diff --git a/libmscore/note.cpp b/libmscore/note.cpp
index 88ca36cb24..bc0b383aa6 100644
--- a/libmscore/note.cpp
+++ b/libmscore/note.cpp
@@ -519,6 +519,36 @@ SymId Note::noteHead(int direction, NoteHead::Group group, NoteHead::Type t, int
                   group = no_accidentals ? NoteHead::Group::HEAD_F : NoteHead::Group::HEAD_F_FLAT;
             else if (tpc == Tpc::TPC_G_B)
                   group = no_accidentals ? NoteHead::Group::HEAD_G : NoteHead::Group::HEAD_G_FLAT;
+            // for TPCs that don't have their own heads (i.e. with 2 or 3 accidentals),
+            // fall back to using the corresponding ones without accidentals rather than using the (smaller) normal notehead
+            else if (tpc == Tpc::TPC_A_SS || tpc == Tpc::TPC_A_SSS)
+                  group = NoteHead::Group::HEAD_A;
+            else if (tpc == Tpc::TPC_B_SS || tpc == Tpc::TPC_B_SSS)
+                  group = german ? NoteHead::Group::HEAD_H : NoteHead::Group::HEAD_B;
+            else if (tpc == Tpc::TPC_C_SS || tpc == Tpc::TPC_C_SSS)
+                  group = NoteHead::Group::HEAD_C;
+            else if (tpc == Tpc::TPC_D_SS || tpc == Tpc::TPC_D_SSS)
+                  group = NoteHead::Group::HEAD_D;
+            else if (tpc == Tpc::TPC_E_SS || tpc == Tpc::TPC_E_SSS)
+                  group = NoteHead::Group::HEAD_E;
+            else if (tpc == Tpc::TPC_F_SS || tpc == Tpc::TPC_F_SSS)
+                  group = NoteHead::Group::HEAD_F;
+            else if (tpc == Tpc::TPC_G_SS || tpc == Tpc::TPC_G_SSS)
+                  group = NoteHead::Group::HEAD_G;
+            else if (tpc == Tpc::TPC_A_BB || tpc == Tpc::TPC_A_BBB)
+                  group = NoteHead::Group::HEAD_A;
+            else if (tpc == Tpc::TPC_B_BB || tpc == Tpc::TPC_B_BBB)
+                  group = NoteHead::Group::HEAD_B;
+            else if (tpc == Tpc::TPC_C_BB || tpc == Tpc::TPC_C_BBB)
+                  group = NoteHead::Group::HEAD_C;
+            else if (tpc == Tpc::TPC_D_BB || tpc == Tpc::TPC_D_BBB)
+                  group = NoteHead::Group::HEAD_D;
+            else if (tpc == Tpc::TPC_E_BB || tpc == Tpc::TPC_E_BBB)
+                  group = NoteHead::Group::HEAD_E;
+            else if (tpc == Tpc::TPC_F_BB || tpc == Tpc::TPC_F_BBB)
+                  group = NoteHead::Group::HEAD_F;
+            else if (tpc == Tpc::TPC_G_BB || tpc == Tpc::TPC_G_BBB)
+                  group = NoteHead::Group::HEAD_G;
             }
       else if (scheme == NoteHead::Scheme::HEAD_SHAPE_NOTE_4) {
             int degree = tpc2degree(tpc, key);

Would look like this (here set up to be using German note names with accidentals):

[Jojo-Schmitz]

See #34242, which is just doing what I described above