From 0dade7c7bebf355cee8c5c95ebcd44ccb8808929 Mon Sep 17 00:00:00 2001 From: Klaus Rettinghaus Date: Mon, 27 May 2024 14:34:30 +0200 Subject: [PATCH] write liquescent color --- include/vrv/iomei.h | 3 +++ src/iomei.cpp | 1 + src/nc.cpp | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/include/vrv/iomei.h b/include/vrv/iomei.h index 491f4c1977a..79caf6480f4 100644 --- a/include/vrv/iomei.h +++ b/include/vrv/iomei.h @@ -105,6 +105,7 @@ class Note; class Num; class Octave; class Orig; +class Oriscus; class Ornam; class Page; class PageElement; @@ -411,6 +412,7 @@ class MEIOutput : public Output { void WriteNc(pugi::xml_node currentNode, Nc *nc); void WriteNeume(pugi::xml_node currentNode, Neume *neume); void WriteNote(pugi::xml_node currentNode, Note *note); + void WriteOriscus(pugi::xml_node currentNode, Oriscus *oriscus); void WritePlica(pugi::xml_node currentNode, Plica *plica); void WriteProport(pugi::xml_node currentNode, Proport *proport); void WriteQuilisma(pugi::xml_node currentNode, Quilisma *quilisma); @@ -723,6 +725,7 @@ class MEIInput : public Input { bool ReadNc(Object *parent, pugi::xml_node nc); bool ReadNeume(Object *parent, pugi::xml_node note); bool ReadNote(Object *parent, pugi::xml_node note); + bool ReadOriscus(Object *parent, pugi::xml_node oriscus); bool ReadPlica(Object *parent, pugi::xml_node plica); bool ReadProport(Object *parent, pugi::xml_node proport); bool ReadQuilisma(Object *parent, pugi::xml_node quilisma); diff --git a/src/iomei.cpp b/src/iomei.cpp index 1ac959de1f1..0b2d374506e 100644 --- a/src/iomei.cpp +++ b/src/iomei.cpp @@ -2585,6 +2585,7 @@ void MEIOutput::WriteLiquescent(pugi::xml_node currentNode, Liquescent *liquesce WriteLayerElement(currentNode, liquescent); WritePositionInterface(currentNode, liquescent); + liquescent->WriteColor(currentNode); } void MEIOutput::WriteMensur(pugi::xml_node currentNode, Mensur *mensur) diff --git a/src/nc.cpp b/src/nc.cpp index a43977c65a5..49b999e4302 100644 --- a/src/nc.cpp +++ b/src/nc.cpp @@ -18,6 +18,7 @@ #include "elementpart.h" #include "functor.h" #include "liquescent.h" +#include "oriscus.h" #include "quilisma.h" #include "staff.h" #include "vrv.h" @@ -91,6 +92,9 @@ bool Nc::IsSupportedChild(Object *child) if (child->Is(LIQUESCENT)) { assert(dynamic_cast(child)); } + else if (child->Is(ORISCUS)) { + assert(dynamic_cast(child)); + } else if (child->Is(QUILISMA)) { assert(dynamic_cast(child)); }