From 75873c19a3b8ad4de87f3914b57d032039e32ccc Mon Sep 17 00:00:00 2001 From: "Maurizio M. Gavioli" Date: Thu, 29 May 2014 18:45:32 +0200 Subject: [PATCH 1/2] Removing default usages of the PERC2 and TAB2 clefs. - PERC2 is no longer supported and always rendered as PERC; using it as default, as in importxml.cpp is obsolete. - TAB is the default tab clef, and TAB2 only remains as a stylistic variant. --- libmscore/clef.cpp | 2 +- libmscore/style.cpp | 2 +- mscore/importxml.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libmscore/clef.cpp b/libmscore/clef.cpp index a6a66dedc1..b002437a0d 100644 --- a/libmscore/clef.cpp +++ b/libmscore/clef.cpp @@ -562,7 +562,7 @@ ClefType Clef::clefType(const QString& s) case 16: ct = ClefType::G4; break; case 17: ct = ClefType::F_8VA; break; case 18: ct = ClefType::F_15MA; break; - case 19: ct = ClefType::PERC2; break; + case 19: ct = ClefType::PERC; break; // PERC2 no longer supported case 20: ct = ClefType::TAB2; break; } } diff --git a/libmscore/style.cpp b/libmscore/style.cpp index 622de8e364..42a247951d 100644 --- a/libmscore/style.cpp +++ b/libmscore/style.cpp @@ -495,7 +495,7 @@ StyleData::StyleData() { StyleIdx::ottavaLineWidth, QVariant(.1) }, { StyleIdx::ottavaLineStyle, QVariant(int(Qt::DashLine)) }, { StyleIdx::ottavaNumbersOnly, true }, - { StyleIdx::tabClef, QVariant(int(ClefType::TAB2)) }, + { StyleIdx::tabClef, QVariant(int(ClefType::TAB)) }, { StyleIdx::tremoloWidth, QVariant(1.2) }, // tremolo stroke width: note head width { StyleIdx::tremoloBoxHeight, QVariant(0.65) }, { StyleIdx::tremoloStrokeWidth, QVariant(0.35) }, diff --git a/mscore/importxml.cpp b/mscore/importxml.cpp index add753da09..dd20d294c4 100644 --- a/mscore/importxml.cpp +++ b/mscore/importxml.cpp @@ -5492,11 +5492,11 @@ StaffTypes MusicXml::xmlClef(QDomElement e, int staffIdx, Measure* measure) clef = ClefType::C1; } else if (c == "percussion") { - clef = ClefType::PERC2; + clef = ClefType::PERC; res = StaffTypes::PERC_DEFAULT; } else if (c == "TAB") { - clef = ClefType::TAB2; + clef = ClefType::TAB; res = StaffTypes::TAB_DEFAULT; } else From ab57d57c3423c9116fc2b85416c05b02b6063828 Mon Sep 17 00:00:00 2001 From: "Maurizio M. Gavioli" Date: Fri, 30 May 2014 19:06:02 +0200 Subject: [PATCH 2/2] Fix Guitar Pro tests --- mtest/guitarpro/arpeggio_up_down.gp4-ref.mscx | 4 ++-- mtest/guitarpro/basic-bend.gp5-ref.mscx | 4 ++-- mtest/guitarpro/bend.gp3-ref.mscx | 4 ++-- mtest/guitarpro/bend.gp4-ref.mscx | 4 ++-- mtest/guitarpro/bend.gp5-ref.mscx | 4 ++-- mtest/guitarpro/copyright.gp3-ref.mscx | 4 ++-- mtest/guitarpro/copyright.gp4-ref.mscx | 4 ++-- mtest/guitarpro/copyright.gp5-ref.mscx | 4 ++-- mtest/guitarpro/dynamic.gp5-ref.mscx | 4 ++-- mtest/guitarpro/ghost_note.gp3-ref.mscx | 4 ++-- mtest/guitarpro/grace.gp5-ref.mscx | 4 ++-- mtest/guitarpro/heavy-accent.gp5-ref.mscx | 4 ++-- mtest/guitarpro/sforzato.gp4-ref.mscx | 4 ++-- mtest/guitarpro/slur.gp4-ref.mscx | 4 ++-- mtest/guitarpro/tempo.gp3-ref.mscx | 4 ++-- mtest/guitarpro/tempo.gp4-ref.mscx | 4 ++-- mtest/guitarpro/tempo.gp5-ref.mscx | 4 ++-- mtest/guitarpro/testIrrTuplet.gp4-ref.mscx | 4 ++-- mtest/guitarpro/tremolos.gp5-ref.mscx | 4 ++-- mtest/guitarpro/trill.gp4-ref.mscx | 4 ++-- mtest/guitarpro/volta.gp3-ref.mscx | 4 ++-- mtest/guitarpro/volta.gp4-ref.mscx | 4 ++-- mtest/guitarpro/volta.gp5-ref.mscx | 4 ++-- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/mtest/guitarpro/arpeggio_up_down.gp4-ref.mscx b/mtest/guitarpro/arpeggio_up_down.gp4-ref.mscx index 8dbb3bf0d5..bc944b6159 100644 --- a/mtest/guitarpro/arpeggio_up_down.gp4-ref.mscx +++ b/mtest/guitarpro/arpeggio_up_down.gp4-ref.mscx @@ -408,8 +408,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/basic-bend.gp5-ref.mscx b/mtest/guitarpro/basic-bend.gp5-ref.mscx index d98a5b50ec..e408e41972 100644 --- a/mtest/guitarpro/basic-bend.gp5-ref.mscx +++ b/mtest/guitarpro/basic-bend.gp5-ref.mscx @@ -304,8 +304,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/bend.gp3-ref.mscx b/mtest/guitarpro/bend.gp3-ref.mscx index d2435f49a7..d4a48cfdca 100644 --- a/mtest/guitarpro/bend.gp3-ref.mscx +++ b/mtest/guitarpro/bend.gp3-ref.mscx @@ -494,8 +494,8 @@ - TAB2 - TAB2 + TAB + TAB 3 diff --git a/mtest/guitarpro/bend.gp4-ref.mscx b/mtest/guitarpro/bend.gp4-ref.mscx index 3691a8be8b..b6ff8b3018 100644 --- a/mtest/guitarpro/bend.gp4-ref.mscx +++ b/mtest/guitarpro/bend.gp4-ref.mscx @@ -502,8 +502,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/bend.gp5-ref.mscx b/mtest/guitarpro/bend.gp5-ref.mscx index 3691a8be8b..b6ff8b3018 100644 --- a/mtest/guitarpro/bend.gp5-ref.mscx +++ b/mtest/guitarpro/bend.gp5-ref.mscx @@ -502,8 +502,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/copyright.gp3-ref.mscx b/mtest/guitarpro/copyright.gp3-ref.mscx index 70038e0171..83eaa77a34 100644 --- a/mtest/guitarpro/copyright.gp3-ref.mscx +++ b/mtest/guitarpro/copyright.gp3-ref.mscx @@ -275,8 +275,8 @@ All Rights Reserved - International Copyright Secured - TAB2 - TAB2 + TAB + TAB 3 diff --git a/mtest/guitarpro/copyright.gp4-ref.mscx b/mtest/guitarpro/copyright.gp4-ref.mscx index 0123067dc3..80e7b76945 100644 --- a/mtest/guitarpro/copyright.gp4-ref.mscx +++ b/mtest/guitarpro/copyright.gp4-ref.mscx @@ -283,8 +283,8 @@ All Rights Reserved - International Copyright Secured - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/copyright.gp5-ref.mscx b/mtest/guitarpro/copyright.gp5-ref.mscx index 13f0a6fea8..88a335a8a0 100644 --- a/mtest/guitarpro/copyright.gp5-ref.mscx +++ b/mtest/guitarpro/copyright.gp5-ref.mscx @@ -283,8 +283,8 @@ All Rights Reserved - International Copyright Secured - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/dynamic.gp5-ref.mscx b/mtest/guitarpro/dynamic.gp5-ref.mscx index fb66f5a7a5..80c76b2386 100644 --- a/mtest/guitarpro/dynamic.gp5-ref.mscx +++ b/mtest/guitarpro/dynamic.gp5-ref.mscx @@ -492,8 +492,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/ghost_note.gp3-ref.mscx b/mtest/guitarpro/ghost_note.gp3-ref.mscx index 250843c6dc..ce2f510737 100644 --- a/mtest/guitarpro/ghost_note.gp3-ref.mscx +++ b/mtest/guitarpro/ghost_note.gp3-ref.mscx @@ -560,8 +560,8 @@ - TAB2 - TAB2 + TAB + TAB 4 diff --git a/mtest/guitarpro/grace.gp5-ref.mscx b/mtest/guitarpro/grace.gp5-ref.mscx index 9deb002263..d862224c0b 100644 --- a/mtest/guitarpro/grace.gp5-ref.mscx +++ b/mtest/guitarpro/grace.gp5-ref.mscx @@ -763,8 +763,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/heavy-accent.gp5-ref.mscx b/mtest/guitarpro/heavy-accent.gp5-ref.mscx index 12d6ef6da2..c83e5f7575 100644 --- a/mtest/guitarpro/heavy-accent.gp5-ref.mscx +++ b/mtest/guitarpro/heavy-accent.gp5-ref.mscx @@ -294,8 +294,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/sforzato.gp4-ref.mscx b/mtest/guitarpro/sforzato.gp4-ref.mscx index 363fa35abd..1021ce2c83 100644 --- a/mtest/guitarpro/sforzato.gp4-ref.mscx +++ b/mtest/guitarpro/sforzato.gp4-ref.mscx @@ -308,8 +308,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/slur.gp4-ref.mscx b/mtest/guitarpro/slur.gp4-ref.mscx index 6b07f98824..8733915561 100644 --- a/mtest/guitarpro/slur.gp4-ref.mscx +++ b/mtest/guitarpro/slur.gp4-ref.mscx @@ -322,8 +322,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/tempo.gp3-ref.mscx b/mtest/guitarpro/tempo.gp3-ref.mscx index 3f383533b8..f88e351e22 100644 --- a/mtest/guitarpro/tempo.gp3-ref.mscx +++ b/mtest/guitarpro/tempo.gp3-ref.mscx @@ -524,8 +524,8 @@ - TAB2 - TAB2 + TAB + TAB 3 diff --git a/mtest/guitarpro/tempo.gp4-ref.mscx b/mtest/guitarpro/tempo.gp4-ref.mscx index a9b1d59289..e3edbc350f 100644 --- a/mtest/guitarpro/tempo.gp4-ref.mscx +++ b/mtest/guitarpro/tempo.gp4-ref.mscx @@ -532,8 +532,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/tempo.gp5-ref.mscx b/mtest/guitarpro/tempo.gp5-ref.mscx index a9b1d59289..e3edbc350f 100644 --- a/mtest/guitarpro/tempo.gp5-ref.mscx +++ b/mtest/guitarpro/tempo.gp5-ref.mscx @@ -532,8 +532,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/testIrrTuplet.gp4-ref.mscx b/mtest/guitarpro/testIrrTuplet.gp4-ref.mscx index 3c942308d0..d1031888d5 100644 --- a/mtest/guitarpro/testIrrTuplet.gp4-ref.mscx +++ b/mtest/guitarpro/testIrrTuplet.gp4-ref.mscx @@ -406,8 +406,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/tremolos.gp5-ref.mscx b/mtest/guitarpro/tremolos.gp5-ref.mscx index f030755af3..9d65e1db52 100644 --- a/mtest/guitarpro/tremolos.gp5-ref.mscx +++ b/mtest/guitarpro/tremolos.gp5-ref.mscx @@ -324,8 +324,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/trill.gp4-ref.mscx b/mtest/guitarpro/trill.gp4-ref.mscx index 4fb774a2c5..3d4598f23f 100644 --- a/mtest/guitarpro/trill.gp4-ref.mscx +++ b/mtest/guitarpro/trill.gp4-ref.mscx @@ -294,8 +294,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/volta.gp3-ref.mscx b/mtest/guitarpro/volta.gp3-ref.mscx index ab7964303c..4d72570e9b 100644 --- a/mtest/guitarpro/volta.gp3-ref.mscx +++ b/mtest/guitarpro/volta.gp3-ref.mscx @@ -1778,8 +1778,8 @@ - TAB2 - TAB2 + TAB + TAB 4 diff --git a/mtest/guitarpro/volta.gp4-ref.mscx b/mtest/guitarpro/volta.gp4-ref.mscx index af3a033592..38198c96d8 100644 --- a/mtest/guitarpro/volta.gp4-ref.mscx +++ b/mtest/guitarpro/volta.gp4-ref.mscx @@ -1458,8 +1458,8 @@ - TAB2 - TAB2 + TAB + TAB 1 diff --git a/mtest/guitarpro/volta.gp5-ref.mscx b/mtest/guitarpro/volta.gp5-ref.mscx index b52e04f6ce..0d32887e4f 100644 --- a/mtest/guitarpro/volta.gp5-ref.mscx +++ b/mtest/guitarpro/volta.gp5-ref.mscx @@ -3844,8 +3844,8 @@ - TAB2 - TAB2 + TAB + TAB 3