-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Keysig fixes #17601
Keysig fixes #17601
Conversation
Amazing! There are still a couple of problems, which I uncovered while testing the fix for #17391. To summarise the situation as I understand it: If we select a bar where there is a 'normal' key signature change - that is, not on that arises because of an instrument change - and insert a bar before it (Add > Bars > Insert before selection, or Ctrl+Ins), the key signature change stays where it is, i.e. the new bar is inserted 'between' the key signature and the selected bar. In other words, this: In the case of an instrument change, before this PR, adding a bar before this one: With this PR the result is this: There are still some problems, however. More problematic: if there's a simultaneous key change and instrument change: This can be reproduced more directly by just deleting the instrument change. This: |
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
@oktophonie I think, better to include it here. |
I corrected something, see video. About instrument change key signatures. If normal key signature already is on place of instrument change, or is added to place of instrument change, it should behave as ordinary key signature (if precedent ks is changed, ic ks remain unchanged, ...) If instrument change is removed, ic ks is removed too. If there were normal ks, it remains and is transposed. If user insert measure, icks is not moved. If normal ks was there, it is moved and in place of instrument change, ic ks is generated. ic-ks-correct.mp4 |
f5a104e
to
0e5d9cf
Compare
@oktophonie this should be done, please check, if You have some time |
@sammik As far as I can tell this fixes all the issues described, except the cut-and-paste one I mentioned in my comment; as that is not a new issue I am happy to leave it to be fixed separately (otherwise if we're continually adding to this monstrous PR it may never be merged), but if you can incorporate a simple solution here, even better. The utests will, in any case, need attention before this can be merged. |
@oktophonie This is not in fact key sig issue. Key sig is just one symptom of problem. Core problem is, that Instrument change data is lot on paste - it is just text pasted (and user needs to right click it and set instrument again to became real Instrument change) So I propose to adress it as a separate issue #17691 |
023f669
to
60dc878
Compare
PR should be ready from my side. @cbjeukendrup please, check, if it needs something translation related (I guess yes, as I changed PreferSharpFlat, now options are "Less", "Sharp", "Flat", "None". @RomanPudashkin please take a care of code review Thanks |
@sammik You don't need to worry about providing the translations! As long as the strings are marked as translatable (which is always the case for strings in a .ui file, and in other places you need to wrap them in I will review this as soon as I can, but that will take some time! |
aa51d1a
to
cc887f3
Compare
… staff with multiple instruments
…n opening saved files
…n added to keysig already present there
… first staff contains instrument change
…first staff to new instrument keylist
@sammik thank you so much! |
Thank You for cooperation and patience. Glad, I could help. |
Resolves: #14274
Resolves: #17547
Resolves: #17508
Resolves: #17506
Resolves: #17498
Resolves: #17493
Resolves: #17407
Resolves: #16983
Resolves: #17391
Resolves: #17375
Resolves: #17293
Resolves: #17613
Resolves: #17642
Resolves: #17626
Resolves: #17661
Resolves: #17665
Resolves: #17732
This PR adds "concertKey" to key definition. It is relevant for transposing instruments, to concert key be unchanged, when switch between transposing and concert pitch.
Now we have "key", which is actual key, shown in score (transposing or concert), and "concert key", which holds concert key information.
Keysig is nowstored as
with optional
<t_accidental>2</t_accidental>
if neededPR also corrects note spellings in transposing pitch, to reflect key signature. And also Harmony.
PR adds default option for prefer sharps or flats, to be "less", which means, program prefer 5 sharps ower 7 flats, or 5 flats ower 7 sharps.
Most of the issues are addresed and fixed by separate commits (but not all).
Key-fixes_edit.mp4
TODO
- add warning - see #17626possible conflict with #17551