Skip to content

Commit

Permalink
Merge branch 'master' into figuredbass
Browse files Browse the repository at this point in the history 
# Conflicts:
#	include/humlib.h
#	src/humlib.cpp
  • Loading branch information
@WolfgangDrescher
WolfgangDrescher committed Jan 21, 2023
2 parents 8e1c055 + eb7c560 commit fa906a0
Show file tree
Hide file tree
Showing 4 changed files with 527 additions and 84 deletions.
22 changes: 18 additions & 4 deletions include/humlib.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Programmer: Craig Stuart Sapp <[email protected]>
// Creation Date: Sat Aug 8 12:24:49 PDT 2015
// Last Modified: Di 17 Jan 2023 22:03:55 CET
// Last Modified: Sa 21 Jan 2023 09:48:51 CET
// Filename: humlib.h
// URL: https://github.com/craigsapp/humlib/blob/master/include/humlib.h
// Syntax: C++11
Expand Down Expand Up @@ -6613,8 +6613,10 @@ class Tool_deg : public HumTool {
int getSubtokenCount (void) const;

// output options:
static void setShowTies (bool state) { m_showTiesQ = state; }
static void setShowZeros (bool state) { m_showZerosQ = state; }
static void setShowTies (bool state) { m_showTiesQ = state; }
static void setShowZeros (bool state) { m_showZerosQ = state; }
static void setShowOctaves (bool state) { m_octaveQ = state; }
static void setForcedKey (const string& key) { m_forcedKey = key; }

protected: // ScaleDegree class
std::string generateDegDataToken (void) const;
Expand Down Expand Up @@ -6694,6 +6696,8 @@ class Tool_deg : public HumTool {
// ScaleDegree rendering options:
static bool m_showTiesQ;
static bool m_showZerosQ;
static bool m_octaveQ;
static std::string m_forcedKey;
};


Expand Down Expand Up @@ -6729,16 +6733,20 @@ class Tool_deg : public HumTool {

bool isDegAboveLine (HumdrumFile& infile, int lineIndex);
bool isDegArrowLine (HumdrumFile& infile, int lineIndex);
bool isDegBoxLine (HumdrumFile& infile, int lineIndex);
bool isDegCircleLine (HumdrumFile& infile, int lineIndex);
bool isDegColorLine (HumdrumFile& infile, int lineIndex);
bool isDegHatLine (HumdrumFile& infile, int lineIndex);
bool isDegSolfegeLine (HumdrumFile& infile, int lineIndex);
bool isKeyDesignationLine (HumdrumFile& infile, int lineIndex);

void checkAboveStatus (string& value, bool arrowStatus);
void checkArrowStatus (string& value, bool arrowStatus);
void checkBoxStatus (string& value, bool arrowStatus);
void checkCircleStatus (string& value, bool arrowStatus);
void checkColorStatus (string& value, bool arrowStatus);
void checkHatStatus (string& value, bool arrowStatus);
void checkSolfegeStatus (string& value, bool arrowStatus);

void checkKeyDesignationStatus(string& value, int keyDesignationStatus);

Expand Down Expand Up @@ -6775,10 +6783,12 @@ class Tool_deg : public HumTool {

bool m_aboveQ = false; // used with --above option
bool m_arrowQ = false; // used with --arrow option
bool m_boxQ = false; // used with --box option
bool m_circleQ = false; // used with --circle option
bool m_hatQ = false; // used with --hat option
bool m_colorQ = false; // used with --color option
std::string m_color; // used with --color option
bool m_solfegeQ = false; // used with --solfege option

bool m_degOnlyQ = false; // used with -I option
bool m_recipQ = false; // used with -r option
Expand All @@ -6800,21 +6810,25 @@ class Tool_deg : public HumTool {
bool hasDegSpines;
bool foundAboveLine;
bool foundArrowLine;
bool foundBoxLine;
bool foundCircleLine;
bool foundColorLine;
bool foundHatLine;
bool foundKeyDesignationLine;
bool foundSolfegeLine;

InterleavedPrintVariables(void) { clear(); }
void clear(void) {
foundData = false;
hasDegSpines = true;
foundAboveLine = false;
foundArrowLine = false;
foundBoxLine = false;
foundCircleLine = false;
foundColorLine = false;
foundHatLine = false;
foundKeyDesignationLine = false;
foundSolfegeLine = false;
}
};
InterleavedPrintVariables m_ipv;
Expand Down Expand Up @@ -7298,7 +7312,7 @@ class Tool_fb : public HumTool {

string m_spineTracks = ""; // used with -s option
string m_kernTracks = ""; // used with -k option
vector<bool> m_processTrack; // used with -k and -s option
vector<bool> m_selectedKernSpines; // used with -k and -s option

};

Expand Down
18 changes: 16 additions & 2 deletions include/tool-deg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ class Tool_deg : public HumTool {
int getSubtokenCount (void) const;

// output options:
static void setShowTies (bool state) { m_showTiesQ = state; }
static void setShowZeros (bool state) { m_showZerosQ = state; }
static void setShowTies (bool state) { m_showTiesQ = state; }
static void setShowZeros (bool state) { m_showZerosQ = state; }
static void setShowOctaves (bool state) { m_octaveQ = state; }
static void setForcedKey (const string& key) { m_forcedKey = key; }

protected: // ScaleDegree class
std::string generateDegDataToken (void) const;
Expand Down Expand Up @@ -146,6 +148,8 @@ class Tool_deg : public HumTool {
// ScaleDegree rendering options:
static bool m_showTiesQ;
static bool m_showZerosQ;
static bool m_octaveQ;
static std::string m_forcedKey;
};


Expand Down Expand Up @@ -181,16 +185,20 @@ class Tool_deg : public HumTool {

bool isDegAboveLine (HumdrumFile& infile, int lineIndex);
bool isDegArrowLine (HumdrumFile& infile, int lineIndex);
bool isDegBoxLine (HumdrumFile& infile, int lineIndex);
bool isDegCircleLine (HumdrumFile& infile, int lineIndex);
bool isDegColorLine (HumdrumFile& infile, int lineIndex);
bool isDegHatLine (HumdrumFile& infile, int lineIndex);
bool isDegSolfegeLine (HumdrumFile& infile, int lineIndex);
bool isKeyDesignationLine (HumdrumFile& infile, int lineIndex);

void checkAboveStatus (string& value, bool arrowStatus);
void checkArrowStatus (string& value, bool arrowStatus);
void checkBoxStatus (string& value, bool arrowStatus);
void checkCircleStatus (string& value, bool arrowStatus);
void checkColorStatus (string& value, bool arrowStatus);
void checkHatStatus (string& value, bool arrowStatus);
void checkSolfegeStatus (string& value, bool arrowStatus);

void checkKeyDesignationStatus(string& value, int keyDesignationStatus);

Expand Down Expand Up @@ -227,10 +235,12 @@ class Tool_deg : public HumTool {

bool m_aboveQ = false; // used with --above option
bool m_arrowQ = false; // used with --arrow option
bool m_boxQ = false; // used with --box option
bool m_circleQ = false; // used with --circle option
bool m_hatQ = false; // used with --hat option
bool m_colorQ = false; // used with --color option
std::string m_color; // used with --color option
bool m_solfegeQ = false; // used with --solfege option

bool m_degOnlyQ = false; // used with -I option
bool m_recipQ = false; // used with -r option
Expand All @@ -252,21 +262,25 @@ class Tool_deg : public HumTool {
bool hasDegSpines;
bool foundAboveLine;
bool foundArrowLine;
bool foundBoxLine;
bool foundCircleLine;
bool foundColorLine;
bool foundHatLine;
bool foundKeyDesignationLine;
bool foundSolfegeLine;

InterleavedPrintVariables(void) { clear(); }
void clear(void) {
foundData = false;
hasDegSpines = true;
foundAboveLine = false;
foundArrowLine = false;
foundBoxLine = false;
foundCircleLine = false;
foundColorLine = false;
foundHatLine = false;
foundKeyDesignationLine = false;
foundSolfegeLine = false;
}
};
InterleavedPrintVariables m_ipv;
Expand Down
Loading

0 comments on commit fa906a0

Please sign in to comment.