X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fattributes.h;h=8591258fe92ffdc7fa43ac253ab1a19849924f12;hb=e950f1f1abd91a298d2f9120aa48080ddc4809b3;hp=768fd000302022f03182f3cbedc623d207868c70;hpb=4550d1abdb3f428b8cd47c144d2cd112254bfb8e;p=inkscape.git

diff --git a/src/attributes.h b/src/attributes.h
index 768fd0003..8591258fe 100644
--- a/src/attributes.h
+++ b/src/attributes.h
@@ -23,7 +23,7 @@ unsigned char const *sp_attribute_name(unsigned int id);
  * True iff k is a property in SVG, i.e. something that can be written either in a style attribute
  * or as its own XML attribute.
  */
-#define SP_ATTRIBUTE_IS_CSS(k) (((k) >= SP_PROP_FONT) && ((k) <= SP_PROP_TEXT_RENDERING))
+#define SP_ATTRIBUTE_IS_CSS(k) (((k) >= SP_PROP_INKSCAPE_FONT_SPEC) && ((k) <= SP_PROP_TEXT_RENDERING))
 
 enum SPAttributeEnum {
     SP_ATTR_INVALID,  ///< Must have value 0.
@@ -85,14 +85,18 @@ enum SPAttributeEnum {
     SP_ATTR_INKSCAPE_WINDOW_HEIGHT,
     SP_ATTR_INKSCAPE_WINDOW_X,
     SP_ATTR_INKSCAPE_WINDOW_Y,
+    SP_ATTR_INKSCAPE_SNAP_GLOBAL,
     SP_ATTR_INKSCAPE_SNAP_BBOX,
     SP_ATTR_INKSCAPE_SNAP_NODES,
     SP_ATTR_INKSCAPE_SNAP_GUIDE,
     SP_ATTR_INKSCAPE_SNAP_CENTER,
+    SP_ATTR_INKSCAPE_SNAP_INTERS_GRIDGUIDE,
+    SP_ATTR_INKSCAPE_SNAP_INTERS_LINESEGM,
     SP_ATTR_INKSCAPE_OBJECT_PATHS,
     SP_ATTR_INKSCAPE_OBJECT_NODES,
     SP_ATTR_INKSCAPE_BBOX_PATHS,
-    SP_ATTR_INKSCAPE_BBOX_NODES,    
+    SP_ATTR_INKSCAPE_BBOX_NODES,
+    SP_ATTR_INKSCAPE_SNAP_PAGE,
     SP_ATTR_INKSCAPE_CURRENT_LAYER,
     SP_ATTR_INKSCAPE_DOCUMENT_UNITS,
     SP_ATTR_INKSCAPE_CONNECTOR_SPACING,
@@ -115,13 +119,18 @@ enum SPAttributeEnum {
     /* SPRect */
     SP_ATTR_RX,
     SP_ATTR_RY,
-    /* SP3DBox */
-    SP_ATTR_INKSCAPE_3DBOX,
-    SP_ATTR_INKSCAPE_3DBOX_CORNER_A, // "upper left front" corner
-    SP_ATTR_INKSCAPE_3DBOX_CORNER_B, // "lower right front" corner
-    SP_ATTR_INKSCAPE_3DBOX_CORNER_C, // "lower right rear" corner
-    SP_ATTR_INKSCAPE_3DBOX_PERSPECTIVE,
-    SP_ATTR_INKSCAPE_3DBOX_FACE,
+    /* Box3D */
+    SP_ATTR_INKSCAPE_BOX3D_PERSPECTIVE_ID,
+    SP_ATTR_INKSCAPE_BOX3D_CORNER0, // "upper left front" corner (as a point in 3-space)
+    SP_ATTR_INKSCAPE_BOX3D_CORNER7, // "lower right rear" corner (as a point in 3-space)
+    /* Box3DSide */
+    SP_ATTR_INKSCAPE_BOX3D_SIDE_TYPE,
+    /* Persp3D */
+    SP_ATTR_INKSCAPE_PERSP3D,
+    SP_ATTR_INKSCAPE_PERSP3D_VP_X,
+    SP_ATTR_INKSCAPE_PERSP3D_VP_Y,
+    SP_ATTR_INKSCAPE_PERSP3D_VP_Z,
+    SP_ATTR_INKSCAPE_PERSP3D_ORIGIN,
     /* SPEllipse */
     SP_ATTR_R,
     SP_ATTR_CX,
@@ -231,7 +240,7 @@ enum SPAttributeEnum {
     /*feFlood*/
     SP_ATTR_FLOODCOLOR,
     SP_ATTR_FLOODOPACITY,
-	/* SPGaussianBlur */
+    /* SPGaussianBlur */
     SP_ATTR_STDDEVIATION,
     /*feImage*/
     /*feMerge*/
@@ -241,14 +250,14 @@ enum SPAttributeEnum {
     /*feOffset*/
     //SP_ATTR_DX,
     //SP_ATTR_DY,
-	/*feSpecularLighting*/
+    /*feSpecularLighting*/
     //SP_ATTR_SURFACESCALE,
     SP_ATTR_SPECULARCONSTANT,
     SP_ATTR_SPECULAREXPONENT,
     /*feTile*/
     /*feTurbulence*/
     SP_ATTR_BASEFREQUENCY,
-	SP_ATTR_NUMOCTAVES,
+    SP_ATTR_NUMOCTAVES,
     SP_ATTR_SEED,
     SP_ATTR_STITCHTILES,
     //SP_ATTR_TYPE,
@@ -299,6 +308,63 @@ enum SPAttributeEnum {
     SP_ATTR_ADDITIVE,
     SP_ATTR_ACCUMULATE,
 
+    /* SVGFonts */
+    /* SPFont */
+    SP_ATTR_HORIZ_ORIGIN_X,
+    SP_ATTR_HORIZ_ORIGIN_Y,
+    SP_ATTR_HORIZ_ADV_X,
+    SP_ATTR_VERT_ORIGIN_X,
+    SP_ATTR_VERT_ORIGIN_Y,
+    SP_ATTR_VERT_ADV_Y,
+
+    SP_ATTR_UNICODE,
+    SP_ATTR_GLYPH_NAME,
+    //SP_ATTR_ORIENTATION,
+    SP_ATTR_ARABIC_FORM,
+    SP_ATTR_LANG,
+
+    /*<hkern> and <vkern>*/
+    SP_ATTR_U1,
+    SP_ATTR_G1,
+    SP_ATTR_U2,
+    SP_ATTR_G2,
+    SP_ATTR_K,
+
+    /*<font-face>*/
+    SP_ATTR_FONT_FAMILY,
+    SP_ATTR_FONT_STYLE,
+    SP_ATTR_FONT_VARIANT,
+    SP_ATTR_FONT_WEIGHT,
+    SP_ATTR_FONT_STRETCH,
+    SP_ATTR_FONT_SIZE,
+    SP_ATTR_UNICODE_RANGE,
+    SP_ATTR_UNITS_PER_EM,
+    SP_ATTR_PANOSE_1,
+    SP_ATTR_STEMV,
+    SP_ATTR_STEMH,
+    //SP_ATTR_SLOPE,
+    SP_ATTR_CAP_HEIGHT,
+    SP_ATTR_X_HEIGHT,
+    SP_ATTR_ACCENT_HEIGHT,
+    SP_ATTR_ASCENT,
+    SP_ATTR_DESCENT,
+    SP_ATTR_WIDTHS,
+    SP_ATTR_BBOX,
+    SP_ATTR_IDEOGRAPHIC,
+    SP_ATTR_ALPHABETIC,
+    SP_ATTR_MATHEMATICAL,
+    SP_ATTR_HANGING,
+    SP_ATTR_V_IDEOGRAPHIC,
+    SP_ATTR_V_ALPHABETIC,
+    SP_ATTR_V_MATHEMATICAL,
+    SP_ATTR_V_HANGING,
+    SP_ATTR_UNDERLINE_POSITION,
+    SP_ATTR_UNDERLINE_THICKNESS,
+    SP_ATTR_STRIKETHROUGH_POSITION,
+    SP_ATTR_STRIKETHROUGH_THICKNESS,
+    SP_ATTR_OVERLINE_POSITION,
+    SP_ATTR_OVERLINE_THICKNESS,
+
     /* XML */
     SP_ATTR_XML_SPACE,
 
@@ -313,6 +379,8 @@ enum SPAttributeEnum {
     SP_ATTR_LAYOUT_OPTIONS,
 
     /* CSS2 */
+    /* Custom full font name because Font stuff below is inadequate */
+    SP_PROP_INKSCAPE_FONT_SPEC,
     /* Font */
     SP_PROP_FONT,
     SP_PROP_FONT_FAMILY,