From 765af83f76a01ebfd7d17e1873e07a429dff1187 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 17 Oct 2017 14:09:05 +0200 Subject: Remove text 'width' and 'height' attributes. These were replaced by the 'inline-size' property. --- src/sp-text.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/sp-text.h') diff --git a/src/sp-text.h b/src/sp-text.h index be48d7fcb..93a4e0d3b 100644 --- a/src/sp-text.h +++ b/src/sp-text.h @@ -42,14 +42,10 @@ public: /** Completely recalculates the layout. */ void rebuildLayout(); -//semiprivate: (need to be accessed by the C-style functions still) + //semiprivate: (need to be accessed by the C-style functions still) TextTagAttributes attributes; Inkscape::Text::Layout layout; - // SVG 2 Auto-wrapped text - SVGLength width; - SVGLength height; - /** when the object is transformed it's nicer to change the font size and coordinates when we can, rather than just applying a matrix transform. is_root is used to indicate to the function that it should -- cgit v1.2.3 From f8d9cf44a22b5011b0367d404414a657ef45f139 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 17 Oct 2017 14:36:20 +0200 Subject: Allow multiple shapes in 'shape-inside' and 'shape-subtract'. Work from Alex Roman --- src/sp-text.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/sp-text.h') diff --git a/src/sp-text.h b/src/sp-text.h index 93a4e0d3b..67613d043 100644 --- a/src/sp-text.h +++ b/src/sp-text.h @@ -68,6 +68,9 @@ private: that we don't get a spurious extra one at the end of the flow. */ unsigned _buildLayoutInput(SPObject *root, Inkscape::Text::Layout::OptionalTextTagAttrs const &parent_optional_attrs, unsigned parent_attrs_offset, bool in_textpath); + /** Union all exlusion shapes. */ + Shape* _buildExclusionShape() const; + public: /** Optimize textpath text on next set_transform. */ void optimizeTextpathText() -- cgit v1.2.3