diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 00:10:02 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-11-03 00:10:02 +0000 |
| commit | d2df0412f728dd5bb54537dfdfe7c35b34d40e0e (patch) | |
| tree | e2703384779e83312c456399999997fcc289c5cf /src/style.h | |
| parent | Merge branch 'master' into powerpencil (diff) | |
| parent | change assignment to equality (diff) | |
| download | inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.tar.gz inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.zip | |
Merge branch 'master' into powerpencil
Diffstat (limited to 'src/style.h')
| -rw-r--r-- | src/style.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/style.h b/src/style.h index 85d07b9ef..1b6ee2f47 100644 --- a/src/style.h +++ b/src/style.h @@ -166,9 +166,10 @@ public: /** SVG2 Text Wrapping */ SPIString shape_inside; - // SPIString shape_outside; + SPIString shape_subtract; SPILength shape_padding; - // SPILength shape_margin; + SPILength shape_margin; + SPILength inline_size; /* Text Decoration ----------------------- */ |