Skip to content

Commit

Permalink
update libmei
Browse files Browse the repository at this point in the history
  • Loading branch information
@rettinghaus
rettinghaus committed Jan 2, 2025
1 parent 0de1bc0 commit 45640f3
Show file tree
Hide file tree
Showing 12 changed files with 367 additions and 374 deletions.
2 changes: 2 additions & 0 deletions libmei/dist/attclasses.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ enum AttClassId {
ATT_CURVATURE,
ATT_CUSTOSLOG,
ATT_DATAPOINTING,
ATT_DATASELECTING,
ATT_DATABLE,
ATT_DISTANCES,
ATT_DOTLOG,
Expand Down Expand Up @@ -242,6 +243,7 @@ enum AttClassId {
ATT_TIMESTAMP2LOG,
ATT_TRANSPOSITION,
ATT_TUNING,
ATT_TUNINGLOG,
ATT_TUPLETPRESENT,
ATT_TYPED,
ATT_TYPOGRAPHY,
Expand Down
212 changes: 31 additions & 181 deletions libmei/dist/attconverter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1739,6 +1739,31 @@ data_GRACE AttConverterBase::StrToGrace(const std::string &value, bool logWarnin
return GRACE_NONE;
}

std::string AttConverterBase::HarppedalpositionToStr(data_HARPPEDALPOSITION data) const
{
std::string value;
switch (data) {
case HARPPEDALPOSITION_f: value = "f"; break;
case HARPPEDALPOSITION_n: value = "n"; break;
case HARPPEDALPOSITION_s: value = "s"; break;
default:
LogWarning("Unknown value '%d' for data.HARPPEDALPOSITION", data);
value = "";
break;
}
return value;
}

data_HARPPEDALPOSITION AttConverterBase::StrToHarppedalposition(const std::string &value, bool logWarning) const
{
if (value == "f") return HARPPEDALPOSITION_f;
if (value == "n") return HARPPEDALPOSITION_n;
if (value == "s") return HARPPEDALPOSITION_s;
if (logWarning && !value.empty())
LogWarning("Unsupported value '%s' for data.HARPPEDALPOSITION", value.c_str());
return HARPPEDALPOSITION_NONE;
}

std::string AttConverterBase::HeadshapeToStr(data_HEADSHAPE data) const
{
std::string value;
Expand Down Expand Up @@ -2856,12 +2881,12 @@ std::string AttConverterBase::NotationtypeToStr(data_NOTATIONTYPE data) const
case NOTATIONTYPE_mensural: value = "mensural"; break;
case NOTATIONTYPE_mensural_black: value = "mensural.black"; break;
case NOTATIONTYPE_mensural_white: value = "mensural.white"; break;
case NOTATIONTYPE_neume: value = "neume"; break;
case NOTATIONTYPE_tab: value = "tab"; break;
case NOTATIONTYPE_tab_guitar: value = "tab.guitar"; break;
case NOTATIONTYPE_tab_lute_french: value = "tab.lute.french"; break;
case NOTATIONTYPE_tab_lute_italian: value = "tab.lute.italian"; break;
case NOTATIONTYPE_tab_lute_german: value = "tab.lute.german"; break;
case NOTATIONTYPE_tab_guitar: value = "tab.guitar"; break;
case NOTATIONTYPE_neume: value = "neume"; break;
case NOTATIONTYPE_tab: value = "tab"; break;
default:
LogWarning("Unknown value '%d' for data.NOTATIONTYPE", data);
value = "";
Expand All @@ -2876,12 +2901,12 @@ data_NOTATIONTYPE AttConverterBase::StrToNotationtype(const std::string &value,
if (value == "mensural") return NOTATIONTYPE_mensural;
if (value == "mensural.black") return NOTATIONTYPE_mensural_black;
if (value == "mensural.white") return NOTATIONTYPE_mensural_white;
if (value == "neume") return NOTATIONTYPE_neume;
if (value == "tab") return NOTATIONTYPE_tab;
if (value == "tab.guitar") return NOTATIONTYPE_tab_guitar;
if (value == "tab.lute.french") return NOTATIONTYPE_tab_lute_french;
if (value == "tab.lute.italian") return NOTATIONTYPE_tab_lute_italian;
if (value == "tab.lute.german") return NOTATIONTYPE_tab_lute_german;
if (value == "tab.guitar") return NOTATIONTYPE_tab_guitar;
if (value == "neume") return NOTATIONTYPE_neume;
if (value == "tab") return NOTATIONTYPE_tab;
if (logWarning && !value.empty())
LogWarning("Unsupported value '%s' for data.NOTATIONTYPE", value.c_str());
return NOTATIONTYPE_NONE;
Expand Down Expand Up @@ -4448,181 +4473,6 @@ harmVis_RENDGRID AttConverterBase::StrToHarmVisRendgrid(const std::string &value
return harmVis_RENDGRID_NONE;
}

std::string AttConverterBase::HarpPedalLogAToStr(harpPedalLog_A data) const
{
std::string value;
switch (data) {
case harpPedalLog_A_f: value = "f"; break;
case harpPedalLog_A_n: value = "n"; break;
case harpPedalLog_A_s: value = "s"; break;
default:
LogWarning("Unknown value '%d' for att.harpPedal.log@a", data);
value = "";
break;
}
return value;
}

harpPedalLog_A AttConverterBase::StrToHarpPedalLogA(const std::string &value, bool logWarning) const
{
if (value == "f") return harpPedalLog_A_f;
if (value == "n") return harpPedalLog_A_n;
if (value == "s") return harpPedalLog_A_s;
if (logWarning && !value.empty())
LogWarning("Unsupported value '%s' for att.harpPedal.log@a", value.c_str());
return harpPedalLog_A_NONE;
}

std::string AttConverterBase::HarpPedalLogBToStr(harpPedalLog_B data) const
{
std::string value;
switch (data) {
case harpPedalLog_B_f: value = "f"; break;
case harpPedalLog_B_n: value = "n"; break;
case harpPedalLog_B_s: value = "s"; break;
default:
LogWarning("Unknown value '%d' for att.harpPedal.log@b", data);
value = "";
break;
}
return value;
}

harpPedalLog_B AttConverterBase::StrToHarpPedalLogB(const std::string &value, bool logWarning) const
{
if (value == "f") return harpPedalLog_B_f;
if (value == "n") return harpPedalLog_B_n;
if (value == "s") return harpPedalLog_B_s;
if (logWarning && !value.empty())
LogWarning("Unsupported value '%s' for att.harpPedal.log@b", value.c_str());
return harpPedalLog_B_NONE;
}

std::string AttConverterBase::HarpPedalLogCToStr(harpPedalLog_C data) const
{
std::string value;
switch (data) {
case harpPedalLog_C_f: value = "f"; break;
case harpPedalLog_C_n: value = "n"; break;
case harpPedalLog_C_s: value = "s"; break;
default:
LogWarning("Unknown value '%d' for att.harpPedal.log@c", data);
value = "";
break;
}
return value;
}

harpPedalLog_C AttConverterBase::StrToHarpPedalLogC(const std::string &value, bool logWarning) const
{
if (value == "f") return harpPedalLog_C_f;
if (value == "n") return harpPedalLog_C_n;
if (value == "s") return harpPedalLog_C_s;
if (logWarning && !value.empty())
LogWarning("Unsupported value '%s' for att.harpPedal.log@c", value.c_str());
return harpPedalLog_C_NONE;
}

std::string AttConverterBase::HarpPedalLogDToStr(harpPedalLog_D data) const
{
std::string value;
switch (data) {
case harpPedalLog_D_f: value = "f"; break;
case harpPedalLog_D_n: value = "n"; break;
case harpPedalLog_D_s: value = "s"; break;
default:
LogWarning("Unknown value '%d' for att.harpPedal.log@d", data);
value = "";
break;
}
return value;
}

harpPedalLog_D AttConverterBase::StrToHarpPedalLogD(const std::string &value, bool logWarning) const
{
if (value == "f") return harpPedalLog_D_f;
if (value == "n") return harpPedalLog_D_n;
if (value == "s") return harpPedalLog_D_s;
if (logWarning && !value.empty())
LogWarning("Unsupported value '%s' for att.harpPedal.log@d", value.c_str());
return harpPedalLog_D_NONE;
}

std::string AttConverterBase::HarpPedalLogEToStr(harpPedalLog_E data) const
{
std::string value;
switch (data) {
case harpPedalLog_E_f: value = "f"; break;
case harpPedalLog_E_n: value = "n"; break;
case harpPedalLog_E_s: value = "s"; break;
default:
LogWarning("Unknown value '%d' for att.harpPedal.log@e", data);
value = "";
break;
}
return value;
}

harpPedalLog_E AttConverterBase::StrToHarpPedalLogE(const std::string &value, bool logWarning) const
{
if (value == "f") return harpPedalLog_E_f;
if (value == "n") return harpPedalLog_E_n;
if (value == "s") return harpPedalLog_E_s;
if (logWarning && !value.empty())
LogWarning("Unsupported value '%s' for att.harpPedal.log@e", value.c_str());
return harpPedalLog_E_NONE;
}

std::string AttConverterBase::HarpPedalLogFToStr(harpPedalLog_F data) const
{
std::string value;
switch (data) {
case harpPedalLog_F_f: value = "f"; break;
case harpPedalLog_F_n: value = "n"; break;
case harpPedalLog_F_s: value = "s"; break;
default:
LogWarning("Unknown value '%d' for att.harpPedal.log@f", data);
value = "";
break;
}
return value;
}

harpPedalLog_F AttConverterBase::StrToHarpPedalLogF(const std::string &value, bool logWarning) const
{
if (value == "f") return harpPedalLog_F_f;
if (value == "n") return harpPedalLog_F_n;
if (value == "s") return harpPedalLog_F_s;
if (logWarning && !value.empty())
LogWarning("Unsupported value '%s' for att.harpPedal.log@f", value.c_str());
return harpPedalLog_F_NONE;
}

std::string AttConverterBase::HarpPedalLogGToStr(harpPedalLog_G data) const
{
std::string value;
switch (data) {
case harpPedalLog_G_f: value = "f"; break;
case harpPedalLog_G_n: value = "n"; break;
case harpPedalLog_G_s: value = "s"; break;
default:
LogWarning("Unknown value '%d' for att.harpPedal.log@g", data);
value = "";
break;
}
return value;
}

harpPedalLog_G AttConverterBase::StrToHarpPedalLogG(const std::string &value, bool logWarning) const
{
if (value == "f") return harpPedalLog_G_f;
if (value == "n") return harpPedalLog_G_n;
if (value == "s") return harpPedalLog_G_s;
if (logWarning && !value.empty())
LogWarning("Unsupported value '%s' for att.harpPedal.log@g", value.c_str());
return harpPedalLog_G_NONE;
}

std::string AttConverterBase::LineLogFuncToStr(lineLog_FUNC data) const
{
std::string value;
Expand Down
24 changes: 3 additions & 21 deletions libmei/dist/attconverter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ class AttConverterBase {
std::string GraceToStr(data_GRACE data) const;
data_GRACE StrToGrace(const std::string &value, bool logWarning = true) const;

std::string HarppedalpositionToStr(data_HARPPEDALPOSITION data) const;
data_HARPPEDALPOSITION StrToHarppedalposition(const std::string &value, bool logWarning = true) const;

std::string HeadshapeToStr(data_HEADSHAPE data) const;
data_HEADSHAPE StrToHeadshape(const std::string &value, bool logWarning = true) const;

Expand Down Expand Up @@ -363,27 +366,6 @@ class AttConverterBase {
std::string HarmVisRendgridToStr(harmVis_RENDGRID data) const;
harmVis_RENDGRID StrToHarmVisRendgrid(const std::string &value, bool logWarning = true) const;

std::string HarpPedalLogAToStr(harpPedalLog_A data) const;
harpPedalLog_A StrToHarpPedalLogA(const std::string &value, bool logWarning = true) const;

std::string HarpPedalLogBToStr(harpPedalLog_B data) const;
harpPedalLog_B StrToHarpPedalLogB(const std::string &value, bool logWarning = true) const;

std::string HarpPedalLogCToStr(harpPedalLog_C data) const;
harpPedalLog_C StrToHarpPedalLogC(const std::string &value, bool logWarning = true) const;

std::string HarpPedalLogDToStr(harpPedalLog_D data) const;
harpPedalLog_D StrToHarpPedalLogD(const std::string &value, bool logWarning = true) const;

std::string HarpPedalLogEToStr(harpPedalLog_E data) const;
harpPedalLog_E StrToHarpPedalLogE(const std::string &value, bool logWarning = true) const;

std::string HarpPedalLogFToStr(harpPedalLog_F data) const;
harpPedalLog_F StrToHarpPedalLogF(const std::string &value, bool logWarning = true) const;

std::string HarpPedalLogGToStr(harpPedalLog_G data) const;
harpPedalLog_G StrToHarpPedalLogG(const std::string &value, bool logWarning = true) const;

std::string LineLogFuncToStr(lineLog_FUNC data) const;
lineLog_FUNC StrToLineLogFunc(const std::string &value, bool logWarning = true) const;

Expand Down
Loading

0 comments on commit 45640f3

Please sign in to comment.