Merge pull request #2875 from lasconic/MuseJazzText

update MuseJazz and MuseJazzText
2016-11-14 15:23:43 +01:00 · 2016-11-14 15:23:43 +01:00 · 2eb7be1833
commit 2eb7be1833
parent f9778790a0 86b27e570d
22 changed files with 1438 additions and 15604 deletions
--- a/fonts/musejazz/MuseJazz.otf
+++ b/fonts/musejazz/MuseJazz.otf
--- a/fonts/musejazz/MuseJazzText.otf
+++ b/fonts/musejazz/MuseJazzText.otf
--- a/fonts/musejazz/MuseJazzText.sfd
+++ b/fonts/musejazz/MuseJazzText.sfd
--- a/fonts/musejazz/MuseJazzText.ttf
+++ b/fonts/musejazz/MuseJazzText.ttf
--- a/fonts/musejazz/metadata.json
+++ b/fonts/musejazz/metadata.json
--- a/libmscore/mscore.cpp
+++ b/libmscore/mscore.cpp
@ -271,7 +271,7 @@ void MScore::init()
      //
 #if !defined(Q_OS_MAC) && !defined(Q_OS_IOS)
      static const char* fonts[] = {
-            ":/fonts/musejazz/MuseJazzText.ttf",
+            ":/fonts/musejazz/MuseJazzText.otf",
            ":/fonts/FreeSans.ttf",
            ":/fonts/FreeSerif.ttf",
            ":/fonts/FreeSerifBold.ttf",
--- a/mscore/CMakeLists.txt
+++ b/mscore/CMakeLists.txt
@ -590,7 +590,7 @@ if (APPLE)
     install (FILES
      ../fonts/gootville/GootvilleText.otf
      ../fonts/mscore/MScoreText.ttf
-      ../fonts/musejazz/MuseJazzText.ttf
+      ../fonts/musejazz/MuseJazzText.otf
      ../fonts/FreeSerif.ttf
      ../fonts/FreeSerifBold.ttf
      ../fonts/FreeSerifItalic.ttf
--- a/mscore/musescorefonts-MuseJazz.qrc
+++ b/mscore/musescorefonts-MuseJazz.qrc
@ -1,6 +1,6 @@
 <RCC>
    <qresource prefix="/">
        <file alias="fonts/musejazz/MuseJazz.otf">../fonts/musejazz/MuseJazz.otf</file>
-        <file alias="fonts/musejazz/MuseJazzText.ttf">../fonts/musejazz/MuseJazzText.ttf</file>
+        <file alias="fonts/musejazz/MuseJazzText.otf">../fonts/musejazz/MuseJazzText.otf</file>
 	    </qresource>
 </RCC>
--- a/vtest/musejazz-1-ref.png
+++ b/vtest/musejazz-1-ref.png
--- a/vtest/musejazz-10-ref.png
+++ b/vtest/musejazz-10-ref.png
--- a/vtest/musejazz-11-ref.png
+++ b/vtest/musejazz-11-ref.png
--- a/vtest/musejazz-2-ref.png
+++ b/vtest/musejazz-2-ref.png
--- a/vtest/musejazz-3-ref.png
+++ b/vtest/musejazz-3-ref.png
--- a/vtest/musejazz-4-ref.png
+++ b/vtest/musejazz-4-ref.png
--- a/vtest/musejazz-5-ref.png
+++ b/vtest/musejazz-5-ref.png
--- a/vtest/musejazz-6-ref.png
+++ b/vtest/musejazz-6-ref.png
--- a/vtest/musejazz-7-ref.png
+++ b/vtest/musejazz-7-ref.png
--- a/vtest/musejazz-8-ref.png
+++ b/vtest/musejazz-8-ref.png
--- a/vtest/musejazz-9-ref.png
+++ b/vtest/musejazz-9-ref.png
--- a/vtest/musejazz-text-1-ref.png
+++ b/vtest/musejazz-text-1-ref.png
--- a/vtest/musejazz-text-2-ref.png
+++ b/vtest/musejazz-text-2-ref.png
--- a/vtest/musejazz-text-3-ref.png
+++ b/vtest/musejazz-text-3-ref.png