From ad1290795e1334bb4fe73c7bbc3aa7aefdc0aacf Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sun, 22 Apr 2018 00:18:49 +0200 Subject: Fix promote d --- src/attributes.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/attributes.h') diff --git a/src/attributes.h b/src/attributes.h index a2c1c30f5..cecf2673b 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. + * or as its own XML attribute. This must be kept in sync with SPAttributeEnum. */ -#define SP_ATTRIBUTE_IS_CSS(k) (((k) >= SP_PROP_INKSCAPE_FONT_SPEC) && ((k) <= SP_PROP_TEXT_RENDERING)) +#define SP_ATTRIBUTE_IS_CSS(k) (((k) >= SP_ATTR_D) && ((k) <= SP_PROP_PATH_EFFECT)) /* * 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, + // SP_ATTR_D, Promoted to property in SVG 2 SP_ATTR_INKSCAPE_ORIGINAL_D, SP_ATTR_CONNECTOR_TYPE, SP_ATTR_CONNECTOR_CURVATURE, @@ -428,7 +428,12 @@ enum SPAttributeEnum { SP_ATTR_TEXT_EXCLUDE, SP_ATTR_LAYOUT_OPTIONS, - /* CSS & SVG Properties KEEP ORDER */ + /* 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, /* Paint */ SP_PROP_COLOR, -- cgit v1.2.3