[MU3] Engraving improvements dialog #6791

vpereverzev · 2020-10-29T22:44:26Z

Design provided by @Tantacrul, although it's might be not a final version

This dialog will also include more handlers soon. For example: "Automatic score ordering and bracketing" - #6479 and "Algorithm for spreading staves/systems over a page" - #6538 (@njvdberg )

Also this PR includes the "First system indentation" handler (https://trello.com/c/kj5W4AQP)

mtests failure is expected

libmscore/scorefile.cpp

libmscore/mscore.h

Jojo-Schmitz · 2020-10-30T07:15:52Z

The mtests don't like that MSC_VERSION change at all

Note to self: conflicts with #6255 (esp. that "Never ask this again")

libmscore/mscore.h

libmscore/style.cpp

libmscore/layout.cpp

Jojo-Schmitz · 2020-10-30T11:17:44Z

Well, along with the (still to be added) new fonts Leland, Leland Text and the Edwin family, we're gonna have backwards compatibility problem anyway I guess, so maybe we need to live with this then?

njvdberg · 2020-11-03T15:08:27Z

mscore/migration/iscoremigrationhandler.h

+    IScoreMigrationHandler() = default;
+    virtual ~IScoreMigrationHandler() = default;
+
+    virtual bool handle(Ms::Score* score) = 0;


At this moment, the migration handlers have one argument only Ms::Score*. However, the Instrument Ordering handler will required another argument Ms::MuseScore* mscore (required to open the Instrument form which is part of the MuseScore class).

Do you prefer a new PR for this change or shall I add a remark at all files to be modified?

Looks like it's only needed for instrument handlers, so I suggest to use Ms::mscore directly, it's an external variable

All you need here is to include "mscore/musescore.h"

…pcoming improvements

…hange their choice regarding "score migration" policy

…er score now

… settings in "Style" dialog

…ialog

Jojo-Schmitz · 2020-11-11T15:00:19Z

rebase needed (sorry, I think at least partly my #6255's fault)

Test test2

vpereverzev · 2020-11-12T20:50:50Z

Well, along with the (still to be added) new fonts Leland, Leland Text and the Edwin family, we're gonna have backwards compatibility problem anyway I guess, so maybe we need to live with this then?

Yes, that was the one of the main motivations for 3.02 introduction along with new engraving improvements, because it's a literally new version of the format anyway

Jojo-Schmitz · 2020-11-12T20:58:43Z

That backwards compatibility issue is a very bad thing! And as explained in the Telegram chats, not needed at all, if you just change the internally coded defaults, i.e. change those to Leland and not record that in the score.

libmscore/barline.cpp

libmscore/sym.cpp

Jojo-Schmitz · 2020-11-12T21:03:51Z

mscore/musescore.cpp

@@ -7646,7 +7646,7 @@ MuseScoreApplication::CommandLineParseResult MuseScoreApplication::parseCommandL
      parser.addOption(QCommandLineOption({"M", "midi-operations"}, "Specify MIDI import operations file", "file"));
      parser.addOption(QCommandLineOption({"w", "no-webview"}, "No web view in start center"));
      parser.addOption(QCommandLineOption({"P", "export-score-parts"}, "Use with '-o <file>.pdf', export score and parts"));
-      parser.addOption(QCommandLineOption(      "no-fallback-font", "Don't use Bravura as fallback musical font"));
+      parser.addOption(QCommandLineOption(      "no-fallback-font", "Don't use Leland as fallback musical font"));


Not sure what to make out of this, in connection with my proposal for Petaluma to fall back to MuseJazz first.

Maybe just "Don't use a fallback musical font"?

Or leave it Bravura, as even Leland falls back to Bravura in the end

vpereverzev · 2020-11-12T21:49:21Z

That backwards compatibility issue is a very bad thing! And as explained in the Telegram chats, not needed at all, if you just change the internally coded defaults, i.e. change those to Leland and not record that in the score.

I think this is not really an option, because it means that once the user changes the font from the standard Leland to, say, Bravura, they can never change it back and save again if we'll not write it in the score. Therefore, every time he opens his score, he will have to go into the styles dialog and temporarily return Leland :)

From my perspective, upgrading the format version is quite natural here, because we will greatly upgrade the engraving rules. It would be wrong if such drastic changes did not affect the format version. Perhaps @Tantacrul might add a few words here.

vpereverzev · 2020-11-13T10:26:13Z

That dialog needs to get made working for the dark theme! Currently it leaves the user in the dark (pun intended):

Also #6255 changed (or rather: was supposed to change) that "Never ask this again" to the clearer "Remember my choice and don't ask again". In a different dialog (importing pre-3.x scores), but IMHO the same string makes sense here too.

THX, fixed

fonts/leland/Leland.mss

Jojo-Schmitz · 2020-11-13T11:38:28Z

Leland and Edwin should get an 'honorable mention' in fonts/Readme.md

See #6856

Jojo-Schmitz · 2020-11-13T11:41:21Z

mtest/CMakeLists.txt

@@ -40,6 +40,8 @@ if (MSVC)
 endif (MSVC)

 QT5_ADD_RESOURCES(qrc_files ${PROJECT_SOURCE_DIR}/mtest/mtest.qrc
+            ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Leland.qrc
+            ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Edwin.qrc


For some reason ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Campania.qrc is missing in this file.
Not a fault of this PR, not causing any issue yet, still something to fix IMHO

Thanks, solved ;-)

Jojo-Schmitz · 2020-11-13T11:55:18Z

mscore/editstyle.ui

+                <property name="text">
+                 <string notr="true">Leland</string>
+                </property>
+               </item>
               <item>


"Leland Text" missing (in the next pull down) (even if it is just cosmetical, but so it this one here too)

Thanks. solved

libmscore/barline.cpp

Jojo-Schmitz · 2020-11-13T12:15:19Z

Leland.mss needs to get installed into the styles folder (next to MuseJazz.mss), here in the GitHub repo only it doesn't help anybody ;-)

vpereverzev · 2020-11-13T13:00:15Z

Leland.mss needs to get installed into the styles folder (next to MuseJazz.mss), here in the GitHub repo only it doesn't help anybody ;-)

ah, very useful, TY
I've tried to find something related to Bravura

AntonioBL · 2020-11-13T13:09:37Z

Ciao.
There is apparently a problem with vtest emmentaler-4, here is how it appears with this PR:

I didn't check, but are all "Emmentaler-*" vtests affected by this PR (not only their text, but also their musical symbols) just because they rely on Emmentaler being the (previous) default font (and thus they do not explicitly mention this font in the file structure)?

Additional note: isn't the percussion clef a little decentered? See for example vtest fmrest-1.

Jojo-Schmitz · 2020-11-13T13:21:27Z

I guess we'd need a whole new set of Leland vtests, and make those Emmentaler test files explicitly using Emmentaler.
Or just rename them all to Leland* (and create a set of Emmentaler vtests, but maybe that is optional?)

Jojo-Schmitz · 2020-11-13T13:23:08Z

share/styles/Leland.mss

@@ -0,0 +1,1097 @@
+<?xml version="1.0" encoding="UTF-8"?>


That's fine, but we now have a duplicate, that other in fonts/Leland?

its-not-nice · 2020-11-13T13:46:18Z

Additional note: isn't the percussion clef a little decentered? See for example vtest fmrest-1.

Clefs are all left-justified, and SMuFL recommends setting zero sidebearings for most symbols, so that's why it looks like this (as it does in Bravura).
Emmentaler/MScore sets a wideish left sidebearing to quasi-centre the percussion clef. We might consider it as an option.

vpereverzev · 2020-11-13T13:46:48Z

I guess we'd need a whole new set of Leland vtests, and make those Emmentaler test files explicitly using Emmentaler.
Or just rename them all to Leland* (and create a set of Emmentaler vtests, but maybe that is optional?)

Yes, that is exact plan for us

MarcSabatella · 2020-11-13T15:25:48Z

The handling of clefs (up through 3.5) involves some special-casing in the code, in order to support the way clefs had previously been justified within the font. I forget the details, but it will be good to review how clefs are positioned in all the different places they occur - beginning of score, mid-measure changes (especially if there are notes on other staves that might overlap), clef changes before barline, courtesy clefs, etc.

…indentation

Jojo-Schmitz reviewed Oct 30, 2020

View reviewed changes

libmscore/scorefile.cpp Outdated Show resolved Hide resolved

Jojo-Schmitz reviewed Oct 30, 2020

View reviewed changes

libmscore/mscore.h Show resolved Hide resolved

njvdberg reviewed Oct 30, 2020

View reviewed changes

libmscore/mscore.h Show resolved Hide resolved

libmscore/style.cpp Show resolved Hide resolved

libmscore/layout.cpp Show resolved Hide resolved

njvdberg suggested changes Nov 3, 2020

View reviewed changes

vpereverzev added 10 commits November 11, 2020 12:04

Implemented the "score migration" dialog view

de875b1

Implemented the "Score migration" dialog model

fc6c3b5

Implemented the ScoreMigrator for 3.6 and prepared the handlers for u…

487b17c

…pcoming improvements

Added a separate option in "preferences" in order to allow users to c…

42fbb52

…hange their choice regarding "score migration" policy

Updated the current mscversion

cd654d4

Saving the property "don't ask me again for this score" only for mast…

1015c6c

…er score now

Implemented the "first system" indentation and provided all necessary…

08f6ec1

… settings in "Style" dialog

Altered a layout of the new "3.6 engraving" dialog

3d1ab00

Fixed codestyle issues and properly applied values from "engraving" d…

4f89c6d

…ialog

Made the "quality upgrade permission" property a style property

0d2bfa7

Jojo-Schmitz mentioned this pull request Nov 12, 2020

MuseScore 3.6 Alpha. PRs to be merged and issues to be fixed. #6505

Closed

74 tasks

Added a Leland and an Edwin fonts

5d26aeb

Test test2

vpereverzev force-pushed the 3.6_scores_upgrade branch from e1d7cfb to 4c6e303 Compare November 12, 2020 20:49

Jojo-Schmitz reviewed Nov 12, 2020

View reviewed changes

libmscore/barline.cpp Outdated Show resolved Hide resolved

Jojo-Schmitz reviewed Nov 12, 2020

View reviewed changes

libmscore/sym.cpp Outdated Show resolved Hide resolved

Jojo-Schmitz reviewed Nov 12, 2020

View reviewed changes

Actualized the mscVersion of mtests

821582c

vpereverzev force-pushed the 3.6_scores_upgrade branch from 4c6e303 to 2d8149e Compare November 12, 2020 21:36

Updated vtests

04335dd

vpereverzev force-pushed the 3.6_scores_upgrade branch from 2d8149e to 04335dd Compare November 12, 2020 21:50

vpereverzev added the vtests This PR produces approved changes to vtest results label Nov 13, 2020

Jojo-Schmitz reviewed Nov 13, 2020

View reviewed changes

fonts/leland/Leland.mss Outdated Show resolved Hide resolved

Updated the Leland font on the latest version

da09d4c

vpereverzev force-pushed the 3.6_scores_upgrade branch from e57ed88 to da09d4c Compare November 13, 2020 11:09

Jojo-Schmitz reviewed Nov 13, 2020

View reviewed changes

libmscore/barline.cpp Outdated Show resolved Hide resolved

Added a missing Leland Text item

f4423e1

vpereverzev force-pushed the 3.6_scores_upgrade branch from 4ae2a93 to f4423e1 Compare November 13, 2020 13:09

Jojo-Schmitz reviewed Nov 13, 2020

View reviewed changes

vpereverzev merged commit f1c4951 into musescore:3.x Nov 13, 2020

vpereverzev added a commit to vpereverzev/MuseScore that referenced this pull request Nov 14, 2020

Fixed issues with prefs dialog introduced in musescore#6791

c89e1e8

vpereverzev mentioned this pull request Nov 14, 2020

[MU3] Prefs dialog fix #6860

Merged

vpereverzev added a commit that referenced this pull request Nov 14, 2020

Fixed issues with prefs dialog introduced in #6791

6fd1af4

igorkorsukov added a commit to igorkorsukov/MuseScore that referenced this pull request Feb 8, 2021

ported musescore#6791, musescore#6941, musescore#7026 : First system …

6955b8c

…indentation

igorkorsukov mentioned this pull request Feb 8, 2021

[MU4] Ported #6791, #6941, #7026 : First system indentation #7445

Merged

vpereverzev pushed a commit that referenced this pull request Feb 8, 2021

ported #6791, #6941, #7026 : First system indentation

57057e6

igorkorsukov added a commit to igorkorsukov/MuseScore that referenced this pull request Feb 8, 2021

ported musescore#6791 : Engraving improvements

db5f37f

igorkorsukov mentioned this pull request Feb 8, 2021

[MU4] Ported #6791 : Engraving improvements #7451

Merged

igorkorsukov added a commit that referenced this pull request Feb 8, 2021

ported #6791 : Engraving improvements

74d7f6a

vpereverzev deleted the 3.6_scores_upgrade branch July 3, 2021 12:47

[MU3] Engraving improvements dialog #6791

[MU3] Engraving improvements dialog #6791

Uh oh!

Conversation

vpereverzev commented Oct 29, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Jojo-Schmitz commented Oct 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Jojo-Schmitz commented Oct 30, 2020

Uh oh!

njvdberg Nov 3, 2020

Choose a reason for hiding this comment

Uh oh!

vpereverzev Nov 12, 2020

Choose a reason for hiding this comment

Uh oh!

Jojo-Schmitz commented Nov 11, 2020

Uh oh!

vpereverzev commented Nov 12, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Jojo-Schmitz commented Nov 12, 2020

Uh oh!

Uh oh!

Uh oh!

Jojo-Schmitz Nov 12, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Jojo-Schmitz Nov 13, 2020

Choose a reason for hiding this comment

Uh oh!

vpereverzev commented Nov 12, 2020

Uh oh!

vpereverzev commented Nov 13, 2020

Uh oh!

Uh oh!

Jojo-Schmitz commented Nov 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Jojo-Schmitz Nov 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Jojo-Schmitz Nov 13, 2020

Choose a reason for hiding this comment

Uh oh!

Jojo-Schmitz Nov 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Jojo-Schmitz Nov 13, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Jojo-Schmitz commented Nov 13, 2020

Uh oh!

vpereverzev commented Nov 13, 2020

Uh oh!

AntonioBL commented Nov 13, 2020

Uh oh!

Jojo-Schmitz commented Nov 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Jojo-Schmitz Nov 13, 2020

Choose a reason for hiding this comment

Uh oh!

its-not-nice commented Nov 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vpereverzev commented Nov 13, 2020

Uh oh!

MarcSabatella commented Nov 13, 2020

vpereverzev commented Oct 29, 2020 •

edited

Loading

Jojo-Schmitz commented Oct 30, 2020 •

edited

Loading

vpereverzev commented Nov 12, 2020 •

edited

Loading

Jojo-Schmitz Nov 12, 2020 •

edited

Loading

Jojo-Schmitz commented Nov 13, 2020 •

edited

Loading

Jojo-Schmitz Nov 13, 2020 •

edited

Loading

Jojo-Schmitz Nov 13, 2020 •

edited

Loading

Jojo-Schmitz commented Nov 13, 2020 •

edited

Loading

its-not-nice commented Nov 13, 2020 •

edited

Loading