Add support for SVG fill-opacity property

  https://www.w3.org/TR/SVGTiny12/painting.html#FillOpacityProperty

This property is unique to SVG documents, but is otherwise analogous
to the usual CSS "opacity" property.

4 files changed, 89 insertions, 0 deletions

diff --git a/src/parse/properties/Makefile b/src/parse/properties/Makefile
index 6461dda..fc7ac76 100644
--- a/src/parse/properties/Makefile
+++ b/src/parse/properties/Makefile
@@ -45,6 +45,7 @@ DIR_SOURCES :=				\
 	cue.c				\
 	cursor.c			\
 	elevation.c			\
+	fill_opacity.c			\
 	flex.c				\
 	flex_flow.c			\
 	font.c				\
diff --git a/src/parse/properties/fill_opacity.c b/src/parse/properties/fill_opacity.c
new file mode 100644
index 0000000..caed86f
--- /dev/null
+++ b/src/parse/properties/fill_opacity.c
@@ -0,0 +1,82 @@
+/*
+ * Licensed under the MIT License,
+ *		  http://www.opensource.org/licenses/mit-license.php
+ */
+
+#include <assert.h>
+#include <string.h>
+
+#include "bytecode/bytecode.h"
+#include "bytecode/opcodes.h"
+#include "parse/properties/properties.h"
+#include "parse/properties/utils.h"
+
+/**
+ * Parse fill-opacity
+ *
+ * \param c	  Parsing context
+ * \param vector  Vector of tokens to process
+ * \param ctx	  Pointer to vector iteration context
+ * \param result  resulting style
+ * \return CSS_OK on success,
+ *	   CSS_NOMEM on memory exhaustion,
+ *	   CSS_INVALID if the input is not valid
+ *
+ * Post condition: \a *ctx is updated with the next token to process
+ *		   If the input is invalid, then \a *ctx remains unchanged.
+ */
+css_error css__parse_fill_opacity(css_language *c,
+		const parserutils_vector *vector, int32_t *ctx,
+		css_style *result)
+{
+	int32_t orig_ctx = *ctx;
+	css_error error;
+	const css_token *token;
+	enum flag_value flag_value;
+
+	token = parserutils_vector_iterate(vector, ctx);
+	if ((token == NULL) || ((token->type != CSS_TOKEN_IDENT) && (token->type != CSS_TOKEN_NUMBER))) {
+		*ctx = orig_ctx;
+		return CSS_INVALID;
+	}
+
+	flag_value = get_css_flag_value(c, token);
+
+	if (flag_value != FLAG_VALUE__NONE) {
+		error = css_stylesheet_style_flag_value(result, flag_value,
+				CSS_PROP_FILL_OPACITY);
+
+	} else if (token->type == CSS_TOKEN_NUMBER) {
+		css_fixed num = 0;
+		size_t consumed = 0;
+
+		num = css__number_from_lwc_string(token->idata, false, &consumed);
+		/* Invalid if there are trailing characters */
+		if (consumed != lwc_string_length(token->idata)) {
+			*ctx = orig_ctx;
+			return CSS_INVALID;
+		}
+
+		/* Clamp to range [0,1] */
+		if (num < 0)
+			num = 0;
+		if (num > INTTOFIX(1))
+			num = INTTOFIX(1);
+
+		error = css__stylesheet_style_appendOPV(result, CSS_PROP_FILL_OPACITY, 0, FILL_OPACITY_SET);
+		if (error != CSS_OK) {
+			*ctx = orig_ctx;
+			return error;
+		}
+
+		error = css__stylesheet_style_append(result, num);
+	} else {
+		error = CSS_INVALID;
+	}
+
+	if (error != CSS_OK)
+		*ctx = orig_ctx;
+
+	return error;
+}
+
diff --git a/src/parse/properties/properties.c b/src/parse/properties/properties.c
index 06524da..c1187ca 100644
--- a/src/parse/properties/properties.c
+++ b/src/parse/properties/properties.c
@@ -74,6 +74,7 @@ const css_prop_handler property_handlers[LAST_PROP + 1 - FIRST_PROP] =
 	css__parse_display,
 	css__parse_elevation,
 	css__parse_empty_cells,
+	css__parse_fill_opacity,
 	css__parse_flex,
 	css__parse_flex_basis,
 	css__parse_flex_direction,
@@ -261,6 +262,7 @@ const uint32_t property_unit_mask[CSS_N_PROPERTIES] = {
 	[CSS_PROP_WORD_SPACING]          = UNIT_MASK_WORD_SPACING,
 	[CSS_PROP_Z_INDEX]               = UNIT_MASK_Z_INDEX,
 	[CSS_PROP_OPACITY]               = UNIT_MASK_OPACITY,
+	[CSS_PROP_FILL_OPACITY]          = UNIT_MASK_FILL_OPACITY,
 	[CSS_PROP_BREAK_AFTER]           = UNIT_MASK_BREAK_AFTER,
 	[CSS_PROP_BREAK_BEFORE]          = UNIT_MASK_BREAK_BEFORE,
 	[CSS_PROP_BREAK_INSIDE]          = UNIT_MASK_BREAK_INSIDE,
diff --git a/src/parse/properties/properties.h b/src/parse/properties/properties.h
index 83aa32b..25ef60e 100644
--- a/src/parse/properties/properties.h
+++ b/src/parse/properties/properties.h
@@ -208,6 +208,9 @@ css_error css__parse_elevation(css_language *c,
 css_error css__parse_empty_cells(css_language *c,
 		const parserutils_vector *vector, int32_t *ctx,
 		css_style *result);
+css_error css__parse_fill_opacity(css_language *c,
+		const parserutils_vector *vector, int32_t *ctx,
+		css_style *result);
 css_error css__parse_flex(css_language *c,
 		const parserutils_vector *vector, int32_t *ctx,
 		css_style *result);
@@ -546,6 +549,7 @@ extern const uint32_t property_unit_mask[CSS_N_PROPERTIES];
 #define UNIT_MASK_WORD_SPACING          (UNIT_LENGTH)
 #define UNIT_MASK_Z_INDEX               (0)
 #define UNIT_MASK_OPACITY               (0)
+#define UNIT_MASK_FILL_OPACITY          (0)
 #define UNIT_MASK_BREAK_AFTER           (0)
 #define UNIT_MASK_BREAK_BEFORE          (0)
 #define UNIT_MASK_BREAK_INSIDE          (0)