Extend MusicXML color support #19132

rettinghaus · 2023-08-22T15:15:55Z

This PR brings a major update to MusicXML support. Focusing on color, it brings some other addition and fixes.

Color support in detail:

color import/export for accidentals
color import/export for articulations
color import/export for barlines
color import/export for clefs
color import/export for fermatas
color import/export for figured bass
color import/export for hairpins
color import/export for keys
color import/export for ornaments
color import/export for pedal lines
color import/export for slurs and ties
color import/export for time signatures
color import/export for voltas
color export for arpeggios
color export for breath marks and caesuras
color export for chord symbols
color export for dynamics
color export for fingerings
color export for metronome
color export for rehearsal marks
color export for text lines
color export for tremolo
color export for jumps and markers

Further improvements:

import/export of curlew fermata
import/export of tuplet placement
improve import/export of barlines
improve import/export of accidental brackets
improve pedal style
improve figured bass
unify tie and slur handling
export WideDashed line style
export circled rehearsal marks
fix color for glissandos and slides
fix export of tempo change lines
fix export of dynamics extenders
new tests added

Fixes #17841

Also addresses most of #18159 (except for special text).
Also addresses cresc./dim. line issue from #18158.

src/importexport/musicxml/internal/musicxml/exportxml.cpp

Backport of musescore#19132 (plus another small change for articulations placement above/below)

RomanPudashkin · 2023-08-24T08:07:25Z

Please rebase your PR. There should only be one commit. Thanks!

rettinghaus · 2023-08-24T09:39:20Z

@RomanPudashkin done.

src/importexport/musicxml/internal/musicxml/exportxml.cpp

Backport of musescore#19132 (plus another small change for articulations placement above/below) * add color to hairpins * add color to ornaments * add color to slurs and ties * add color to fermata * add color to glissandos * add color to accidentals * add color to articulations * export accidental brackets

src/importexport/musicxml/internal/musicxml/exportxml.cpp

src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp

src/importexport/musicxml/internal/musicxml/exportxml.cpp

Jojo-Schmitz · 2023-08-30T13:38:15Z

I believe a unit- and/or vtest is needed

Backport of musescore#19132 (plus another small change for articulations placement above/below) * add color for textlines * add color to ornaments * add color to slurs and ties * add color to fermata * add color to hairpins * add color to accidentals * add color to articulations * export accidental brackets * fix color for glissandos

Backport of musescore#19132 (plus another small change for articulations placement above/below) * add color to breath marks and caesuras (+, export only) * impove/extend breath marks and caesuras ex- and import (+) * add color to chord symbols(+) * add color to arpeggios (+) * add color to pedal lines (+) * add color to voltas (+) * add color to textlines (+) * add color to dynamics (+) * import accidental brackets (+) add color, placement(?) and visibility to figured bass add color to ornaments add color to slurs and ties add color to fermata add color to hairpins add color to clef add color to time signature add color to accidentals add color to articulations export accidental brackets fix color for glissando unify tie and slur handling add tuplet placement add import of key color add tuplet placement also export WideDashed accidental-mark on ornament add color to ending add placement to accidental-mark color on trill-mark add color to octave import ending color add textline color export appearance pedal color import add support for curlew bracket color only at start import/export barline color export fingering color add another barlines test add missing spannerStop for tempo change export metronome and rehearsal color tuplet color hairpintext color don't export invisible line add color export test improve figured bass import (not yet export) Also fixes musescore#17841 (for 3.x)

src/importexport/musicxml/tests/musicxml_tests.cpp

Backport of musescore#19132 (plus another small change for articulations placement above/below) * add color to breath marks and caesuras (+, export only) * impove/extend breath marks and caesuras ex- and import (+) * add color to chord symbols(+) * add color to arpeggios (+) * add color to pedal lines (+) * add color to voltas (+) * add color to textlines (+) * add color to dynamics (+) * import accidental brackets (+) add color, placement(?) and visibility to figured bass add color to ornaments add color to slurs and ties add color to fermata add color to hairpins add color to clef add color to time signature add color to accidentals add color to articulations export accidental brackets fix color for glissando unify tie and slur handling add tuplet placement add import of key color add tuplet placement also export WideDashed accidental-mark on ornament add color to ending add placement to accidental-mark color on trill-mark add color to octave import ending color add textline color export appearance pedal color import add support for curlew bracket color only at start import/export barline color export fingering color add another barlines test add missing spannerStop for tempo change export metronome and rehearsal color tuplet color hairpintext color don't export invisible line add color export test improve figured bass import (not yet export) Also fixes musescore#17841 (for 3.x)

add color to ornaments add color to slurs and ties add color to fermata add color to hairpins add color to clef add color to time signature add color to accidentals add color to articulations export accidental brackets fix color for glissando unify tie and slur handling add tuplet placement add import of key color add tuplet placement also export WideDashed accidental-mark on ornament add color to ending add placement to accidental-mark color on trill-mark add color to octave import ending color add textline color export appearance pedal color import add support for curlew bracket color only at start export system dividers import/export barline color export fingering color add another barlines test add missing spannerStop for tempo change export metronome and rehearsal color tuplet color hairpintext color don't export invisible line add color tests improve figured bass import/export export circled rehearsal marks add color export to jumps and markers

Backport of musescore#19132 (plus another small change for articulations placement above/below) * add color to breath marks and caesuras (+, export only) * impove/extend breath marks and caesuras ex- and import (+) * add color to chord symbols(+) * add color to arpeggios (+) * add color to pedal lines (+) * add color to voltas (+) * add color to textlines (+) * add color to dynamics (+) * import accidental brackets (+) add color, placement(?) and visibility to figured bass add color to ornaments add color to slurs and ties add color to fermata add color to hairpins add color to clef add color to time signature add color to accidentals add color to articulations export accidental brackets fix color for glissando unify tie and slur handling add tuplet placement add import of key color add tuplet placement also export WideDashed accidental-mark on ornament add color to ending add placement to accidental-mark color on trill-mark add color to octave import ending color add textline color export appearance pedal color import add support for curlew bracket color only at start import/export barline color export fingering color add another barlines test add missing spannerStop for tempo change export metronome and rehearsal color tuplet color hairpintext color don't export invisible line add color export test improve figured bass import (not yet export) Also fixes musescore#17841 (for 3.x)

…arlines Backport of musescore#20213 (Needs a part from musescore#19132, the curlew export)

Backport of musescore#20213 (Needs a part from musescore#19132, the curlew export)

Backport of musescore#20248 Plus a part from musescore#19132

Backport of musescore#19132 (plus another small change for articulations placement above/below) * add color to breath marks and caesuras (+, export only) * impove/extend breath marks and caesuras ex- and import (+) * add color to chord symbols(+) * add color to arpeggios (+) * add color to pedal lines (+) * add color to voltas (+) * add color to textlines (+) * add color to dynamics (+) * import accidental brackets (+) add color, placement(?) and visibility to figured bass add color to ornaments add color to slurs and ties add color to fermata add color to hairpins add color to clef add color to time signature add color to accidentals add color to articulations export accidental brackets fix color for glissando unify tie and slur handling add tuplet placement add import of key color add tuplet placement also export WideDashed accidental-mark on ornament add color to ending add placement to accidental-mark color on trill-mark add color to octave import ending color add textline color export appearance pedal color import add support for curlew bracket color only at start import/export barline color export fingering color add another barlines test add missing spannerStop for tempo change export metronome and rehearsal color tuplet color hairpintext color don't export invisible line add color export test improve figured bass import (not yet export) Also fixes musescore#17841 (for 3.x)

Backport of musescore#20248 Plus a bit from musescore#19132, those changes to exportxml.cpp (the rest is to follow later

Backport of musescore#19132 (plus another small change for articulations placement above/below) * add color to breath marks and caesuras (+, export only) * impove/extend breath marks and caesuras ex- and import (+) * add color to chord symbols(+) * add color to arpeggios (+) * add color to pedal lines (+) * add color to voltas (+) * add color to textlines (+) * add color to dynamics (+) * import accidental brackets (+) add color, placement(?) and visibility to figured bass add color to ornaments add color to slurs and ties add color to fermata add color to hairpins add color to clef add color to time signature add color to accidentals add color to articulations export accidental brackets fix color for glissando unify tie and slur handling add tuplet placement add import of key color add tuplet placement also export WideDashed accidental-mark on ornament add color to ending add placement to accidental-mark color on trill-mark add color to octave import ending color add textline color export appearance pedal color import add support for curlew bracket color only at start import/export barline color export fingering color add another barlines test add missing spannerStop for tempo change export metronome and rehearsal color tuplet color hairpintext color don't export invisible line add color export test improve figured bass import (not yet export) Also fixes musescore#17841 (for 3.x)

Backport of musescore#19132 (plus another small change for articulations placement above/below)add color to ornaments add color to slurs and ties add color to fermata add color to hairpins add color to clef add color to time signature add color to accidentals add color to articulations export accidental brackets fix color for glissando unify tie and slur handling add tuplet placement add import of key color add tuplet placement also export WideDashed accidental-mark on ornament add color to ending add placement to accidental-mark color on trill-mark add color to octave import ending color add textline color export appearance pedal color import add support for curlew bracket color only at start export system dividers import/export barline color export fingering color add another barlines test add missing spannerStop for tempo change export metronome and rehearsal color tuplet color hairpintext color don't export invisible line add color tests improve figured bass import/export export circled rehearsal marks add color export to jumps and markers

Backport of musescore#20213 (Needs a part from musescore#19132, the curlew export)

rettinghaus changed the title ~~Xmlcolors~~ Extends MusicXML color support Aug 22, 2023

rettinghaus changed the title ~~Extends MusicXML color support~~ Extend MusicXML color support Aug 22, 2023

Jojo-Schmitz reviewed Aug 22, 2023

View reviewed changes

src/importexport/musicxml/internal/musicxml/exportxml.cpp Outdated Show resolved Hide resolved

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 23, 2023

Extend MusicXML color support

ffcccaa

Backport of musescore#19132 (plus another small change for articulations placement above/below)

Jojo-Schmitz mentioned this pull request Aug 23, 2023

Extend MusicXML color support Jojo-Schmitz/MuseScore#159

Merged

RomanPudashkin requested a review from oktophonie August 24, 2023 08:07

rettinghaus force-pushed the xmlcolors branch from 510432d to 122cf19 Compare August 24, 2023 09:38

RomanPudashkin approved these changes Aug 24, 2023

View reviewed changes

rettinghaus force-pushed the xmlcolors branch 2 times, most recently from 257e2c8 to 1161931 Compare August 30, 2023 09:33

Jojo-Schmitz reviewed Aug 30, 2023

View reviewed changes

src/importexport/musicxml/internal/musicxml/exportxml.cpp Outdated Show resolved Hide resolved

Jojo-Schmitz reviewed Aug 30, 2023

View reviewed changes

src/importexport/musicxml/internal/musicxml/exportxml.cpp Outdated Show resolved Hide resolved

rettinghaus force-pushed the xmlcolors branch from 1161931 to 8f71160 Compare August 30, 2023 12:01

Jojo-Schmitz reviewed Aug 30, 2023

View reviewed changes

src/importexport/musicxml/internal/musicxml/exportxml.cpp Outdated Show resolved Hide resolved

Jojo-Schmitz reviewed Aug 30, 2023

View reviewed changes

src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp Show resolved Hide resolved

rettinghaus force-pushed the xmlcolors branch from 8f71160 to 8d17d9a Compare August 30, 2023 12:12

Jojo-Schmitz reviewed Aug 30, 2023

View reviewed changes

src/importexport/musicxml/internal/musicxml/exportxml.cpp Outdated Show resolved Hide resolved

rettinghaus force-pushed the xmlcolors branch 2 times, most recently from 5b45d56 to b551856 Compare November 16, 2023 15:35

oktophonie approved these changes Nov 20, 2023

View reviewed changes

RomanPudashkin reviewed Nov 20, 2023

View reviewed changes

src/importexport/musicxml/tests/musicxml_tests.cpp Outdated Show resolved Hide resolved

rettinghaus force-pushed the xmlcolors branch from f404502 to 39bb06c Compare November 20, 2023 10:23

RomanPudashkin approved these changes Nov 20, 2023

View reviewed changes

RomanPudashkin merged commit 2aa3bbe into musescore:master Nov 20, 2023
11 checks passed

rettinghaus deleted the xmlcolors branch November 20, 2023 12:32

This was referenced Nov 20, 2023

[Musicxml export] - Better pedal export #18159

Closed

[Musicxml Export] - Textline without line still exports line #18158

Closed

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Nov 27, 2023

Fix GH musescore#19770: Add missing MusicXML import for fermatas on b…

a2dc1ae

…arlines Backport of musescore#20213 (Needs a part from musescore#19132, the curlew export)

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Nov 28, 2023

Fix GH#19770: Add missing MusicXML import for fermatas on barlines

274c876

Backport of musescore#20213 (Needs a part from musescore#19132, the curlew export)

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Nov 29, 2023

Fix GH#9186: Prevent merging articulations on xml import

88ec312

Backport of musescore#20248 Plus a part from musescore#19132

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Dec 2, 2023

Fix GH#9186: Prevent merging articulations on xml import

fb52366

Backport of musescore#20248 Plus a bit from musescore#19132, those changes to exportxml.cpp (the rest is to follow later

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Dec 2, 2023

Fix GH#9186: Prevent merging articulations on xml import

1f42494

Backport of musescore#20248 Plus a bit from musescore#19132, those changes to exportxml.cpp (the rest is to follow later

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Dec 2, 2023

Fix GH#9186: Prevent merging articulations on xml import

a30c73d

Backport of musescore#20248 Plus a bit from musescore#19132, those changes to exportxml.cpp (the rest is to follow later

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Dec 2, 2023

Fix GH#19770: Add missing MusicXML import for fermatas on barlines

490cfcf

Backport of musescore#20213 (Needs a part from musescore#19132, the curlew export)

rettinghaus mentioned this pull request Jan 11, 2024

MusicXML: Export color of group-symbol #20952

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extend MusicXML color support #19132

Extend MusicXML color support #19132

rettinghaus commented Aug 22, 2023 •

edited

Loading

RomanPudashkin commented Aug 24, 2023

rettinghaus commented Aug 24, 2023

Jojo-Schmitz commented Aug 30, 2023 •

edited

Loading

Extend MusicXML color support #19132

Extend MusicXML color support #19132

Conversation

rettinghaus commented Aug 22, 2023 • edited Loading

RomanPudashkin commented Aug 24, 2023

rettinghaus commented Aug 24, 2023

Jojo-Schmitz commented Aug 30, 2023 • edited Loading

rettinghaus commented Aug 22, 2023 •

edited

Loading

Jojo-Schmitz commented Aug 30, 2023 •

edited

Loading