From b1ef96c7c83ad712231a35d2e554aa58e4961ca8 Mon Sep 17 00:00:00 2001 From: Klaus Rettinghaus Date: Tue, 17 Oct 2023 12:29:40 +0200 Subject: [PATCH] make trill part of att enclosingChars --- include/vrv/trill.h | 1 + src/iomei.cpp | 2 ++ src/trill.cpp | 3 +++ 3 files changed, 6 insertions(+) diff --git a/include/vrv/trill.h b/include/vrv/trill.h index da61ec3d259..5581f8c4e62 100644 --- a/include/vrv/trill.h +++ b/include/vrv/trill.h @@ -26,6 +26,7 @@ namespace vrv { class Trill : public ControlElement, public TimeSpanningInterface, public AttColor, + public AttEnclosingChars, public AttExtender, public AttExtSymAuth, public AttExtSymNames, diff --git a/src/iomei.cpp b/src/iomei.cpp index 3e5436e9441..039b302d4b6 100644 --- a/src/iomei.cpp +++ b/src/iomei.cpp @@ -2285,6 +2285,7 @@ void MEIOutput::WriteTrill(pugi::xml_node currentNode, Trill *trill) this->WriteControlElement(currentNode, trill); this->WriteTimeSpanningInterface(currentNode, trill); trill->WriteColor(currentNode); + trill->WriteEnclosingChars(currentNode); trill->WriteExtender(currentNode); trill->WriteExtSymAuth(currentNode); trill->WriteExtSymNames(currentNode); @@ -6062,6 +6063,7 @@ bool MEIInput::ReadTrill(Object *parent, pugi::xml_node trill) this->ReadTimeSpanningInterface(trill, vrvTrill); vrvTrill->ReadColor(trill); + vrvTrill->ReadEnclosingChars(trill); vrvTrill->ReadExtender(trill); vrvTrill->ReadExtSymAuth(trill); vrvTrill->ReadExtSymNames(trill); diff --git a/src/trill.cpp b/src/trill.cpp index 8d6b762ff39..2236b64ea01 100644 --- a/src/trill.cpp +++ b/src/trill.cpp @@ -30,6 +30,7 @@ Trill::Trill() : ControlElement(TRILL, "trill-") , TimeSpanningInterface() , AttColor() + , AttEnclosingChars() , AttExtender() , AttExtSymAuth() , AttExtSymNames() @@ -40,6 +41,7 @@ Trill::Trill() { this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface()); this->RegisterAttClass(ATT_COLOR); + this->RegisterAttClass(ATT_ENCLOSINGCHARS); this->RegisterAttClass(ATT_EXTENDER); this->RegisterAttClass(ATT_EXTSYMAUTH); this->RegisterAttClass(ATT_EXTSYMNAMES); @@ -58,6 +60,7 @@ void Trill::Reset() ControlElement::Reset(); TimeSpanningInterface::Reset(); this->ResetColor(); + this->ResetEnclosingChars(); this->ResetExtender(); this->ResetExtSymAuth(); this->ResetExtSymNames();