now that selection description includes style (filtered, clipped), we need to update...

[inkscape.git] / src / style.h

diff --git a/src/style.h b/src/style.h
index 623291941e614a590bfcb393a78e16747365ea2f..d5ccc4901ac5553d0fe6c29db161d30894a43d77 100644 (file)
--- a/src/style.h
+++ b/src/style.h
@@ -3,8 +3,8 @@
 
 /** \file
  * SPStyle - a style object for SPItem objects
- *
- * Authors:
+ */
+/* Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *
  * Copyright (C) 2001-2002 Lauris Kaplinski
@@ -156,7 +156,6 @@ struct SPIPaint {
     struct {
          SPPaintServerReference *href;
          SPColor color;
-         SVGICCColor *iccColor;
     } value;
 
 
@@ -171,8 +170,8 @@ struct SPIPaint {
 
     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;}
 };
 
@@ -383,7 +382,7 @@ SPStyle *sp_style_unref(SPStyle *style);
 
 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);
 
@@ -539,6 +538,9 @@ struct SPTextStyle {
     /* 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;
 };