diff --git a/src/style.h b/src/style.h
index 623291941e614a590bfcb393a78e16747365ea2f..9a2c72f16a694005d01076a0ced930f2905e63a0 100644 (file)
--- a/src/style.h
+++ b/src/style.h
/** \file
* SPStyle - a style object for SPItem objects
- *
- * Authors:
+ */
+/* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
*
* Copyright (C) 2001-2002 Lauris Kaplinski
struct {
SPPaintServerReference *href;
SPColor color;
- SVGICCColor *iccColor;
} value;
void clear();
- void setColor( float r, float g, float b ) {sp_color_set_rgb_float(&value.color, r, g, b); colorSet = true;}
- void setColor( guint32 val ) {sp_color_set_rgb_rgba32(&value.color, val); colorSet = true;}
+ void setColor( float r, float g, float b ) {value.color.set( r, g, b ); colorSet = true;}
+ void setColor( guint32 val ) {value.color.set( val ); colorSet = true;}
void setColor( SPColor const& color ) {value.color = color; colorSet = true;}
};
unsigned stroke_dasharray_set : 1;
unsigned stroke_dasharray_inherit : 1;
unsigned stroke_dashoffset_set : 1;
+ unsigned stroke_dashoffset_inherit : 1;
/** stroke-opacity */
SPIScale24 stroke_opacity;
void sp_style_read_from_object(SPStyle *style, SPObject *object);
-void sp_style_read_from_repr(SPStyle *style, Inkscape::XML::Node *repr);
+void sp_style_read_from_prefs(SPStyle *style, Glib::ustring const &path);
void sp_style_merge_from_style_string(SPStyle *style, gchar const *p);
/* CSS font properties */
SPIString font_family;
+ /* Full font name, as font_factory::ConstructFontSpecification would give */
+ SPIString font_specification;
+
/** \todo fixme: The 'font' property is ugly, and not working (lauris) */
SPIString font;
};