summaryrefslogtreecommitdiffstats
path: root/src/sp-text.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-11-07 23:11:54 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-11-07 23:11:54 +0000
commit51639504fbee801b07900b8ffeef069157d298cb (patch)
tree6aec1edd9cfaf33d18e8f2cb61e90bcfaf99b9e1 /src/sp-text.cpp
parentFixes to CPU (diff)
parentMerge branch 'luzpaz/inkscape-typos' (!119) (diff)
downloadinkscape-51639504fbee801b07900b8ffeef069157d298cb.tar.gz
inkscape-51639504fbee801b07900b8ffeef069157d298cb.zip
Merge branch 'master' into fixSymbolsCpuProblems
Diffstat (limited to 'src/sp-text.cpp')
-rw-r--r--src/sp-text.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 3d9a41fe3..bbc711c96 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -517,7 +517,7 @@ unsigned SPText::_buildLayoutInput(SPObject *root, Inkscape::Text::Layout::Optio
// If both shape_inside and inline_size are set, shape_inside wins out.
// We construct a rectange with one dimension set by the computed value of 'inline-size'
- // and the other dimension set to infinity. Text is layed out starting at the 'x' and 'y'
+ // and the other dimension set to infinity. Text is laid out starting at the 'x' and 'y'
// attribute values. This is handled elsewhere.
double inline_size = style->inline_size.computed;