remove Petaluma Script at places that ask for a musical text fonts

and fix a typo
musescore · Oct 13, 2019 · 9ed0f2a · 9ed0f2a
1 parent b9d653e
commit 9ed0f2a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 13 deletions.
diff --git a/libmscore/sym.cpp b/libmscore/sym.cpp
@@ -5859,7 +5859,6 @@ void initScoreFonts()
       QFont::insertSubstitution("ScoreFont",      "Bravura Text");
       QFont::insertSubstitution("MuseJazz Text",  "Bravura Text");
       QFont::insertSubstitution("Petaluma Text",  "Bravura Text");
-      QFont::insertSubstitution("Petaluma Script","Bravura Text");
       ScoreFont::fallbackFont();   // load fallback font
       }
 

diff --git a/mscore/editstyle.cpp b/mscore/editstyle.cpp
@@ -1112,7 +1112,6 @@ void EditStyle::setValues()
       musicalTextFont->addItem("Gonville Text", "Gootville Text");
       musicalTextFont->addItem("MuseJazz Text", "MuseJazz Text");
       musicalTextFont->addItem("Petaluma Text", "Petaluma Text");
-      musicalTextFont->addItem("Petaluma Script", "Petaluma Script");
       QString tfont(lstyle.value(Sid::MusicalTextFont).toString());
       idx = musicalTextFont->findData(tfont);
       musicalTextFont->setCurrentIndex(idx);

diff --git a/mscore/editstyle.ui b/mscore/editstyle.ui
@@ -357,16 +357,6 @@
                  <string notr="true">Petaluma Text</string>
                 </property>
                </item>
-               <item>
-                <property name="text">
-                 <string notr="true">Petaluma Script</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string/>
-                </property>
-               </item>
               </widget>
              </item>
              <item row="0" column="3">

diff --git a/mscore/musescorefonts-Mac.qrc b/mscore/musescorefonts-Mac.qrc
@@ -4,6 +4,6 @@
         <file alias="fonts/gootville/Gootville.otf">../fonts/gootville/Gootville.otf</file>
         <file alias="fonts/bravura/Bravura.otf">../fonts/bravura/Bravura.otf</file>
         <file alias="fonts/musejazz/MuseJazz.otf">../fonts/musejazz/MuseJazz.otf</file>
-        <file alias="fonts/petaluma/Petaluma.otf">../fonts/petalume/Petaluma.otf</file>
+        <file alias="fonts/petaluma/Petaluma.otf">../fonts/petaluma/Petaluma.otf</file>
         </qresource>
 </RCC>