Add back Gonville, converted to SMuFL

Jojo-Schmitz · Jan 9, 2014 · fe6c721 · fe6c721
1 parent d6523e5
commit fe6c721
Show file tree

Hide file tree

Showing 9 changed files with 745 additions and 1,886 deletions.
diff --git a/fonts/gonville/Gonville.otf b/fonts/gonville/Gonville.otf
diff --git a/fonts/gonville/gonville-20.otf b/fonts/gonville/gonville-20.otf
diff --git a/fonts/gonville/gonville-20.ttf b/fonts/gonville/gonville-20.ttf
diff --git a/fonts/gonville/gonville.xml b/fonts/gonville/gonville.xml
diff --git a/fonts/gonville/metadata.json b/fonts/gonville/metadata.json
diff --git a/libmscore/sym.cpp b/libmscore/sym.cpp
@@ -25,9 +25,9 @@ namespace Ms {
 //---------------------------------------------------------
 
 QVector<ScoreFont> ScoreFont::_scoreFonts = {
-      ScoreFont("Emmentaler", "MScore",      ":/fonts/mscore/",   "mscore.ttf"),
-//      ScoreFont("Goneville",  "Gonville-20", ":/fonts/gonville/", "gonville-20.ttf"),
-      ScoreFont("Bravura",    "Bravura",     ":/fonts/bravura/",  "Bravura.otf")
+      ScoreFont("Emmentaler", "MScore",   ":/fonts/mscore/",   "mscore.ttf"),
+      ScoreFont("Gonville",   "Gonville", ":/fonts/gonville/", "Gonville.otf"),
+      ScoreFont("Bravura",    "Bravura",  ":/fonts/bravura/",  "Bravura.otf")
       };
 
 //---------------------------------------------------------

diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
@@ -496,7 +496,7 @@ endif (MINGW)
 
 if (APPLE)
      install (FILES
-      ../fonts/gonville/gonville-20.ttf
+      ../fonts/gonville/Gonville.otf
       ../fonts/mscore/mscore.ttf
       ../fonts/MuseJazz.ttf
       ../fonts/FreeSerifMscore.ttf

diff --git a/mscore/musescore.qrc b/mscore/musescore.qrc
@@ -10,7 +10,7 @@
         <file alias="fonts/mscore/mscore.ttf">../fonts/mscore/mscore.ttf</file>
         <file alias="/fonts/mscore/glyphnames.json">../fonts/mscore/glyphnames.json</file>
         <file alias="/fonts/mscore/metadata.json">../fonts/mscore/metadata.json</file>
-        <file alias="fonts/gonville/gonville-20.ttf">../fonts/gonville/gonville-20.ttf</file>
+        <file alias="fonts/gonville/Gonville.otf">../fonts/gonville/Gonville.otf</file>
         <file alias="/fonts/gonville/glyphnames.json">../fonts/gonville/glyphnames.json</file>
         <file alias="/fonts/gonville/metadata.json">../fonts/gonville/metadata.json</file>
         <file alias="fonts/bravura/Bravura.otf">../fonts/bravura/Bravura.otf</file>

diff --git a/mtest/mtest.qrc b/mtest/mtest.qrc
@@ -7,6 +7,9 @@
       <file alias="fonts/bravura/Bravura.otf">../fonts/bravura/Bravura.otf</file>
       <file alias="fonts/bravura/glyphnames.json">../fonts/bravura/glyphnames.json</file>
       <file alias="fonts/bravura/metadata.json">../fonts/bravura/metadata.json</file>
+      <file alias="fonts/gonville/Gonville.otf">../fonts/gonville/Gonville.otf</file>
+      <file alias="fonts/gonville/glyphnames.json">../fonts/gonville/glyphnames.json</file>
+      <file alias="fonts/gonville/metadata.json">../fonts/gonville/metadata.json</file>
       <file alias="fonts/MuseJazz.ttf">../fonts/MuseJazz.ttf</file>
       <file alias="fonts/FreeSerifMscore.ttf">../fonts/FreeSerifMscore.ttf</file>
       <file alias="fonts/FreeSerifBold.ttf">../fonts/FreeSerifBold.ttf</file>
@@ -16,6 +19,7 @@
       <file alias="fonts/fonts_figuredbass.xml">../fonts/fonts_figuredbass.xml</file>
       <file alias="fonts/mscore-BC.ttf">../fonts/mscore-BC.ttf</file>
       <file alias="fonts/Bravura.otf">../fonts/bravura/Bravura.otf</file>
+      <file alias="fonts/Gonville.otf">../fonts/gonville/Gonville.otf</file>
 
       <file alias="instruments.xml">../share/templates/instruments.xml</file>