Connector tool: make connectors avoid the convex hull of shapes.

[inkscape.git] / src / style.h

diff --git a/src/style.h b/src/style.h
index 9b2d2878ae631456600b5baa1e263289906517fa..9a2c72f16a694005d01076a0ced930f2905e63a0 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;
 
 
@@ -337,6 +336,7 @@ struct SPStyle {
     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;
 
@@ -383,7 +383,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 +539,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;
 };