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

[myank] Fix insertZerothMeasure and allow line yank for anacruses #84

Merged
merged 5 commits into from
Dec 12, 2023
Merged

[myank] Fix insertZerothMeasure and allow line yank for anacruses #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49df9b1
Fix insertZerothMeasure
WolfgangDrescher Nov 13, 2023
70938a6
Set default measure number in analyzeBarNumbers to 0
WolfgangDrescher Nov 13, 2023
214b51a
Merge branch 'master' into myank
WolfgangDrescher Nov 13, 2023
8310dab
Merge branch 'master' into myank
WolfgangDrescher Nov 30, 2023
83d17e1
Allow `myank -l` when there are no measure numbers
WolfgangDrescher Nov 30, 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
22 changes: 16 additions & 6 deletions min/humlib.cpp
View file
Open in desktop
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 28 Nov 2023 10:52:29 CET
// Last Modified: Do 30 Nov 2023 12:59:09 CET
// Filename: min/humlib.cpp
// URL: https://github.com/craigsapp/humlib/blob/master/min/humlib.cpp
// Syntax: C++11
Expand Down Expand Up @@ -104422,7 +104422,7 @@ void Tool_myank::processFile(HumdrumFile& infile) {
vector<int> Tool_myank::analyzeBarNumbers(HumdrumFile& infile) {
vector<int> m_barnum;
m_barnum.resize(infile.getLineCount());
int current = -1;
int current = 0;
HumRegex hre;
for (int i=0; i<infile.getLineCount(); i++) {
if (!infile[i].isBarline()) {
Expand Down Expand Up @@ -106021,6 +106021,15 @@ void Tool_myank::getMeasureStartStop(vector<MeasureInfo>& measurelist, HumdrumFi
measurelist.push_back(current);
}

// allow "myank -l" when there are no measure numbers
if (getBoolean("lines") && measurelist.size() == 0) {
current.clear();
current.num = 0;
current.start = 0;
current.stop = dataend;
current.file = &infile;
measurelist.push_back(current);
}

}

Expand Down Expand Up @@ -106128,7 +106137,7 @@ void Tool_myank::insertZerothMeasure(vector<MeasureInfo>& measurelist,
int startline = -1;
int stopline = -1;
int i;
for (i=9; i<infile.getLineCount(); i++) {
for (i=0; i<infile.getLineCount(); i++) {
if ((exinterpline < 0) && infile[i].isInterpretation()) {
exinterpline = i;
}
Expand Down Expand Up @@ -106158,9 +106167,10 @@ void Tool_myank::insertZerothMeasure(vector<MeasureInfo>& measurelist,
MeasureInfo current;
current.clear();
current.num = 0;
// current.start = startline;
current.start = exinterpline+1;
current.start = startline;
// current.start = exinterpline+1;
current.stop = stopline;
current.file = &infile;
measurelist.push_back(current);
}

Expand Down Expand Up @@ -106188,7 +106198,7 @@ void Tool_myank::expandMeasureOutList(vector<MeasureInfo>& measureout,
minmeasure = measurein[i].num;
}
}
if (maxmeasure <= 0) {
if (maxmeasure <= 0 && !getBoolean("lines")) {
cerr << "Error: There are no measure numbers present in the data" << endl;
exit(1);
}
Expand Down
2 changes: 1 addition & 1 deletion min/humlib.h
View file
Open in desktop
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 28 Nov 2023 10:52:29 CET
// Last Modified: Do 30 Nov 2023 12:59:09 CET
// Filename: min/humlib.h
// URL: https://github.com/craigsapp/humlib/blob/master/min/humlib.h
// Syntax: C++11
Expand Down
20 changes: 15 additions & 5 deletions src/tool-myank.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ void Tool_myank::processFile(HumdrumFile& infile) {
vector<int> Tool_myank::analyzeBarNumbers(HumdrumFile& infile) {
vector<int> m_barnum;
m_barnum.resize(infile.getLineCount());
int current = -1;
int current = 0;
HumRegex hre;
for (int i=0; i<infile.getLineCount(); i++) {
if (!infile[i].isBarline()) {
Expand Down Expand Up @@ -1925,6 +1925,15 @@ void Tool_myank::getMeasureStartStop(vector<MeasureInfo>& measurelist, HumdrumFi
measurelist.push_back(current);
}

// allow "myank -l" when there are no measure numbers
if (getBoolean("lines") && measurelist.size() == 0) {
current.clear();
current.num = 0;
current.start = 0;
current.stop = dataend;
current.file = &infile;
measurelist.push_back(current);
}

}

Expand Down Expand Up @@ -2032,7 +2041,7 @@ void Tool_myank::insertZerothMeasure(vector<MeasureInfo>& measurelist,
int startline = -1;
int stopline = -1;
int i;
for (i=9; i<infile.getLineCount(); i++) {
for (i=0; i<infile.getLineCount(); i++) {
if ((exinterpline < 0) && infile[i].isInterpretation()) {
exinterpline = i;
}
Expand Down Expand Up @@ -2062,9 +2071,10 @@ void Tool_myank::insertZerothMeasure(vector<MeasureInfo>& measurelist,
MeasureInfo current;
current.clear();
current.num = 0;
// current.start = startline;
current.start = exinterpline+1;
current.start = startline;
// current.start = exinterpline+1;
current.stop = stopline;
current.file = &infile;
measurelist.push_back(current);
}

Expand Down Expand Up @@ -2092,7 +2102,7 @@ void Tool_myank::expandMeasureOutList(vector<MeasureInfo>& measureout,
minmeasure = measurein[i].num;
}
}
if (maxmeasure <= 0) {
if (maxmeasure <= 0 && !getBoolean("lines")) {
cerr << "Error: There are no measure numbers present in the data" << endl;
exit(1);
}
Expand Down