From 374d9de5339b3ce68e037943cad24375e6688909 Mon Sep 17 00:00:00 2001 From: Thomas Holder Date: Sun, 25 Oct 2020 18:22:53 +0100 Subject: [PATCH] Fix 'shape-inside' added to Prevent that `style="shape-inside:url(#...)"` is added to fallback tspan elements. --- src/extension/internal/svg.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp index 67319bdec4..d9f7408356 100644 --- a/src/extension/internal/svg.cpp +++ b/src/extension/internal/svg.cpp @@ -479,8 +479,10 @@ static void insert_text_fallback( Inkscape::XML::Node *repr, SPDocument *origina text->layout.getSourceOfCharacter(it, &source_obj, &span_text_start_iter); // Set tspan style - Glib::ustring style_text = (dynamic_cast(source_obj) ? source_obj->parent : source_obj)->style->write( SP_STYLE_FLAG_IFDIFF, SP_STYLE_SRC_UNSET, text->style); - if (!style_text.empty()) { + SPObject *style_source_obj = dynamic_cast(source_obj) ? source_obj->parent : source_obj; + if (style_source_obj != text) { + auto style_text = + style_source_obj->style->write(SP_STYLE_FLAG_IFDIFF, SP_STYLE_SRC_UNSET, text->style); span_tspan->setAttributeOrRemoveIfEmpty("style", style_text); } -- GitLab