make trill part of att enclosingChars

rettinghaus · Feb 3, 2025 · 24f50c0 · 24f50c0
1 parent f4bf7d9
commit 24f50c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/include/vrv/trill.h b/include/vrv/trill.h
@@ -25,6 +25,7 @@ namespace vrv {
  */
 class Trill : public ControlElement,
               public TimeSpanningInterface,
+              public AttEnclosingChars,
               public AttExtender,
               public AttExtSymAuth,
               public AttExtSymNames,

diff --git a/src/iomei.cpp b/src/iomei.cpp
@@ -2281,6 +2281,7 @@ void MEIOutput::WriteTrill(pugi::xml_node currentNode, Trill *trill)
 
     this->WriteControlElement(currentNode, trill);
     this->WriteTimeSpanningInterface(currentNode, trill);
+    trill->WriteEnclosingChars(currentNode);
     trill->WriteExtender(currentNode);
     trill->WriteExtSymAuth(currentNode);
     trill->WriteExtSymNames(currentNode);
@@ -6065,6 +6066,7 @@ bool MEIInput::ReadTrill(Object *parent, pugi::xml_node trill)
     this->ReadControlElement(trill, vrvTrill);
 
     this->ReadTimeSpanningInterface(trill, vrvTrill);
+    vrvTrill->ReadEnclosingChars(trill);
     vrvTrill->ReadExtender(trill);
     vrvTrill->ReadExtSymAuth(trill);
     vrvTrill->ReadExtSymNames(trill);

diff --git a/src/trill.cpp b/src/trill.cpp
@@ -29,6 +29,7 @@ static const ClassRegistrar<Trill> s_factory("trill", TRILL);
 Trill::Trill()
     : ControlElement(TRILL, "trill-")
     , TimeSpanningInterface()
+    , AttEnclosingChars()
     , AttExtender()
     , AttExtSymAuth()
     , AttExtSymNames()
@@ -38,6 +39,7 @@ Trill::Trill()
     , AttPlacementRelStaff()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
+    this->RegisterAttClass(ATT_ENCLOSINGCHARS);
     this->RegisterAttClass(ATT_EXTENDER);
     this->RegisterAttClass(ATT_EXTSYMAUTH);
     this->RegisterAttClass(ATT_EXTSYMNAMES);
@@ -55,6 +57,7 @@ void Trill::Reset()
 {
     ControlElement::Reset();
     TimeSpanningInterface::Reset();
+    this->ResetEnclosingChars();
     this->ResetExtender();
     this->ResetExtSymAuth();
     this->ResetExtSymNames();