more SVGFonts boilerplate code

diff --git a/src/Makefile_insert b/src/Makefile_insert
index d37cb9b59ba0d71bd01771cd77158356bcc85f2f..201f8aaf2a136440ce7c391e42f7d5053f762887 100644 (file)
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -205,6 +205,7 @@ libinkpre_a_SOURCES =       \
        sp-flowdiv.h sp-flowdiv.cpp \
        sp-flowregion.h sp-flowregion.cpp \
        sp-flowtext.h sp-flowtext.cpp \
+        sp-font.cpp sp-font.h \
        sp-gaussian-blur.cpp sp-gaussian-blur.h \
        sp-gaussian-blur-fns.h  \
        sp-gradient-fns.h       \

diff --git a/src/attributes.cpp b/src/attributes.cpp
index c00268b968a913e4ade645c68917b5f78911b549..4a24e18a69cd9c3f9de58e0bb306c3e761ef156c 100644 (file)
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -307,6 +307,14 @@ static SPStyleProp const props[] = {
     {SP_ATTR_ADDITIVE, "additive"},
     {SP_ATTR_ACCUMULATE, "accumulate"},
 
+    /* SVGFonts */
+    {SP_ATTR_HORIZ_ORIGIN_X, "horiz-origin-x"},
+    {SP_ATTR_HORIZ_ORIGIN_Y, "horiz-origin-y"},
+    {SP_ATTR_HORIZ_ADV_X, "horiz-adv-x"},
+    {SP_ATTR_VERT_ORIGIN_X, "vert-origin-x"},
+    {SP_ATTR_VERT_ORIGIN_Y, "vert-origin-y"},
+    {SP_ATTR_VERT_ADV_Y, "vert-adv-y"},
+
     /* XML */
     {SP_ATTR_XML_SPACE, "xml:space"},
 

diff --git a/src/attributes.h b/src/attributes.h
index 89b3f4d04a6ae329f386ccfd42692705c8a0e443..2817685a9dda55a85c38392f29b82877aab135bc 100644 (file)
--- a/src/attributes.h
+++ b/src/attributes.h
@@ -307,6 +307,15 @@ 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,
+
     /* XML */
     SP_ATTR_XML_SPACE,
 

diff --git a/src/sp-font.h b/src/sp-font.h
index 0b8ea7ffbcb3192847a98ebcb7fb35b513a7ae0e..3ec866ccc83e3a18b9373b9cbc05e9472c22a418 100644 (file)
--- a/src/sp-font.h
+++ b/src/sp-font.h
@@ -21,6 +21,12 @@
 #define SP_IS_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_FONT))
 
 struct SPFont : public SPObject {
+    double horiz_origin_x;
+    double horiz_origin_y;
+    double horiz_adv_x;
+    double vert_origin_x;
+    double vert_origin_y;
+    double vert_adv_y;
 };
 
 struct SPFontClass {

diff --git a/src/sp-object-repr.cpp b/src/sp-object-repr.cpp
index 57e9ef986627465e5b4041bd3682777a27355270..577ff1690f1d4ef26e2fd4723d46d7d263f4bd01 100644 (file)
--- a/src/sp-object-repr.cpp
+++ b/src/sp-object-repr.cpp
@@ -43,6 +43,7 @@
 #include "sp-flowdiv.h"
 #include "sp-flowregion.h"
 #include "sp-flowtext.h"
+#include "sp-font.h"
 #include "sp-style-elem.h"
 #include "sp-switch.h"
 #include "color-profile-fns.h"
@@ -139,6 +140,7 @@ populate_dtables()
         { "svg:flowRegionExclude", SP_TYPE_FLOWREGIONEXCLUDE },
         { "svg:flowRoot", SP_TYPE_FLOWTEXT },
         { "svg:flowSpan", SP_TYPE_FLOWTSPAN },
+        { "svg:font", SP_TYPE_FONT },
         { "svg:g", SP_TYPE_GROUP },
         { "svg:feBlend", SP_TYPE_FEBLEND },
         { "svg:feColorMatrix", SP_TYPE_FECOLORMATRIX },