X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-object-repr.cpp;h=7eb91d281046aa13bc9a6eed2d00374578cabf92;hb=8d358698ecbf192ba7c6dc05d4f7de7592753d9f;hp=a4b47ca220c13c017567334e3593246ccd76e9aa;hpb=29ad4e90d149629a444e2b7aab6b48ca5a709d3e;p=inkscape.git diff --git a/src/sp-object-repr.cpp b/src/sp-object-repr.cpp index a4b47ca22..7eb91d281 100644 --- a/src/sp-object-repr.cpp +++ b/src/sp-object-repr.cpp @@ -22,6 +22,8 @@ #include "sp-radial-gradient-fns.h" #include "sp-rect.h" #include "box3d.h" +#include "box3d-side.h" +#include "persp3d.h" #include "sp-ellipse.h" #include "sp-star.h" #include "sp-stop-fns.h" @@ -41,6 +43,16 @@ #include "sp-flowdiv.h" #include "sp-flowregion.h" #include "sp-flowtext.h" +#include "config.h" + +#ifdef ENABLE_SVG_FONTS + #include "sp-font.h" + #include "sp-font-face.h" + #include "sp-glyph.h" + #include "sp-missing-glyph.h" + #include "sp-glyph-kerning.h" +#endif + #include "sp-style-elem.h" #include "sp-switch.h" #include "color-profile-fns.h" @@ -50,18 +62,25 @@ #include "sp-feblend.h" #include "sp-fecolormatrix.h" #include "sp-fecomponenttransfer.h" +#include "sp-fecomponenttransfer-funcnode.h" #include "sp-fecomposite.h" #include "sp-feconvolvematrix.h" #include "sp-fediffuselighting.h" +#include "sp-fedistantlight.h" #include "sp-fedisplacementmap.h" #include "sp-feflood.h" #include "sp-feimage.h" #include "sp-femerge.h" #include "sp-femorphology.h" #include "sp-feoffset.h" +#include "sp-fepointlight.h" #include "sp-fespecularlighting.h" +#include "sp-fespotlight.h" #include "sp-fetile.h" #include "sp-feturbulence.h" +#include "sp-femergenode.h" +#include "live_effects/lpeobject.h" + enum NameType { REPR_NAME, SODIPODI_TYPE }; static unsigned const N_NAME_TYPES = SODIPODI_TYPE + 1; @@ -130,6 +149,14 @@ populate_dtables() { "svg:flowRegionExclude", SP_TYPE_FLOWREGIONEXCLUDE }, { "svg:flowRoot", SP_TYPE_FLOWTEXT }, { "svg:flowSpan", SP_TYPE_FLOWTSPAN }, +#ifdef ENABLE_SVG_FONTS + { "svg:font", SP_TYPE_FONT }, + { "svg:font-face", SP_TYPE_FONTFACE }, + { "svg:glyph", SP_TYPE_GLYPH }, + { "svg:missing-glyph", SP_TYPE_MISSING_GLYPH }, + { "svg:hkern", SP_TYPE_HKERN }, + { "svg:vkern", SP_TYPE_VKERN }, +#endif { "svg:g", SP_TYPE_GROUP }, { "svg:feBlend", SP_TYPE_FEBLEND }, { "svg:feColorMatrix", SP_TYPE_FECOLORMATRIX }, @@ -137,16 +164,24 @@ populate_dtables() { "svg:feComposite", SP_TYPE_FECOMPOSITE }, { "svg:feConvolveMatrix", SP_TYPE_FECONVOLVEMATRIX }, { "svg:feDiffuseLighting", SP_TYPE_FEDIFFUSELIGHTING }, + { "svg:feDistantLight", SP_TYPE_FEDISTANTLIGHT }, { "svg:feDisplacementMap", SP_TYPE_FEDISPLACEMENTMAP }, { "svg:feFlood", SP_TYPE_FEFLOOD }, + { "svg:feFuncR", SP_TYPE_FEFUNCR }, + { "svg:feFuncG", SP_TYPE_FEFUNCG }, + { "svg:feFuncB", SP_TYPE_FEFUNCB }, + { "svg:feFuncA", SP_TYPE_FEFUNCA }, { "svg:feGaussianBlur", SP_TYPE_GAUSSIANBLUR }, { "svg:feImage", SP_TYPE_FEIMAGE }, { "svg:feMerge", SP_TYPE_FEMERGE }, { "svg:feMorphology", SP_TYPE_FEMORPHOLOGY }, { "svg:feOffset", SP_TYPE_FEOFFSET }, + { "svg:fePointLight", SP_TYPE_FEPOINTLIGHT }, { "svg:feSpecularLighting", SP_TYPE_FESPECULARLIGHTING }, + { "svg:feSpotLight", SP_TYPE_FESPOTLIGHT }, { "svg:feTile", SP_TYPE_FETILE }, { "svg:feTurbulence", SP_TYPE_FETURBULENCE }, + { "svg:feMergeNode", SP_TYPE_FEMERGENODE }, { "svg:image", SP_TYPE_IMAGE }, { "svg:line", SP_TYPE_LINE }, { "svg:linearGradient", SP_TYPE_LINEARGRADIENT }, @@ -168,15 +203,17 @@ populate_dtables() { "svg:textPath", SP_TYPE_TEXTPATH }, { "svg:tref", SP_TYPE_TREF }, { "svg:tspan", SP_TYPE_TSPAN }, - { "svg:use", SP_TYPE_USE } + { "svg:use", SP_TYPE_USE }, + { "inkscape:path-effect", TYPE_LIVEPATHEFFECT } }; NameTypeEntry const sodipodi_name_entries[] = { { "arc", SP_TYPE_ARC }, { "inkscape:offset", SP_TYPE_OFFSET }, { "spiral", SP_TYPE_SPIRAL }, { "star", SP_TYPE_STAR }, - { "inkscape:3dbox", SP_TYPE_3DBOX }//, - //{ "inkscape:3dboxface", SP_TYPE_3DBOX_FACE } + { "inkscape:box3d", SP_TYPE_BOX3D }, + { "inkscape:box3dside", SP_TYPE_BOX3D_SIDE }, + { "inkscape:persp3d", SP_TYPE_PERSP3D } }; NameTypeEntry const *const t2entries[] = {