diff --git a/libmei/datatypes.yml b/libmei/datatypes.yml
index 4586cc27674..165866c920e 100644
--- a/libmei/datatypes.yml
+++ b/libmei/datatypes.yml
@@ -187,11 +187,6 @@ defaults:
data_STAFFREL()
modules:
- cmn:
- att.bracketSpan.log:
- func:
- type: bracketSpanLog_FUNC
-
externalsymbols:
att.extsym:
glyphnum:
diff --git a/libmei/dist/attconverter.cpp b/libmei/dist/attconverter.cpp
index d97e5b5a880..513853fcca7 100644
--- a/libmei/dist/attconverter.cpp
+++ b/libmei/dist/attconverter.cpp
@@ -3994,6 +3994,9 @@ std::string AttConverterBase::BracketSpanLogFuncToStr(bracketSpanLog_FUNC data)
case bracketSpanLog_FUNC_coloration: value = "coloration"; break;
case bracketSpanLog_FUNC_cross_rhythm: value = "cross-rhythm"; break;
case bracketSpanLog_FUNC_ligature: value = "ligature"; break;
+ case bracketSpanLog_FUNC_analytical: value = "analytical"; break;
+ case bracketSpanLog_FUNC_phrase: value = "phrase"; break;
+ case bracketSpanLog_FUNC_uspecified: value = "uspecified"; break;
default:
LogWarning("Unknown value '%d' for att.bracketSpan.log@func", data);
value = "";
@@ -4007,6 +4010,9 @@ bracketSpanLog_FUNC AttConverterBase::StrToBracketSpanLogFunc(const std::string
if (value == "coloration") return bracketSpanLog_FUNC_coloration;
if (value == "cross-rhythm") return bracketSpanLog_FUNC_cross_rhythm;
if (value == "ligature") return bracketSpanLog_FUNC_ligature;
+ if (value == "analytical") return bracketSpanLog_FUNC_analytical;
+ if (value == "phrase") return bracketSpanLog_FUNC_phrase;
+ if (value == "uspecified") return bracketSpanLog_FUNC_uspecified;
if (logWarning && !value.empty())
LogWarning("Unsupported value '%s' for att.bracketSpan.log@func", value.c_str());
return bracketSpanLog_FUNC_NONE;
diff --git a/libmei/dist/atttypes.h b/libmei/dist/atttypes.h
index 7d15953404c..89c73a8369b 100644
--- a/libmei/dist/atttypes.h
+++ b/libmei/dist/atttypes.h
@@ -1872,6 +1872,9 @@ enum bracketSpanLog_FUNC : int8_t {
bracketSpanLog_FUNC_coloration,
bracketSpanLog_FUNC_cross_rhythm,
bracketSpanLog_FUNC_ligature,
+ bracketSpanLog_FUNC_analytical,
+ bracketSpanLog_FUNC_phrase,
+ bracketSpanLog_FUNC_uspecified,
bracketSpanLog_FUNC_MAX
};
diff --git a/libmei/mei/mei-verovio.xml b/libmei/mei/mei-verovio.xml
index 3d2a80d1fee..f9b6b3f3bbb 100644
--- a/libmei/mei/mei-verovio.xml
+++ b/libmei/mei/mei-verovio.xml
@@ -54,7 +54,7 @@
-
+
@@ -125,6 +125,37 @@
+
+
+
+
+
+
+
+
+ Represents coloration in the mensural notation source material.
+
+
+ Marks a sequence which does not match the current meter.
+
+
+ Represents a ligature in the mensural notation source material.
+
+
+
+ Highlights a grouping of some sort.
+
+
+ Marks a phrase.
+
+
+ Unspecified bracket.
+
+
+
+
+
+
@@ -522,8 +553,8 @@
-
- In string tablature, the number of the course to be played, i.e., [1-9]+.
+
+ In string tablature, the number of the course to be played.
@@ -542,7 +573,7 @@
Open D tuning for guitars. D2 A2 D3 F3s A3 D4.
- Open G tuning for guitars. D2 G2 D2 G2 B3 D4.
+ Open G tuning for guitars. D2 G2 D3 G3 B3 D4.
Open A tuning for guitars. E2 A2 E3 A3 C4s E4.
diff --git a/libmei/mei/mei-verovio_compiled.odd b/libmei/mei/mei-verovio_compiled.odd
index a3ca3632df4..11f33ab283e 100644
--- a/libmei/mei/mei-verovio_compiled.odd
+++ b/libmei/mei/mei-verovio_compiled.odd
@@ -1,4 +1,4 @@
-
+
@@ -50,7 +50,7 @@
-
+
Written accidental values.
@@ -4190,35 +4190,21 @@
-
- Logical domain attributes.
-
-
-
-
-
-
-
-
- function
- Describes the function of the bracketed event sequence.
-
-
-
-
-
- Represents coloration in the mensural notation source material.
-
-
- Marks a sequence which does not match the current meter.
-
-
- Represents a ligature in the mensural notation source material.
-
-
-
-
-
+ Logical domain attributes.functionDescribes the function of the bracketed event sequence.
+
+
+ Represents coloration in the mensural notation source material.
+
+ Marks a sequence which does not match the current meter.
+
+ Represents a ligature in the mensural notation source material.
+
+ Highlights a grouping of some sort.
+
+ Marks a phrase.
+
+ Unspecified bracket.
+
Logical domain attributes.
@@ -20435,8 +20421,8 @@
-
- In string tablature, the number of the course to be played, i.e., [1-9]+.
+
+ In string tablature, the number of the course to be played.
@@ -20454,7 +20440,7 @@
Open D tuning for guitars. D2 A2 D3 F3s A3 D4.
- Open G tuning for guitars. D2 G2 D2 G2 B3 D4.
+ Open G tuning for guitars. D2 G2 D3 G3 B3 D4.
Open A tuning for guitars. E2 A2 E3 A3 C4s E4.
@@ -20498,7 +20484,7 @@
foo informationDummy element for enforcing that the att classes are used.
-
+
\ No newline at end of file
diff --git a/src/iohumdrum.cpp b/src/iohumdrum.cpp
index 1a7373ae923..5e9e6b5b554 100644
--- a/src/iohumdrum.cpp
+++ b/src/iohumdrum.cpp
@@ -21245,6 +21245,7 @@ void HumdrumInput::processPhrases(hum::HTp phraseend)
insertPhrase(bracket, phrasestart, phraseend, startmeasure, startchordsorted, endchordsorted,
phrasestartnoteinfo, phraseendnoteinfo, ndex, phraseindex, i, j, startpitches, endpitches,
indexused);
+ bracket->SetFunc(bracketSpanLog_FUNC_phrase);
}
}
}
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 2ef83d1258d..86cb54613d9 100644
--- a/src/iomusxml.cpp
+++ b/src/iomusxml.cpp
@@ -2008,7 +2008,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
bracketSpan->SetLform(
bracketSpan->AttLineRendBase::StrToLineform(bracket.attribute("line-type").as_string()));
// bracketSpan->SetPlace(bracketSpan->AttPlacementRelStaff::StrToStaffrel(placeStr.c_str()));
- // bracketSpan->SetFunc("unclear");
+ bracketSpan->SetFunc(bracketSpanLog_FUNC_uspecified);
bracketSpan->SetLstartsym(ConvertLineEndSymbol(bracket.attribute("line-end").as_string()));
bracketSpan->SetTstamp(timeStamp);
m_controlElements.push_back({ measureNum, bracketSpan });
@@ -2433,7 +2433,7 @@ void MusicXmlInput::ReadMusicXmlDirection(
musicxml::OpenSpanner openBracket(voiceNumber, m_measureCounts.at(measure));
bracketSpan->SetColor(lead.attribute("color").as_string());
// bracketSpan->SetPlace(bracketSpan->AttPlacementRelStaff::StrToStaffrel(placeStr.c_str()));
- // bracketSpan->SetFunc("analytical");
+ bracketSpan->SetFunc(bracketSpanLog_FUNC_analytical);
bracketSpan->SetLstartsym(ConvertLineEndSymbol(lead.attribute("symbol").as_string()));
bracketSpan->SetTstamp(timeStamp);
bracketSpan->SetType("principal-voice");