X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-object-repr.cpp;h=4bd83c61d3c81de75357683090f2117325332490;hb=d2a643364cc535fc47b69e8b8b5cd85973778dc2;hp=2ab53163a53f141bcbf219fe411942666929ec51;hpb=761a541468cc0b8a7fcfb8c65784c0896f0f80f4;p=inkscape.git diff --git a/src/sp-object-repr.cpp b/src/sp-object-repr.cpp index 2ab53163a..4bd83c61d 100644 --- a/src/sp-object-repr.cpp +++ b/src/sp-object-repr.cpp @@ -13,7 +13,7 @@ #include "sp-defs.h" #include "sp-symbol.h" -#include "sp-marker.h" +#include "marker.h" #include "sp-use.h" #include "sp-root.h" #include "sp-image.h" @@ -21,6 +21,9 @@ #include "sp-path.h" #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" @@ -30,6 +33,7 @@ #include "sp-metadata.h" #include "sp-polyline.h" #include "sp-textpath.h" +#include "sp-tref.h" #include "sp-tspan.h" #include "sp-pattern.h" #include "sp-clippath.h" @@ -39,6 +43,9 @@ #include "sp-flowdiv.h" #include "sp-flowregion.h" #include "sp-flowtext.h" +#include "sp-font.h" +#include "sp-glyph.h" +#include "sp-missing-glyph.h" #include "sp-style-elem.h" #include "sp-switch.h" #include "color-profile-fns.h" @@ -48,18 +55,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; @@ -128,23 +142,34 @@ populate_dtables() { "svg:flowRegionExclude", SP_TYPE_FLOWREGIONEXCLUDE }, { "svg:flowRoot", SP_TYPE_FLOWTEXT }, { "svg:flowSpan", SP_TYPE_FLOWTSPAN }, + { "svg:font", SP_TYPE_FONT }, + { "svg:glyph", SP_TYPE_GLYPH }, + { "svg:missing-glyph", SP_TYPE_MISSING_GLYPH }, { "svg:g", SP_TYPE_GROUP }, - { "feBlend", SP_TYPE_FEBLEND }, - { "feColorMatrix", SP_TYPE_FECOLORMATRIX }, - { "feComponentTransfer", SP_TYPE_FECOMPONENTTRANSFER }, - { "feComposite", SP_TYPE_FECOMPOSITE }, - { "feConvolveMatrix", SP_TYPE_FECONVOLVEMATRIX }, - { "feDiffuseLighting", SP_TYPE_FEDIFFUSELIGHTING }, - { "feDisplacementMap", SP_TYPE_FEDISPLACEMENTMAP }, - { "feFlood", SP_TYPE_FEFLOOD }, - { "feGaussianBlur", SP_TYPE_GAUSSIANBLUR }, - { "feImage", SP_TYPE_FEIMAGE }, - { "feMerge", SP_TYPE_FEMERGE }, - { "feMorphology", SP_TYPE_FEMORPHOLOGY }, - { "feOffset", SP_TYPE_FEOFFSET }, - { "feSpecularLighting", SP_TYPE_FESPECULARLIGHTING }, - { "feTile", SP_TYPE_FETILE }, - { "feTurbulence", SP_TYPE_FETURBULENCE }, + { "svg:feBlend", SP_TYPE_FEBLEND }, + { "svg:feColorMatrix", SP_TYPE_FECOLORMATRIX }, + { "svg:feComponentTransfer", SP_TYPE_FECOMPONENTTRANSFER }, + { "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 }, @@ -164,14 +189,19 @@ populate_dtables() { "svg:symbol", SP_TYPE_SYMBOL }, { "svg:text", SP_TYPE_TEXT }, { "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 } + { "star", SP_TYPE_STAR }, + { "inkscape:box3d", SP_TYPE_BOX3D }, + { "inkscape:box3dside", SP_TYPE_BOX3D_SIDE }, + { "inkscape:persp3d", SP_TYPE_PERSP3D } }; NameTypeEntry const *const t2entries[] = {