diff --git a/libmei/datatypes.yml b/libmei/datatypes.yml
index 4586cc2767..165866c920 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 d97e5b5a88..c55294f273 100644
--- a/libmei/dist/attconverter.cpp
+++ b/libmei/dist/attconverter.cpp
@@ -3994,6 +3994,8 @@ 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_uspecified: value = "uspecified"; break;
default:
LogWarning("Unknown value '%d' for att.bracketSpan.log@func", data);
value = "";
@@ -4007,6 +4009,8 @@ 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 == "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 7d15953404..cf3c7c6347 100644
--- a/libmei/dist/atttypes.h
+++ b/libmei/dist/atttypes.h
@@ -1872,6 +1872,8 @@ enum bracketSpanLog_FUNC : int8_t {
bracketSpanLog_FUNC_coloration,
bracketSpanLog_FUNC_cross_rhythm,
bracketSpanLog_FUNC_ligature,
+ bracketSpanLog_FUNC_analytical,
+ bracketSpanLog_FUNC_uspecified,
bracketSpanLog_FUNC_MAX
};
diff --git a/libmei/mei/mei-verovio.xml b/libmei/mei/mei-verovio.xml
index cb51c50714..b3f64eee16 100644
--- a/libmei/mei/mei-verovio.xml
+++ b/libmei/mei/mei-verovio.xml
@@ -125,6 +125,34 @@
+
+
+
+
+
+
+
+
+ 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.
+
+
+
+ Represents a ligature in the mensural notation source material.
+
+
+ Represents a ligature in the mensural notation source material.
+
+
+
+
+
+
@@ -522,8 +550,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.
diff --git a/libmei/mei/mei-verovio_compiled.odd b/libmei/mei/mei-verovio_compiled.odd
index a3ca3632df..1ddd4ca435 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,19 @@
-
- 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.
+
+ Represents a ligature in the mensural notation source material.
+
+ Represents a ligature in the mensural notation source material.
+
Logical domain attributes.
@@ -20435,8 +20419,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.
@@ -20498,7 +20482,7 @@
foo informationDummy element for enforcing that the att classes are used.
-
+
\ No newline at end of file
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
index 2ef83d1258..86cb54613d 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");