From 191e81c2d4a6229e2375f4419af2f9aaef5d4adc Mon Sep 17 00:00:00 2001 From: Alexander Pavlov Date: Wed, 22 Jan 2025 17:15:41 +0200 Subject: [PATCH] gp-import: fixed voices numbers inside each instrument --- .../guitarpro/internal/gtp/gp67dombuilder.cpp | 4 + .../guitarpro/internal/gtp/gpconverter.cpp | 15 +++- .../guitarpro/internal/gtp/gpvoice.h | 5 +- .../tests/data/basic-bend.gp-ref.mscx | 25 ++++-- .../tests/data/basic-bend.gpx-ref.mscx | 25 ++++-- .../tests/data/dotted-tuplets.gp-ref.mscx | 25 ++++-- .../tests/data/dotted-tuplets.gpx-ref.mscx | 25 ++++-- .../guitarpro/tests/data/dynamic.gp-ref.mscx | 50 +++++++---- .../guitarpro/tests/data/dynamic.gpx-ref.mscx | 50 +++++++---- .../guitarpro/tests/data/fade-in.gpx-ref.mscx | 25 ++++-- .../guitarpro/tests/data/grace.gp-ref.mscx | 75 +++++++++++------ .../guitarpro/tests/data/grace.gpx-ref.mscx | 75 +++++++++++------ .../tests/data/heavy-accent.gp-ref.mscx | 25 ++++-- .../tests/data/heavy-accent.gpx-ref.mscx | 25 ++++-- .../tests/data/hide-rests.gp-ref.mscx | 82 ++++++++++++------- .../tests/data/legato-slide.gp-ref.mscx | 25 ++++-- .../tests/data/legato-slide.gpx-ref.mscx | 25 ++++-- .../tests/data/shift-slide.gp-ref.mscx | 25 ++++-- .../tests/data/shift-slide.gpx-ref.mscx | 25 ++++-- .../tests/data/slide-in-above.gp-ref.mscx | 25 ++++-- .../tests/data/slide-in-above.gpx-ref.mscx | 25 ++++-- .../tests/data/slide-in-below.gp-ref.mscx | 25 ++++-- .../tests/data/slide-in-below.gpx-ref.mscx | 25 ++++-- .../tests/data/slide-out-down.gp-ref.mscx | 25 ++++-- .../tests/data/slide-out-down.gpx-ref.mscx | 25 ++++-- .../tests/data/slide-out-up.gp-ref.mscx | 25 ++++-- .../tests/data/slide-out-up.gpx-ref.mscx | 25 ++++-- .../tests/data/slur_voices.gp-ref.mscx | 80 +++++++++++++++--- .../tests/data/slur_voices.gpx-ref.mscx | 80 +++++++++++++++--- .../tests/data/tuplets2.gpx-ref.mscx | 69 ++++++++++------ .../tests/data/volume-swell.gp-ref.mscx | 25 ++++-- .../tests/data/volume-swell.gpx-ref.mscx | 25 ++++-- 32 files changed, 753 insertions(+), 357 deletions(-) diff --git a/src/importexport/guitarpro/internal/gtp/gp67dombuilder.cpp b/src/importexport/guitarpro/internal/gtp/gp67dombuilder.cpp index 5b757a6a05434..64ec844eb9656 100644 --- a/src/importexport/guitarpro/internal/gtp/gp67dombuilder.cpp +++ b/src/importexport/guitarpro/internal/gtp/gp67dombuilder.cpp @@ -441,13 +441,17 @@ std::pair > GP67DomBuilder::createGPBar(XmlDomNode* } else if (nodeName == u"Voices") { String voicesElement = innerNode.toElement().text(); StringList voices = voicesElement.split(u' '); + int currentPosition = -1; for (const String& voiceIdx : voices) { + currentPosition++; int idx = voiceIdx.toInt(); if (idx == -1) { continue; } + std::unique_ptr voice; voice = std::move(_voices.at(idx)); + voice->setPosition(currentPosition); _voices.erase(idx); bar->addGPVoice(std::move(voice)); } diff --git a/src/importexport/guitarpro/internal/gtp/gpconverter.cpp b/src/importexport/guitarpro/internal/gtp/gpconverter.cpp index eecf740ba46ad..0098f18a3634d 100644 --- a/src/importexport/guitarpro/internal/gtp/gpconverter.cpp +++ b/src/importexport/guitarpro/internal/gtp/gpconverter.cpp @@ -514,9 +514,18 @@ void GPConverter::convertVoices(const std::vector >& vo fillUncompletedMeasure(ctx); } + int currentTrackFirstVoice = ctx.curTrack; for (const auto& voice : voices) { + ctx.curTrack = currentTrackFirstVoice + voice->position(); convertVoice(voice.get(), ctx); - ctx.curTrack++; + } + + bool hasFirstVoice = std::any_of(voices.begin(), voices.end(), [](const std::unique_ptr& voice) { + return voice->position() == 0; + }); + + if (!hasFirstVoice && _score->lastMeasure()) { + _score->setRest(_score->lastMeasure()->tick(), currentTrackFirstVoice, _score->lastMeasure()->ticks(), true, nullptr); } } @@ -1240,13 +1249,13 @@ void GPConverter::hideRestsInEmptyMeasures(track_idx_t startTrack, track_idx_t e // hiding rests in secondary voices for measures without any chords if (!m_chordExistsInBar) { - rest->setGap(!mainVoice); + rest->setVisible(mainVoice); continue; } // hiding rests in voices without chords if (!m_chordExistsForVoice[voice]) { - rest->setGap(true); + rest->setVisible(false); } } } diff --git a/src/importexport/guitarpro/internal/gtp/gpvoice.h b/src/importexport/guitarpro/internal/gtp/gpvoice.h index 31446c7f26095..b0cd775794b78 100644 --- a/src/importexport/guitarpro/internal/gtp/gpvoice.h +++ b/src/importexport/guitarpro/internal/gtp/gpvoice.h @@ -13,12 +13,15 @@ class GPVoice void addGPBeat(const std::shared_ptr& b) { _beats.push_back(b); } void setId(int id) { _id = id; } + void setPosition(int pos) { _pos = pos; } + int position() const { return _pos; } const std::vector >& beats() const { return _beats; } private: - int _id{ -1 }; + int _id = -1; // imported id + int _pos = 0; // for defining correct track number std::vector > _beats; }; } // namespace mu::iex::guitarpro diff --git a/src/importexport/guitarpro/tests/data/basic-bend.gp-ref.mscx b/src/importexport/guitarpro/tests/data/basic-bend.gp-ref.mscx index 204518c5fdc2d..1bea80f2c5854 100644 --- a/src/importexport/guitarpro/tests/data/basic-bend.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/basic-bend.gp-ref.mscx @@ -92,15 +92,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/basic-bend.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/basic-bend.gpx-ref.mscx index 693ceb4c23ec3..609063e233947 100644 --- a/src/importexport/guitarpro/tests/data/basic-bend.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/basic-bend.gpx-ref.mscx @@ -92,15 +92,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/dotted-tuplets.gp-ref.mscx b/src/importexport/guitarpro/tests/data/dotted-tuplets.gp-ref.mscx index 76e3b6a94756b..c989d98b6c2d2 100644 --- a/src/importexport/guitarpro/tests/data/dotted-tuplets.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dotted-tuplets.gp-ref.mscx @@ -142,15 +142,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/dotted-tuplets.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/dotted-tuplets.gpx-ref.mscx index 706985c23d785..da5c4d4f3a4cb 100644 --- a/src/importexport/guitarpro/tests/data/dotted-tuplets.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dotted-tuplets.gpx-ref.mscx @@ -144,15 +144,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/dynamic.gp-ref.mscx b/src/importexport/guitarpro/tests/data/dynamic.gp-ref.mscx index 298463c12d4e1..8cedf24be8c48 100644 --- a/src/importexport/guitarpro/tests/data/dynamic.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dynamic.gp-ref.mscx @@ -151,15 +151,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + @@ -218,15 +225,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/dynamic.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/dynamic.gpx-ref.mscx index 298463c12d4e1..8cedf24be8c48 100644 --- a/src/importexport/guitarpro/tests/data/dynamic.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dynamic.gpx-ref.mscx @@ -151,15 +151,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + @@ -218,15 +225,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/fade-in.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/fade-in.gpx-ref.mscx index 2103b2382be41..800ddd96f4ff4 100644 --- a/src/importexport/guitarpro/tests/data/fade-in.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/fade-in.gpx-ref.mscx @@ -88,15 +88,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/grace.gp-ref.mscx b/src/importexport/guitarpro/tests/data/grace.gp-ref.mscx index a587766fff984..cf35ba733e613 100644 --- a/src/importexport/guitarpro/tests/data/grace.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/grace.gp-ref.mscx @@ -131,15 +131,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + @@ -264,15 +271,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + @@ -311,15 +325,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/grace.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/grace.gpx-ref.mscx index 3891be476a716..239517104c2c1 100644 --- a/src/importexport/guitarpro/tests/data/grace.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/grace.gpx-ref.mscx @@ -135,15 +135,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + @@ -268,15 +275,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + @@ -315,15 +329,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/heavy-accent.gp-ref.mscx b/src/importexport/guitarpro/tests/data/heavy-accent.gp-ref.mscx index f31bce7d3ba46..1003ee4a61558 100644 --- a/src/importexport/guitarpro/tests/data/heavy-accent.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/heavy-accent.gp-ref.mscx @@ -88,15 +88,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/heavy-accent.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/heavy-accent.gpx-ref.mscx index 45ec05f57a5e4..bc93433f7930b 100644 --- a/src/importexport/guitarpro/tests/data/heavy-accent.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/heavy-accent.gpx-ref.mscx @@ -88,15 +88,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/hide-rests.gp-ref.mscx b/src/importexport/guitarpro/tests/data/hide-rests.gp-ref.mscx index 6916629436572..6fea71b8af3a7 100644 --- a/src/importexport/guitarpro/tests/data/hide-rests.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/hide-rests.gp-ref.mscx @@ -95,18 +95,22 @@ 2 metNoteQuarterUp = 120 - - 1/4 - - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + @@ -155,15 +159,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + @@ -201,17 +212,28 @@ - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + half + - - 1/2 - + + 0 + half + + + 0 + half + diff --git a/src/importexport/guitarpro/tests/data/legato-slide.gp-ref.mscx b/src/importexport/guitarpro/tests/data/legato-slide.gp-ref.mscx index eaa2e26a3bcf7..6ba032da26496 100644 --- a/src/importexport/guitarpro/tests/data/legato-slide.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/legato-slide.gp-ref.mscx @@ -128,15 +128,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/legato-slide.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/legato-slide.gpx-ref.mscx index eaa2e26a3bcf7..6ba032da26496 100644 --- a/src/importexport/guitarpro/tests/data/legato-slide.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/legato-slide.gpx-ref.mscx @@ -128,15 +128,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/shift-slide.gp-ref.mscx b/src/importexport/guitarpro/tests/data/shift-slide.gp-ref.mscx index d4a4382fdfd67..db96d5afe22ce 100644 --- a/src/importexport/guitarpro/tests/data/shift-slide.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/shift-slide.gp-ref.mscx @@ -113,15 +113,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/shift-slide.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/shift-slide.gpx-ref.mscx index d4a4382fdfd67..db96d5afe22ce 100644 --- a/src/importexport/guitarpro/tests/data/shift-slide.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/shift-slide.gpx-ref.mscx @@ -113,15 +113,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/slide-in-above.gp-ref.mscx b/src/importexport/guitarpro/tests/data/slide-in-above.gp-ref.mscx index 80f743fa0fb9c..e86349c35441d 100644 --- a/src/importexport/guitarpro/tests/data/slide-in-above.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slide-in-above.gp-ref.mscx @@ -119,15 +119,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/slide-in-above.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/slide-in-above.gpx-ref.mscx index 80f743fa0fb9c..e86349c35441d 100644 --- a/src/importexport/guitarpro/tests/data/slide-in-above.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slide-in-above.gpx-ref.mscx @@ -119,15 +119,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/slide-in-below.gp-ref.mscx b/src/importexport/guitarpro/tests/data/slide-in-below.gp-ref.mscx index 2429690eec66f..1558fb4d05608 100644 --- a/src/importexport/guitarpro/tests/data/slide-in-below.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slide-in-below.gp-ref.mscx @@ -119,15 +119,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/slide-in-below.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/slide-in-below.gpx-ref.mscx index 2429690eec66f..1558fb4d05608 100644 --- a/src/importexport/guitarpro/tests/data/slide-in-below.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slide-in-below.gpx-ref.mscx @@ -119,15 +119,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/slide-out-down.gp-ref.mscx b/src/importexport/guitarpro/tests/data/slide-out-down.gp-ref.mscx index 145f49794cf7a..a82856f5b7951 100644 --- a/src/importexport/guitarpro/tests/data/slide-out-down.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slide-out-down.gp-ref.mscx @@ -119,15 +119,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/slide-out-down.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/slide-out-down.gpx-ref.mscx index 145f49794cf7a..a82856f5b7951 100644 --- a/src/importexport/guitarpro/tests/data/slide-out-down.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slide-out-down.gpx-ref.mscx @@ -119,15 +119,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/slide-out-up.gp-ref.mscx b/src/importexport/guitarpro/tests/data/slide-out-up.gp-ref.mscx index 99598674b3fcb..cd86d6d3dc693 100644 --- a/src/importexport/guitarpro/tests/data/slide-out-up.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slide-out-up.gp-ref.mscx @@ -121,15 +121,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/slide-out-up.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/slide-out-up.gpx-ref.mscx index 99598674b3fcb..cd86d6d3dc693 100644 --- a/src/importexport/guitarpro/tests/data/slide-out-up.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slide-out-up.gpx-ref.mscx @@ -121,15 +121,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/slur_voices.gp-ref.mscx b/src/importexport/guitarpro/tests/data/slur_voices.gp-ref.mscx index 27f40e90254cd..d058a7bf03f08 100644 --- a/src/importexport/guitarpro/tests/data/slur_voices.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur_voices.gp-ref.mscx @@ -139,6 +139,19 @@ + + 0 + measure + 4/4 + + + + + + + mf + 80 + quarter @@ -207,12 +220,24 @@ 4 - - + + 0 + measure + 4/4 + + + + + + + + mf + 80 + quarter @@ -281,12 +306,25 @@ 2 - - + + 0 + measure + 4/4 + + + + + + + + + mf + 80 + quarter @@ -355,8 +393,6 @@ 2 - - @@ -452,6 +488,15 @@ + + + 0 + measure + 4/4 + + + + quarter @@ -539,11 +584,19 @@ 1 - - + + + 0 + measure + 4/4 + + + + + quarter @@ -631,11 +684,18 @@ 1 - - + + + 0 + measure + 4/4 + + + + quarter diff --git a/src/importexport/guitarpro/tests/data/slur_voices.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/slur_voices.gpx-ref.mscx index 27f40e90254cd..d058a7bf03f08 100644 --- a/src/importexport/guitarpro/tests/data/slur_voices.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur_voices.gpx-ref.mscx @@ -139,6 +139,19 @@ + + 0 + measure + 4/4 + + + + + + + mf + 80 + quarter @@ -207,12 +220,24 @@ 4 - - + + 0 + measure + 4/4 + + + + + + + + mf + 80 + quarter @@ -281,12 +306,25 @@ 2 - - + + 0 + measure + 4/4 + + + + + + + + + mf + 80 + quarter @@ -355,8 +393,6 @@ 2 - - @@ -452,6 +488,15 @@ + + + 0 + measure + 4/4 + + + + quarter @@ -539,11 +584,19 @@ 1 - - + + + 0 + measure + 4/4 + + + + + quarter @@ -631,11 +684,18 @@ 1 - - + + + 0 + measure + 4/4 + + + + quarter diff --git a/src/importexport/guitarpro/tests/data/tuplets2.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/tuplets2.gpx-ref.mscx index 56c9dfe0a3446..68b76920d54c9 100644 --- a/src/importexport/guitarpro/tests/data/tuplets2.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tuplets2.gpx-ref.mscx @@ -76,14 +76,24 @@ solo concert 4 4 - - mf - 80 - 2.666667 metNoteQuarterUp = 160 + + 0 + measure + 4/4 + + + dashed + + + + + mf + 80 + 22 26 @@ -174,12 +184,19 @@ solo concert 1 + + + + + + 0 + measure + 4/4 + dashed - - quarter @@ -226,8 +243,8 @@ solo concert - -6 - -4 + 40 + 44 eighth @@ -299,8 +316,8 @@ solo concert - 6 - 10 + 52 + 56 eighth @@ -377,8 +394,8 @@ solo concert - 14 - 18 + 64 + 68 eighth @@ -442,9 +459,6 @@ solo concert - - dashed - @@ -453,9 +467,19 @@ solo concert 5 4 + + 0 + measure + 5/4 + + + dashed + + + - 14 - 18 + 76 + 80 eighth @@ -536,9 +560,6 @@ solo concert 1 - - dashed - @@ -547,6 +568,10 @@ solo concert 4 4 + + mf + 80 + half @@ -612,10 +637,6 @@ solo concert Arm.12 - - mf - 80 - quarter diff --git a/src/importexport/guitarpro/tests/data/volume-swell.gp-ref.mscx b/src/importexport/guitarpro/tests/data/volume-swell.gp-ref.mscx index 5078655ab27d5..04e58bbd13a3f 100644 --- a/src/importexport/guitarpro/tests/data/volume-swell.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/volume-swell.gp-ref.mscx @@ -88,15 +88,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + diff --git a/src/importexport/guitarpro/tests/data/volume-swell.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/volume-swell.gpx-ref.mscx index 5078655ab27d5..04e58bbd13a3f 100644 --- a/src/importexport/guitarpro/tests/data/volume-swell.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/volume-swell.gpx-ref.mscx @@ -88,15 +88,22 @@ - - 1/4 - - - 1/4 - - - 1/4 - + + 0 + quarter + + + 0 + quarter + + + 0 + quarter + + + 0 + quarter +