From 39237ff2bef1dd6982f59d424859f184c674cb17 Mon Sep 17 00:00:00 2001 From: Alexander Pavlov Date: Mon, 10 Jul 2023 17:13:28 +0300 Subject: [PATCH] gp-import: changed hiding rests behaviour, refactored, added tests --- .../guitarpro/internal/gtp/gpconverter.cpp | 90 ++- .../guitarpro/internal/gtp/gpconverter.h | 15 +- .../data/UncompletedMeasure.gpx-ref.mscx | 3 - .../guitarpro/tests/data/accent.gp-ref.mscx | 3 - .../guitarpro/tests/data/accent.gpx-ref.mscx | 3 - .../tests/data/all-percussion.gp-ref.mscx | 3 - .../guitarpro/tests/data/arpeggio.gp-ref.mscx | 3 - .../tests/data/arpeggio.gpx-ref.mscx | 3 - .../data/artificial-harmonic.gp-ref.mscx | 3 - .../data/artificial-harmonic.gpx-ref.mscx | 3 - .../tests/data/barline-last-measure.gp | Bin 0 -> 8874 bytes .../data/barline-last-measure.gp-ref.mscx | 258 ++++++++ .../guitarpro/tests/data/barre.gp-ref.mscx | 3 - .../guitarpro/tests/data/barre.gpx-ref.mscx | 3 - .../tests/data/basic-bend.gp-ref.mscx | 3 - .../tests/data/basic-bend.gpx-ref.mscx | 3 - .../guitarpro/tests/data/beam-modes.gp | Bin 0 -> 9520 bytes .../tests/data/beam-modes.gp-ref.mscx | 612 ++++++++++++++++++ .../data/beams-stems-ledger-lines.gp-ref.mscx | 3 - .../beams-stems-ledger-lines.gpx-ref.mscx | 3 - .../guitarpro/tests/data/bend.gp-ref.mscx | 3 - .../guitarpro/tests/data/bend.gpx-ref.mscx | 3 - .../tests/data/bend_and_harmonic.gp-ref.mscx | 3 - .../guitarpro/tests/data/brush.gp-ref.mscx | 3 - .../guitarpro/tests/data/brush.gpx-ref.mscx | 3 - .../chord_with_tied_harmonics.gp-ref.mscx | 3 - .../data/chordnames_keyboard.gp-ref.mscx | 8 - .../data/chordnames_keyboard.gpx-ref.mscx | 8 - .../guitarpro/tests/data/clefs.gp-ref.mscx | 3 - .../guitarpro/tests/data/clefs.gpx-ref.mscx | 3 - .../tests/data/copyright.gp-ref.mscx | 3 - .../tests/data/copyright.gpx-ref.mscx | 3 - .../data/crescendo-diminuendo.gp-ref.mscx | 3 - .../data/crescendo-diminuendo.gpx-ref.mscx | 3 - .../tests/data/dead-note.gp-ref.mscx | 3 - .../tests/data/dead-note.gpx-ref.mscx | 3 - .../tests/data/directions.gp-ref.mscx | 3 - .../tests/data/directions.gpx-ref.mscx | 3 - .../tests/data/dotted-gliss.gp-ref.mscx | 3 - .../tests/data/dotted-gliss.gpx-ref.mscx | 3 - .../tests/data/dotted-tuplets.gp-ref.mscx | 3 - .../tests/data/dotted-tuplets.gpx-ref.mscx | 3 - .../tests/data/double-bar.gp-ref.mscx | 3 - .../tests/data/double-bar.gpx-ref.mscx | 3 - .../guitarpro/tests/data/dynamic.gp-ref.mscx | 6 - .../guitarpro/tests/data/dynamic.gpx-ref.mscx | 6 - .../guitarpro/tests/data/fade-in.gp-ref.mscx | 3 - .../guitarpro/tests/data/fade-in.gpx-ref.mscx | 3 - .../guitarpro/tests/data/fermata.gp-ref.mscx | 3 - .../guitarpro/tests/data/fermata.gpx-ref.mscx | 3 - .../tests/data/fingering.gp-ref.mscx | 3 - .../tests/data/fingering.gpx-ref.mscx | 3 - .../tests/data/free-time.gp-ref.mscx | 3 - .../tests/data/free-time.gpx-ref.mscx | 3 - .../tests/data/fret-diagram.gp-ref.mscx | 3 - .../tests/data/fret-diagram.gpx-ref.mscx | 3 - .../fret-diagram_2instruments.gp-ref.mscx | 6 - .../fret-diagram_2instruments.gpx-ref.mscx | 6 - .../tests/data/ghost-note.gp-ref.mscx | 3 - .../tests/data/ghost-note.gpx-ref.mscx | 3 - .../tests/data/grace-before-beat.gp-ref.mscx | 3 - .../tests/data/grace-before-beat.gpx-ref.mscx | 3 - .../tests/data/grace-durations.gp-ref.mscx | 3 - .../tests/data/grace-on-beat.gp-ref.mscx | 3 - .../tests/data/grace-on-beat.gpx-ref.mscx | 3 - .../guitarpro/tests/data/grace.gp-ref.mscx | 3 - .../guitarpro/tests/data/grace.gpx-ref.mscx | 3 - .../tests/data/heavy-accent.gp-ref.mscx | 3 - .../tests/data/heavy-accent.gpx-ref.mscx | 3 - .../guitarpro/tests/data/hide-rests.gp | Bin 0 -> 8934 bytes .../tests/data/hide-rests.gp-ref.mscx | 275 ++++++++ .../data/instr-change-1-beat.gp-ref.mscx | 3 - .../data/instr-change-1-beat.gpx-ref.mscx | 3 - .../tests/data/instr-change.gp-ref.mscx | 3 - .../tests/data/instr-change.gpx-ref.mscx | 3 - .../guitarpro/tests/data/keysig.gp-ref.mscx | 3 - .../guitarpro/tests/data/keysig.gpx-ref.mscx | 3 - .../tests/data/legato-slide.gp-ref.mscx | 3 - .../tests/data/legato-slide.gpx-ref.mscx | 3 - .../guitarpro/tests/data/let-ring.gp-ref.mscx | 3 - .../tests/data/let-ring.gpx-ref.mscx | 3 - .../tests/data/line_elements.gp-ref.mscx | 17 - .../guitarpro/tests/data/mmrest.gp-ref.mscx | 3 - .../guitarpro/tests/data/mordents.gp-ref.mscx | 3 - .../tests/data/mordents.gpx-ref.mscx | 3 - .../tests/data/multivoices.gp-ref.mscx | 3 - .../tests/data/multivoices.gpx-ref.mscx | 3 - .../guitarpro/tests/data/ottava1.gp-ref.mscx | 3 - .../guitarpro/tests/data/ottava1.gpx-ref.mscx | 3 - .../guitarpro/tests/data/ottava2.gp-ref.mscx | 6 - .../guitarpro/tests/data/ottava2.gpx-ref.mscx | 6 - .../guitarpro/tests/data/ottava3.gp-ref.mscx | 6 - .../guitarpro/tests/data/ottava3.gpx-ref.mscx | 6 - .../guitarpro/tests/data/ottava4.gp-ref.mscx | 6 - .../guitarpro/tests/data/ottava4.gpx-ref.mscx | 6 - .../guitarpro/tests/data/ottava5.gp-ref.mscx | 6 - .../guitarpro/tests/data/ottava5.gpx-ref.mscx | 6 - .../tests/data/palm-mute.gp-ref.mscx | 3 - .../tests/data/palm-mute.gpx-ref.mscx | 3 - .../tests/data/percussion-beams.gp-ref.mscx | 3 - .../tests/data/pick-up-down.gp-ref.mscx | 3 - .../tests/data/pick-up-down.gpx-ref.mscx | 3 - .../guitarpro/tests/data/rasg.gp-ref.mscx | 3 - .../guitarpro/tests/data/rasg.gpx-ref.mscx | 3 - .../tests/data/repeated-bars.gp-ref.mscx | 3 - .../tests/data/repeated-bars.gpx-ref.mscx | 3 - .../tests/data/rest-centered.gp-ref.mscx | 3 - .../tests/data/rest-centered.gpx-ref.mscx | 3 - .../guitarpro/tests/data/sforzato.gp-ref.mscx | 3 - .../tests/data/sforzato.gpx-ref.mscx | 3 - .../tests/data/shift-slide.gp-ref.mscx | 3 - .../tests/data/shift-slide.gpx-ref.mscx | 3 - .../tests/data/slide-in-above.gp-ref.mscx | 3 - .../tests/data/slide-in-above.gpx-ref.mscx | 3 - .../tests/data/slide-in-below.gp-ref.mscx | 3 - .../tests/data/slide-in-below.gpx-ref.mscx | 3 - .../tests/data/slide-out-down.gp-ref.mscx | 3 - .../tests/data/slide-out-down.gpx-ref.mscx | 3 - .../tests/data/slide-out-up.gp-ref.mscx | 3 - .../tests/data/slide-out-up.gpx-ref.mscx | 3 - .../data/slur-notes-effect-mask.gp-ref.mscx | 3 - .../data/slur-notes-effect-mask.gpx-ref.mscx | 3 - .../guitarpro/tests/data/slur.gp-ref.mscx | 3 - .../guitarpro/tests/data/slur.gpx-ref.mscx | 3 - .../tests/data/slur_hammer_slur.gp-ref.mscx | 3 - .../tests/data/slur_hammer_slur.gpx-ref.mscx | 3 - .../data/slur_over_3_measures.gp-ref.mscx | 3 - .../data/slur_over_3_measures.gpx-ref.mscx | 3 - .../tests/data/slur_slur_hammer.gp-ref.mscx | 3 - .../tests/data/slur_slur_hammer.gpx-ref.mscx | 3 - .../tests/data/slur_voices.gp-ref.mscx | 3 - .../tests/data/slur_voices.gpx-ref.mscx | 3 - .../spanner-in-uncomplete-measure.gp-ref.mscx | 3 - .../tests/data/tap-slap-pop.gp-ref.mscx | 3 - .../tests/data/tap-slap-pop.gpx-ref.mscx | 3 - .../guitarpro/tests/data/tempo.gp-ref.mscx | 3 - .../guitarpro/tests/data/tempo.gpx-ref.mscx | 3 - .../guitarpro/tests/data/text.gp-ref.mscx | 3 - .../guitarpro/tests/data/text.gpx-ref.mscx | 3 - .../guitarpro/tests/data/timer.gp-ref.mscx | 3 - .../guitarpro/tests/data/timer.gpx-ref.mscx | 3 - .../tests/data/tremolo-bar.gp-ref.mscx | 3 - .../tests/data/tremolo-bar.gpx-ref.mscx | 3 - .../guitarpro/tests/data/tremolos.gp-ref.mscx | 3 - .../tests/data/tremolos.gpx-ref.mscx | 3 - .../guitarpro/tests/data/trill.gp-ref.mscx | 3 - .../guitarpro/tests/data/trill.gpx-ref.mscx | 3 - .../tests/data/tuplet-with-slur.gp-ref.mscx | 3 - .../tests/data/tuplet-with-slur.gpx-ref.mscx | 3 - .../guitarpro/tests/data/tuplets.gpx-ref.mscx | 3 - .../tests/data/tuplets2.gpx-ref.mscx | 3 - .../guitarpro/tests/data/turn.gp-ref.mscx | 3 - .../guitarpro/tests/data/turn.gpx-ref.mscx | 3 - .../guitarpro/tests/data/vibrato.gp-ref.mscx | 3 - .../guitarpro/tests/data/vibrato.gpx-ref.mscx | 3 - .../guitarpro/tests/data/volta.gp-ref.mscx | 3 - .../guitarpro/tests/data/volta.gpx-ref.mscx | 3 - .../tests/data/volume-swell.gp-ref.mscx | 3 - .../tests/data/volume-swell.gpx-ref.mscx | 3 - .../guitarpro/tests/data/wah.gp-ref.mscx | 3 - .../guitarpro/tests/data/wah.gpx-ref.mscx | 3 - .../guitarpro/tests/guitarpro_tests.cpp | 10 + 162 files changed, 1203 insertions(+), 576 deletions(-) create mode 100644 src/importexport/guitarpro/tests/data/barline-last-measure.gp create mode 100644 src/importexport/guitarpro/tests/data/barline-last-measure.gp-ref.mscx create mode 100644 src/importexport/guitarpro/tests/data/beam-modes.gp create mode 100644 src/importexport/guitarpro/tests/data/beam-modes.gp-ref.mscx create mode 100644 src/importexport/guitarpro/tests/data/hide-rests.gp create mode 100644 src/importexport/guitarpro/tests/data/hide-rests.gp-ref.mscx diff --git a/src/importexport/guitarpro/internal/gtp/gpconverter.cpp b/src/importexport/guitarpro/internal/gtp/gpconverter.cpp index 05d68395adf40..026793027b6e4 100644 --- a/src/importexport/guitarpro/internal/gtp/gpconverter.cpp +++ b/src/importexport/guitarpro/internal/gtp/gpconverter.cpp @@ -344,13 +344,6 @@ void GPConverter::convert(const std::vector >& mast // glueing line segment elements separated with rests m_continiousElementsBuilder->addElementsToScore(); - // fixing last measure barline - if (_lastMeasure) { - for (size_t staffIdx = 0; staffIdx < _score->staves().size(); staffIdx++) { - _lastMeasure->setEndBarLineType(mu::engraving::BarLineType::FINAL, staffIdx * VOICES); - } - } - addTempoMap(); addInstrumentChanges(); StretchedBend::prepareBends(m_stretchedBends); @@ -363,25 +356,15 @@ void GPConverter::convertMasterBar(const GPMasterBar* mB, Context ctx) Measure* measure = addMeasure(mB); addTimeSig(mB, measure); - addKeySig(mB, measure); - - addBarline(mB, measure); - + addBarline(mB, measure, ctx.masterBarIndex); addRepeat(mB, measure); - collectFermatas(mB, measure); - convertBars(mB->bars(), ctx); - addTripletFeel(mB, measure); - addSection(mB, measure); - addDirection(mB, measure); - _lastMeasure = measure; - fixEmptyMeasures(); } @@ -391,10 +374,11 @@ void GPConverter::fixEmptyMeasures() // Also store root Segment ptr will need it later to delete some rest elems std::map > > elems; - auto ntracks = _score->ntracks(); - auto type = SegmentType::ChordRest; + size_t ntracks = _score->ntracks(); + SegmentType type = SegmentType::ChordRest; + Measure* lastMeasure = _score->lastMeasure(); - for (Segment* s = _lastMeasure->segments().first(type); s; s = s->next(type)) { + for (Segment* s = lastMeasure->segments().first(type); s; s = s->next(type)) { for (track_idx_t i = 0; i < ntracks; ++i) { auto e = s->element(i); if (!e) { @@ -406,7 +390,7 @@ void GPConverter::fixEmptyMeasures() for (const auto& [staffIdx, segItemPairs] : elems) { bool shouldClear = true; - for (auto p : segItemPairs) { + for (const auto& p : segItemPairs) { // Don't need to do anything if there is not "rest" elem on a staff if (!p.second->isRest()) { shouldClear = false; @@ -425,7 +409,7 @@ void GPConverter::fixEmptyMeasures() } Rest* rest = toRest(segItemPairs.at(0).second); - rest->setTicks(_lastMeasure->ticks()); + rest->setTicks(lastMeasure->ticks()); rest->setDurationType(DurationType::V_MEASURE); } } @@ -435,6 +419,8 @@ void GPConverter::convertBars(const std::vector >& bars, { ctx.curTrack = 0; for (const auto& bar : bars) { + m_chordExistsInBar = false; + m_chordExistsForVoice.fill(false); convertBar(bar.get(), ctx); ctx.curTrack += VOICES; } @@ -449,18 +435,16 @@ void GPConverter::convertBar(const GPBar* bar, Context ctx) } convertVoices(bar->voices(), ctx); - - for (track_idx_t i = ctx.curTrack; i < ctx.curTrack + VOICES; i++) { - hideRestsInEmptyMeasures(i); - } + hideRestsInEmptyMeasures(ctx.curTrack, ctx.curTrack + VOICES); } -void GPConverter::addBarline(const GPMasterBar* mB, Measure* measure) +void GPConverter::addBarline(const GPMasterBar* mB, Measure* measure, int32_t masterBarIndex) { static bool insideFreeTime = false; size_t staves = _score->staves().size(); + bool lastMeasure = (masterBarIndex == _gpDom->masterBars().size() - 1); - if (mB->barlineType() == GPMasterBar::BarlineType::DOUBLE) { + if (!lastMeasure && mB->barlineType() == GPMasterBar::BarlineType::DOUBLE) { for (size_t staffIdx = 0; staffIdx < staves; ++staffIdx) { measure->setEndBarLineType(mu::engraving::BarLineType::DOUBLE, staffIdx * VOICES); } @@ -470,7 +454,7 @@ void GPConverter::addBarline(const GPMasterBar* mB, Measure* measure) auto scoreTimeSig = Fraction(sig.numerator, sig.denominator); if (mB->freeTime()) { - if (mB->barlineType() != GPMasterBar::BarlineType::DOUBLE) { + if (!lastMeasure && mB->barlineType() != GPMasterBar::BarlineType::DOUBLE) { for (size_t staffIdx = 0; staffIdx < staves; ++staffIdx) { measure->setEndBarLineType(mu::engraving::BarLineType::BROKEN, staffIdx * VOICES); } @@ -570,11 +554,11 @@ Fraction GPConverter::convertBeat(const GPBeat* beat, ChordRestContainer& graceC curSegment->add(cr); if (cr->isChord()) { - m_chordsInMeasureByVoice[lastMeasure][cr->voice()]++; - m_chordsInMeasure[lastMeasure]++; + m_chordExistsForVoice[ctx.curTrack % VOICES] = true; + m_chordExistsInBar = true; if (beat->stemOrientationUserDefined()) { - static_cast(cr)->setStemDirection(beat->stemOrientationUp() ? DirectionV::UP : DirectionV::DOWN); + toChord(cr)->setStemDirection(beat->stemOrientationUp() ? DirectionV::UP : DirectionV::DOWN); } setBeamMode(beat, cr, lastMeasure, ctx.curTick); @@ -1188,17 +1172,29 @@ void GPConverter::fillUncompletedMeasure(const Context& ctx) } } -void GPConverter::hideRestsInEmptyMeasures(track_idx_t track) +void GPConverter::hideRestsInEmptyMeasures(track_idx_t startTrack, track_idx_t endTrack) { - Measure* lastMeasure = _score->lastMeasure(); - for (Segment* segment = lastMeasure->first(SegmentType::ChordRest); segment; segment = segment->next(SegmentType::ChordRest)) { - EngravingItem* element = segment->element(track); - if (element && element->isRest()) { - if (m_chordsInMeasureByVoice[lastMeasure][element->voice()] == 0) { - bool measureHasChords = m_chordsInMeasure[lastMeasure] != 0; - if (measureHasChords || (!measureHasChords && element->voice() != 0)) { - toRest(element)->setGap(true); - } + for (Segment* segment = _score->lastMeasure()->first(SegmentType::ChordRest); segment; + segment = segment->next(SegmentType::ChordRest)) { + for (track_idx_t trackIdx = startTrack; trackIdx < endTrack; trackIdx++) { + EngravingItem* element = segment->element(trackIdx); + if (!element || !element->isRest()) { + continue; + } + + Rest* rest = toRest(element); + size_t voice = trackIdx % VOICES; + bool mainVoice = (voice == 0); + + // hiding rests in secondary voices for measures without any chords + if (!m_chordExistsInBar) { + rest->setGap(!mainVoice); + continue; + } + + // hiding rests in voices without chords + if (!m_chordExistsForVoice[voice]) { + rest->setGap(true); } } } @@ -2873,13 +2869,7 @@ void GPConverter::setBeamMode(const GPBeat* beat, ChordRest* cr, Measure* measur } } - cr->setBeamMode(beamMode); - - /// last chord of the measure has always type BeamMode::AUTO, which makes layout incorrect - if (measure != _lastMeasure) { - cr->setBeamMode(m_previousBeamMode); - } - + cr->setBeamMode(m_previousBeamMode); m_previousBeamMode = beamMode; } } // namespace mu::iex::guitarpro diff --git a/src/importexport/guitarpro/internal/gtp/gpconverter.h b/src/importexport/guitarpro/internal/gtp/gpconverter.h index a1346a28fb3ca..d3ebfb51f6448 100644 --- a/src/importexport/guitarpro/internal/gtp/gpconverter.h +++ b/src/importexport/guitarpro/internal/gtp/gpconverter.h @@ -45,8 +45,8 @@ class GPConverter using TieMap = std::unordered_map >; struct Context { - int32_t masterBarIndex{ 0 }; - track_idx_t curTrack{ 0 }; + int32_t masterBarIndex = 0; + track_idx_t curTrack = 0; Fraction curTick; }; @@ -83,7 +83,7 @@ class GPConverter void doAddVolta(const GPMasterBar* mB, Measure* measure); void addClef(const GPBar* bar, int curTrack); bool addSimileMark(const GPBar* bar, int curTrack); - void addBarline(const GPMasterBar* mB, Measure* measure); + void addBarline(const GPMasterBar* mB, Measure* measure, int32_t masterBarIndex); void addTie(const GPNote* gpnote, Note* note, TieMap& ties); void addFretDiagram(const GPBeat* gpnote, ChordRest* note, const Context& ctx, bool asHarmony = true); @@ -145,7 +145,7 @@ class GPConverter void addTempoMap(); void addInstrumentChanges(); void fillUncompletedMeasure(const Context& ctx); - void hideRestsInEmptyMeasures(track_idx_t track); + void hideRestsInEmptyMeasures(track_idx_t startTrack, track_idx_t endTrack); int getStringNumberFor(Note* pNote, int pitch) const; void fillTuplet(); bool tupletParamsChanged(const GPBeat* beat, const ChordRest* cr); @@ -201,10 +201,11 @@ class GPConverter static constexpr mu::engraving::voice_idx_t VOICES = 4; - Measure* _lastMeasure = nullptr; bool m_showCapo = true; // TODO-gp : settings - std::unordered_map > m_chordsInMeasureByVoice; /// if measure has any chord for specific voice, rests are hidden - std::unordered_map m_chordsInMeasure; + + bool m_chordExistsInBar = false; + std::array m_chordExistsForVoice; + mu::engraving::BeamMode m_previousBeamMode = mu::engraving::BeamMode::AUTO; std::unique_ptr _drumResolver; diff --git a/src/importexport/guitarpro/tests/data/UncompletedMeasure.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/UncompletedMeasure.gpx-ref.mscx index 4de50ac8ea1f0..b52f771eb423d 100644 --- a/src/importexport/guitarpro/tests/data/UncompletedMeasure.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/UncompletedMeasure.gpx-ref.mscx @@ -108,9 +108,6 @@ half - - end - diff --git a/src/importexport/guitarpro/tests/data/accent.gp-ref.mscx b/src/importexport/guitarpro/tests/data/accent.gp-ref.mscx index e95ba6f6037e6..385b8fa20f0b4 100644 --- a/src/importexport/guitarpro/tests/data/accent.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/accent.gp-ref.mscx @@ -132,9 +132,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/accent.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/accent.gpx-ref.mscx index e95ba6f6037e6..385b8fa20f0b4 100644 --- a/src/importexport/guitarpro/tests/data/accent.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/accent.gpx-ref.mscx @@ -132,9 +132,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/all-percussion.gp-ref.mscx b/src/importexport/guitarpro/tests/data/all-percussion.gp-ref.mscx index 8ab8125e2acdd..eae352ad46bb7 100644 --- a/src/importexport/guitarpro/tests/data/all-percussion.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/all-percussion.gp-ref.mscx @@ -1243,9 +1243,6 @@ half - - end - diff --git a/src/importexport/guitarpro/tests/data/arpeggio.gp-ref.mscx b/src/importexport/guitarpro/tests/data/arpeggio.gp-ref.mscx index 4c5f89c26fa0f..91121181c8229 100644 --- a/src/importexport/guitarpro/tests/data/arpeggio.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/arpeggio.gp-ref.mscx @@ -147,9 +147,6 @@ 0.966667 - - end - diff --git a/src/importexport/guitarpro/tests/data/arpeggio.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/arpeggio.gpx-ref.mscx index 4c5f89c26fa0f..91121181c8229 100644 --- a/src/importexport/guitarpro/tests/data/arpeggio.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/arpeggio.gpx-ref.mscx @@ -147,9 +147,6 @@ 0.966667 - - end - diff --git a/src/importexport/guitarpro/tests/data/artificial-harmonic.gp-ref.mscx b/src/importexport/guitarpro/tests/data/artificial-harmonic.gp-ref.mscx index 5a1d1117cc16f..29886cb3e4463 100644 --- a/src/importexport/guitarpro/tests/data/artificial-harmonic.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/artificial-harmonic.gp-ref.mscx @@ -345,9 +345,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/artificial-harmonic.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/artificial-harmonic.gpx-ref.mscx index 5a1d1117cc16f..29886cb3e4463 100644 --- a/src/importexport/guitarpro/tests/data/artificial-harmonic.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/artificial-harmonic.gpx-ref.mscx @@ -345,9 +345,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/barline-last-measure.gp b/src/importexport/guitarpro/tests/data/barline-last-measure.gp new file mode 100644 index 0000000000000000000000000000000000000000..89ed8b5347191453ce370547cb7ec6aa811c630e GIT binary patch literal 8874 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 + + + 480 + 1 + 1 + 1 + 0 + + + + + + + + + + + + + + + stdNormal + + + Electric Guitar + + Electric Guitar + jz.guit. + + -7 + -12 + pluck.guitar.electric + 0 + + 24 + 52 + 57 + 62 + 67 + 71 + 76 + + + 100 + 30 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 144 + 67 + + + 169 + 100 + + + + + 0 + 0 + + + + + + + stdNormal + + + Electric Guitar + + Electric Guitar + el.guit. + + -7 + -12 + pluck.guitar.electric + 0 + + 24 + 52 + 57 + 62 + 67 + 71 + 76 + + + 100 + 30 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 144 + 67 + + + 169 + 100 + + + + + 0 + 2 + + + + + + + + 0 + + + Free time + + + 4 + 4 + + + 2 + metNoteQuarterUp = 120 + + + measure + 4/4 + + + dashed + + + + + + + mf + 80 + + + quarter + + 65 + 13 + 1 + 0 + + + + quarter + + + half + + + double + + + + + + + Free time + + + 4 + 4 + + + measure + 4/4 + + + + + + + + + 0 + + + Free time + + + 4 + 4 + + + measure + 4/4 + + + dashed + + + + + + + measure + 4/4 + + + double + + + + + + + Free time + + + 4 + 4 + + + measure + 4/4 + + + + + + diff --git a/src/importexport/guitarpro/tests/data/barre.gp-ref.mscx b/src/importexport/guitarpro/tests/data/barre.gp-ref.mscx index 7ff8bd560fb7b..9f257a8a93d0a 100644 --- a/src/importexport/guitarpro/tests/data/barre.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/barre.gp-ref.mscx @@ -129,9 +129,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/barre.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/barre.gpx-ref.mscx index 7ff8bd560fb7b..9f257a8a93d0a 100644 --- a/src/importexport/guitarpro/tests/data/barre.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/barre.gpx-ref.mscx @@ -129,9 +129,6 @@ quarter - - end - 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 35f81fe1e0c85..d006464c1e573 100644 --- a/src/importexport/guitarpro/tests/data/basic-bend.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/basic-bend.gp-ref.mscx @@ -118,9 +118,6 @@ quarter - - end - 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 a14da087c87d5..efd6928816345 100644 --- a/src/importexport/guitarpro/tests/data/basic-bend.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/basic-bend.gpx-ref.mscx @@ -118,9 +118,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/beam-modes.gp b/src/importexport/guitarpro/tests/data/beam-modes.gp new file mode 100644 index 0000000000000000000000000000000000000000..0b824f0782b13ba49e33d96ca762b5bdb9990d0b GIT binary patch literal 9520 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 M5D=yJB@mE*17s3 + + + 480 + 1 + 1 + 1 + 0 + + + + + + + + + + + + + + + stdNormal + + + Clean Guitar + + Clean Guitar + el.guit. + + -7 + -12 + pluck.guitar.electric + 0 + + 24 + 52 + 57 + 62 + 67 + 71 + 76 + + + 100 + 30 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 144 + 67 + + + 169 + 100 + + + + + + + + + + + + 0 + + + 4 + 4 + + + Auto + + + mf + 80 + + + 2 + metNoteQuarterUp = 120 + + + 0 + -2 + + + eighth + + 55 + 15 + 0 + 2 + + + + eighth + + 57 + 17 + 2 + 2 + + + + 40 + 36 + + + 16th + + 59 + 19 + 0 + 1 + + + + 16th + + 60 + 14 + 1 + 1 + + + + 16th + + 62 + 16 + 3 + 1 + + + + 16th + + 64 + 18 + 5 + 1 + + + + 56 + 56 + + + eighth + + 67 + 15 + 3 + 0 + + + + 16th + + 52 + 18 + 2 + 3 + + + + 16th + + 59 + 19 + 0 + 1 + + + + 6 + 10 + + + eighth + + 53 + 13 + 3 + 3 + + + + 16th + + 52 + 18 + 2 + 3 + + + + 16th + + 47 + 19 + 2 + 4 + + + + + + + + Force beams + + + -24 + -24 + + + eighth + + 55 + 15 + 0 + 2 + + + + mid + eighth + + 57 + 17 + 2 + 2 + + + + mid + 16th + + 59 + 19 + 0 + 1 + + + + mid + 16th + + 60 + 14 + 1 + 1 + + + + mid + 16th + + 62 + 16 + 3 + 1 + + + + mid + 16th + + 64 + 18 + 5 + 1 + + + + mid + eighth + + 67 + 15 + 3 + 0 + + + + mid + 16th + + 52 + 18 + 2 + 3 + + + + mid + 16th + + 59 + 19 + 0 + 1 + + + + mid + eighth + + 53 + 13 + 3 + 3 + + + + mid + 16th + + 52 + 18 + 2 + 3 + + + + mid + 16th + + 47 + 19 + 2 + 4 + + + + + + + + Break beams + + + eighth + + 55 + 15 + 0 + 2 + + + + no + eighth + + 57 + 17 + 2 + 2 + + + + no + 16th + + 59 + 19 + 0 + 1 + + + + no + 16th + + 60 + 14 + 1 + 1 + + + + no + 16th + + 62 + 16 + 3 + 1 + + + + no + 16th + + 64 + 18 + 5 + 1 + + + + no + eighth + + 67 + 15 + 3 + 0 + + + + no + 16th + + 52 + 18 + 2 + 3 + + + + no + 16th + + 59 + 19 + 0 + 1 + + + + no + eighth + + 53 + 13 + 3 + 3 + + + + no + 16th + + 52 + 18 + 2 + 3 + + + + no + 16th + + 47 + 19 + 2 + 4 + + + + + + + + Break secondary beams + + + 0 + -2 + + + eighth + + 55 + 15 + 0 + 2 + + + + eighth + + 57 + 17 + 2 + 2 + + + + -24 + -24 + + + 16th + + 59 + 19 + 0 + 1 + + + + 16th + + 60 + 14 + 1 + 1 + + + + begin16 + 16th + + 62 + 16 + 3 + 1 + + + + begin16 + 16th + + 64 + 18 + 5 + 1 + + + + begin16 + eighth + + 67 + 15 + 3 + 0 + + + + 16th + + 52 + 18 + 2 + 3 + + + + begin16 + 16th + + 59 + 19 + 0 + 1 + + + + begin16 + eighth + + 53 + 13 + 3 + 3 + + + + 16th + + 52 + 18 + 2 + 3 + + + + begin16 + 16th + + 47 + 19 + 2 + 4 + + + + + + + diff --git a/src/importexport/guitarpro/tests/data/beams-stems-ledger-lines.gp-ref.mscx b/src/importexport/guitarpro/tests/data/beams-stems-ledger-lines.gp-ref.mscx index 611ace0766613..7a49b0f6fd2f0 100644 --- a/src/importexport/guitarpro/tests/data/beams-stems-ledger-lines.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/beams-stems-ledger-lines.gp-ref.mscx @@ -780,9 +780,6 @@ 0 - - end - diff --git a/src/importexport/guitarpro/tests/data/beams-stems-ledger-lines.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/beams-stems-ledger-lines.gpx-ref.mscx index 82099024e62e9..78477ea855660 100644 --- a/src/importexport/guitarpro/tests/data/beams-stems-ledger-lines.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/beams-stems-ledger-lines.gpx-ref.mscx @@ -780,9 +780,6 @@ 0 - - end - diff --git a/src/importexport/guitarpro/tests/data/bend.gp-ref.mscx b/src/importexport/guitarpro/tests/data/bend.gp-ref.mscx index f2f142041a2c8..9794e3489bb24 100644 --- a/src/importexport/guitarpro/tests/data/bend.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/bend.gp-ref.mscx @@ -245,9 +245,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/bend.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/bend.gpx-ref.mscx index ac854b80be786..da5f5b1dc489c 100644 --- a/src/importexport/guitarpro/tests/data/bend.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/bend.gpx-ref.mscx @@ -239,9 +239,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/bend_and_harmonic.gp-ref.mscx b/src/importexport/guitarpro/tests/data/bend_and_harmonic.gp-ref.mscx index 55831ce917500..001d38360ed78 100644 --- a/src/importexport/guitarpro/tests/data/bend_and_harmonic.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/bend_and_harmonic.gp-ref.mscx @@ -158,9 +158,6 @@ Cowboys From Hell half - - end - diff --git a/src/importexport/guitarpro/tests/data/brush.gp-ref.mscx b/src/importexport/guitarpro/tests/data/brush.gp-ref.mscx index 1126940d6a1a3..5543e64ce0952 100644 --- a/src/importexport/guitarpro/tests/data/brush.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/brush.gp-ref.mscx @@ -147,9 +147,6 @@ 0.985417 - - end - diff --git a/src/importexport/guitarpro/tests/data/brush.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/brush.gpx-ref.mscx index 1126940d6a1a3..5543e64ce0952 100644 --- a/src/importexport/guitarpro/tests/data/brush.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/brush.gpx-ref.mscx @@ -147,9 +147,6 @@ 0.985417 - - end - diff --git a/src/importexport/guitarpro/tests/data/chord_with_tied_harmonics.gp-ref.mscx b/src/importexport/guitarpro/tests/data/chord_with_tied_harmonics.gp-ref.mscx index 356e02778105e..77e099aa4efa3 100644 --- a/src/importexport/guitarpro/tests/data/chord_with_tied_harmonics.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/chord_with_tied_harmonics.gp-ref.mscx @@ -631,9 +631,6 @@ half - - end - diff --git a/src/importexport/guitarpro/tests/data/chordnames_keyboard.gp-ref.mscx b/src/importexport/guitarpro/tests/data/chordnames_keyboard.gp-ref.mscx index b0a176e06385e..f972a8acf7184 100644 --- a/src/importexport/guitarpro/tests/data/chordnames_keyboard.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/chordnames_keyboard.gp-ref.mscx @@ -152,10 +152,6 @@ 0 - - end - 1 - @@ -197,10 +193,6 @@ measure 4/4 - - end - 1 - diff --git a/src/importexport/guitarpro/tests/data/chordnames_keyboard.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/chordnames_keyboard.gpx-ref.mscx index c37620480d76c..23b15e492ca6c 100644 --- a/src/importexport/guitarpro/tests/data/chordnames_keyboard.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/chordnames_keyboard.gpx-ref.mscx @@ -149,10 +149,6 @@ 0 - - end - 1 - @@ -194,10 +190,6 @@ measure 4/4 - - end - 1 - diff --git a/src/importexport/guitarpro/tests/data/clefs.gp-ref.mscx b/src/importexport/guitarpro/tests/data/clefs.gp-ref.mscx index e30fb73bd1989..501e8519c7c8b 100644 --- a/src/importexport/guitarpro/tests/data/clefs.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/clefs.gp-ref.mscx @@ -204,9 +204,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/clefs.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/clefs.gpx-ref.mscx index ac77eb29c6947..1a609cc39d553 100644 --- a/src/importexport/guitarpro/tests/data/clefs.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/clefs.gpx-ref.mscx @@ -203,9 +203,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/copyright.gp-ref.mscx b/src/importexport/guitarpro/tests/data/copyright.gp-ref.mscx index 8d3ffed6af81a..9182b583c88d6 100644 --- a/src/importexport/guitarpro/tests/data/copyright.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/copyright.gp-ref.mscx @@ -114,9 +114,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/copyright.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/copyright.gpx-ref.mscx index be7001347663e..308dada81e821 100644 --- a/src/importexport/guitarpro/tests/data/copyright.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/copyright.gpx-ref.mscx @@ -129,9 +129,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/crescendo-diminuendo.gp-ref.mscx b/src/importexport/guitarpro/tests/data/crescendo-diminuendo.gp-ref.mscx index a57f17d1ee99d..ef871bc187416 100644 --- a/src/importexport/guitarpro/tests/data/crescendo-diminuendo.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/crescendo-diminuendo.gp-ref.mscx @@ -180,9 +180,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/crescendo-diminuendo.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/crescendo-diminuendo.gpx-ref.mscx index a57f17d1ee99d..ef871bc187416 100644 --- a/src/importexport/guitarpro/tests/data/crescendo-diminuendo.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/crescendo-diminuendo.gpx-ref.mscx @@ -180,9 +180,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/dead-note.gp-ref.mscx b/src/importexport/guitarpro/tests/data/dead-note.gp-ref.mscx index eb79e1ecdbc81..a6e38334c33aa 100644 --- a/src/importexport/guitarpro/tests/data/dead-note.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dead-note.gp-ref.mscx @@ -131,9 +131,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/dead-note.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/dead-note.gpx-ref.mscx index eb79e1ecdbc81..a6e38334c33aa 100644 --- a/src/importexport/guitarpro/tests/data/dead-note.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dead-note.gpx-ref.mscx @@ -131,9 +131,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/directions.gp-ref.mscx b/src/importexport/guitarpro/tests/data/directions.gp-ref.mscx index b3b5e5a4a6ce6..f61c4137b2aaf 100644 --- a/src/importexport/guitarpro/tests/data/directions.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/directions.gp-ref.mscx @@ -537,9 +537,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/directions.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/directions.gpx-ref.mscx index b3b5e5a4a6ce6..f61c4137b2aaf 100644 --- a/src/importexport/guitarpro/tests/data/directions.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/directions.gpx-ref.mscx @@ -537,9 +537,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/dotted-gliss.gp-ref.mscx b/src/importexport/guitarpro/tests/data/dotted-gliss.gp-ref.mscx index fee7ae5b96d8e..31b3fafafd436 100644 --- a/src/importexport/guitarpro/tests/data/dotted-gliss.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dotted-gliss.gp-ref.mscx @@ -175,9 +175,6 @@ Innuendo - - end - diff --git a/src/importexport/guitarpro/tests/data/dotted-gliss.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/dotted-gliss.gpx-ref.mscx index a166f55ddefff..e83eb20eb5cc6 100644 --- a/src/importexport/guitarpro/tests/data/dotted-gliss.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dotted-gliss.gpx-ref.mscx @@ -177,9 +177,6 @@ Innuendo - - end - 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 454d002a7b33e..cbc6f56858cb6 100644 --- a/src/importexport/guitarpro/tests/data/dotted-tuplets.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dotted-tuplets.gp-ref.mscx @@ -168,9 +168,6 @@ 0 - - end - 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 cd8adf17aa967..2b0b5e9011fe4 100644 --- a/src/importexport/guitarpro/tests/data/dotted-tuplets.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dotted-tuplets.gpx-ref.mscx @@ -170,9 +170,6 @@ 0 - - end - diff --git a/src/importexport/guitarpro/tests/data/double-bar.gp-ref.mscx b/src/importexport/guitarpro/tests/data/double-bar.gp-ref.mscx index 2b156c241e98d..97db21d74a7cd 100644 --- a/src/importexport/guitarpro/tests/data/double-bar.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/double-bar.gp-ref.mscx @@ -154,9 +154,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/double-bar.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/double-bar.gpx-ref.mscx index 2b156c241e98d..97db21d74a7cd 100644 --- a/src/importexport/guitarpro/tests/data/double-bar.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/double-bar.gpx-ref.mscx @@ -154,9 +154,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/dynamic.gp-ref.mscx b/src/importexport/guitarpro/tests/data/dynamic.gp-ref.mscx index 9a88599194044..bb90ac71970c9 100644 --- a/src/importexport/guitarpro/tests/data/dynamic.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dynamic.gp-ref.mscx @@ -270,9 +270,6 @@ 1 - - end - @@ -345,9 +342,6 @@ 1 - - end - diff --git a/src/importexport/guitarpro/tests/data/dynamic.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/dynamic.gpx-ref.mscx index 9a88599194044..bb90ac71970c9 100644 --- a/src/importexport/guitarpro/tests/data/dynamic.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/dynamic.gpx-ref.mscx @@ -270,9 +270,6 @@ 1 - - end - @@ -345,9 +342,6 @@ 1 - - end - diff --git a/src/importexport/guitarpro/tests/data/fade-in.gp-ref.mscx b/src/importexport/guitarpro/tests/data/fade-in.gp-ref.mscx index 0956741785f49..12d8d42abbbd2 100644 --- a/src/importexport/guitarpro/tests/data/fade-in.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/fade-in.gp-ref.mscx @@ -114,9 +114,6 @@ quarter - - end - 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 b64c5e51bbbb1..e55164650abba 100644 --- a/src/importexport/guitarpro/tests/data/fade-in.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/fade-in.gpx-ref.mscx @@ -114,9 +114,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/fermata.gp-ref.mscx b/src/importexport/guitarpro/tests/data/fermata.gp-ref.mscx index b7e6f52e9385c..e6a17d516f2b9 100644 --- a/src/importexport/guitarpro/tests/data/fermata.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/fermata.gp-ref.mscx @@ -216,9 +216,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/fermata.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/fermata.gpx-ref.mscx index f900c06542070..b4549f605f1d8 100644 --- a/src/importexport/guitarpro/tests/data/fermata.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/fermata.gpx-ref.mscx @@ -216,9 +216,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/fingering.gp-ref.mscx b/src/importexport/guitarpro/tests/data/fingering.gp-ref.mscx index 28e788b7f7ae7..37e3b25ef940e 100644 --- a/src/importexport/guitarpro/tests/data/fingering.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/fingering.gp-ref.mscx @@ -245,9 +245,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/fingering.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/fingering.gpx-ref.mscx index e64862f34c8a5..9c21ed587564e 100644 --- a/src/importexport/guitarpro/tests/data/fingering.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/fingering.gpx-ref.mscx @@ -248,9 +248,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/free-time.gp-ref.mscx b/src/importexport/guitarpro/tests/data/free-time.gp-ref.mscx index 4b5640eef0d16..3deb43001d94e 100644 --- a/src/importexport/guitarpro/tests/data/free-time.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/free-time.gp-ref.mscx @@ -154,9 +154,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/free-time.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/free-time.gpx-ref.mscx index 68ef180cb446a..b00a239487c8c 100644 --- a/src/importexport/guitarpro/tests/data/free-time.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/free-time.gpx-ref.mscx @@ -154,9 +154,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/fret-diagram.gp-ref.mscx b/src/importexport/guitarpro/tests/data/fret-diagram.gp-ref.mscx index 3bf41ab38df38..c3e67340d469c 100644 --- a/src/importexport/guitarpro/tests/data/fret-diagram.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/fret-diagram.gp-ref.mscx @@ -744,9 +744,6 @@ 1 - - end - diff --git a/src/importexport/guitarpro/tests/data/fret-diagram.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/fret-diagram.gpx-ref.mscx index 3bf41ab38df38..c3e67340d469c 100644 --- a/src/importexport/guitarpro/tests/data/fret-diagram.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/fret-diagram.gpx-ref.mscx @@ -744,9 +744,6 @@ 1 - - end - diff --git a/src/importexport/guitarpro/tests/data/fret-diagram_2instruments.gp-ref.mscx b/src/importexport/guitarpro/tests/data/fret-diagram_2instruments.gp-ref.mscx index 198a576bdfa9d..af65188475efc 100644 --- a/src/importexport/guitarpro/tests/data/fret-diagram_2instruments.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/fret-diagram_2instruments.gp-ref.mscx @@ -202,9 +202,6 @@ 2 - - end - @@ -257,9 +254,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/fret-diagram_2instruments.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/fret-diagram_2instruments.gpx-ref.mscx index 92f8ac5cb3cc5..a5e0b681035f1 100644 --- a/src/importexport/guitarpro/tests/data/fret-diagram_2instruments.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/fret-diagram_2instruments.gpx-ref.mscx @@ -194,9 +194,6 @@ 2 - - end - @@ -249,9 +246,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/ghost-note.gp-ref.mscx b/src/importexport/guitarpro/tests/data/ghost-note.gp-ref.mscx index 2ed3c01789071..dd59523e319b1 100644 --- a/src/importexport/guitarpro/tests/data/ghost-note.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ghost-note.gp-ref.mscx @@ -112,9 +112,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/ghost-note.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/ghost-note.gpx-ref.mscx index 2ed3c01789071..dd59523e319b1 100644 --- a/src/importexport/guitarpro/tests/data/ghost-note.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ghost-note.gpx-ref.mscx @@ -112,9 +112,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/grace-before-beat.gp-ref.mscx b/src/importexport/guitarpro/tests/data/grace-before-beat.gp-ref.mscx index 7e2fc4825b097..b2d82fcaa7dc6 100644 --- a/src/importexport/guitarpro/tests/data/grace-before-beat.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/grace-before-beat.gp-ref.mscx @@ -140,9 +140,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/grace-before-beat.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/grace-before-beat.gpx-ref.mscx index 7e2fc4825b097..b2d82fcaa7dc6 100644 --- a/src/importexport/guitarpro/tests/data/grace-before-beat.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/grace-before-beat.gpx-ref.mscx @@ -140,9 +140,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/grace-durations.gp-ref.mscx b/src/importexport/guitarpro/tests/data/grace-durations.gp-ref.mscx index 6ba36db55ca8b..f1a6fedfe9bf4 100644 --- a/src/importexport/guitarpro/tests/data/grace-durations.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/grace-durations.gp-ref.mscx @@ -433,9 +433,6 @@ half - - end - diff --git a/src/importexport/guitarpro/tests/data/grace-on-beat.gp-ref.mscx b/src/importexport/guitarpro/tests/data/grace-on-beat.gp-ref.mscx index 09c8b332ac1d8..8a68cee948376 100644 --- a/src/importexport/guitarpro/tests/data/grace-on-beat.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/grace-on-beat.gp-ref.mscx @@ -140,9 +140,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/grace-on-beat.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/grace-on-beat.gpx-ref.mscx index 09c8b332ac1d8..8a68cee948376 100644 --- a/src/importexport/guitarpro/tests/data/grace-on-beat.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/grace-on-beat.gpx-ref.mscx @@ -140,9 +140,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/grace.gp-ref.mscx b/src/importexport/guitarpro/tests/data/grace.gp-ref.mscx index b8646ff25217b..a164366751ef1 100644 --- a/src/importexport/guitarpro/tests/data/grace.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/grace.gp-ref.mscx @@ -334,9 +334,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/grace.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/grace.gpx-ref.mscx index caf1e10b3cb43..6a690eeedf169 100644 --- a/src/importexport/guitarpro/tests/data/grace.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/grace.gpx-ref.mscx @@ -338,9 +338,6 @@ quarter - - end - 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 80e104fcda5a2..24d771116651f 100644 --- a/src/importexport/guitarpro/tests/data/heavy-accent.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/heavy-accent.gp-ref.mscx @@ -114,9 +114,6 @@ quarter - - end - 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 bc2263321a1bb..dc502e48ef4fa 100644 --- a/src/importexport/guitarpro/tests/data/heavy-accent.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/heavy-accent.gpx-ref.mscx @@ -114,9 +114,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/hide-rests.gp b/src/importexport/guitarpro/tests/data/hide-rests.gp new file mode 100644 index 0000000000000000000000000000000000000000..4098fde1b194058e4c9ea9b7c0c84c376362c54f GIT binary patch literal 8934 zcmaKyWmH|uvbGoQ8YH;82AAN@!rdXj!rk3ng1bYI;J$Eo4H7hHaCZxY8}2vuclO=) zo>O!5n6s<9-qAhlPd_zU2?zy^1^B-V{*P14-p&PN=fa}&-?QKWZ@&L&@BeiFnk8y! z_sPjq)y2~WnZWtp^ zAN0_GNOsP1J+IOoY}PFFtT_9beeSc*zmIdu^ZjR&MwBS-;Mp9l#8=!<0-2~_F_rY6SV7kB+@trIf(OtvqrG zin;yrKcbEGd>;-=^CpEZi%_q)?-Fp)Ixi^i3YUPx*u!6+myNCE?rLWumG5B`z*3jM z=O4~#RlhT!b{0KNeB9(jY4WZzuXFE?QMR;S8?4i#?`;ta{bD(`} z)ZR4)Cdh9&51nZCHpu>BA_%9@Af1C3(>I zQvqbh5@fmb8ChX7d4MFkiFRU)9}v=9-__k*k09pXXkkJ zTr_f$ylqMWRQKRde6Vm-pPk>i{Va09`iYz`C=1J!Zbid~L}VVe>KJ~Kyo9NtgTI8TA89$fQ17xVNyl4^B_mjy`D5Dwj|gR1x}qm|x98wzO1h(L)S*LCp35z|prd<= znrQA(1cq@9p9BdA{AgKPl{3J=+&3qBFpN+Qeps(R{t#_5Y74@h@niK5F7gj#r@KUId;_@FO3>Le0<7>q8QhpAAk z$31yZ?rAgT+0fU4RgdRwAmj>otk0Ucl8FKa-xl&5;z8VA!nz znT1w?29Y1V;tj}BMxPClme)wihm`JZB{*b0LS0fe+T&@Gz^lB-zFh8~1~)@*ZM4HPc0(a9wd(fr1Y5-WSys712OX>XjWdi zd&A@tQ|Z65?7KXh`aDwJYkX;M4%bg@EdFNkkfZ$PuatqY&Plw=#Z056=C-i!}4EE(Le%6_)3KfeopNi~XBrt}U;teFLJnto&=LsQ4 zM$ZmC2}|upy#wfAburOT-*Z9XH|bGweYzH<`u(!+|0KI~){<42MxUYQWuh+NAn569 z`JH<~ZO)G4>nQH~vL^E{gH)%O!L$UeT)ylq(LKyN6IG7iB7L5o%BxWog@=bnfUOE^ zzoQi?2@`|}^KmZeA2y0bPv!A>c|v|}+R(&fI<64G=fJg^%NXwP+(kSjAi7RXB+{(& zmaKXU7>0??LWEA=-;b0}@%1cZ@Oi^i_0((db9!w?iVZN()CXsZlcuztLc}}xqsPu4 z{QBJ;N#Bp10%vhyC*G*?QmB&7ECY5Lb|ZHqq)V{uGpO?pBeMF{Setw=+LR0@YQO?a z^eT2^;HHXfF-HgyNkk7Vo7WjYWV96`pjJDD&-4`(77;$;9rUt)-r(@BA!se*yb(|W zkXMR4pePm=Ts_?XzN?mJ;?j0fX)KK3qV0v?hr&YB)!#9J=puRUSKLUvnKG4DNUOG- z&C!JOa-05@=EOhkORV5=c_l-Qxn%sr0eRqnT#^8)5!G-kZNw?;ldD4Tr?v84kpD*K zsZnZbkj#@YL5K*^cM#FhD9F;k5;sM=G5Dj~hm@+A#RJfw2h(g&FOt@5O>4B@_@m@| zzGldJ2=V-Fd*cQqO3DRZ4Jf#iOI*W)wGoxy$yXm@1q*H%%AB?l%*pDTg(_rN@nVb#gh>H zy>b5hPvTp&(@TTz^>@kFVFAVPYotN4j;nCiBn8gI_ETw)R3BDtTwqrccAO0sRlD*p zyMp`S(TA;o?HZE%h5LHrV~Q%4r~Uos-b5m-wWLXy zCxeZ<9=4-3$=%`tv7tJ7FNWfvtyHXD&0IcA}P@dU4qZi` zcIPs~$~VZm**T!iuC_ykE$L4Ms~As07^}hr@jTa<(Q&)*6tnF4I@S8ZBnDV*_*H2~ zjW5HIfz(rbhvnwEm2Qe1R6N$OR1MQyqz(zq_0^vp`Mh@Zouu3HBs?Ql1+{kr(`>Ta zq?|gjy4)hW#KKjanAdW)=~K-XJNwq!x9=(QyM~sdZ3Gmj_>M=Rk{sR+tg#k*xdL-F z&<}yoY!!S_gDBq;4?pSGPG?96c8`S5Zk={4E%s8dIAV-A;N~SEt>1Z+fm`7tZL`Ju zV?+FAF3$7(xJp0AD~NJ6=A&X@bZ$W?2BRiL#&?E%ohJt*piNYuePf745p7kSI*wfu z`)zBYtX?$EtMNVDl!!Kb->E(L2#wZT;>8yS!si7{0tekXLeu}{i&nS4>MBE^b~L3- z5T{x6kUaw~>8zYF$%>cu4o*#}{B81qUY@p!%S!VcOsQ z9M?d*d`x3pM`y7b$&WG5berLEf48?|_F_;|dYTitq_Qz$JkbS}37$l_k*3f;F|M7+ zVl+Z&8lsK$paFZ(CxG4S321ILJNmNf44o%v6|c;cB>3s%p^9mWQDDycvNR$-UJmy| z+{1in^bX}=&<)GTmRDidFdpJsXYN@sH5E1uyOEhRB8;V2_F0^NTsYros(#7GYTzIQ z@~FrDt@ zDbCS3IU}uDu#Sa6SBYKiCPw-T4}#bNWZgS$Nt~oX{_948b5%_so8br1gfWEHNZsaU zT@kXc=%wO)I)VL<&)7`l@A*wxDkjLfkmon0x_*rEDkKZNpqJ-`b?A_nt2MJ_j|ud* zY2T!NfM#dtzw*iLNAz_rdOs9;en7gFBkt_p_EN?*iP<^X5;~sY@blB9{^x-cXK=_Y zR+|GNxx{WE+mw0q8f*XeiDxRbC0CTubetK|uE-2lRBhQ$$~8#Pof=y}OUE{$Ba=yF zq*i5ylsOEu9~p{51on-D0Y zuMvoGK}vYJZK#F3)iD%bg|mM|WICUxg-UCO`H}PsYqnOUHS3RT4Q3j_oNB3u%0*9n z5#qLG<|$yT(C$-6^eU)3Q7(59wJaMwU5JkAW0PV-UyZ9Amt>l%CZqv9|I*=1Vt%kl=T(R)CAm5-)+Jg?( zV#(Jg9a{db1;no>QpS1#f5xe+g;G71Xe8P%G`VLSFrF{UxyiNhf0z*vpuP&x=_0pR zSz(^$imkv*1#3~Re`w5pQK2_vlKnF8q8WnAIf3QH_|8QZH5s@oME=Odlxe@JKbfj- zQ|?z%CE-H-8wRz>QoajZjJp?)DbJ0^q^yK3X!W?cfMf{iY`PI>?yi0hB(>zzhEgf8 zqGie}&Sfs70X}9fcV3LRJ0-h*qLQ?=I6wTrni5H%ox>h}q&MhQPo8{TxLTNvc+0%J znXLM_rVW$7oc6j>*Fe7k&-csrx0z+2sZXbAtL^46V|&BG`7Ew&Zz8D3=XPYMi{n^r z%!Vp2e7V#VWq%Y=g@C;R??NN8cwmSlrONPAs$s*dcERjH;?)w#PEKZJjx~^+<#{P++`VKp??rthd?oc~}25N0; zimX$^52o2?s{%e%acx=Ik^qq548FRJ*(#M7Sq#dHO)N`E)R%6Y>(zQLE}oL{1IeVW z1-9Jz?jhtOBDmLvT7I|u)TY;Txkf{2{K14KZ!6&S?s|sY46BLa0tIM@TcK40AjP1U zLag`UKECGq^vBQNLe8*}?RRnj0LGt+CDEG1At ziII`fC({QsXk=vM7=X8Z|~`^%NJb{9uwp%*ly9XGy_qJ3#cJkSo|UFQ9IZWm96fA0Y#Vt9?f1xqkN&A z(^ba>{P)xfaCz9F{*&}-Zk9%cqO?TQd^}IvDinVpv=i?N$Zd?fc*L z{8@hBf7}A*pV7Zcx6UT^P9SD;2TQY4LTl$$uB&!GnDQ*W)r=%MWwh@1Zl=0!zUDO5 zyOivUhaRMu_3`o0@=%98FKZQ?XU)^YnKL1HjwD+{2n*GcLbu1nS=IE z*EPWMTAT1`aNN_Yk=gEUE8R;>$2;3MS^@^vYTn+~jo+JMAOnKaP6UQgBbRLZDE9hd z%ob0YAU5GQ%mcG}pKJ+8#IngLf_bSASBm#AqH`j`F)>qHs2jk?X-VNUui82sglNcH4N0C(QA!+QIK<2$69KQ z^C=pi%@1)f78Ago(Ptn1abRt+ZF5II!6NZw=S`V0ma_{(=`L8JkJCEF``=D#gy}3G zk+t?8N#iwwh^}c#XJzUfGBG*rO^*p8bgCI&p6c>dzro)WD`tCuIlkj9bz z7RB|!h9MOghtY}*frNof^Lf?n0d3pyio^-LndrJ5&u0@Cf^qyqg5w9xYZI~rT-Gdb zGNhdn@uow5uU6Dt!S{^m-mha@FnScpO^P{GF_`53)?q@ZzH^;6+4A)>8PYxMnq62x z(kTr2)mQLFb5*=j+(y7CPpv0T)Ae^B{I!dG3W=6Q6rmIImyCFo2kiLay?RI`4?7e=0=DqvQUxd`=r>hlerl_X_ z##xbAd7llYYB(ULgnV5uIvb39JYD%ZpK|dW+%Aruy+3w;oqpZh-JQ8P->)et4aa7F ze_%6nU09(RSU`*_3$d*Q|7Z&r(J-*ZOhtnM!>oxn<1g-^boKmd9fs*}%K=5DfraRa z(|2wj<~1-)oM=VgpV~yf%`hKz!fot7Yg{9(N3}2qV$2{RspFOZ=qZ^-o^S_H*;ho> zK+sfGQ+{O%@hAIu#(26o57dg%g-k;~HL%nwUdr96fuSsQ(*!Mgf>X%JF+)K`6%l;r ztg1uiHtq;=Da~Yqio$#xz@TX2?O^g1%?UJ^O_O#|&Sk*NNUkbN*l9^;sw<$oK#5N& z2MNQO6H55XZQKiGcN%#f%gK&((hD$LWRfE;2dF^J&acNPY8xFtq!c1pP`c)Irrc6; z$#IujlmfD{pT$5OMP@b54GA!_SP%wh6f{X1MGD7G1WYe{ei8`C!+1u%gi9eG?i&ME zsTfxK3#3Gj!>GA4X6gr7xcEQ!L_KKRhvrzbE;{t)jM{geLA*Z`Gsmm`)iCu`y0(66 zy+tJ$Tz(P+d%6;(yIM5#HAYW1EHzVEee?qx!=gmdN)^|2GrE&L5iz}3eZX4>RyHXn4VOLFYI{XCjPI+M{Az}*4n*z;GXldpLYA#9DH&Zy<_03v1!bk_4A z2~{I8hoTaJ&=IGj73zn)#*CCcL7o}9Bs>D^ALH7kCppEz%UYudgi)07cS^qiYY>B% z?-fXJCv7s2m~&v9E9S!SSaaMF=UUkDJLbsQ%YA({w~r1M8AFEWnS^Dbbj_#8H^B%{mOM}Kq)X}T0bt`waaR2& z_N`^AMy#NEgm<1(`oGC9%`L<|1eBqgD$^pN-@i}XM&6tU;7N*vhIhkR9}?tZ9>?%m z$BOz%%9KmWhbLRYI?@`0M5CoWE#Wko_-YxXX74A?gn!6nF<}Qf$(|CZ$V+mfMjyA0 zI=D<9S8i>{cAlwtE$H~42cOwKHsGJJwG@vbLPz8T`!P- zOCJHW);2}5FP32p3<(92avO&t*}&{J^#TFnoMaZc#5vnXb5O|`f`AhK{c>lFNCKnJ zwx5ks8)FT0=PVa?+z`fjki6MWO^+8Ojrh(wfTG3iq)LjEcD(#8aKSdhFj-4ypAr*Y zg(t=1Aza_xsZCV%ql_fLeZSy5%UleHw6Qr6>pl3k`OTyvNQ>kavi}vGEs)9i-Wk%R zCJ{2={sL8EvsT*Jxp*&A-x)6NMUG19xQg@8y@m!%leFsHaOZvzOgF*omr3Az3y0r{ z;U_KGweARRfIj{fj1|IPjC{N<;=Nk5e%5c!UM^omKgH-c!Z8l%!DpmU{t*{_ z%5?!xrg)t2C>mt7VU>>vp>Bpww1x@aaKb0Y8?0WyH6AR)858DgABWy=j&4s%IjUp9 z(qn1NfsoH*j30uNPAv^$UAn^L;HPE|A5$7sEh8cuv?~qNfyqa^MRI|GEXtlXDbY%8 z*5S+d4{r?HE1Du)Z{PuvH7X+a=C(qXjHMHub>RTOWv)JV{V4i zXM3OcDGhn+o*5728}OKHiRufk$6!#L6PK0wOc8V&E-6ESl0e0+Da?G!v6%FezVxYp zZDPxds@yjeIdkGdZ;C?q^g!#b8VUCSI>{NS%5)V$V|gaL9gajfNJPDvt|oC+d2Qk4 znZwpy%E2;=u7u^_1lEiiffd6Xn^Tj*FACiYR3XZ(>dL)!U^)fv z!NU@sHLTLCZ5P#SyQn#N$0xkOudND>D;rp)ir}6f{~D^%$;LTG-=ZA1o*}F6TgRgzN^QqU8#7g7j3gH>Zq_c3#UG;Suarj&xU^ z(uP+^_QpU-f}V(Ad(?9@_<%62nxyym7?W3(W)xQ4!l&HisE7k16x+4Jgk0pGWr4w) znQ0r$@lvr7{Kv!=V7$6`W3G^CQ47l;+dL9o$%Qako4RDAJaL=P7GvOj*xmAU{!rmd zwrz{dvEWX`^PbMM6FW})^^mVupj*no@x9F!{SKmE96HWZ$!1$^esi3;W5ypLG9c7Y zEfEWUO&-d5QZphi=9JYJ;tqbsNlL2~Duzk9r)gxb~XvkNwK7qlmf3O&duw`tVV6avm;E!dORdQEi>t zbsU$s>0U0D+mZ@)&t0||rUUu(U59gk`By;GcyVb?r!oGXefn$`O}opKI@sayR@*=4 zn7w0?Nq;%Ed9l5IZV^*D-2fTw^5ZhLV?U>YIycE=iZX?!Ri6}D8ffj;SiPXuy;`u; zxK~xhY-VM6dtCDEX7q@cZ8e8(4^%x@cYS4?M)r}t;Zm(TvB}bl6k_|UL`bKgF0sk7 zCs%&3*$n;5HCoR%aDF!xN8$ryD`1O(H`I{oL>=MM8p~QKL%kf~H$&54=|PO~aM+MEJ{I1F8Rf{uTAlixU4-`8(9Sp~zqM z8tC~)`!ALMgN^@{$X^#A8o2?zuGHURhM N8HNA=5Xjzo{{^#(K*|6B literal 0 HcmV?d00001 diff --git a/src/importexport/guitarpro/tests/data/hide-rests.gp-ref.mscx b/src/importexport/guitarpro/tests/data/hide-rests.gp-ref.mscx new file mode 100644 index 0000000000000..65ad53751f4e7 --- /dev/null +++ b/src/importexport/guitarpro/tests/data/hide-rests.gp-ref.mscx @@ -0,0 +1,275 @@ + + + + 480 + 1 + 1 + 1 + 0 + + + + + + + + + + + + + + + stdNormal + + + Electric Guitar + + Electric Guitar + jz.guit. + + -7 + -12 + pluck.guitar.electric + 0 + + 24 + 52 + 57 + 62 + 67 + 71 + 76 + + + 100 + 30 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 144 + 67 + + + 169 + 100 + + + + + 0 + 0 + + + + + + + stdNormal + + + Electric Guitar + + Electric Guitar + jz.guit. + + -7 + -12 + pluck.guitar.electric + 0 + + 24 + 52 + 57 + 62 + 67 + 71 + 76 + + + 100 + 30 + + + 100 + 50 + + + 100 + 67 + + + 100 + 100 + + + 120 + 67 + + + 144 + 67 + + + 169 + 100 + + + + + 0 + 2 + + + + + + + + 0 + + + 4 + 4 + + + 2 + metNoteQuarterUp = 120 + + + 1/4 + + + 1/4 + + + 1/4 + + + + + mf + 80 + + + quarter + + 67 + 15 + 3 + 0 + + + + quarter + + + half + + + + + + + mf + 80 + + + half + + + accidentalSharp + + 63 + 23 + 8 + 2 + + + + half + + + + + 1/4 + + + 1/4 + + + 1/4 + + + + + + + + + 0 + + + 4 + 4 + + + quarter + + + mf + 80 + + + half + + 59 + 19 + 0 + 1 + + + + quarter + + + + + 1/4 + + + 1/4 + + + + + 1/2 + + + + + + + measure + 4/4 + + + + + + diff --git a/src/importexport/guitarpro/tests/data/instr-change-1-beat.gp-ref.mscx b/src/importexport/guitarpro/tests/data/instr-change-1-beat.gp-ref.mscx index f7205e17b65d0..95f80a7c1b376 100644 --- a/src/importexport/guitarpro/tests/data/instr-change-1-beat.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/instr-change-1-beat.gp-ref.mscx @@ -150,9 +150,6 @@ The Wall half - - end - diff --git a/src/importexport/guitarpro/tests/data/instr-change-1-beat.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/instr-change-1-beat.gpx-ref.mscx index 0ad7bff87b5ba..5af9381d8bd35 100644 --- a/src/importexport/guitarpro/tests/data/instr-change-1-beat.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/instr-change-1-beat.gpx-ref.mscx @@ -129,9 +129,6 @@ The Wall half - - end - diff --git a/src/importexport/guitarpro/tests/data/instr-change.gp-ref.mscx b/src/importexport/guitarpro/tests/data/instr-change.gp-ref.mscx index 7465ee8ea0ed5..447bec5f2bb04 100644 --- a/src/importexport/guitarpro/tests/data/instr-change.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/instr-change.gp-ref.mscx @@ -465,9 +465,6 @@ The Wall quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/instr-change.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/instr-change.gpx-ref.mscx index 89c95dfa09dca..bff5e982a29b9 100644 --- a/src/importexport/guitarpro/tests/data/instr-change.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/instr-change.gpx-ref.mscx @@ -465,9 +465,6 @@ The Wall quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/keysig.gp-ref.mscx b/src/importexport/guitarpro/tests/data/keysig.gp-ref.mscx index f5d99dc5dd813..968cb15584b76 100644 --- a/src/importexport/guitarpro/tests/data/keysig.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/keysig.gp-ref.mscx @@ -1630,9 +1630,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/keysig.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/keysig.gpx-ref.mscx index 960cb60065daa..d76bf31777b3f 100644 --- a/src/importexport/guitarpro/tests/data/keysig.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/keysig.gpx-ref.mscx @@ -1644,9 +1644,6 @@ 4 - - end - 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 0106a8b5df261..8e59289cdff25 100644 --- a/src/importexport/guitarpro/tests/data/legato-slide.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/legato-slide.gp-ref.mscx @@ -155,9 +155,6 @@ quarter - - end - 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 0106a8b5df261..8e59289cdff25 100644 --- a/src/importexport/guitarpro/tests/data/legato-slide.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/legato-slide.gpx-ref.mscx @@ -155,9 +155,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/let-ring.gp-ref.mscx b/src/importexport/guitarpro/tests/data/let-ring.gp-ref.mscx index 6005f09e94579..4e158331cdf7f 100644 --- a/src/importexport/guitarpro/tests/data/let-ring.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/let-ring.gp-ref.mscx @@ -144,9 +144,6 @@ 2 - - end - diff --git a/src/importexport/guitarpro/tests/data/let-ring.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/let-ring.gpx-ref.mscx index 6005f09e94579..4e158331cdf7f 100644 --- a/src/importexport/guitarpro/tests/data/let-ring.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/let-ring.gpx-ref.mscx @@ -144,9 +144,6 @@ 2 - - end - diff --git a/src/importexport/guitarpro/tests/data/line_elements.gp-ref.mscx b/src/importexport/guitarpro/tests/data/line_elements.gp-ref.mscx index bf6f53eb447e0..4ea2566d1c61b 100644 --- a/src/importexport/guitarpro/tests/data/line_elements.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/line_elements.gp-ref.mscx @@ -494,9 +494,6 @@ 1 - - end - @@ -613,9 +610,6 @@ quarter - - end - @@ -847,10 +841,6 @@ measure 4/4 - - end - 1 - @@ -1072,10 +1062,6 @@ measure 4/4 - - end - 1 - @@ -1307,9 +1293,6 @@ 1 - - end - diff --git a/src/importexport/guitarpro/tests/data/mmrest.gp-ref.mscx b/src/importexport/guitarpro/tests/data/mmrest.gp-ref.mscx index 20083a9cf919c..d8d824156a48c 100644 --- a/src/importexport/guitarpro/tests/data/mmrest.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/mmrest.gp-ref.mscx @@ -152,9 +152,6 @@ 0 - - end - diff --git a/src/importexport/guitarpro/tests/data/mordents.gp-ref.mscx b/src/importexport/guitarpro/tests/data/mordents.gp-ref.mscx index a08b32dfc46c4..a3786c23e80fc 100644 --- a/src/importexport/guitarpro/tests/data/mordents.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/mordents.gp-ref.mscx @@ -135,9 +135,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/mordents.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/mordents.gpx-ref.mscx index a08b32dfc46c4..a3786c23e80fc 100644 --- a/src/importexport/guitarpro/tests/data/mordents.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/mordents.gpx-ref.mscx @@ -135,9 +135,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/multivoices.gp-ref.mscx b/src/importexport/guitarpro/tests/data/multivoices.gp-ref.mscx index a00ddfb317481..45a850dae89b8 100644 --- a/src/importexport/guitarpro/tests/data/multivoices.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/multivoices.gp-ref.mscx @@ -290,9 +290,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/multivoices.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/multivoices.gpx-ref.mscx index a00ddfb317481..45a850dae89b8 100644 --- a/src/importexport/guitarpro/tests/data/multivoices.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/multivoices.gpx-ref.mscx @@ -290,9 +290,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/ottava1.gp-ref.mscx b/src/importexport/guitarpro/tests/data/ottava1.gp-ref.mscx index 7714e5215f7e6..6ff5b29414cd0 100644 --- a/src/importexport/guitarpro/tests/data/ottava1.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ottava1.gp-ref.mscx @@ -396,9 +396,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/ottava1.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/ottava1.gpx-ref.mscx index 7714e5215f7e6..6ff5b29414cd0 100644 --- a/src/importexport/guitarpro/tests/data/ottava1.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ottava1.gpx-ref.mscx @@ -396,9 +396,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/ottava2.gp-ref.mscx b/src/importexport/guitarpro/tests/data/ottava2.gp-ref.mscx index e39c8914c1980..741689f38a012 100644 --- a/src/importexport/guitarpro/tests/data/ottava2.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ottava2.gp-ref.mscx @@ -295,9 +295,6 @@ measure 4/4 - - end - @@ -421,9 +418,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/ottava2.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/ottava2.gpx-ref.mscx index 23f7e86600f94..e32f003373571 100644 --- a/src/importexport/guitarpro/tests/data/ottava2.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ottava2.gpx-ref.mscx @@ -295,9 +295,6 @@ measure 4/4 - - end - @@ -421,9 +418,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/ottava3.gp-ref.mscx b/src/importexport/guitarpro/tests/data/ottava3.gp-ref.mscx index 2db85ffd54980..55cb4caa505b9 100644 --- a/src/importexport/guitarpro/tests/data/ottava3.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ottava3.gp-ref.mscx @@ -177,9 +177,6 @@ 1 - - end - @@ -213,9 +210,6 @@ 2 - - end - diff --git a/src/importexport/guitarpro/tests/data/ottava3.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/ottava3.gpx-ref.mscx index 2db85ffd54980..55cb4caa505b9 100644 --- a/src/importexport/guitarpro/tests/data/ottava3.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ottava3.gpx-ref.mscx @@ -177,9 +177,6 @@ 1 - - end - @@ -213,9 +210,6 @@ 2 - - end - diff --git a/src/importexport/guitarpro/tests/data/ottava4.gp-ref.mscx b/src/importexport/guitarpro/tests/data/ottava4.gp-ref.mscx index 4b2305e6d1075..c604795e3d7ff 100644 --- a/src/importexport/guitarpro/tests/data/ottava4.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ottava4.gp-ref.mscx @@ -295,9 +295,6 @@ measure 4/4 - - end - @@ -455,9 +452,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/ottava4.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/ottava4.gpx-ref.mscx index 5b41f4f6e10ad..98d503833f376 100644 --- a/src/importexport/guitarpro/tests/data/ottava4.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ottava4.gpx-ref.mscx @@ -295,9 +295,6 @@ measure 4/4 - - end - @@ -455,9 +452,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/ottava5.gp-ref.mscx b/src/importexport/guitarpro/tests/data/ottava5.gp-ref.mscx index 47f56d7bcdcfd..cd5c6a4914c16 100644 --- a/src/importexport/guitarpro/tests/data/ottava5.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ottava5.gp-ref.mscx @@ -208,9 +208,6 @@ measure 4/4 - - end - @@ -299,9 +296,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/ottava5.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/ottava5.gpx-ref.mscx index 47f56d7bcdcfd..cd5c6a4914c16 100644 --- a/src/importexport/guitarpro/tests/data/ottava5.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/ottava5.gpx-ref.mscx @@ -208,9 +208,6 @@ measure 4/4 - - end - @@ -299,9 +296,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/palm-mute.gp-ref.mscx b/src/importexport/guitarpro/tests/data/palm-mute.gp-ref.mscx index 809b1dd600ebd..ac687e6c1bc39 100644 --- a/src/importexport/guitarpro/tests/data/palm-mute.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/palm-mute.gp-ref.mscx @@ -144,9 +144,6 @@ 2 - - end - diff --git a/src/importexport/guitarpro/tests/data/palm-mute.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/palm-mute.gpx-ref.mscx index 809b1dd600ebd..ac687e6c1bc39 100644 --- a/src/importexport/guitarpro/tests/data/palm-mute.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/palm-mute.gpx-ref.mscx @@ -144,9 +144,6 @@ 2 - - end - diff --git a/src/importexport/guitarpro/tests/data/percussion-beams.gp-ref.mscx b/src/importexport/guitarpro/tests/data/percussion-beams.gp-ref.mscx index 01b5713cd6e69..e23cbae4bc4e9 100644 --- a/src/importexport/guitarpro/tests/data/percussion-beams.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/percussion-beams.gp-ref.mscx @@ -587,9 +587,6 @@ half - - end - diff --git a/src/importexport/guitarpro/tests/data/pick-up-down.gp-ref.mscx b/src/importexport/guitarpro/tests/data/pick-up-down.gp-ref.mscx index fd66694bc8d1f..5a9de7a88e483 100644 --- a/src/importexport/guitarpro/tests/data/pick-up-down.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/pick-up-down.gp-ref.mscx @@ -135,9 +135,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/pick-up-down.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/pick-up-down.gpx-ref.mscx index fd66694bc8d1f..5a9de7a88e483 100644 --- a/src/importexport/guitarpro/tests/data/pick-up-down.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/pick-up-down.gpx-ref.mscx @@ -135,9 +135,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/rasg.gp-ref.mscx b/src/importexport/guitarpro/tests/data/rasg.gp-ref.mscx index af65415d18bd5..2476e7dade35e 100644 --- a/src/importexport/guitarpro/tests/data/rasg.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/rasg.gp-ref.mscx @@ -128,9 +128,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/rasg.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/rasg.gpx-ref.mscx index af65415d18bd5..2476e7dade35e 100644 --- a/src/importexport/guitarpro/tests/data/rasg.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/rasg.gpx-ref.mscx @@ -128,9 +128,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/repeated-bars.gp-ref.mscx b/src/importexport/guitarpro/tests/data/repeated-bars.gp-ref.mscx index 1400c44839ea4..54e946c6ad67b 100644 --- a/src/importexport/guitarpro/tests/data/repeated-bars.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/repeated-bars.gp-ref.mscx @@ -139,9 +139,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/repeated-bars.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/repeated-bars.gpx-ref.mscx index 1400c44839ea4..54e946c6ad67b 100644 --- a/src/importexport/guitarpro/tests/data/repeated-bars.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/repeated-bars.gpx-ref.mscx @@ -139,9 +139,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/rest-centered.gp-ref.mscx b/src/importexport/guitarpro/tests/data/rest-centered.gp-ref.mscx index 6dc7bd5ab6dbb..f40d6d3ee82e7 100644 --- a/src/importexport/guitarpro/tests/data/rest-centered.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/rest-centered.gp-ref.mscx @@ -117,9 +117,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/rest-centered.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/rest-centered.gpx-ref.mscx index 6dc7bd5ab6dbb..f40d6d3ee82e7 100644 --- a/src/importexport/guitarpro/tests/data/rest-centered.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/rest-centered.gpx-ref.mscx @@ -117,9 +117,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/sforzato.gp-ref.mscx b/src/importexport/guitarpro/tests/data/sforzato.gp-ref.mscx index 36a4d5a18ff71..e5efac095f8c3 100644 --- a/src/importexport/guitarpro/tests/data/sforzato.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/sforzato.gp-ref.mscx @@ -122,9 +122,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/sforzato.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/sforzato.gpx-ref.mscx index 95ee6a4a45d70..0f7d9c2129388 100644 --- a/src/importexport/guitarpro/tests/data/sforzato.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/sforzato.gpx-ref.mscx @@ -122,9 +122,6 @@ measure 4/4 - - end - 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 fdc6c54eff78b..296bab3a2b361 100644 --- a/src/importexport/guitarpro/tests/data/shift-slide.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/shift-slide.gp-ref.mscx @@ -139,9 +139,6 @@ quarter - - end - 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 fdc6c54eff78b..296bab3a2b361 100644 --- a/src/importexport/guitarpro/tests/data/shift-slide.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/shift-slide.gpx-ref.mscx @@ -139,9 +139,6 @@ quarter - - end - 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 093a4bd28ba44..e5a5657ae3225 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 @@ -145,9 +145,6 @@ - - end - 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 093a4bd28ba44..e5a5657ae3225 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 @@ -145,9 +145,6 @@ - - end - 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 c47719d2dcf90..8a50dbbfd73e8 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 @@ -145,9 +145,6 @@ - - end - 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 c47719d2dcf90..8a50dbbfd73e8 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 @@ -145,9 +145,6 @@ - - end - 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 3ec7a9089feab..c9ac6174f58d4 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 @@ -145,9 +145,6 @@ - - end - 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 3ec7a9089feab..c9ac6174f58d4 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 @@ -145,9 +145,6 @@ - - end - 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 0fcbe3e46f0de..7b6bd353d69e6 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 @@ -164,9 +164,6 @@ measure 4/4 - - end - 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 0fcbe3e46f0de..7b6bd353d69e6 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 @@ -164,9 +164,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/slur-notes-effect-mask.gp-ref.mscx b/src/importexport/guitarpro/tests/data/slur-notes-effect-mask.gp-ref.mscx index 6d191d0f6fd87..88c6f52a61e42 100644 --- a/src/importexport/guitarpro/tests/data/slur-notes-effect-mask.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur-notes-effect-mask.gp-ref.mscx @@ -298,9 +298,6 @@ 1 - - end - diff --git a/src/importexport/guitarpro/tests/data/slur-notes-effect-mask.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/slur-notes-effect-mask.gpx-ref.mscx index e46369085818e..a78482813f89b 100644 --- a/src/importexport/guitarpro/tests/data/slur-notes-effect-mask.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur-notes-effect-mask.gpx-ref.mscx @@ -298,9 +298,6 @@ 1 - - end - diff --git a/src/importexport/guitarpro/tests/data/slur.gp-ref.mscx b/src/importexport/guitarpro/tests/data/slur.gp-ref.mscx index 734687fc6527a..d4d795d7e2798 100644 --- a/src/importexport/guitarpro/tests/data/slur.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur.gp-ref.mscx @@ -167,9 +167,6 @@ 2 - - end - diff --git a/src/importexport/guitarpro/tests/data/slur.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/slur.gpx-ref.mscx index 734687fc6527a..d4d795d7e2798 100644 --- a/src/importexport/guitarpro/tests/data/slur.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur.gpx-ref.mscx @@ -167,9 +167,6 @@ 2 - - end - diff --git a/src/importexport/guitarpro/tests/data/slur_hammer_slur.gp-ref.mscx b/src/importexport/guitarpro/tests/data/slur_hammer_slur.gp-ref.mscx index 85821474dde33..1047e6b1c6916 100644 --- a/src/importexport/guitarpro/tests/data/slur_hammer_slur.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur_hammer_slur.gp-ref.mscx @@ -178,9 +178,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/slur_hammer_slur.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/slur_hammer_slur.gpx-ref.mscx index 85821474dde33..1047e6b1c6916 100644 --- a/src/importexport/guitarpro/tests/data/slur_hammer_slur.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur_hammer_slur.gpx-ref.mscx @@ -178,9 +178,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/slur_over_3_measures.gp-ref.mscx b/src/importexport/guitarpro/tests/data/slur_over_3_measures.gp-ref.mscx index e286a487eed2a..a7c60c3c329f9 100644 --- a/src/importexport/guitarpro/tests/data/slur_over_3_measures.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur_over_3_measures.gp-ref.mscx @@ -198,9 +198,6 @@ 1 - - end - diff --git a/src/importexport/guitarpro/tests/data/slur_over_3_measures.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/slur_over_3_measures.gpx-ref.mscx index e286a487eed2a..a7c60c3c329f9 100644 --- a/src/importexport/guitarpro/tests/data/slur_over_3_measures.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur_over_3_measures.gpx-ref.mscx @@ -198,9 +198,6 @@ 1 - - end - diff --git a/src/importexport/guitarpro/tests/data/slur_slur_hammer.gp-ref.mscx b/src/importexport/guitarpro/tests/data/slur_slur_hammer.gp-ref.mscx index 423ceaeae4d05..f7b72658c4460 100644 --- a/src/importexport/guitarpro/tests/data/slur_slur_hammer.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur_slur_hammer.gp-ref.mscx @@ -216,9 +216,6 @@ measure 4/4 - - end - diff --git a/src/importexport/guitarpro/tests/data/slur_slur_hammer.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/slur_slur_hammer.gpx-ref.mscx index 423ceaeae4d05..f7b72658c4460 100644 --- a/src/importexport/guitarpro/tests/data/slur_slur_hammer.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur_slur_hammer.gpx-ref.mscx @@ -216,9 +216,6 @@ measure 4/4 - - end - 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 fa948066c45d0..e2cdafd1b0634 100644 --- a/src/importexport/guitarpro/tests/data/slur_voices.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur_voices.gp-ref.mscx @@ -737,9 +737,6 @@ 1 - - end - 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 fa948066c45d0..e2cdafd1b0634 100644 --- a/src/importexport/guitarpro/tests/data/slur_voices.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/slur_voices.gpx-ref.mscx @@ -737,9 +737,6 @@ 1 - - end - diff --git a/src/importexport/guitarpro/tests/data/spanner-in-uncomplete-measure.gp-ref.mscx b/src/importexport/guitarpro/tests/data/spanner-in-uncomplete-measure.gp-ref.mscx index 9126db8a959cc..ce587d0671b44 100644 --- a/src/importexport/guitarpro/tests/data/spanner-in-uncomplete-measure.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/spanner-in-uncomplete-measure.gp-ref.mscx @@ -157,9 +157,6 @@ half - - end - diff --git a/src/importexport/guitarpro/tests/data/tap-slap-pop.gp-ref.mscx b/src/importexport/guitarpro/tests/data/tap-slap-pop.gp-ref.mscx index ce90d663753cc..04a55a1b3241e 100644 --- a/src/importexport/guitarpro/tests/data/tap-slap-pop.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tap-slap-pop.gp-ref.mscx @@ -132,9 +132,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/tap-slap-pop.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/tap-slap-pop.gpx-ref.mscx index ce90d663753cc..04a55a1b3241e 100644 --- a/src/importexport/guitarpro/tests/data/tap-slap-pop.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tap-slap-pop.gpx-ref.mscx @@ -132,9 +132,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/tempo.gp-ref.mscx b/src/importexport/guitarpro/tests/data/tempo.gp-ref.mscx index bb02eec09cb3b..e725f36022088 100644 --- a/src/importexport/guitarpro/tests/data/tempo.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tempo.gp-ref.mscx @@ -222,9 +222,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/tempo.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/tempo.gpx-ref.mscx index 1bf527a9a0eca..18493464011a4 100644 --- a/src/importexport/guitarpro/tests/data/tempo.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tempo.gpx-ref.mscx @@ -222,9 +222,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/text.gp-ref.mscx b/src/importexport/guitarpro/tests/data/text.gp-ref.mscx index 853cc774a634f..d9b07993c47d1 100644 --- a/src/importexport/guitarpro/tests/data/text.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/text.gp-ref.mscx @@ -132,9 +132,6 @@ 1 - - end - diff --git a/src/importexport/guitarpro/tests/data/text.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/text.gpx-ref.mscx index 853cc774a634f..d9b07993c47d1 100644 --- a/src/importexport/guitarpro/tests/data/text.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/text.gpx-ref.mscx @@ -132,9 +132,6 @@ 1 - - end - diff --git a/src/importexport/guitarpro/tests/data/timer.gp-ref.mscx b/src/importexport/guitarpro/tests/data/timer.gp-ref.mscx index bd42a6cc680ec..9f9ac555cba8c 100644 --- a/src/importexport/guitarpro/tests/data/timer.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/timer.gp-ref.mscx @@ -1112,9 +1112,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/timer.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/timer.gpx-ref.mscx index bd42a6cc680ec..9f9ac555cba8c 100644 --- a/src/importexport/guitarpro/tests/data/timer.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/timer.gpx-ref.mscx @@ -1112,9 +1112,6 @@ 4 - - end - diff --git a/src/importexport/guitarpro/tests/data/tremolo-bar.gp-ref.mscx b/src/importexport/guitarpro/tests/data/tremolo-bar.gp-ref.mscx index 58ef602d70d7c..3c9735e6d7221 100644 --- a/src/importexport/guitarpro/tests/data/tremolo-bar.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tremolo-bar.gp-ref.mscx @@ -208,9 +208,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/tremolo-bar.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/tremolo-bar.gpx-ref.mscx index 58ef602d70d7c..3c9735e6d7221 100644 --- a/src/importexport/guitarpro/tests/data/tremolo-bar.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tremolo-bar.gpx-ref.mscx @@ -208,9 +208,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/tremolos.gp-ref.mscx b/src/importexport/guitarpro/tests/data/tremolos.gp-ref.mscx index aa5dd754d12c8..5f8da6eb858e8 100644 --- a/src/importexport/guitarpro/tests/data/tremolos.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tremolos.gp-ref.mscx @@ -138,9 +138,6 @@ r32 - - end - diff --git a/src/importexport/guitarpro/tests/data/tremolos.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/tremolos.gpx-ref.mscx index aa5dd754d12c8..5f8da6eb858e8 100644 --- a/src/importexport/guitarpro/tests/data/tremolos.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tremolos.gpx-ref.mscx @@ -138,9 +138,6 @@ r32 - - end - diff --git a/src/importexport/guitarpro/tests/data/trill.gp-ref.mscx b/src/importexport/guitarpro/tests/data/trill.gp-ref.mscx index f2b8f7294eb9e..202b9befcb793 100644 --- a/src/importexport/guitarpro/tests/data/trill.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/trill.gp-ref.mscx @@ -155,9 +155,6 @@ 5 - - end - diff --git a/src/importexport/guitarpro/tests/data/trill.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/trill.gpx-ref.mscx index f2b8f7294eb9e..202b9befcb793 100644 --- a/src/importexport/guitarpro/tests/data/trill.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/trill.gpx-ref.mscx @@ -155,9 +155,6 @@ 5 - - end - diff --git a/src/importexport/guitarpro/tests/data/tuplet-with-slur.gp-ref.mscx b/src/importexport/guitarpro/tests/data/tuplet-with-slur.gp-ref.mscx index ffe29c67a7724..d43c9b721cf16 100644 --- a/src/importexport/guitarpro/tests/data/tuplet-with-slur.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tuplet-with-slur.gp-ref.mscx @@ -165,9 +165,6 @@ - - end - diff --git a/src/importexport/guitarpro/tests/data/tuplet-with-slur.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/tuplet-with-slur.gpx-ref.mscx index 5ff02ab881771..5e259db4ca9dc 100644 --- a/src/importexport/guitarpro/tests/data/tuplet-with-slur.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tuplet-with-slur.gpx-ref.mscx @@ -165,9 +165,6 @@ - - end - diff --git a/src/importexport/guitarpro/tests/data/tuplets.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/tuplets.gpx-ref.mscx index 8b6bfd95ab770..b625143e7006e 100644 --- a/src/importexport/guitarpro/tests/data/tuplets.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tuplets.gpx-ref.mscx @@ -427,9 +427,6 @@ 2 - - end - diff --git a/src/importexport/guitarpro/tests/data/tuplets2.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/tuplets2.gpx-ref.mscx index 2b9d9ae325f9d..1bc78b1989095 100644 --- a/src/importexport/guitarpro/tests/data/tuplets2.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/tuplets2.gpx-ref.mscx @@ -629,9 +629,6 @@ solo concert quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/turn.gp-ref.mscx b/src/importexport/guitarpro/tests/data/turn.gp-ref.mscx index 2adc1ddfbd44c..25247bc8f4f34 100644 --- a/src/importexport/guitarpro/tests/data/turn.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/turn.gp-ref.mscx @@ -135,9 +135,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/turn.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/turn.gpx-ref.mscx index 2adc1ddfbd44c..25247bc8f4f34 100644 --- a/src/importexport/guitarpro/tests/data/turn.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/turn.gpx-ref.mscx @@ -135,9 +135,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/vibrato.gp-ref.mscx b/src/importexport/guitarpro/tests/data/vibrato.gp-ref.mscx index a9ad6c33ce3b2..13c02dbaa0740 100644 --- a/src/importexport/guitarpro/tests/data/vibrato.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/vibrato.gp-ref.mscx @@ -245,9 +245,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/vibrato.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/vibrato.gpx-ref.mscx index a9ad6c33ce3b2..13c02dbaa0740 100644 --- a/src/importexport/guitarpro/tests/data/vibrato.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/vibrato.gpx-ref.mscx @@ -245,9 +245,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/volta.gp-ref.mscx b/src/importexport/guitarpro/tests/data/volta.gp-ref.mscx index 00d5537fedabc..a7f5e4bce32ac 100644 --- a/src/importexport/guitarpro/tests/data/volta.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/volta.gp-ref.mscx @@ -214,9 +214,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/volta.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/volta.gpx-ref.mscx index 00d5537fedabc..a7f5e4bce32ac 100644 --- a/src/importexport/guitarpro/tests/data/volta.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/volta.gpx-ref.mscx @@ -214,9 +214,6 @@ 3 - - end - 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 1ce61702a3473..63f4b29009a56 100644 --- a/src/importexport/guitarpro/tests/data/volume-swell.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/volume-swell.gp-ref.mscx @@ -114,9 +114,6 @@ quarter - - end - 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 1ce61702a3473..63f4b29009a56 100644 --- a/src/importexport/guitarpro/tests/data/volume-swell.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/volume-swell.gpx-ref.mscx @@ -114,9 +114,6 @@ quarter - - end - diff --git a/src/importexport/guitarpro/tests/data/wah.gp-ref.mscx b/src/importexport/guitarpro/tests/data/wah.gp-ref.mscx index e3e865dc4645b..5a96dc72c2499 100644 --- a/src/importexport/guitarpro/tests/data/wah.gp-ref.mscx +++ b/src/importexport/guitarpro/tests/data/wah.gp-ref.mscx @@ -135,9 +135,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/data/wah.gpx-ref.mscx b/src/importexport/guitarpro/tests/data/wah.gpx-ref.mscx index e3e865dc4645b..5a96dc72c2499 100644 --- a/src/importexport/guitarpro/tests/data/wah.gpx-ref.mscx +++ b/src/importexport/guitarpro/tests/data/wah.gpx-ref.mscx @@ -135,9 +135,6 @@ 3 - - end - diff --git a/src/importexport/guitarpro/tests/guitarpro_tests.cpp b/src/importexport/guitarpro/tests/guitarpro_tests.cpp index d4cf6003aa6e3..9088558b81b85 100644 --- a/src/importexport/guitarpro/tests/guitarpro_tests.cpp +++ b/src/importexport/guitarpro/tests/guitarpro_tests.cpp @@ -740,4 +740,14 @@ TEST_F(GuitarPro_Tests, gpSpannerInUncompleteMeasure) { TEST_F(GuitarPro_Tests, gp5SpannerInUncompleteMeasure) { gpReadTest("spanner-in-uncomplete-measure", "gp5"); } +TEST_F(GuitarPro_Tests, gpBarlineLastMeasure) { + gpReadTest("barline-last-measure", "gp"); +} +TEST_F(GuitarPro_Tests, gpBeamModes) { + gpReadTest("beam-modes", "gp"); +} +TEST_F(GuitarPro_Tests, gpHideRests) { + gpReadTest("hide-rests", "gp"); +} + }