[MU3] Various changes for Leland

build/Linux+BSD/mscore.1.in

@@ -3,7 +3,7 @@
 .\"	mirabilos <[email protected]>
 .\" Published under the same terms as MuseScore itself.
 .\"-
-.Dd October 19, 2020
+.Dd November 13, 2020
 .Dt @MAN_MSCORE_UPPER@ 1
 .Os MuseScore
 .Sh NAME@Variables_substituted_by_CMAKE_on_installation@
@@ -242,7 +242,7 @@ Print a conditioned diff between the given scores
 Display the full name, version and git revision of the application
 without starting the graphical user interface
 .It Fl \-no\-fallback\-font
-Don't use Bravura as fallback musical font
+Don't use a fallback musical font
 .It Fl \-raw\-diff
 Print a raw diff between the given scores
 .It Fl \-run\-test\-script

fonts/README.md

@@ -8,7 +8,9 @@ This directory contains the fonts used internally by MuseScore and the sources u
 
 * **bravura** The [_Bravura_](https://github.com/steinbergmedia/bravura/) fonts and the documentation for them. These fonts are **not** maintained by the MuseScore community, please **DO NOT EDIT** these fonts. 
 * **campania** The [_Campania_](https://github.com/MarcSabatella/Campania) font for Roman numeral analysis.  This font is not maintained by the MuseScore project, but it is open source and contributions from the MuseScore community are encouraged at the main site for the font.
+* **edwin** The _Edwin_ text font family. This font is maintained by the MuseScore project.
 * **gootville** The [_Gonville_](http://www.chiark.greenend.org.uk/~sgtatham/gonville/) fonts for score musical symbols. This font is modified and maintained by the MuseScore project.
+* **leland** The _Leland_ font used in MuseScore scores for musical symbols. This is maintained by the MuseScore project.
 * **mscore** The main font used in MuseScore scores for musical symbols (formerly known as [_Emmentaler_](http://lilypond.org/doc/v2.18/Documentation/notation/the-feta-font)), as well its counterpart used for texts.
 * **musejazz** The _MuseJazz_ and _MuseJazzText_ fonts used for notation and text in a handwritten style.  These are maintained by the MuseScore project.
 * **petaluma** The [_Petaluma_](https://github.com/steinbergmedia/petaluma/) fonts and the documentation for them. These fonts are **not** maintained by the MuseScore community, please **DO NOT EDIT** these fonts. 

libmscore/sym.cpp

@@ -31,13 +31,13 @@ namespace Ms {
 //    this is the list of available score fonts
 //---------------------------------------------------------
 
-static const int FALLBACK_FONT = 0;       // Bravura
+static const int FALLBACK_FONT = 1;       // Bravura
 
 QVector<ScoreFont> ScoreFont::_scoreFonts {
-      ScoreFont("Bravura",    "Bravura",     ":/fonts/bravura/",   "Bravura.otf"  ),
       ScoreFont("Leland",     "Leland",      ":/fonts/leland/",    "Leland.otf"   ),
+      ScoreFont("Bravura",    "Bravura",     ":/fonts/bravura/",   "Bravura.otf"  ),
       ScoreFont("Emmentaler", "MScore",      ":/fonts/mscore/",    "mscore.ttf"   ),
-      ScoreFont("Gonville",   "Gootville",   ":/fonts/gootville/", "Gootville.otf" ),
+      ScoreFont("Gonville",   "Gootville",   ":/fonts/gootville/", "Gootville.otf"),
       ScoreFont("MuseJazz",   "MuseJazz",    ":/fonts/musejazz/",  "MuseJazz.otf" ),
       ScoreFont("Petaluma",   "Petaluma",    ":/fonts/petaluma/",  "Petaluma.otf" ),
       };
@@ -6279,9 +6279,9 @@ void initScoreFonts()
       QFont::insertSubstitution("Bravura Text",   "Leland Text");
       QFont::insertSubstitution("MScore Text",    "Leland Text");
       QFont::insertSubstitution("Gootville Text", "Leland Text");
-      QFont::insertSubstitution("ScoreFont",      "Leland Text");
       QFont::insertSubstitution("MuseJazz Text",  "Leland Text");
       QFont::insertSubstitution("Petaluma Text",  "MuseJazz Text");
+      QFont::insertSubstitution("ScoreFont",      "Leland Text"); // alias for current Musical Text Font
       ScoreFont::fallbackFont();   // load fallback font
       }
 

mscore/musescore.cpp

@@ -7623,7 +7623,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 Leland as fallback musical font"));
+      parser.addOption(QCommandLineOption(      "no-fallback-font", "Don't use a fallback musical font"));
       parser.addOption(QCommandLineOption({"f", "force"}, "Use with '-o <file>', ignore warnings reg. score being corrupted or from wrong version"));
       parser.addOption(QCommandLineOption({"b", "bitrate"}, "Use with '-o <file>.mp3', sets bitrate, in kbps", "bitrate"));
       parser.addOption(QCommandLineOption({"E", "install-extension"}, "Install an extension, load soundfont as default unless -e is passed too", "extension file"));

mscore/qml/migration/ScoreMigrationDialog.qml

@@ -165,7 +165,7 @@ FocusScope {
                 Layout.fillWidth: true
 
                 checked: root.model ? root.model.shouldNeverAskAgain : false
-                text: qsTr("Never ask this again")
+                text: qsTr("Remember my choice and don't ask again")
 
                 onToggled: {
                     root.model.shouldNeverAskAgain = checked