From 9d6b0e851f455225558c58ee007788bf6b8e3ee3 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 18 Feb 2018 01:56:29 +0100 Subject: Revert "Promote the path 'd' attribute to a property per SVG 2." Needs further testing. This reverts commit e88644b0f3481c78a9563dbf9ee6b76ab6674583. --- src/attributes.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/attributes.h') diff --git a/src/attributes.h b/src/attributes.h index cecf2673b..a2c1c30f5 100644 --- a/src/attributes.h +++ b/src/attributes.h @@ -20,9 +20,9 @@ unsigned char const *sp_attribute_name(unsigned int id); /** * True iff k is a property in SVG, i.e. something that can be written either in a style attribute - * or as its own XML attribute. This must be kept in sync with SPAttributeEnum. + * or as its own XML attribute. */ -#define SP_ATTRIBUTE_IS_CSS(k) (((k) >= SP_ATTR_D) && ((k) <= SP_PROP_PATH_EFFECT)) +#define SP_ATTRIBUTE_IS_CSS(k) (((k) >= SP_PROP_INKSCAPE_FONT_SPEC) && ((k) <= SP_PROP_TEXT_RENDERING)) /* * Do not change order of attributes and properties. Attribute and @@ -146,7 +146,7 @@ enum SPAttributeEnum { SP_ATTR_X, SP_ATTR_Y, /* SPPath */ - // SP_ATTR_D, Promoted to property in SVG 2 + SP_ATTR_D, SP_ATTR_INKSCAPE_ORIGINAL_D, SP_ATTR_CONNECTOR_TYPE, SP_ATTR_CONNECTOR_CURVATURE, @@ -428,12 +428,7 @@ enum SPAttributeEnum { SP_ATTR_TEXT_EXCLUDE, SP_ATTR_LAYOUT_OPTIONS, - /* CSS & SVG Properties KEEP ORDER! - * If first or last property changed, macro at top must be changed! - */ - - /* SVG 2 Attributes promoted to properties */ - SP_ATTR_D, + /* CSS & SVG Properties KEEP ORDER */ /* Paint */ SP_PROP_COLOR, -- cgit v1.2.3