![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/style.cpp b/src/style.cpp
index 07ea4a49a4c39eba85eb3121fcd02901d71110ad..87151c5a847feb38dd29251140c03aa88e37f460 100644 (file)
--- a/src/style.cpp
+++ b/src/style.cpp
#include "document.h"
#include "extract-uri.h"
#include "uri-references.h"
+#include "uri.h"
#include "sp-paint-server.h"
#include "streq.h"
#include "strneq.h"
#include "xml/repr.h"
#include "unit-constants.h"
#include "isnan.h"
+#include "macros.h"
+
+#include "sp-filter-reference.h"
#include <sigc++/functors/ptr_fun.h>
#include <sigc++/adaptors/bind.h>
using Inkscape::CSSOStringStream;
using std::vector;
-namespace Inkscape {
-
-/**
- * Parses a CSS url() specification; temporary hack until
- * style stuff is redone.
- * \param string the CSS string to parse
- * \return a newly-allocated URL string (or NULL); free with g_free()
- */
-gchar *parse_css_url(gchar const *string) {
- if (!string)
- return NULL;
-
- gchar const *iter = string;
- for ( ; g_ascii_isspace(*iter) ; iter = g_utf8_next_char(iter) );
- if (strncmp(iter, "url(", 4))
- return NULL;
- iter += 4;
-
- gchar const end_char = *iter;
- if ( *iter == '"' || *iter == '\'' ) {
- iter += 1;
- }
-
- GString *temp = g_string_new(NULL);
- for ( ; *iter ; iter = g_utf8_next_char(iter) ) {
- if ( *iter == '(' || *iter == ')' ||
- *iter == '"' || *iter == '\'' ||
- g_ascii_isspace(*iter) ||
- g_ascii_iscntrl(*iter) )
- {
- break;
- }
- if ( *iter == '\\' ) {
- iter = g_utf8_next_char(iter);
- }
- if ( *iter & (gchar)0x80 ) {
- break;
- } else {
- g_string_append_c(temp, *iter);
- }
- }
-
- if ( *iter == end_char && end_char != ')' ) {
- iter = g_utf8_next_char(iter);
- }
- gchar *result;
- if ( *iter == ')' ) {
- result = temp->str;
- g_string_free(temp, FALSE);
- } else {
- result = NULL;
- g_string_free(temp, TRUE);
- }
-
- return result;
-}
-
-}
-
#define BMAX 8192
class SPStyleEnum;
@@ -155,8 +100,6 @@ static gint sp_style_write_ilengthornormal(gchar *p, gint const len, gchar const
static gint sp_style_write_itextdecoration(gchar *p, gint const len, gchar const *const key, SPITextDecoration const *const val, SPITextDecoration const *const base, guint const flags);
static gint sp_style_write_ifilter(gchar *b, gint len, gchar const *key, SPIFilter const *filter, SPIFilter const *base, guint flags);
-static void css2_unescape_unquote(SPIString *val);
-
static void sp_style_paint_clear(SPStyle *style, SPIPaint *paint);
static void sp_style_filter_clear(SPStyle *style);
style->object = NULL;
}
+/**
+ * Emit style modified signal on style's object if the filter changed.
+ */
+static void
+sp_style_filter_ref_modified(SPObject *obj, guint flags, SPStyle *style)
+{
+ SPFilter *filter=static_cast<SPFilter *>(obj);
+ if (style->getFilter() == filter)
+ {
+ if (style->object) {
+ style->object->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+ }
+ }
+}
+/**
+ * Gets called when the filter is (re)attached to the style
+ */
+static void
+sp_style_filter_ref_changed(SPObject *old_ref, SPObject *ref, SPStyle *style)
+{
+ if (old_ref) {
+ style->filter_modified_connection.disconnect();
+ }
+ if ( SP_IS_FILTER(ref))
+ {
+ style->filter_modified_connection =
+ ref->connectModified(sigc::bind(sigc::ptr_fun(&sp_style_filter_ref_modified), style));
+ }
+ sp_style_filter_ref_modified(ref, 0, style);
+}
+
+/**
+ * Emit style modified signal on style's object if server is style's fill
+ * or stroke paint server.
+ */
+static void
+sp_style_paint_server_ref_modified(SPObject *obj, guint flags, SPStyle *style)
+{
+ SPPaintServer *server = static_cast<SPPaintServer *>(obj);
+
+ if ((style->fill.type == SP_PAINT_TYPE_PAINTSERVER)
+ && style->getFillPaintServer() == server)
+ {
+ if (style->object) {
+ /** \todo
+ * fixme: I do not know, whether it is optimal - we are
+ * forcing reread of everything (Lauris)
+ */
+ /** \todo
+ * fixme: We have to use object_modified flag, because parent
+ * flag is only available downstreams.
+ */
+ style->object->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+ }
+ } else if ((style->stroke.type == SP_PAINT_TYPE_PAINTSERVER)
+ && style->getStrokePaintServer() == server)
+ {
+ if (style->object) {
+ /// \todo fixme:
+ style->object->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+ }
+ } else {
+ g_assert_not_reached();
+ }
+}
+
+/**
+ * Gets called when the paintserver is (re)attached to the style
+ */
+static void
+sp_style_fill_paint_server_ref_changed(SPObject *old_ref, SPObject *ref, SPStyle *style)
+{
+ if (old_ref) {
+ style->fill_ps_modified_connection.disconnect();
+ }
+ if (SP_IS_PAINT_SERVER(ref)) {
+ style->fill_ps_modified_connection =
+ ref->connectModified(sigc::bind(sigc::ptr_fun(&sp_style_paint_server_ref_modified), style));
+ }
+
+ sp_style_paint_server_ref_modified(ref, 0, style);
+}
+
+/**
+ * Gets called when the paintserver is (re)attached to the style
+ */
+static void
+sp_style_stroke_paint_server_ref_changed(SPObject *old_ref, SPObject *ref, SPStyle *style)
+{
+ if (old_ref) {
+ style->stroke_ps_modified_connection.disconnect();
+ }
+ if (SP_IS_PAINT_SERVER(ref)) {
+ style->stroke_ps_modified_connection =
+ ref->connectModified(sigc::bind(sigc::ptr_fun(&sp_style_paint_server_ref_modified), style));
+ }
+
+ sp_style_paint_server_ref_modified(ref, 0, style);
+}
/**
* Returns a new SPStyle object with settings as per sp_style_clear().
*/
SPStyle *
-sp_style_new()
+sp_style_new(SPDocument *document)
{
SPStyle *const style = g_new0(SPStyle, 1);
style->refcount = 1;
style->object = NULL;
+ style->document = document;
style->text = sp_text_style_new();
style->text_private = TRUE;
style->cloned = false;
- style->fill_hreffed = false;
- style->stroke_hreffed = false;
- style->filter_hreffed = false;
-
new (&style->release_connection) sigc::connection();
-
- new (&style->fill_release_connection) sigc::connection();
- new (&style->fill_modified_connection) sigc::connection();
-
- new (&style->stroke_release_connection) sigc::connection();
- new (&style->stroke_modified_connection) sigc::connection();
-
- new (&style->filter_release_connection) sigc::connection();
new (&style->filter_modified_connection) sigc::connection();
+ new (&style->fill_ps_modified_connection) sigc::connection();
+ new (&style->stroke_ps_modified_connection) sigc::connection();
return style;
}
g_return_val_if_fail(object != NULL, NULL);
g_return_val_if_fail(SP_IS_OBJECT(object), NULL);
- SPStyle *style = sp_style_new();
+ SPStyle *style = sp_style_new(SP_OBJECT_DOCUMENT(object));
style->object = object;
style->release_connection = object->connectRelease(sigc::bind<1>(sigc::ptr_fun(&sp_style_object_release), style));
style->release_connection.disconnect();
style->release_connection.~connection();
if (style->text) sp_text_style_unref(style->text);
+
+ if (style->fill.value.href) {
+ style->fill_ps_modified_connection.disconnect();
+ delete style->fill.value.href;
+ style->fill.value.href = NULL;
+ }
+ if (style->stroke.value.href) {
+ style->stroke_ps_modified_connection.disconnect();
+ delete style->stroke.value.href;
+ style->stroke.value.href = NULL;
+ }
+ if (style->filter.href) {
+ style->filter_modified_connection.disconnect();
+ delete style->filter.href;
+ style->filter.href = NULL;
+ }
+
+ style->filter_modified_connection.~connection();
+ style->fill_ps_modified_connection.~connection();
+ style->stroke_ps_modified_connection.~connection();
+
sp_style_paint_clear(style, &style->fill);
sp_style_paint_clear(style, &style->stroke);
sp_style_filter_clear(style);
- style->fill_release_connection.disconnect();
- style->fill_release_connection.~connection();
- style->fill_modified_connection.disconnect();
- style->fill_modified_connection.~connection();
- style->stroke_release_connection.disconnect();
- style->stroke_release_connection.~connection();
- style->stroke_modified_connection.disconnect();
- style->stroke_modified_connection.~connection();
- style->filter_modified_connection.disconnect();
- style->filter_modified_connection.~connection();
- style->filter_release_connection.disconnect();
- style->filter_release_connection.~connection();
+
g_free(style->stroke_dash.dash);
g_free(style);
}
val = repr->attribute("font-family");
if (val) {
if (!style->text_private) sp_style_privatize_text(style);
- sp_style_read_istring(&style->text->font_family, val);
- css2_unescape_unquote(&style->text->font_family);
+ gchar *val_unquoted = attribute_unquote(val);
+ sp_style_read_istring(&style->text->font_family, val_unquoted);
+ if (val_unquoted) g_free (val_unquoted);
}
}
if (!style->filter.set) {
val = repr->attribute("filter");
if (val) {
- sp_style_read_ifilter(val, style, (object) ? SP_OBJECT_DOCUMENT(object) : NULL);
+ sp_style_read_ifilter(val, style, (object) ? SP_OBJECT_DOCUMENT(object) : NULL);
}
}
SPS_READ_PENUM_IF_UNSET(&style->enable_background, repr,
"enable-background", enum_enable_background, true);
-
+
/* 3. Merge from parent */
if (object) {
if (object->parent) {
} else {
if (sp_repr_parent(repr)) {
/// \todo fixme: This is not the prettiest thing (Lauris)
- SPStyle *parent = sp_style_new();
+ SPStyle *parent = sp_style_new(NULL);
sp_style_read(parent, NULL, sp_repr_parent(repr));
sp_style_merge_from_parent(style, parent);
sp_style_unref(parent);
case SP_PROP_FONT_FAMILY:
if (!style->text_private) sp_style_privatize_text(style);
if (!style->text->font_family.set) {
- sp_style_read_istring(&style->text->font_family, val);
- css2_unescape_unquote(&style->text->font_family);
+ gchar *val_unquoted = attribute_unquote(val);
+ sp_style_read_istring(&style->text->font_family, val_unquoted);
+ if (val_unquoted) g_free (val_unquoted);
}
break;
case SP_PROP_FONT_SIZE:
static void
sp_style_merge_from_decl_list(SPStyle *const style, CRDeclaration const *const decl_list)
{
+ // read the decls from end to start, using head recursion, so that latter declarations override
+ // (Ref: http://www.w3.org/TR/REC-CSS2/cascade.html#cascading-order point 4.)
+ // because sp_style_merge_style_from_decl only sets properties that are unset
if (decl_list->next) {
sp_style_merge_from_decl_list(style, decl_list->next);
}
@@ -1934,7 +1982,7 @@ sp_style_merge_from_dying_parent(SPStyle *const style, SPStyle const *const pare
if (!style->filter.set || style->filter.inherit)
{
- // FIXME:
+ // FIXME:
// instead of just copying over, we need to _really merge_ the two filters by combining their
// filter primitives
sp_style_merge_ifilter(style, &parent->filter);
@@ -2000,96 +2048,42 @@ sp_style_merge_from_dying_parent(SPStyle *const style, SPStyle const *const pare
}
-
-/**
- * Disconnects from possible fill and stroke paint servers.
- */
static void
-sp_style_paint_server_release(SPObject *obj, SPStyle *style)
+sp_style_set_ipaint_to_uri(SPStyle *style, SPIPaint *paint, const Inkscape::URI *uri, SPDocument *document)
{
- SPPaintServer *server=static_cast<SPPaintServer *>(obj);
- if ((style->fill.type == SP_PAINT_TYPE_PAINTSERVER)
- && (server == style->fill.value.paint.server))
- {
- sp_style_paint_clear(style, &style->fill);
+ // it may be that this style's SPIPaint has not yet created its URIReference;
+ // now that we have a document, we can create it here
+ if (!paint->value.href && document) {
+ paint->value.href = new SPPaintServerReference(document);
+ paint->value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun((paint == &style->fill)? sp_style_fill_paint_server_ref_changed : sp_style_stroke_paint_server_ref_changed), style));
}
- if ((style->stroke.type == SP_PAINT_TYPE_PAINTSERVER)
- && (server == style->stroke.value.paint.server))
- {
- sp_style_paint_clear(style, &style->stroke);
- }
-}
-
-
+ if (paint->value.href && paint->value.href->getObject())
+ paint->value.href->detach();
-
-/**
- * Emit style modified signal on style's object if server is style's fill
- * or stroke paint server.
- */
-static void
-sp_style_paint_server_modified(SPObject *obj, guint flags, SPStyle *style)
-{
- SPPaintServer *server = static_cast<SPPaintServer *>(obj);
- if ((style->fill.type == SP_PAINT_TYPE_PAINTSERVER)
- && (server == style->fill.value.paint.server))
- {
- if (style->object) {
- /** \todo
- * fixme: I do not know, whether it is optimal - we are
- * forcing reread of everything (Lauris)
- */
- /** \todo
- * fixme: We have to use object_modified flag, because parent
- * flag is only available downstreams.
- */
- style->object->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
- }
- } else if ((style->stroke.type == SP_PAINT_TYPE_PAINTSERVER)
- && (server == style->stroke.value.paint.server))
- {
- if (style->object) {
- /// \todo fixme:
- style->object->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+ if (paint->value.href) {
+ try {
+ paint->value.href->attach(*uri);
+ } catch (Inkscape::BadURIException &e) {
+ g_warning("%s", e.what());
+ paint->value.href->detach();
}
- } else {
- g_assert_not_reached();
}
}
-
-
-/**
- * Disconnects from filter.
- */
static void
-sp_style_filter_release(SPObject *obj, SPStyle *style)
+sp_style_set_ipaint_to_uri_string (SPStyle *style, SPIPaint *paint, const gchar *uri)
{
- SPFilter *filter=static_cast<SPFilter *>(obj);
- if (style->filter.filter == filter)
- {
- sp_style_filter_clear(style);
- }
+ const Inkscape::URI IURI(uri);
+ sp_style_set_ipaint_to_uri(style, paint, &IURI, style->document);
}
-
-/**
- * Emit style modified signal on style's object if the filter changed.
- */
-static void
-sp_style_filter_modified(SPObject *obj, guint flags, SPStyle *style)
+void
+sp_style_set_to_uri_string (SPStyle *style, bool isfill, const gchar *uri)
{
- SPFilter *filter=static_cast<SPFilter *>(obj);
- if (style->filter.filter == filter)
- {
- if (style->object) {
- style->object->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
- }
- }
+ sp_style_set_ipaint_to_uri_string (style, isfill? &style->fill : &style->stroke, uri);
}
-
/**
*
*/
@@ -2111,33 +2105,8 @@ sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent)
sp_color_copy(&paint->value.color, &parent->value.color);
break;
case SP_PAINT_TYPE_PAINTSERVER:
- paint->value.paint.server = parent->value.paint.server;
- paint->value.paint.uri = parent->value.paint.uri;
- if (paint->value.paint.server) {
- if (style->object && !style->cloned) { // href paintserver for style of non-clones only
- sp_object_href(SP_OBJECT(paint->value.paint.server), style);
- if (paint == &style->fill) {
- style->fill_hreffed = true;
- } else {
- assert(paint == &style->stroke);
- style->stroke_hreffed = true;
- }
- }
- if (style->object || style->cloned) { // connect to signals for style of real objects or clones (this excludes temp styles)
- SPObject *server = paint->value.paint.server;
- sigc::connection release_connection
- = server->connectRelease(sigc::bind<1>(sigc::ptr_fun(&sp_style_paint_server_release), style));
- sigc::connection modified_connection
- = server->connectModified(sigc::bind<2>(sigc::ptr_fun(&sp_style_paint_server_modified), style));
- if (paint == &style->fill) {
- style->fill_release_connection = release_connection;
- style->fill_modified_connection = modified_connection;
- } else {
- assert(paint == &style->stroke);
- style->stroke_release_connection = release_connection;
- style->stroke_modified_connection = modified_connection;
- }
- }
+ if (parent->value.href) {
+ sp_style_set_ipaint_to_uri(style, paint, parent->value.href->getURI(), parent->value.href->getOwnerDocument());
}
break;
case SP_PAINT_TYPE_NONE:
sp_style_filter_clear(style);
style->filter.set = parent->set;
style->filter.inherit = parent->inherit;
- style->filter.filter = parent->filter;
- style->filter.uri = parent->uri;
- if (style->filter.filter) {
- if (style->object && !style->cloned) { // href filter for style of non-clones only
- sp_object_href(SP_OBJECT(style->filter.filter), style);
- style->filter_hreffed = true;
- }
- if (style->object || style->cloned) { // connect to signals for style of real objects or clones (this excludes temp styles)
- SPObject *filter = style->filter.filter;
- style->filter_release_connection
- = filter->connectRelease(sigc::bind<1>(sigc::ptr_fun(&sp_style_filter_release), style));
- style->filter_modified_connection
- = filter->connectModified(sigc::bind<2>(sigc::ptr_fun(&sp_style_filter_modified), style));
+
+ if (style->filter.href && style->filter.href->getObject())
+ style->filter.href->detach();
+
+ if (style->filter.href && parent->href) {
+ try {
+ style->filter.href->attach(*parent->href->getURI());
+ } catch (Inkscape::BadURIException &e) {
+ g_warning("%s", e.what());
+ style->filter.href->detach();
}
}
}
sp_style_paint_clear(style, &style->fill);
sp_style_paint_clear(style, &style->stroke);
sp_style_filter_clear(style);
+
+ if (style->fill.value.href)
+ delete style->fill.value.href;
+ if (style->stroke.value.href)
+ delete style->stroke.value.href;
+ if (style->filter.href)
+ delete style->filter.href;
+
if (style->stroke_dash.dash) {
g_free(style->stroke_dash.dash);
}
/** \todo fixme: Do that text manipulation via parents */
SPObject *object = style->object;
+ SPDocument *document = style->document;
gint const refcount = style->refcount;
SPTextStyle *text = style->text;
unsigned const text_private = style->text_private;
+
memset(style, 0, sizeof(SPStyle));
+
style->refcount = refcount;
style->object = object;
+ style->document = document;
+
+ if (document) {
+ style->filter.href = new SPFilterReference(document);
+ style->filter.href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_filter_ref_changed), style));
+
+ style->fill.value.href = new SPPaintServerReference(document);
+ style->fill.value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_fill_paint_server_ref_changed), style));
+
+ style->stroke.value.href = new SPPaintServerReference(document);
+ style->stroke.value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_stroke_paint_server_ref_changed), style));
+ }
+
style->text = text;
style->text_private = text_private;
+
/* fixme: */
style->text->font.set = FALSE;
style->text->font_family.set = FALSE;
style->marker[i].set = FALSE;
}
- style->filter.set = FALSE;
- style->filter.uri = NULL;
- style->filter.filter = NULL;
-
style->enable_background.value = SP_CSS_BACKGROUND_ACCUMULATE;
style->enable_background.set = false;
style->enable_background.inherit = false;
@@ -3013,10 +3000,8 @@ sp_style_read_ipaint(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocume
paint->inherit = FALSE;
paint->currentcolor = FALSE;
} else if (strneq(str, "url", 3) && paint != &style->color) {
- // this is alloc'd uri, but seems to be shared with a parent
- // potentially, so it's not any easy g_free case...
- paint->value.paint.uri = extract_uri(str);
- if (paint->value.paint.uri == NULL || *(paint->value.paint.uri) == '\0') {
+ gchar *uri = extract_uri(str);
+ if(uri == NULL || uri[0] == '\0') {
paint->type = SP_PAINT_TYPE_NONE;
return;
}
@@ -3024,38 +3009,18 @@ sp_style_read_ipaint(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocume
paint->set = TRUE;
paint->inherit = FALSE;
paint->currentcolor = FALSE;
- if (document) {
- SPObject *ps = sp_uri_reference_resolve(document, str);
- if (ps && SP_IS_PAINT_SERVER(ps)) {
- paint->value.paint.server = SP_PAINT_SERVER(ps);
- if (style->object && !style->cloned) {
- sp_object_href(SP_OBJECT(paint->value.paint.server), style);
- if (paint == &style->fill) {
- style->fill_hreffed = true;
- } else {
- assert(paint == &style->stroke);
- style->stroke_hreffed = true;
- }
- }
- if (style->object || style->cloned) {
- SPObject *server = paint->value.paint.server;
- sigc::connection release_connection
- = server->connectRelease(sigc::bind<1>(sigc::ptr_fun(&sp_style_paint_server_release), style));
- sigc::connection modified_connection
- = server->connectModified(sigc::bind<2>(sigc::ptr_fun(&sp_style_paint_server_modified), style));
- if (paint == &style->fill) {
- style->fill_release_connection = release_connection;
- style->fill_modified_connection = modified_connection;
- } else {
- assert(paint == &style->stroke);
- style->stroke_release_connection = release_connection;
- style->stroke_modified_connection = modified_connection;
- }
- }
- } else {
- paint->value.paint.server = NULL;
- }
+
+ // it may be that this style's SPIPaint has not yet created its URIReference;
+ // now that we have a document, we can create it here
+ if (!paint->value.href && document) {
+ paint->value.href = new SPPaintServerReference(document);
+ paint->value.href->changedSignal().connect(sigc::bind(sigc::ptr_fun((paint == &style->fill)? sp_style_fill_paint_server_ref_changed : sp_style_stroke_paint_server_ref_changed), style));
}
+
+ sp_style_set_ipaint_to_uri_string (style, paint, uri);
+
+ g_free (uri);
+
} else {
guint32 const rgb0 = sp_svg_read_color(str, &str, 0xff);
if (rgb0 != 0xff) {
@@ -3074,7 +3039,7 @@ sp_style_read_ipaint(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocume
delete tmp;
tmp = 0;
}
- paint->iccColor = tmp;
+ paint->value.iccColor = tmp;
}
}
}
@@ -3159,49 +3124,47 @@ sp_style_read_ifilter(gchar const *str, SPStyle * style, SPDocument *document)
if (streq(str, "inherit")) {
f->set = TRUE;
f->inherit = TRUE;
- f->filter = NULL;
+ if (f->href && f->href->getObject())
+ f->href->detach();
} else if(streq(str, "none")) {
f->set = TRUE;
f->inherit = FALSE;
- f->filter = NULL;
+ if (f->href && f->href->getObject())
+ f->href->detach();
} else if (strneq(str, "url", 3)) {
- f->uri = extract_uri(str);
- if(f->uri == NULL || f->uri[0] == '\0') {
+ char *uri = extract_uri(str);
+ if(uri == NULL || uri[0] == '\0') {
g_warning("Specified filter url is empty");
f->set = TRUE;
f->inherit = FALSE;
- f->filter = NULL;
return;
}
f->set = TRUE;
f->inherit = FALSE;
- f->filter = NULL;
- if (document) {
- SPObject *obj = sp_uri_reference_resolve(document, str);
- if (SP_IS_FILTER(obj)) {
- f->filter = SP_FILTER(obj);
- if (style->object && !style->cloned) {
- sp_object_href(obj, style);
- style->filter_hreffed = true;
- }
- if (style->object || style->cloned) { // connect to signals for style of real objects or clones (this excludes temp styles)
- SPObject *filter = style->filter.filter;
- style->filter_release_connection
- = filter->connectRelease(sigc::bind<1>(sigc::ptr_fun(&sp_style_filter_release), style));
- style->filter_modified_connection
- = filter->connectModified(sigc::bind<2>(sigc::ptr_fun(&sp_style_filter_modified), style));
- }
- } else {
- g_warning("Element '%s' not found or is not a filter", f->uri);
- }
+ if (f->href && f->href->getObject())
+ f->href->detach();
+
+ // it may be that this style has not yet created its SPFilterReference;
+ // now that we have a document, we can create it here
+ if (!f->href && document) {
+ f->href = new SPFilterReference(document);
+ f->href->changedSignal().connect(sigc::bind(sigc::ptr_fun(sp_style_filter_ref_changed), style));
}
+ try {
+ f->href->attach(Inkscape::URI(uri));
+ } catch (Inkscape::BadURIException &e) {
+ g_warning("%s", e.what());
+ f->href->detach();
+ }
+ g_free (uri);
+
} else {
/* We shouldn't reach this if SVG input is well-formed */
f->set = FALSE;
f->inherit = FALSE;
- f->filter = NULL;
- f->uri = NULL;
+ if (f->href && f->href->getObject())
+ f->href->detach();
}
}
if (val->inherit) {
return g_snprintf(p, len, "%s:inherit;", key);
} else {
- return g_snprintf(p, len, "%s:%s;", key, val->value);
+ gchar *val_quoted = css2_escape_quote(val->value);
+ return g_snprintf(p, len, "%s:%s;", key, val_quoted);
+ g_free (val_quoted);
}
}
return 0;
return true;
if (a->type == SP_PAINT_TYPE_COLOR)
return !(sp_color_is_equal(&a->value.color, &b->value.color)
- && ((a->iccColor == b->iccColor)
- || (a->iccColor && b->iccColor
- && (a->iccColor->colorProfile == b->iccColor->colorProfile)
- && (a->iccColor->colors == b->iccColor->colors))));
+ && ((a->value.iccColor == b->value.iccColor)
+ || (a->value.iccColor && b->value.iccColor
+ && (a->value.iccColor->colorProfile == b->value.iccColor->colorProfile)
+ && (a->value.iccColor->colors == b->value.iccColor->colors))));
/* todo: Allow for epsilon differences in iccColor->colors, e.g. changes small enough not to show up
* in the string representation. */
if (a->type == SP_PAINT_TYPE_PAINTSERVER)
- return (a->value.paint.server != b->value.paint.server);
+ return (a->value.href == NULL || b->value.href == NULL || a->value.href->getObject() != b->value.href->getObject());
return false;
}
case SP_PAINT_TYPE_COLOR: {
char color_buf[8];
sp_svg_write_color(color_buf, sizeof(color_buf), sp_color_get_rgba32_ualpha(&paint->value.color, 0));
- if (paint->iccColor) {
+ if (paint->value.iccColor) {
CSSOStringStream css;
- css << color_buf << " icc-color(" << paint->iccColor->colorProfile;
- for (vector<double>::const_iterator i(paint->iccColor->colors.begin()),
- iEnd(paint->iccColor->colors.end());
+ css << color_buf << " icc-color(" << paint->value.iccColor->colorProfile;
+ for (vector<double>::const_iterator i(paint->value.iccColor->colors.begin()),
+ iEnd(paint->value.iccColor->colors.end());
i != iEnd; ++i) {
css << ", " << *i;
}
}
}
case SP_PAINT_TYPE_PAINTSERVER:
- return g_snprintf(b, len, "%s:url(%s);", key, paint->value.paint.uri);
+ return g_snprintf(b, len, "%s:url(%s);", key, paint->value.href? paint->value.href->getURI()->toString() : "");
default:
break;
}
{
if (val->inherit) {
return g_snprintf(p, len, "%s:inherit;", key);
- } else if (val->uri) {
- return g_snprintf(p, len, "%s:url(%s);", key, val->uri);
+ } else if (val->href && val->href->getURI()) {
+ return g_snprintf(p, len, "%s:url(%s);", key, val->href->getURI()->toString());
}
}
static void
sp_style_paint_clear(SPStyle *style, SPIPaint *paint)
{
- if ((paint->type == SP_PAINT_TYPE_PAINTSERVER) && paint->value.paint.server) {
- if (paint == &style->fill) {
- if (style->fill_hreffed) {
- sp_object_hunref(SP_OBJECT(paint->value.paint.server), style);
- style->fill_hreffed = false;
- }
- style->fill_release_connection.disconnect();
- style->fill_modified_connection.disconnect();
- } else {
- assert(paint == &style->stroke); // Only fill & stroke can have a paint server.
- if (style->stroke_hreffed) {
- sp_object_hunref(SP_OBJECT(paint->value.paint.server), style);
- style->stroke_hreffed = false;
- }
- style->stroke_release_connection.disconnect();
- style->stroke_modified_connection.disconnect();
- }
+ if (paint->value.href && paint->value.href->getObject())
+ paint->value.href->detach();
- paint->value.paint.server = NULL;
- }
- paint->value.paint.uri = NULL;
paint->type = SP_PAINT_TYPE_NONE;
- delete paint->iccColor;
- paint->iccColor = NULL;
+ delete paint->value.iccColor;
+ paint->value.iccColor = NULL;
}
static void
sp_style_filter_clear(SPStyle *style)
{
-
- if (style->filter_hreffed) {
- sp_object_hunref(SP_OBJECT(style->filter.filter), style);
- style->filter_hreffed = false;
- }
- style->filter_release_connection.disconnect();
- style->filter_modified_connection.disconnect();
-
- style->filter.filter = NULL;
+ if (style->filter.href && style->filter.href->getObject())
+ style->filter.href->detach();
}
/**
- * Remove quotes from SPIString object value.
- *
- * \todo FIXME: now used for font family, but perhaps this should apply to
- * ALL strings (check CSS spec), in which case this should be part of
- * read_istring.
+ * Remove quotes and escapes from a string. Returned value must be g_free'd.
+ * Note: in CSS (in style= and in stylesheets), unquoting and unescaping is done
+ * by libcroco, our CSS parser, though it adds a new pair of "" quotes for the strings
+ * it parsed for us. So this function is only used to remove those quotes and for
+ * presentation attributes, without any unescaping. (XML unescaping
+ * (& etc) is done by XML parser.)
*/
-static void
-css2_unescape_unquote(SPIString *val)
-{
- if (val->set && val->value && strlen(val->value) >= 2) {
+gchar *
+attribute_unquote(gchar const *val)
+{
+ if (val) {
+ if (*val == '\'' || *val == '"') {
+ int l = strlen(val);
+ if (l >= 2) {
+ if ( ( val[0] == '"' && val[l - 1] == '"' ) ||
+ ( val[0] == '\'' && val[l - 1] == '\'' ) ) {
+ return (g_strndup (val+1, l-2));
+ }
+ }
+ }
+ }
- /// \todo unescape all \-escaped chars
+ return (val? g_strdup (val) : NULL);
+}
- int l = strlen(val->value);
- if ( ( val->value[0] == '"' && val->value[l - 1] == '"' ) ||
- ( val->value[0] == '\'' && val->value[l - 1] == '\'' ) ) {
- memcpy(val->value, val->value + 1, l - 2);
- val->value[l - 2] = '\0';
+/**
+ * Quote and/or escape string for writing to CSS (style=). Returned value must be g_free'd.
+ */
+gchar *
+css2_escape_quote(gchar const *val) {
+
+ Glib::ustring t;
+ bool quote = false;
+ bool last_was_space = false;
+
+ for (gchar const *i = val; *i; i++) {
+ bool is_space = ( *i == ' ' );
+ if (g_ascii_isalnum(*i) || *i=='-' || *i=='_') {
+ // ASCII alphanumeric, - and _ don't require quotes
+ t.push_back(*i);
+ } else if ( is_space && !last_was_space ) {
+ // non-consecutive spaces don't require quotes
+ t.push_back(*i);
+ } else if (*i=='\'') {
+ // single quotes require escaping and quotes
+ t.push_back('\\');
+ t.push_back(*i);
+ quote = true;
+ } else {
+ // everything else requires quotes
+ t.push_back(*i);
+ quote = true;
}
+ if (i == val && !g_ascii_isalpha(*i)) {
+ // a non-ASCII/non-alpha initial character requires quotes
+ quote = true;
+ }
+ last_was_space = is_space;
+ }
+
+ if (last_was_space) {
+ // a trailing space requires quotes
+ quote = true;
}
-}
+ if (quote) {
+ // we use single quotes so the result can be stored in an XML
+ // attribute without incurring un-aesthetic additional quoting
+ // (our XML emitter always uses double quotes)
+ t.insert(t.begin(), '\'');
+ t.push_back('\'');
+ }
+
+ return (t.empty() ? NULL : g_strdup (t.c_str()));
+}
/*
Local Variables: