Merge pull request #3744 from DDMAL/shape-fix

[Neon] Reset layout after change nc head shape
rism-digital · Aug 26, 2024 · aa5ab3f · aa5ab3f
2 parents 884c75c + 877db2a
commit aa5ab3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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;

diff --git 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);