update MuseJazz and MuseJazzText

musescore · Nov 4, 2016 · 86b27e5 · 86b27e5 · mirabilos · Nov 2, 2018
1 parent 221f20b
commit 86b27e5
Show file tree

Hide file tree

Showing 22 changed files with 1,458 additions and 15,624 deletions.
diff --git a/fonts/musejazz/MuseJazz.otf b/fonts/musejazz/MuseJazz.otf
diff --git a/fonts/musejazz/MuseJazzText.otf b/fonts/musejazz/MuseJazzText.otf
diff --git a/fonts/musejazz/MuseJazzText.sfd b/fonts/musejazz/MuseJazzText.sfd
diff --git a/fonts/musejazz/MuseJazzText.ttf b/fonts/musejazz/MuseJazzText.ttf
diff --git a/fonts/musejazz/metadata.json b/fonts/musejazz/metadata.json
diff --git 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",

diff --git 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

diff --git 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>
diff --git a/vtest/musejazz-1-ref.png b/vtest/musejazz-1-ref.png
diff --git a/vtest/musejazz-10-ref.png b/vtest/musejazz-10-ref.png
diff --git a/vtest/musejazz-11-ref.png b/vtest/musejazz-11-ref.png
diff --git a/vtest/musejazz-2-ref.png b/vtest/musejazz-2-ref.png
diff --git a/vtest/musejazz-3-ref.png b/vtest/musejazz-3-ref.png
diff --git a/vtest/musejazz-4-ref.png b/vtest/musejazz-4-ref.png
diff --git a/vtest/musejazz-5-ref.png b/vtest/musejazz-5-ref.png
diff --git a/vtest/musejazz-6-ref.png b/vtest/musejazz-6-ref.png
diff --git a/vtest/musejazz-7-ref.png b/vtest/musejazz-7-ref.png
diff --git a/vtest/musejazz-8-ref.png b/vtest/musejazz-8-ref.png
diff --git a/vtest/musejazz-9-ref.png b/vtest/musejazz-9-ref.png
diff --git a/vtest/musejazz-text-1-ref.png b/vtest/musejazz-text-1-ref.png
diff --git a/vtest/musejazz-text-2-ref.png b/vtest/musejazz-text-2-ref.png
diff --git a/vtest/musejazz-text-3-ref.png b/vtest/musejazz-text-3-ref.png