Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[musicxml2hum] Fix missing lines when nowevents includes nonzerodur elements #88

Merged
merged 18 commits into from
Dec 12, 2023
+289 −78
Merged

[musicxml2hum] Fix missing lines when nowevents includes nonzerodur elements #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d91ff19
Fix missing lines when nowevents includes nonzerodur elements
WolfgangDrescher Dec 4, 2023
c271de6
Fix indentation
WolfgangDrescher Dec 4, 2023
05a049b
Fix debug label
WolfgangDrescher Dec 4, 2023
1a01418
Add missing humlib build
WolfgangDrescher Dec 5, 2023
bc9e508
Keep figured bass numbers in correct part
WolfgangDrescher Dec 6, 2023
2aa1161
Prefix m_offsetFiguredBass as member variable
WolfgangDrescher Dec 6, 2023
9d4510c
Allow multiple **fb spines
WolfgangDrescher Dec 6, 2023
7c731dd
Fix m_offsetFiguredBass
WolfgangDrescher Dec 6, 2023
2913851
Improve slash detection
WolfgangDrescher Dec 7, 2023
0ea53e5
Allow `sharp-sharp` as value in figured bass prefix and suffix
WolfgangDrescher Dec 7, 2023
a677b45
Prevent overhanging figured bass numbers
WolfgangDrescher Dec 7, 2023
1d626d8
Improve clearing current figured bass for nowtime
WolfgangDrescher Dec 7, 2023
874e308
Prevent empty data tokens in fb spines
WolfgangDrescher Dec 8, 2023
aeefb59
Handle figured bass without non-zero event
WolfgangDrescher Dec 8, 2023
c03994d
Improve regex to trim whitespaces
WolfgangDrescher Dec 8, 2023
b45e76d
Fix duration of invisible rest tokens in data holes
WolfgangDrescher Dec 8, 2023
d309393
Fix overwriting notes when the staff changes within a voice layer
WolfgangDrescher Dec 12, 2023
7df2873
Keep voice layer in one staff and use RDF**kern above/below signifiers
WolfgangDrescher Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/MxmlEvent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ class MxmlEvent {
void setVoiceNumber (int value);
int getStaffNumber (void) const;
int getStaffIndex (void) const;
int getCrossStaffOffset(void) const;
int getVoiceIndex (int maxvoice = 4) const;
void setStaffNumber (int value);
measure_event_type getType (void) const;
Expand Down
3 changes: 3 additions & 0 deletions include/MxmlPart.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ class MxmlPart {
string getPartAbbr (void) const;
string cleanSpaces (const string& input);
bool hasOrnaments (void) const;

vector<pair<int, int>> getVoiceMapping (void) { return m_voicemapping; };
vector<vector<int>> getStaffVoiceHist (void) { return m_staffvoicehist; };


private:
Expand Down
7 changes: 5 additions & 2 deletions include/tool-musicxml2hum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ class Tool_musicxml2hum : public HumTool {
std::vector<SimultaneousEvents*>& nowevents,
HumNum nowtime,
std::vector<MxmlPart>& partdata);
void handleFiguredBassWithoutNonZeroEvent (std::vector<SimultaneousEvents*>& nowevents, HumNum nowtime);
void appendNonZeroEvents (GridMeasure* outdata,
std::vector<SimultaneousEvents*>& nowevents,
HumNum nowtime,
Expand Down Expand Up @@ -231,12 +232,14 @@ class Tool_musicxml2hum : public HumTool {
bool m_stemsQ = false;
int m_slurabove = 0;
int m_slurbelow = 0;
int m_staffabove = 0;
int m_staffbelow = 0;
char m_hasEditorial = '\0';
bool m_hasOrnamentsQ = false;
int m_maxstaff = 0;
std::vector<std::vector<std::string>> m_last_ottava_direction;
std::vector<MusicXmlHarmonyInfo> offsetHarmony;
std::vector<MusicXmlFiguredBassInfo> offsetFiguredBass;
std::vector<MusicXmlFiguredBassInfo> m_offsetFiguredBass;
std::vector<string> m_stop_char;

// RDF indications in **kern data:
Expand All @@ -249,7 +252,7 @@ class Tool_musicxml2hum : public HumTool {
std::vector<std::vector<pugi::xml_node>> m_current_brackets;
std::map<int, string> m_bracket_type_buffer;
std::vector<std::vector<pugi::xml_node>> m_used_hairpins;
std::vector<pugi::xml_node> m_current_figured_bass;
std::vector<std::vector<pugi::xml_node>> m_current_figured_bass;
std::vector<std::pair<int, pugi::xml_node>> m_current_text;
std::vector<std::pair<int, pugi::xml_node>> m_current_tempo;

Expand Down
Loading