summaryrefslogtreecommitdiffstats
path: root/src/attributes.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-07-30 15:53:05 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-07-30 15:53:05 +0000
commit5281d66b1a85e8f203c71798305f838fa3089dc2 (patch)
treecc3c8c61428eaa7308db24ee6c5b1c9c2fa5c2d3 /src/attributes.cpp
parentRefactoring of linejoin code (diff)
parentUpdate to trunk r13482 (diff)
downloadinkscape-5281d66b1a85e8f203c71798305f838fa3089dc2.tar.gz
inkscape-5281d66b1a85e8f203c71798305f838fa3089dc2.zip
Update to experimental r13452
(bzr r13090.1.95)
Diffstat (limited to 'src/attributes.cpp')
-rw-r--r--src/attributes.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/attributes.cpp b/src/attributes.cpp
index 2dc0d8071..f491dfc01 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -415,10 +415,6 @@ static SPStyleProp const props[] = {
/* Text */
{SP_PROP_TEXT_INDENT, "text-indent"},
{SP_PROP_TEXT_ALIGN, "text-align"},
- {SP_PROP_TEXT_DECORATION, "text-decoration"},
- {SP_PROP_TEXT_DECORATION_LINE, "text-decoration-line"},
- {SP_PROP_TEXT_DECORATION_STYLE,"text-decoration-style"},
- {SP_PROP_TEXT_DECORATION_COLOR,"text-decoration-color"},
{SP_PROP_LINE_HEIGHT, "line-height"},
{SP_PROP_LETTER_SPACING, "letter-spacing"},
{SP_PROP_WORD_SPACING, "word-spacing"},
@@ -435,6 +431,12 @@ static SPStyleProp const props[] = {
{SP_PROP_GLYPH_ORIENTATION_VERTICAL, "glyph-orientation-vertical"},
{SP_PROP_KERNING, "kerning"},
{SP_PROP_TEXT_ANCHOR, "text-anchor"},
+ {SP_PROP_WHITE_SPACE, "white-space"},
+ /* Text Decoration */
+ {SP_PROP_TEXT_DECORATION, "text-decoration"},
+ {SP_PROP_TEXT_DECORATION_LINE, "text-decoration-line"},
+ {SP_PROP_TEXT_DECORATION_STYLE,"text-decoration-style"},
+ {SP_PROP_TEXT_DECORATION_COLOR,"text-decoration-color"},
/* Misc */
{SP_PROP_CLIP, "clip"},
{SP_PROP_COLOR, "color"},
@@ -477,6 +479,8 @@ static SPStyleProp const props[] = {
{SP_PROP_MARKER_START, "marker-start"},
{SP_PROP_PAINT_ORDER, "paint-order" },
{SP_PROP_SHAPE_RENDERING, "shape-rendering"},
+ {SP_PROP_SOLID_COLOR, "solid-color"},
+ {SP_PROP_SOLID_OPACITY, "solid-opacity"},
{SP_PROP_STROKE, "stroke"},
{SP_PROP_STROKE_DASHARRAY, "stroke-dasharray"},
{SP_PROP_STROKE_DASHOFFSET, "stroke-dashoffset"},