make spcurve::first_point and last_point boost::optional

[inkscape.git] / src / attributes.cpp

diff --git a/src/attributes.cpp b/src/attributes.cpp
index a8ecb872bfe977901a54fc560671978c917968f2..e64cedf36a6d5cdf0be1766439ce0b4a54466281 100644 (file)
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -59,6 +59,7 @@ static SPStyleProp const props[] = {
     {SP_ATTR_PRESERVEASPECTRATIO, "preserveAspectRatio"},
     {SP_ATTR_SODIPODI_VERSION, "sodipodi:version"},
     {SP_ATTR_INKSCAPE_VERSION, "inkscape:version"},
+    {SP_ATTR_ONLOAD, "onload"},
     /* SPNamedView */
     {SP_ATTR_VIEWONLY, "viewonly"},
     {SP_ATTR_SHOWGUIDES, "showguides"},
@@ -86,12 +87,13 @@ static SPStyleProp const props[] = {
     {SP_ATTR_INKSCAPE_WINDOW_X, "inkscape:window-x"},
     {SP_ATTR_INKSCAPE_WINDOW_Y, "inkscape:window-y"},
     {SP_ATTR_INKSCAPE_SNAP_GLOBAL, "inkscape:snap-global"},
+    {SP_ATTR_INKSCAPE_SNAP_INDICATOR, "inkscape:snap-indicator"},
     {SP_ATTR_INKSCAPE_SNAP_BBOX, "inkscape:snap-bbox"},
     {SP_ATTR_INKSCAPE_SNAP_NODES, "inkscape:snap-nodes"},
     {SP_ATTR_INKSCAPE_SNAP_GUIDE, "inkscape:snap-guide"},
     {SP_ATTR_INKSCAPE_SNAP_CENTER, "inkscape:snap-center"},
     {SP_ATTR_INKSCAPE_SNAP_INTERS_GRIDGUIDE, "inkscape:snap-intersection-grid-guide"},
-    {SP_ATTR_INKSCAPE_SNAP_INTERS_LINESEGM, "inkscape:snap-intersection-line-segments"},
+    {SP_ATTR_INKSCAPE_SNAP_INTERS_PATHS, "inkscape:snap-intersection-paths"},
     {SP_ATTR_INKSCAPE_OBJECT_PATHS, "inkscape:object-paths"},
     {SP_ATTR_INKSCAPE_OBJECT_NODES, "inkscape:object-nodes"},
     {SP_ATTR_INKSCAPE_BBOX_PATHS, "inkscape:bbox-paths"},
@@ -332,12 +334,12 @@ static SPStyleProp const props[] = {
     {SP_ATTR_K, "k"},
 
     /*<font-face>*/
-    {SP_ATTR_FONT_FAMILY, "font-family"},
-    {SP_ATTR_FONT_STYLE, "font-style"},
-    {SP_ATTR_FONT_VARIANT, "font-variant"},
-    {SP_ATTR_FONT_WEIGHT, "font-weight"},
-    {SP_ATTR_FONT_STRETCH, "font-stretch"},
-    {SP_ATTR_FONT_SIZE, "font-size"},
+    //{SP_ATTR_FONT_FAMILY, "font-family"}, these are already set for CSS2 (SP_PROP_FONT_FAMILY, SP_PROP_FONT_STYLE, SP_PROP_FONT_VARIANT etc...)
+    //{SP_ATTR_FONT_STYLE, "font-style"},
+    //{SP_ATTR_FONT_VARIANT, "font-variant"},
+    //{SP_ATTR_FONT_WEIGHT, "font-weight"},
+    //{SP_ATTR_FONT_STRETCH, "font-stretch"},
+    //{SP_ATTR_FONT_SIZE, "font-size"},
     {SP_ATTR_UNICODE_RANGE, "unicode-range"},
     {SP_ATTR_UNITS_PER_EM, "units-per-em"},
     {SP_ATTR_PANOSE_1, "panose-1"},
@@ -355,7 +357,7 @@ static SPStyleProp const props[] = {
     {SP_ATTR_ALPHABETIC, "alphabetic"},
     {SP_ATTR_MATHEMATICAL, "mathematical"},
     {SP_ATTR_HANGING, "hanging"},
-    {SP_ATTR_V_IDEOGRAPHIC, "ideographic"},
+    {SP_ATTR_V_IDEOGRAPHIC, "v-ideographic"},
     {SP_ATTR_V_ALPHABETIC, "v-alphabetic"},
     {SP_ATTR_V_MATHEMATICAL, "v-mathematical"},
     {SP_ATTR_V_HANGING, "v-hanging"},