From af07c76c1828df73db5298b17007c59a6b2e8cef Mon Sep 17 00:00:00 2001
From: lasconic <lasconic@gmail.com>
Date: Wed, 23 Jul 2014 16:13:13 +0200
Subject: [PATCH] next try to fix the tests, include Bravura Text in fonts for
 tests

---
 libmscore/dynamic.cpp | 58 +++++++++++++++++++++----------------------
 mtest/mtest.qrc       |  3 +--
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/libmscore/dynamic.cpp b/libmscore/dynamic.cpp
index c4e8ff27e7..4a3d8b8f26 100644
--- a/libmscore/dynamic.cpp
+++ b/libmscore/dynamic.cpp
@@ -44,37 +44,37 @@ struct Dyn {
 static Dyn dynList[] = {
       // dynamic:
       {  -1,  true,  "other-dynamics", "" },
-      {   1,  false, "pppppp", "<font face=\"BravuraText\">\ue520\ue520\ue520\ue520\ue520\ue520</font>" },
-      {   5,  false, "ppppp",  "<font face=\"BravuraText\">\ue520\ue520\ue520\ue520\ue520</font>" },
-      {  10,  false, "pppp",   "<font face=\"BravuraText\">\ue520\ue520\ue520\ue520</font>" },
-      {  16,  false, "ppp",    "<font face=\"BravuraText\">\ue520\ue520\ue520</font>" },
-      {  33,  false, "pp",     "<font face=\"BravuraText\">\ue520\ue520</font>" },
-      {  49,  false, "p",      "<font face=\"BravuraText\">\ue520</font>" },
-      {  64,  false, "mp",     "<font face=\"BravuraText\">\ue521\ue520</font>" },
-      {  80,  false, "mf",     "<font face=\"BravuraText\">\ue521\ue522</font>" },
-      {  96,  false, "f",      "<font face=\"BravuraText\">\ue522</font>" },
-      { 112,  false, "ff",     "<font face=\"BravuraText\">\ue522\ue522</font>" },
-      { 126,  false, "fff",    "<font face=\"BravuraText\">\ue522\ue522\ue522</font>" },
-      { 127,  false, "ffff",   "<font face=\"BravuraText\">\ue522\ue522\ue522\ue522</font>" },
-      { 127,  false, "fffff",  "<font face=\"BravuraText\">\ue522\ue522\ue522\ue522\ue522</font>" },
-      { 127,  false, "ffffff", "<font face=\"BravuraText\">\ue522\ue522\ue522\ue522\ue522\ue522</font>" },
+      {   1,  false, "pppppp", "<font face=\"Bravura Text\">\ue520\ue520\ue520\ue520\ue520\ue520" },
+      {   5,  false, "ppppp",  "<font face=\"Bravura Text\">\ue520\ue520\ue520\ue520\ue520" },
+      {  10,  false, "pppp",   "<font face=\"Bravura Text\">\ue520\ue520\ue520\ue520" },
+      {  16,  false, "ppp",    "<font face=\"Bravura Text\">\ue520\ue520\ue520" },
+      {  33,  false, "pp",     "<font face=\"Bravura Text\">\ue520\ue520" },
+      {  49,  false, "p",      "<font face=\"Bravura Text\">\ue520" },
+      {  64,  false, "mp",     "<font face=\"Bravura Text\">\ue521\ue520" },
+      {  80,  false, "mf",     "<font face=\"Bravura Text\">\ue521\ue522" },
+      {  96,  false, "f",      "<font face=\"Bravura Text\">\ue522" },
+      { 112,  false, "ff",     "<font face=\"Bravura Text\">\ue522\ue522" },
+      { 126,  false, "fff",    "<font face=\"Bravura Text\">\ue522\ue522\ue522" },
+      { 127,  false, "ffff",   "<font face=\"Bravura Text\">\ue522\ue522\ue522\ue522" },
+      { 127,  false, "fffff",  "<font face=\"Bravura Text\">\ue522\ue522\ue522\ue522\ue522" },
+      { 127,  false, "ffffff", "<font face=\"Bravura Text\">\ue522\ue522\ue522\ue522\ue522\ue522" },
 
       // accents:
-      {  0,   true,  "fp",     "<font face=\"BravuraText\">\ue522\ue520</font>" },
-      {  0,   true,  "sf",     "<font face=\"BravuraText\">\ue524\ue522</font>" },
-      {  0,   true,  "sfz",    "<font face=\"BravuraText\">\ue524\ue522\0e525</font>" },
-      {  0,   true,  "sff",    "<font face=\"BravuraText\">\ue524\ue522\ue522</font>" },
-      {  0,   true,  "sffz",   "<font face=\"BravuraText\">\ue524\ue522\ue522\ue525</font>" },
-      {  0,   true,  "sfp",    "<font face=\"BravuraText\">\ue524\ue522\ue520</font>" },
-      {  0,   true,  "sfpp",   "<font face=\"BravuraText\">\ue524\ue522\ue520\ue520</font>" },
-      {  0,   true,  "rfz",    "<font face=\"BravuraText\">\ue523\ue522\ue525</font>" },
-      {  0,   true,  "rf",     "<font face=\"BravuraText\">\ue523\ue522</font>" },
-      {  0,   true,  "fz",     "<font face=\"BravuraText\">\ue522\ue525</font>" },
-      {  0,   true,  "m",      "<font face=\"BravuraText\">\ue521</font>" },
-      {  0,   true,  "r",      "<font face=\"BravuraText\">\ue523</font>" },
-      {  0,   true,  "s",      "<font face=\"BravuraText\">\ue524</font>" },
-      {  0,   true,  "z",      "<font face=\"BravuraText\">\ue525</font>" },
-      {  0,   true,  "n",      "<font face=\"BravuraText\">\ue526</font>" },
+      {  0,   true,  "fp",     "<font face=\"Bravura Text\">\ue522\ue520" },
+      {  0,   true,  "sf",     "<font face=\"Bravura Text\">\ue524\ue522" },
+      {  0,   true,  "sfz",    "<font face=\"Bravura Text\">\ue524\ue522\0e525" },
+      {  0,   true,  "sff",    "<font face=\"Bravura Text\">\ue524\ue522\ue522" },
+      {  0,   true,  "sffz",   "<font face=\"Bravura Text\">\ue524\ue522\ue522\ue525" },
+      {  0,   true,  "sfp",    "<font face=\"Bravura Text\">\ue524\ue522\ue520" },
+      {  0,   true,  "sfpp",   "<font face=\"Bravura Text\">\ue524\ue522\ue520\ue520" },
+      {  0,   true,  "rfz",    "<font face=\"Bravura Text\">\ue523\ue522\ue525" },
+      {  0,   true,  "rf",     "<font face=\"Bravura Text\">\ue523\ue522" },
+      {  0,   true,  "fz",     "<font face=\"Bravura Text\">\ue522\ue525" },
+      {  0,   true,  "m",      "<font face=\"Bravura Text\">\ue521" },
+      {  0,   true,  "r",      "<font face=\"Bravura Text\">\ue523" },
+      {  0,   true,  "s",      "<font face=\"Bravura Text\">\ue524" },
+      {  0,   true,  "z",      "<font face=\"Bravura Text\">\ue525" },
+      {  0,   true,  "n",      "<font face=\"Bravura Text\">\ue526" },
       };
 #endif
 
diff --git a/mtest/mtest.qrc b/mtest/mtest.qrc
index c515f6922d..72bf3f0037 100644
--- a/mtest/mtest.qrc
+++ b/mtest/mtest.qrc
@@ -8,6 +8,7 @@
       <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>
+      <file alias="fonts/bravura/BravuraText.otf">../fonts/bravura/BravuraText.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/MuseJazz.ttf">../fonts/MuseJazz.ttf</file>
@@ -15,8 +16,6 @@
       <file alias="fonts/mscoreTab.ttf">../fonts/mscoreTab.ttf</file>
       <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/Gonville.otf">../fonts/gonville/Gonville.otf</file>
-      <file alias="fonts/Bravura.otf">../fonts/bravura/Bravura.otf</file>
 
       <file alias="instruments.xml">../share/templates/instruments.xml</file>