fix guitar pro tests and symbol inclusion

musescore · Feb 19, 2014 · 5e9cec1 · 5e9cec1
1 parent 29de29d
commit 5e9cec1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/mscore/importgtp.cpp b/mscore/importgtp.cpp
@@ -638,7 +638,7 @@ void GuitarPro::setTempo(int tempo)
       {
       TempoText* tt = new TempoText(score);
       tt->setTempo(double(tempo)/60.0);
-      tt->setText(QString("#noteQuarterUp# = %1").arg(tempo));
+      tt->setText(QString("<sym>noteQuarterUp</sym> = %1").arg(tempo));
 
       tt->setTrack(0);
       Measure* measure = score->firstMeasure();

diff --git a/mtest/guitarpro/slur.gp4-ref.mscx b/mtest/guitarpro/slur.gp4-ref.mscx
@@ -90,13 +90,7 @@
           <tempo>2</tempo>
           <lid>2</lid>
           <style>Tempo</style>
-          <text>#noteQuarterUp# = 120</text>
-          </Tempo>
-        <Tempo>
-          <tempo>2</tempo>
-          <lid>10</lid>
-          <style>Tempo</style>
-          <text>#noteQuarterUp# = 120</text>
+          <text><sym>noteQuarterUp</sym> = 120</text>
           </Tempo>
         <Slur id="2">
           <lid>9</lid>
@@ -235,7 +229,7 @@
             <tempo>2</tempo>
             <lid>2</lid>
             <style>Tempo</style>
-            <text>#noteQuarterUp# = 120</text>
+            <text><sym>noteQuarterUp</sym> = 120</text>
             </Tempo>
           <Slur id="3">
             <lid>9</lid>

diff --git a/mtest/guitarpro/testIrrTuplet.gp4-ref.mscx b/mtest/guitarpro/testIrrTuplet.gp4-ref.mscx
@@ -90,13 +90,7 @@
           <tempo>1.2</tempo>
           <lid>2</lid>
           <style>Tempo</style>
-          <text>#noteQuarterUp# = 72</text>
-          </Tempo>
-        <Tempo>
-          <tempo>1.2</tempo>
-          <lid>12</lid>
-          <style>Tempo</style>
-          <text>#noteQuarterUp# = 72</text>
+          <text><sym>noteQuarterUp</sym> = 72</text>
           </Tempo>
         <Rest>
           <lid>3</lid>
@@ -271,7 +265,7 @@
             <tempo>1.2</tempo>
             <lid>2</lid>
             <style>Tempo</style>
-            <text>#noteQuarterUp# = 72</text>
+            <text><sym>noteQuarterUp</sym> = 72</text>
             </Tempo>
           <Rest>
             <lid>3</lid>