Skip to content

Commit

Permalink
regenerate libmei output
Browse files Browse the repository at this point in the history
  • Loading branch information
@lpugin
lpugin committed Feb 9, 2023
1 parent f0adef5 commit 491841c
Show file tree
Hide file tree
Showing 44 changed files with 1,057 additions and 1,057 deletions.
40 changes: 20 additions & 20 deletions libmei/dist/atts_analytical.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ void AttHarmAnl::ResetHarmAnl()
m_form = harmAnl_FORM_NONE;
}

bool AttHarmAnl::ReadHarmAnl(pugi::xml_node element)
bool AttHarmAnl::ReadHarmAnl(pugi::xml_node element, bool removeAttr)
{
bool hasAttribute = false;
if (element.attribute("form")) {
this->SetForm(StrToHarmAnlForm(element.attribute("form").value()));
element.remove_attribute("form");
if (removeAttr) element.remove_attribute("form");
hasAttribute = true;
}
return hasAttribute;
Expand Down Expand Up @@ -82,12 +82,12 @@ void AttHarmonicFunction::ResetHarmonicFunction()
m_deg = "";
}

bool AttHarmonicFunction::ReadHarmonicFunction(pugi::xml_node element)
bool AttHarmonicFunction::ReadHarmonicFunction(pugi::xml_node element, bool removeAttr)
{
bool hasAttribute = false;
if (element.attribute("deg")) {
this->SetDeg(StrToStr(element.attribute("deg").value()));
element.remove_attribute("deg");
if (removeAttr) element.remove_attribute("deg");
hasAttribute = true;
}
return hasAttribute;
Expand Down Expand Up @@ -126,12 +126,12 @@ void AttIntervalHarmonic::ResetIntervalHarmonic()
m_inth = "";
}

bool AttIntervalHarmonic::ReadIntervalHarmonic(pugi::xml_node element)
bool AttIntervalHarmonic::ReadIntervalHarmonic(pugi::xml_node element, bool removeAttr)
{
bool hasAttribute = false;
if (element.attribute("inth")) {
this->SetInth(StrToStr(element.attribute("inth").value()));
element.remove_attribute("inth");
if (removeAttr) element.remove_attribute("inth");
hasAttribute = true;
}
return hasAttribute;
Expand Down Expand Up @@ -170,12 +170,12 @@ void AttIntervalMelodic::ResetIntervalMelodic()
m_intm = "";
}

bool AttIntervalMelodic::ReadIntervalMelodic(pugi::xml_node element)
bool AttIntervalMelodic::ReadIntervalMelodic(pugi::xml_node element, bool removeAttr)
{
bool hasAttribute = false;
if (element.attribute("intm")) {
this->SetIntm(StrToStr(element.attribute("intm").value()));
element.remove_attribute("intm");
if (removeAttr) element.remove_attribute("intm");
hasAttribute = true;
}
return hasAttribute;
Expand Down Expand Up @@ -214,12 +214,12 @@ void AttKeySigAnl::ResetKeySigAnl()
m_mode = MODE_NONE;
}

bool AttKeySigAnl::ReadKeySigAnl(pugi::xml_node element)
bool AttKeySigAnl::ReadKeySigAnl(pugi::xml_node element, bool removeAttr)
{
bool hasAttribute = false;
if (element.attribute("mode")) {
this->SetMode(StrToMode(element.attribute("mode").value()));
element.remove_attribute("mode");
if (removeAttr) element.remove_attribute("mode");
hasAttribute = true;
}
return hasAttribute;
Expand Down Expand Up @@ -260,22 +260,22 @@ void AttKeySigDefaultAnl::ResetKeySigDefaultAnl()
m_keyPname = PITCHNAME_NONE;
}

bool AttKeySigDefaultAnl::ReadKeySigDefaultAnl(pugi::xml_node element)
bool AttKeySigDefaultAnl::ReadKeySigDefaultAnl(pugi::xml_node element, bool removeAttr)
{
bool hasAttribute = false;
if (element.attribute("key.accid")) {
this->SetKeyAccid(StrToAccidentalGestural(element.attribute("key.accid").value()));
element.remove_attribute("key.accid");
if (removeAttr) element.remove_attribute("key.accid");
hasAttribute = true;
}
if (element.attribute("key.mode")) {
this->SetKeyMode(StrToMode(element.attribute("key.mode").value()));
element.remove_attribute("key.mode");
if (removeAttr) element.remove_attribute("key.mode");
hasAttribute = true;
}
if (element.attribute("key.pname")) {
this->SetKeyPname(StrToPitchname(element.attribute("key.pname").value()));
element.remove_attribute("key.pname");
if (removeAttr) element.remove_attribute("key.pname");
hasAttribute = true;
}
return hasAttribute;
Expand Down Expand Up @@ -332,12 +332,12 @@ void AttMelodicFunction::ResetMelodicFunction()
m_mfunc = MELODICFUNCTION_NONE;
}

bool AttMelodicFunction::ReadMelodicFunction(pugi::xml_node element)
bool AttMelodicFunction::ReadMelodicFunction(pugi::xml_node element, bool removeAttr)
{
bool hasAttribute = false;
if (element.attribute("mfunc")) {
this->SetMfunc(StrToMelodicfunction(element.attribute("mfunc").value()));
element.remove_attribute("mfunc");
if (removeAttr) element.remove_attribute("mfunc");
hasAttribute = true;
}
return hasAttribute;
Expand Down Expand Up @@ -376,12 +376,12 @@ void AttPitchClass::ResetPitchClass()
m_pclass = MEI_UNSET;
}

bool AttPitchClass::ReadPitchClass(pugi::xml_node element)
bool AttPitchClass::ReadPitchClass(pugi::xml_node element, bool removeAttr)
{
bool hasAttribute = false;
if (element.attribute("pclass")) {
this->SetPclass(StrToInt(element.attribute("pclass").value()));
element.remove_attribute("pclass");
if (removeAttr) element.remove_attribute("pclass");
hasAttribute = true;
}
return hasAttribute;
Expand Down Expand Up @@ -420,12 +420,12 @@ void AttSolfa::ResetSolfa()
m_psolfa = "";
}

bool AttSolfa::ReadSolfa(pugi::xml_node element)
bool AttSolfa::ReadSolfa(pugi::xml_node element, bool removeAttr)
{
bool hasAttribute = false;
if (element.attribute("psolfa")) {
this->SetPsolfa(StrToStr(element.attribute("psolfa").value()));
element.remove_attribute("psolfa");
if (removeAttr) element.remove_attribute("psolfa");
hasAttribute = true;
}
return hasAttribute;
Expand Down
18 changes: 9 additions & 9 deletions libmei/dist/atts_analytical.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class AttHarmAnl : public Att {
void ResetHarmAnl();

/** Read the values for the attribute class **/
bool ReadHarmAnl(pugi::xml_node element);
bool ReadHarmAnl(pugi::xml_node element, bool removeAttr = true);

/** Write the values for the attribute class **/
bool WriteHarmAnl(pugi::xml_node element);
Expand Down Expand Up @@ -73,7 +73,7 @@ class AttHarmonicFunction : public Att {
void ResetHarmonicFunction();

/** Read the values for the attribute class **/
bool ReadHarmonicFunction(pugi::xml_node element);
bool ReadHarmonicFunction(pugi::xml_node element, bool removeAttr = true);

/** Write the values for the attribute class **/
bool WriteHarmonicFunction(pugi::xml_node element);
Expand Down Expand Up @@ -114,7 +114,7 @@ class AttIntervalHarmonic : public Att {
void ResetIntervalHarmonic();

/** Read the values for the attribute class **/
bool ReadIntervalHarmonic(pugi::xml_node element);
bool ReadIntervalHarmonic(pugi::xml_node element, bool removeAttr = true);

/** Write the values for the attribute class **/
bool WriteIntervalHarmonic(pugi::xml_node element);
Expand Down Expand Up @@ -149,7 +149,7 @@ class AttIntervalMelodic : public Att {
void ResetIntervalMelodic();

/** Read the values for the attribute class **/
bool ReadIntervalMelodic(pugi::xml_node element);
bool ReadIntervalMelodic(pugi::xml_node element, bool removeAttr = true);

/** Write the values for the attribute class **/
bool WriteIntervalMelodic(pugi::xml_node element);
Expand Down Expand Up @@ -189,7 +189,7 @@ class AttKeySigAnl : public Att {
void ResetKeySigAnl();

/** Read the values for the attribute class **/
bool ReadKeySigAnl(pugi::xml_node element);
bool ReadKeySigAnl(pugi::xml_node element, bool removeAttr = true);

/** Write the values for the attribute class **/
bool WriteKeySigAnl(pugi::xml_node element);
Expand Down Expand Up @@ -224,7 +224,7 @@ class AttKeySigDefaultAnl : public Att {
void ResetKeySigDefaultAnl();

/** Read the values for the attribute class **/
bool ReadKeySigDefaultAnl(pugi::xml_node element);
bool ReadKeySigDefaultAnl(pugi::xml_node element, bool removeAttr = true);

/** Write the values for the attribute class **/
bool WriteKeySigDefaultAnl(pugi::xml_node element);
Expand Down Expand Up @@ -274,7 +274,7 @@ class AttMelodicFunction : public Att {
void ResetMelodicFunction();

/** Read the values for the attribute class **/
bool ReadMelodicFunction(pugi::xml_node element);
bool ReadMelodicFunction(pugi::xml_node element, bool removeAttr = true);

/** Write the values for the attribute class **/
bool WriteMelodicFunction(pugi::xml_node element);
Expand Down Expand Up @@ -309,7 +309,7 @@ class AttPitchClass : public Att {
void ResetPitchClass();

/** Read the values for the attribute class **/
bool ReadPitchClass(pugi::xml_node element);
bool ReadPitchClass(pugi::xml_node element, bool removeAttr = true);

/** Write the values for the attribute class **/
bool WritePitchClass(pugi::xml_node element);
Expand Down Expand Up @@ -344,7 +344,7 @@ class AttSolfa : public Att {
void ResetSolfa();

/** Read the values for the attribute class **/
bool ReadSolfa(pugi::xml_node element);
bool ReadSolfa(pugi::xml_node element, bool removeAttr = true);

/** Write the values for the attribute class **/
bool WriteSolfa(pugi::xml_node element);
Expand Down
Loading

0 comments on commit 491841c

Please sign in to comment.