From 57818ed55e02a807554872aff64efd6fb4c97149 Mon Sep 17 00:00:00 2001 From: Laurent Pugin Date: Fri, 2 Aug 2024 09:59:18 +0200 Subject: [PATCH 1/2] Do not process expansion in PreparePlistFunctor [skip-ci] --- src/preparedatafunctor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/preparedatafunctor.cpp b/src/preparedatafunctor.cpp index c33f2677f1e..aad6ed25246 100644 --- a/src/preparedatafunctor.cpp +++ b/src/preparedatafunctor.cpp @@ -501,7 +501,8 @@ void PreparePlistFunctor::InsertInterfaceIDPair(const std::string &elementID, Pl FunctorCode PreparePlistFunctor::VisitObject(Object *object) { if (this->IsCollectingData()) { - if (object->HasInterface(INTERFACE_PLIST)) { + // Skip expansion elements because these are handled in Doc::ExpandExpansions + if (object->HasInterface(INTERFACE_PLIST) && !object->Is(EXPANSION)) { PlistInterface *interface = object->GetPlistInterface(); assert(interface); return interface->InterfacePreparePlist(*this, object); From 877db2a811466534b7f938fbefbf9be7a5bddfb2 Mon Sep 17 00:00:00 2001 From: Yinan Zhou Date: Tue, 13 Aug 2024 22:02:02 -0400 Subject: [PATCH 2/2] Reset layout after change nc head shape Refs: https://github.com/DDMAL/Neon/issues/1239 --- src/editortoolkit_neume.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/editortoolkit_neume.cpp b/src/editortoolkit_neume.cpp index 39ef113c585..11b5ea9a0a6 100644 --- a/src/editortoolkit_neume.cpp +++ b/src/editortoolkit_neume.cpp @@ -1862,6 +1862,7 @@ bool EditorToolkitNeume::Set(std::string elementId, std::string attrType, std::s else if (AttModule::SetVisual(element, attrType, attrValue)) success = true; + m_doc->GetDrawingPage()->LayOutTranscription(true); m_editInfo.import("status", success ? "OK" : "FAILURE"); m_editInfo.import("message", success ? "" : "Could not set attribute '" + attrType + "' to '" + attrValue + "'."); return success;