summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2019-07-01 23:35:16 +0000
committerPatrick Storz <eduard.braun2@gmx.de>2019-07-01 23:35:16 +0000
commit7f3aa2882be5547d5308870bced554502ca4421c (patch)
tree4c6b44f441fa20ac0d409c4c98c160fcaefc00c6 /src
parentBasque translation update (diff)
downloadinkscape-7f3aa2882be5547d5308870bced554502ca4421c.tar.gz
inkscape-7f3aa2882be5547d5308870bced554502ca4421c.zip
Fix various minor typos
Diffstat (limited to 'src')
-rw-r--r--src/attribute-rel-css.cpp2
-rw-r--r--src/attribute-rel-svg.cpp2
-rw-r--r--src/conn-avoid-ref.cpp2
-rw-r--r--src/extension/dbus/dbus-init.cpp2
-rw-r--r--src/extension/dbus/document-interface.cpp2
-rw-r--r--src/extension/dbus/document-interface.h2
-rw-r--r--src/extension/effect.h2
-rw-r--r--src/extension/implementation/script.cpp2
-rw-r--r--src/extension/init.cpp2
-rw-r--r--src/extension/internal/emf-inout.cpp4
-rw-r--r--src/extension/internal/filter/paint.h2
-rw-r--r--src/extension/internal/odf.cpp2
-rw-r--r--src/extension/internal/pdfinput/pdf-input.cpp2
-rw-r--r--src/extension/internal/text_reassemble.h2
-rw-r--r--src/extension/internal/wmf-inout.cpp2
-rw-r--r--src/extension/param/string.h2
-rw-r--r--src/helper/pixbuf-ops.cpp2
-rw-r--r--src/helper/png-write.cpp2
-rw-r--r--src/io/resource.cpp2
-rw-r--r--src/livarot/Path.cpp2
-rw-r--r--src/livarot/Path.h4
-rw-r--r--src/livarot/PathCutting.cpp2
-rw-r--r--src/livarot/PathOutline.cpp2
-rw-r--r--src/livarot/PathSimplify.cpp4
-rw-r--r--src/live_effects/effect.cpp4
-rw-r--r--src/live_effects/lpe-dashed-stroke.cpp14
-rw-r--r--src/live_effects/lpe-offset.cpp4
-rw-r--r--src/live_effects/lpe-rough-hatches.cpp2
-rw-r--r--src/live_effects/lpe-roughen.cpp72
-rw-r--r--src/live_effects/lpe-roughen.h2
-rw-r--r--src/live_effects/lpe-sketch.cpp2
-rw-r--r--src/live_effects/lpe-transform_2pts.cpp28
-rw-r--r--src/live_effects/lpe-transform_2pts.h4
-rw-r--r--src/live_effects/parameter/satellitesarray.cpp8
-rw-r--r--src/object/sp-conn-end-pair.h2
-rw-r--r--src/object/sp-ellipse.cpp2
-rw-r--r--src/object/sp-item.cpp2
-rw-r--r--src/object/sp-object.h2
-rw-r--r--src/object/sp-use.cpp2
-rw-r--r--src/style.h2
-rw-r--r--src/svg/svg.h2
-rw-r--r--src/text-editing.cpp2
-rw-r--r--src/ui/dialog/export.cpp8
-rw-r--r--src/ui/dialog/extension-editor.cpp2
-rw-r--r--src/ui/dialog/livepatheffect-add.cpp2
-rw-r--r--src/ui/dialog/styledialog.h6
-rw-r--r--src/ui/dialog/symbols.cpp2
-rw-r--r--src/ui/tool/node.h2
-rw-r--r--src/ui/tool/path-manipulator.cpp2
-rw-r--r--src/ui/toolbar/mesh-toolbar.cpp2
-rw-r--r--src/ui/toolbar/text-toolbar.cpp2
-rw-r--r--src/ui/tools/connector-tool.cpp2
-rw-r--r--src/ui/tools/tweak-tool.cpp2
-rw-r--r--src/ui/widget/combo-box-entry-tool-item.cpp2
-rw-r--r--src/ui/widget/point.h2
-rw-r--r--src/ui/widget/scalar.h2
-rw-r--r--src/util/expression-evaluator.cpp2
-rw-r--r--src/util/find-if-before.h2
-rw-r--r--src/verbs.cpp2
-rw-r--r--src/widgets/sp-attribute-widget.cpp2
-rw-r--r--src/xml/node.h2
61 files changed, 129 insertions, 129 deletions
diff --git a/src/attribute-rel-css.cpp b/src/attribute-rel-css.cpp
index 4a110f5e9..a7cefb4a5 100644
--- a/src/attribute-rel-css.cpp
+++ b/src/attribute-rel-css.cpp
@@ -53,7 +53,7 @@ bool SPAttributeRelCSS::findIfValid(Glib::ustring property, Glib::ustring elemen
temp.erase( temp.find("svg:"), 4 );
}
- // Don't check for properties with -, role, aria etc. to allow for more accessbility
+ // Don't check for properties with -, role, aria etc. to allow for more accessibility
// FixMe: Name space list should be created when file read in.
if (property[0] == '-'
|| property.substr(0,4) == "role"
diff --git a/src/attribute-rel-svg.cpp b/src/attribute-rel-svg.cpp
index 90ec53f4d..73b3f84a7 100644
--- a/src/attribute-rel-svg.cpp
+++ b/src/attribute-rel-svg.cpp
@@ -71,7 +71,7 @@ bool SPAttributeRelSVG::findIfValid(Glib::ustring attribute, Glib::ustring eleme
temp.erase( temp.find("svg:"), 4 );
}
- // Check for attributes with -, role, aria etc. to allow for more accessbility
+ // Check for attributes with -, role, aria etc. to allow for more accessibility
if (attribute[0] == '-'
|| attribute.substr(0,4) == "role"
|| attribute.substr(0,4) == "aria"
diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
index 3b706e151..e571debbf 100644
--- a/src/conn-avoid-ref.cpp
+++ b/src/conn-avoid-ref.cpp
@@ -92,7 +92,7 @@ void SPAvoidRef::handleSettingChange()
// isn't the same as the document that this item is part of. This
// case can happen if a new document is loaded from the file chooser
// or via the recent file menu. In this case, we can end up here
- // as a rersult of a ensureUpToDate performed on a
+ // as a result of a ensureUpToDate performed on a
// document not yet attached to the active desktop.
return;
}
diff --git a/src/extension/dbus/dbus-init.cpp b/src/extension/dbus/dbus-init.cpp
index e74aa7be4..30f9fa1dc 100644
--- a/src/extension/dbus/dbus-init.cpp
+++ b/src/extension/dbus/dbus-init.cpp
@@ -15,7 +15,7 @@
*/
#include <dbus/dbus-glib.h>
-// this is reguired so that giomm headers won't barf
+// this is required so that giomm headers won't barf
#undef DBUS_MESSAGE_TYPE_INVALID
#include "dbus-init.h"
diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp
index 8a771f5b0..265b6f61a 100644
--- a/src/extension/dbus/document-interface.cpp
+++ b/src/extension/dbus/document-interface.cpp
@@ -1468,7 +1468,7 @@ document_interface_get_xpath (DocumentInterface *doc_interface, char *xpath_exp
xpathObj = xmlXPathEvalExpression(xmlCharStrdup(xpath_expression), xpathCtx);
//xpathresult result = xpatheval(repr, xpath_selection);
- //convert resut to a string array we can return via dbus
+ //convert result to a string array we can return via dbus
return TRUE;
}
#endif
diff --git a/src/extension/dbus/document-interface.h b/src/extension/dbus/document-interface.h
index f2229a9aa..ed3151308 100644
--- a/src/extension/dbus/document-interface.h
+++ b/src/extension/dbus/document-interface.h
@@ -24,7 +24,7 @@
#include <dbus/dbus-glib-bindings.h>
#include <dbus/dbus-glib-lowlevel.h>
-// this is reguired so that giomm headers won't barf
+// this is required so that giomm headers won't barf
#undef DBUS_MESSAGE_TYPE_INVALID
#undef DBUS_MESSAGE_TYPE_METHOD_CALL
#undef DBUS_MESSAGE_TYPE_METHOD_RETURN
diff --git a/src/extension/effect.h b/src/extension/effect.h
index 8a52838f5..1eb04cd15 100644
--- a/src/extension/effect.h
+++ b/src/extension/effect.h
@@ -55,7 +55,7 @@ class Effect : public Extension {
Effect * _effect;
/** \brief Whether or not to show preferences on display */
bool _showPrefs;
- /** \brief Name with elipses if that makes sense */
+ /** \brief Name with ellipses if that makes sense */
gchar * _elip_name;
protected:
SPAction * make_action (Inkscape::ActionContext const & context) override;
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 53f082955..1d90d1266 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -807,7 +807,7 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr
}
// Question: Why is the "sodipodi:namedview" special? Treating it as a normal
- // elmement results in crashes.
+ // element results in crashes.
// Seems to be a bug:
// http://inkscape.13.x6.nabble.com/Effect-that-modifies-the-document-properties-tt2822126.html
diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index c3d34b0c1..5a95fb8ef 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -145,7 +145,7 @@ update_pref(Glib::ustring const &pref_path,
* Invokes the init routines for internal modules.
*
* This should be a list of all the internal modules that need to initialized. This is just a
- * convinent place to put them.
+ * convenient place to put them.
*/
void
init()
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index d1d0f5c5a..30b98c462 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -162,7 +162,7 @@ Emf::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filena
ext->set_param_bool("FixImageRot",new_FixImageRot);
ext->set_param_bool("textToPath", new_val);
- // ensure usage of dot as decimal separator in scanf/printf functions (indepentendly of current locale)
+ // ensure usage of dot as decimal separator in scanf/printf functions (independently of current locale)
char *oldlocale = g_strdup(setlocale(LC_NUMERIC, nullptr));
setlocale(LC_NUMERIC, "C");
@@ -215,7 +215,7 @@ std::string Emf::current_matrix(PEMF_CALLBACK_DATA d, double x, double y, int us
}
/* given the transformation matrix from worldTransform return the rotation angle in radians.
- counter clocwise from the x axis. */
+ counter clockwise from the x axis. */
double Emf::current_rotation(PEMF_CALLBACK_DATA d){
return -std::atan2(d->dc[d->level].worldTransform.eM12, d->dc[d->level].worldTransform.eM11);
}
diff --git a/src/extension/internal/filter/paint.h b/src/extension/internal/filter/paint.h
index 06a05f167..69da5fd2c 100644
--- a/src/extension/internal/filter/paint.h
+++ b/src/extension/internal/filter/paint.h
@@ -828,7 +828,7 @@ PointEngraving::get_filter_text (Inkscape::Extension::Extension * ext)
* Effect type (enum, default "Normal") ->
Normal = feComponentTransfer
Dented = Normal + intermediate values
- * Transfer type (enum, default "descrete") -> component (type)
+ * Transfer type (enum, default "discrete") -> component (type)
* Levels (0->15, default 5) -> component (tableValues)
* Blend mode (enum, default "Lighten") -> blend (mode)
* Primary simplify (0.01->100., default 4.) -> blur1 (stdDeviation)
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 6debd3f28..d61dc56c5 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -1087,7 +1087,7 @@ bool OdfOutput::writeManifest(ZipFile &zf)
{
Glib::ustring newName = iter->second;
- // note: mime subtype was added as file extenion in OdfOutput::preprocess
+ // note: mime subtype was added as file extension in OdfOutput::preprocess
Glib::ustring mimesubtype = Inkscape::IO::get_file_extension(newName);
outs.printf(" <manifest:file-entry manifest:media-type=\"");
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 2a3947ec1..e46ab9778 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -834,7 +834,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
PdfParser *pdf_parser = new PdfParser(pdf_doc->getXRef(), builder, page_num-1, page->getRotate(),
page->getResourceDict(), page->getCropBox(), clipToBox);
- // Set up approximation precision for parser. Used for convering Mesh Gradients into tiles.
+ // Set up approximation precision for parser. Used for converting Mesh Gradients into tiles.
double color_delta;
sp_repr_get_double(prefs, "approximationPrecision", &color_delta);
if ( color_delta <= 0.0 ) {
diff --git a/src/extension/internal/text_reassemble.h b/src/extension/internal/text_reassemble.h
index 817ea998e..25b556abb 100644
--- a/src/extension/internal/text_reassemble.h
+++ b/src/extension/internal/text_reassemble.h
@@ -194,7 +194,7 @@ typedef struct {
element in a complex */
TRCOLORREF color; /**< RGB */
int taln; /**< text alignment with respect to x,y */
- int ldir; /**< language diretion LDIR_* */
+ int ldir; /**< language direction LDIR_* */
int italics; /**< italics, as in FontConfig */
int weight; /**< weight, as in FontConfig */
int condensed; /**< condensed, as in FontConfig */
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index c9b15e7ac..4a080da00 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -160,7 +160,7 @@ Wmf::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filena
ext->set_param_bool("FixPPTPatternAsHatch",new_FixPPTPatternAsHatch);
ext->set_param_bool("textToPath", new_val);
- // ensure usage of dot as decimal separator in scanf/printf functions (indepentendly of current locale)
+ // ensure usage of dot as decimal separator in scanf/printf functions (independently of current locale)
char *oldlocale = g_strdup(setlocale(LC_NUMERIC, nullptr));
setlocale(LC_NUMERIC, "C");
diff --git a/src/extension/param/string.h b/src/extension/param/string.h
index 195496ba3..7c094d394 100644
--- a/src/extension/param/string.h
+++ b/src/extension/param/string.h
@@ -45,7 +45,7 @@ public:
void string(std::string &string) const override;
- void setMaxLength(int maxLenght) { _max_length = maxLenght; }
+ void setMaxLength(int maxLength) { _max_length = maxLength; }
int getMaxLength() { return _max_length; }
};
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index e29234c24..4c5b9693c 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -123,7 +123,7 @@ Inkscape::Pixbuf *sp_generate_internal_bitmap(SPDocument *doc, gchar const */*fi
if (item_only) {
hide_other_items_recursively(doc->getRoot(), item_only, dkey);
// TODO: The following line forces 100% opacity as required by sp_asbitmap_render() in cairo-renderer.cpp
- // Make it contitional if 'item_only' is ever used by other callers which need to retain opacity
+ // Make it conditional if 'item_only' is ever used by other callers which need to retain opacity
item_only->get_arenaitem(dkey)->setOpacity(1.0);
}
diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
index 1f1b89625..5fedc08ec 100644
--- a/src/helper/png-write.cpp
+++ b/src/helper/png-write.cpp
@@ -169,7 +169,7 @@ sp_png_write_rgba_striped(SPDocument *doc,
}
/* Set error handling. REQUIRED if you aren't supplying your own
- * error hadnling functions in the png_create_write_struct() call.
+ * error handling functions in the png_create_write_struct() call.
*/
if (setjmp(png_jmpbuf(png_ptr))) {
// If we get here, we had a problem reading the file
diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index 078914ba0..5a15b02f3 100644
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -286,7 +286,7 @@ std::vector<Glib::ustring> get_foldernames(Glib::ustring path, std::vector<const
/*
* Get all the files from a specific path and any sub-dirs, populating &files vector
*
- * &files - Output list to populate, will be poulated with full paths
+ * &files - Output list to populate, will be populated with full paths
* path - The directory to parse, will add nothing if directory doesn't exist
* extensions - Only add files with these extensions, they must be duplicated
* exclusions - Exclude files that exactly match these names.
diff --git a/src/livarot/Path.cpp b/src/livarot/Path.cpp
index b0f19fddb..6b29a9e14 100644
--- a/src/livarot/Path.cpp
+++ b/src/livarot/Path.cpp
@@ -811,7 +811,7 @@ void Path::FastBBox(double &l,double &t,double &r,double &b)
}
/* bug 249665: "...the calculation of the bounding-box for cubic-paths
-has some extra steps to make it work corretly in Win32 that unfortunately
+has some extra steps to make it work correctly in Win32 that unfortunately
are unnecessary in Linux, generating wrong results. This only shows in
Type1 fonts because they use cubic-paths instead of the
bezier-paths used by True-Type fonts."
diff --git a/src/livarot/Path.h b/src/livarot/Path.h
index eced78ec5..c965e360e 100644
--- a/src/livarot/Path.h
+++ b/src/livarot/Path.h
@@ -84,7 +84,7 @@ public:
std::vector<PathDescr*> descr_cmd;
// polyline storage: a series of coordinates (and maybe weights)
- // also back data: info on where this polyline's segment comes from, ie wich command in the path description: "piece"
+ // also back data: info on where this polyline's segment comes from, ie which command in the path description: "piece"
// and what abcissis on the chunk of path for this command: "t"
// t=0 means it's at the start of the command's chunk, t=1 it's at the end
struct path_lineto
@@ -233,7 +233,7 @@ public:
bool IsLineSegment(int piece);
private:
- // utilitary functions for the path contruction
+ // utilitary functions for the path construction
void CancelBezier ();
void CloseSubpath();
void InsertMoveTo (Geom::Point const &iPt,int at);
diff --git a/src/livarot/PathCutting.cpp b/src/livarot/PathCutting.cpp
index 94826c70b..4684b05dc 100644
--- a/src/livarot/PathCutting.cpp
+++ b/src/livarot/PathCutting.cpp
@@ -75,7 +75,7 @@ void Path::DashPolylineFromStyle(SPStyle *style, float scale, float min_len)
dash[i] = style->stroke_dasharray.values[i].value * scale;
}
- // Convert relative positions to absolute postions
+ // Convert relative positions to absolute positions
int nbD = n_dash;
float *dashs=(float*)malloc((nbD+1)*sizeof(float));
while ( dash_offset >= dlen ) dash_offset-=dlen;
diff --git a/src/livarot/PathOutline.cpp b/src/livarot/PathOutline.cpp
index 4e0cefec7..c7fb22638 100644
--- a/src/livarot/PathOutline.cpp
+++ b/src/livarot/PathOutline.cpp
@@ -901,7 +901,7 @@ Path::IsNulCurve (std::vector<PathDescr*> const &cmd, int curD, Geom::Point cons
}
}
-// tangents and cuvarture computing, for the different path command types.
+// tangents and curvarture computing, for the different path command types.
// the need for tangent is obvious: it gives the normal, along which we offset points
// curvature is used to do strength correction on the length of the tangents to the offset (see
// cubic offset)
diff --git a/src/livarot/PathSimplify.cpp b/src/livarot/PathSimplify.cpp
index dd86b5090..90e080a6c 100644
--- a/src/livarot/PathSimplify.cpp
+++ b/src/livarot/PathSimplify.cpp
@@ -74,7 +74,7 @@ void Path::Simplify(double treshhold)
#if 0
// dichomtomic method to get distance to curve approximation
// a real polynomial solver would get the minimum more efficiently, but since the polynom
-// would likely be of degree >= 5, that would imply using some generic solver, liek using the sturm metod
+// would likely be of degree >= 5, that would imply using some generic solver, liek using the sturm method
static double RecDistanceToCubic(Geom::Point const &iS, Geom::Point const &isD,
Geom::Point const &iE, Geom::Point const &ieD,
Geom::Point &pt, double current, int lev, double st, double et)
@@ -242,7 +242,7 @@ void Path::DoSimplify(int off, int N, double treshhold)
// warning: slow
-// idea behing this feature: splotches appear when trying to fit a small number of points: you can
+// idea behind this feature: splotches appear when trying to fit a small number of points: you can
// get a cubic bezier that fits the points very well but doesn't fit the polyline itself
// so we add a bit of the error at the middle of each segment of the polyline
// also we restrict this to <=20 points, to avoid unnecessary computations
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index f93e4400d..7bfe6617a 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -612,7 +612,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "powerclip" //key
, "powerclip" //icon
, "Power clip" //untranslated name
- , N_("Power clip alows to reverse a clip, flatten it...") //description
+ , N_("Power clip allows to reverse a clip, flatten it...") //description
, true //on_path
, true //on_shape
, true //on_group
@@ -626,7 +626,7 @@ const EnumEffectData<EffectType> LPETypeData[] = {
, "powermask" //key
, "powermask" //icon
, "Power mask" //untranslated name
- , N_("Power mask allow to inverse the mask, make negative..") //description
+ , N_("Power mask allows inversing the mask, make negative...") //description
, true //on_path
, true //on_shape
, true //on_group
diff --git a/src/live_effects/lpe-dashed-stroke.cpp b/src/live_effects/lpe-dashed-stroke.cpp
index fe6390430..13d1e9408 100644
--- a/src/live_effects/lpe-dashed-stroke.cpp
+++ b/src/live_effects/lpe-dashed-stroke.cpp
@@ -117,13 +117,13 @@ Geom::PathVector LPEDashedStroke::doEffect_path(Geom::PathVector const &path_in)
double dashsize_fixed = 0;
double holesize_fixed = 0;
Geom::Piecewise<Geom::D2<Geom::SBasis> > pwd2 = path_it.toPwSb();
- double lenght_pwd2 = length (pwd2);
- double minlenght = lenght_pwd2;
+ double length_pwd2 = length (pwd2);
+ double minlength = length_pwd2;
if(unifysegment) {
while (curve_it1 != curve_endit) {
- double lenght_segment = (*curve_it1).length();
- if (lenght_segment < minlenght) {
- minlenght = lenght_segment;
+ double length_segment = (*curve_it1).length();
+ if (length_segment < minlength) {
+ minlength = length_segment;
dashsize_fixed = (*curve_it1).length() * dashpercent;
holesize_fixed = (*curve_it1).length() * holepercent;
}
@@ -234,8 +234,8 @@ Geom::PathVector LPEDashedStroke::doEffect_path(Geom::PathVector const &path_in)
} else {
double start = 0.0;
double end = 0.0;
- double dashsize = lenght_pwd2 * dashpercent;
- double holesize = lenght_pwd2 * holepercent;
+ double dashsize = length_pwd2 * dashpercent;
+ double holesize = length_pwd2 * holepercent;
if (halfextreme) {
end = timeAtLength(dashsize/2.0,pwd2);
} else {
diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp
index 124d7a612..3ec66d433 100644
--- a/src/live_effects/lpe-offset.cpp
+++ b/src/live_effects/lpe-offset.cpp
@@ -359,8 +359,8 @@ LPEOffset::doEffect_path(Geom::PathVector const & path_in)
original_width = (*original_bounds).width();
}
reversed = against_dir_bounds.contains(with_dir_bounds) == false;
- // We can have a strange result thth bounding box container
- // Give a wrong result.in teory it happends sometimes on expand offset
+ // We can have a strange result for the bounding box container
+ // Gives a wrong result, in theory, it happens sometimes on expand offset
if (offset > 0 &&
((original_width < against_dir_width &&
original_width < with_dir_width) ||
diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index e121045f7..acda1f401 100644
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -488,7 +488,7 @@ LPERoughHatches::smoothSnake(std::vector<std::vector<Point> > const &linearSnake
new_hdle_in -= (pt1-pt0)/2*( double((is_top ? front_thickness : back_thickness)) / (pt1[X]-pt0[X]) );
new_hdle_out += (pt1-pt0)/2*( double((is_top ? back_thickness : front_thickness)) / (pt1[X]-pt0[X]) );
- //TODO: find a good way to handle limit cases (small smthness, large stroke).
+ //TODO: find a good way to handle limit cases (small smoothness, large stroke).
//if (inside_hdle_in[X] > inside[X]) inside_hdle_in = inside;
//if (inside_hdle_out[X] < inside[X]) inside_hdle_out = inside;
diff --git a/src/live_effects/lpe-roughen.cpp b/src/live_effects/lpe-roughen.cpp
index 14c95ca45..b97fc5a26 100644
--- a/src/live_effects/lpe-roughen.cpp
+++ b/src/live_effects/lpe-roughen.cpp
@@ -178,7 +178,7 @@ double LPERoughen::sign(double random_number)
return random_number;
}
-Geom::Point LPERoughen::randomize(double max_lenght, bool is_node)
+Geom::Point LPERoughen::randomize(double max_length, bool is_node)
{
double factor = 1.0/3.0;
if(is_node){
@@ -189,7 +189,7 @@ Geom::Point LPERoughen::randomize(double max_lenght, bool is_node)
Geom::Point output = Geom::Point(sign(displace_x_parsed), sign(displace_y_parsed));
if( fixed_displacement ){
Geom::Ray ray(Geom::Point(0,0),output);
- output = Geom::Point::polar(ray.angle(), max_lenght);
+ output = Geom::Point::polar(ray.angle(), max_length);
}
return output;
}
@@ -312,7 +312,7 @@ SPCurve const * LPERoughen::addNodesAndJitter(Geom::Curve const * A, Geom::Point
{
SPCurve *out = new SPCurve();
Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const *>(&*A);
- double max_lenght = Geom::distance(A->initialPoint(),A->pointAt(t)) / 3.0;
+ double max_length = Geom::distance(A->initialPoint(),A->pointAt(t)) / 3.0;
Geom::Point point_a1(0, 0);
Geom::Point point_a2(0, 0);
Geom::Point point_a3(0, 0);
@@ -320,17 +320,17 @@ SPCurve const * LPERoughen::addNodesAndJitter(Geom::Curve const * A, Geom::Point
Geom::Point point_b2(0, 0);
Geom::Point point_b3(0, 0);
if (shift_nodes) {
- point_a3 = randomize(max_lenght, true);
+ point_a3 = randomize(max_length, true);
if(last){
- point_b3 = randomize(max_lenght, true);
+ point_b3 = randomize(max_length, true);
}
}
if (handles == HM_RAND || handles == HM_SMOOTH) {
- point_a1 = randomize(max_lenght);
- point_a2 = randomize(max_lenght);
- point_b1 = randomize(max_lenght);
+ point_a1 = randomize(max_length);
+ point_a2 = randomize(max_length);
+ point_b1 = randomize(max_length);
if(last){
- point_b2 = randomize(max_lenght);
+ point_b2 = randomize(max_length);
}
} else {
point_a2 = point_a3;
@@ -345,28 +345,28 @@ SPCurve const * LPERoughen::addNodesAndJitter(Geom::Curve const * A, Geom::Point
std::vector<Geom::Point> seg1 = div.first.controlPoints(),
seg2 = div.second.controlPoints();
Geom::Ray ray(seg1[3] + point_a3, seg2[1] + point_a3);
- double lenght = max_lenght;
+ double length = max_length;
if(!fixed_displacement ){
- lenght = Geom::distance(seg1[3] + point_a3, seg2[1] + point_a3);
+ length = Geom::distance(seg1[3] + point_a3, seg2[1] + point_a3);
}
- point_b1 = seg1[3] + point_a3 + Geom::Point::polar(ray.angle() , lenght);
+ point_b1 = seg1[3] + point_a3 + Geom::Point::polar(ray.angle() , length);
point_b2 = seg2[2];
point_b3 = seg2[3] + point_b3;
point_a3 = seg1[3] + point_a3;
ray.setPoints(prev,A->initialPoint());
- point_a1 = A->initialPoint() + Geom::Point::polar(ray.angle(), max_lenght);
+ point_a1 = A->initialPoint() + Geom::Point::polar(ray.angle(), max_length);
if(last){
Geom::Path b2(point_b3);
b2.appendNew<Geom::LineSegment>(point_a3);
- lenght = max_lenght;
+ length = max_length;
ray.setPoints(point_b3, point_b2);
if(!fixed_displacement ){
- lenght = Geom::distance(b2.pointAt(1.0/3.0), point_b3);
+ length = Geom::distance(b2.pointAt(1.0/3.0), point_b3);
}
- point_b2 = point_b3 + Geom::Point::polar(ray.angle() , lenght);
+ point_b2 = point_b3 + Geom::Point::polar(ray.angle() , length);
}
ray.setPoints(point_b1, point_a3);
- point_a2 = point_a3 + Geom::Point::polar(ray.angle(), max_lenght);
+ point_a2 = point_a3 + Geom::Point::polar(ray.angle(), max_length);
if(last){
prev = point_b2;
} else {
@@ -377,31 +377,31 @@ SPCurve const * LPERoughen::addNodesAndJitter(Geom::Curve const * A, Geom::Point
out->curveto(point_b1, point_b2, point_b3);
} else {
Geom::Ray ray(A->pointAt(t) + point_a3, A->pointAt(t + (t / 3)));
- double lenght = max_lenght;
+ double length = max_length;
if(!fixed_displacement ){
- lenght = Geom::distance(A->pointAt(t) + point_a3, A->pointAt(t + (t / 3)));
+ length = Geom::distance(A->pointAt(t) + point_a3, A->pointAt(t + (t / 3)));
}
- point_b1 = A->pointAt(t) + point_a3 + Geom::Point::polar(ray.angle() , lenght);
+ point_b1 = A->pointAt(t) + point_a3 + Geom::Point::polar(ray.angle() , length);
point_b2 = A->pointAt(t +((t / 3) * 2));
point_b3 = A->finalPoint() + point_b3;
point_a3 = A->pointAt(t) + point_a3;
ray.setPoints(prev,A->initialPoint());
- point_a1 = A->initialPoint() + Geom::Point::polar(ray.angle(), max_lenght);
+ point_a1 = A->initialPoint() + Geom::Point::polar(ray.angle(), max_length);
if(prev == Geom::Point(0,0)){
- point_a1 = randomize(max_lenght);
+ point_a1 = randomize(max_length);
}
if(last){
Geom::Path b2(point_b3);
b2.appendNew<Geom::LineSegment>(point_a3);
- lenght = max_lenght;
+ length = max_length;
ray.setPoints(point_b3, point_b2);
if(!fixed_displacement ){
- lenght = Geom::distance(b2.pointAt(1.0/3.0), point_b3);
+ length = Geom::distance(b2.pointAt(1.0/3.0), point_b3);
}
- point_b2 = point_b3 + Geom::Point::polar(ray.angle() , lenght);
+ point_b2 = point_b3 + Geom::Point::polar(ray.angle() , length);
}
ray.setPoints(point_b1, point_a3);
- point_a2 = point_a3 + Geom::Point::polar(ray.angle(), max_lenght);
+ point_a2 = point_a3 + Geom::Point::polar(ray.angle(), max_length);
if(last){
prev = point_b2;
} else {
@@ -459,37 +459,37 @@ SPCurve *LPERoughen::jitter(Geom::Curve const * A, Geom::Point &prev, Geom::Poin
{
SPCurve *out = new SPCurve();
Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const *>(&*A);
- double max_lenght = Geom::distance(A->initialPoint(),A->finalPoint()) / 3.0;
+ double max_length = Geom::distance(A->initialPoint(),A->finalPoint()) / 3.0;
Geom::Point point_a1(0, 0);
Geom::Point point_a2(0, 0);
Geom::Point point_a3(0, 0);
if (shift_nodes) {
- point_a3 = randomize(max_lenght, true);
+ point_a3 = randomize(max_length, true);
}
if (handles == HM_RAND || handles == HM_SMOOTH) {
- point_a1 = randomize(max_lenght);
- point_a2 = randomize(max_lenght);
+ point_a1 = randomize(max_length);
+ point_a2 = randomize(max_length);
}
if(handles == HM_SMOOTH) {
if (cubic) {
Geom::Ray ray(prev,A->initialPoint());
- point_a1 = Geom::Point::polar(ray.angle(), max_lenght);
+ point_a1 = Geom::Point::polar(ray.angle(), max_length);
if(prev == Geom::Point(0,0)){
- point_a1 = A->pointAt(1.0/3.0) + randomize(max_lenght);
+ point_a1 = A->pointAt(1.0/3.0) + randomize(max_length);
}
ray.setPoints((*cubic)[3] + point_a3, (*cubic)[2] + point_a3);
- point_a2 = randomize(max_lenght, ray.angle());
+ point_a2 = randomize(max_length, ray.angle());
prev = (*cubic)[2] + point_a2;
out->moveto((*cubic)[0]);
out->curveto((*cubic)[0] + point_a1, (*cubic)[2] + point_a2 + point_a3, (*cubic)[3] + point_a3);
} else {
Geom::Ray ray(prev,A->initialPoint());
- point_a1 = Geom::Point::polar(ray.angle(), max_lenght);
+ point_a1 = Geom::Point::polar(ray.angle(), max_length);
if(prev==Geom::Point(0,0)){
- point_a1 = A->pointAt(1.0/3.0) + randomize(max_lenght);
+ point_a1 = A->pointAt(1.0/3.0) + randomize(max_length);
}
ray.setPoints(A->finalPoint() + point_a3, A->pointAt((1.0/3.0) * 2) + point_a3);
- point_a2 = randomize(max_lenght, ray.angle());
+ point_a2 = randomize(max_length, ray.angle());
prev = A->pointAt((1.0/3.0) * 2) + point_a2 + point_a3;
out->moveto(A->initialPoint());
out->curveto(A->initialPoint() + point_a1, A->pointAt((1.0/3.0) * 2) + point_a2 + point_a3, A->finalPoint() + point_a3);
diff --git a/src/live_effects/lpe-roughen.h b/src/live_effects/lpe-roughen.h
index 3426b810a..421df36f7 100644
--- a/src/live_effects/lpe-roughen.h
+++ b/src/live_effects/lpe-roughen.h
@@ -46,7 +46,7 @@ public:
void doEffect(SPCurve *curve) override;
virtual double sign(double randNumber);
- virtual Geom::Point randomize(double max_lenght, bool is_node = false);
+ virtual Geom::Point randomize(double max_length, bool is_node = false);
void doBeforeEffect(SPLPEItem const * lpeitem) override;
virtual SPCurve const * addNodesAndJitter(Geom::Curve const * A, Geom::Point &prev, Geom::Point &last_move, double t, bool last);
virtual SPCurve *jitter(Geom::Curve const * A, Geom::Point &prev, Geom::Point &last_move);
diff --git a/src/live_effects/lpe-sketch.cpp b/src/live_effects/lpe-sketch.cpp
index 594751967..614d71102 100644
--- a/src/live_effects/lpe-sketch.cpp
+++ b/src/live_effects/lpe-sketch.cpp
@@ -251,7 +251,7 @@ LPESketch::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_
// pick a new end point (s1 = s0 + strokelength).
s1 = s0 + strokelength*(1-strokelength_rdm);
- // don't let it go beyond the end of the orgiginal path.
+ // don't let it go beyond the end of the original path.
// TODO/FIXME: this might result in short strokes near the end...
if (!closed && s1>piece_total_length-ends_tolerance.get_value()*strokelength){
done = true;
diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp
index adb3d6fd4..b6548a13c 100644
--- a/src/live_effects/lpe-transform_2pts.cpp
+++ b/src/live_effects/lpe-transform_2pts.cpp
@@ -31,7 +31,7 @@ LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) :
Effect(lpeobject),
elastic(_("Elastic"), _("Elastic transform mode"), "elastic", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")),
from_original_width(_("From original width"), _("From original width"), "from_original_width", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")),
- lock_lenght(_("Lock length"), _("Lock length to current distance"), "lock_lenght", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")),
+ lock_length(_("Lock length"), _("Lock length to current distance"), "lock_length", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")),
lock_angle(_("Lock angle"), _("Lock angle"), "lock_angle", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")),
flip_horizontal(_("Flip horizontal"), _("Flip horizontal"), "flip_horizontal", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")),
flip_vertical(_("Flip vertical"), _("Flip vertical"), "flip_vertical", &wr, this, false,"", INKSCAPE_ICON("on"), INKSCAPE_ICON("off")),
@@ -49,7 +49,7 @@ LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) :
append_path(false),
previous_angle(Geom::rad_from_deg(0)),
previous_start(Geom::Point()),
- previous_lenght(-1)
+ previous_length(-1)
{
registerParameter(&first_knot);
@@ -63,7 +63,7 @@ LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) :
registerParameter(&from_original_width);
registerParameter(&flip_vertical);
registerParameter(&flip_horizontal);
- registerParameter(&lock_lenght);
+ registerParameter(&lock_length);
registerParameter(&lock_angle);
first_knot.param_make_integer(true);
@@ -107,7 +107,7 @@ LPETransform2Pts::doOnApply(SPLPEItem const* lpeitem)
last_knot.param_set_value(nnodes);
}
- previous_lenght = Geom::distance(point_a,point_b);
+ previous_length = Geom::distance(point_a,point_b);
Geom::Ray transformed(point_a,point_b);
previous_angle = transformed.angle();
start.param_update_default(point_a);
@@ -157,23 +157,23 @@ LPETransform2Pts::doBeforeEffect (SPLPEItem const* lpeitem)
from_original_width.param_setValue(true);
}
}
- if(lock_lenght && !lock_angle && previous_lenght != -1) {
+ if(lock_length && !lock_angle && previous_length != -1) {
Geom::Ray transformed((Geom::Point)start,(Geom::Point)end);
if(previous_start == start || previous_angle == Geom::rad_from_deg(0)) {
previous_angle = transformed.angle();
}
- } else if(lock_angle && !lock_lenght && previous_angle != Geom::rad_from_deg(0)) {
+ } else if(lock_angle && !lock_length && previous_angle != Geom::rad_from_deg(0)) {
if(previous_start == start){
- previous_lenght = Geom::distance((Geom::Point)start, (Geom::Point)end);
+ previous_length = Geom::distance((Geom::Point)start, (Geom::Point)end);
}
}
- if(lock_lenght || lock_angle ) {
- Geom::Point end_point = Geom::Point::polar(previous_angle, previous_lenght) + (Geom::Point)start;
+ if(lock_length || lock_angle ) {
+ Geom::Point end_point = Geom::Point::polar(previous_angle, previous_length) + (Geom::Point)start;
end.param_setValue(end_point);
}
Geom::Ray transformed((Geom::Point)start,(Geom::Point)end);
previous_angle = transformed.angle();
- previous_lenght = Geom::distance((Geom::Point)start, (Geom::Point)end);
+ previous_length = Geom::distance((Geom::Point)start, (Geom::Point)end);
previous_start = start;
}
@@ -265,7 +265,7 @@ LPETransform2Pts::reset()
stretch.param_set_value(1.0);
Geom::Ray transformed(point_a, point_b);
previous_angle = transformed.angle();
- previous_lenght = Geom::distance(point_a, point_b);
+ previous_length = Geom::distance(point_a, point_b);
start.param_update_default(point_a);
end.param_update_default(point_b);
start.param_set_default();
@@ -331,7 +331,7 @@ Gtk::Widget *LPETransform2Pts::newWidget()
widg->set_has_tooltip(false);
}
}
- } else if (param->param_key == "lock_angle" || param->param_key == "lock_lenght") {
+ } else if (param->param_key == "lock_angle" || param->param_key == "lock_length") {
Glib::ustring * tip = param->param_getTooltip();
if (widg) {
button3->pack_start(*widg, true, true, 2);
@@ -437,14 +437,14 @@ LPETransform2Pts::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<
Geom::PathVector pathv;
pathv.push_back(hp);
double r = helper_size*.1;
- if(lock_lenght || lock_angle ) {
+ if(lock_length || lock_angle ) {
char const * svgd;
svgd = "M -5.39,8.78 -9.13,5.29 -10.38,10.28 Z M -7.22,7.07 -3.43,3.37 m -1.95,-12.16 -3.74,3.5 -1.26,-5 z m -1.83,1.71 3.78,3.7 M 5.24,8.78 8.98,5.29 10.24,10.28 Z M 7.07,7.07 3.29,3.37 M 5.24,-8.78 l 3.74,3.5 1.26,-5 z M 7.07,-7.07 3.29,-3.37";
PathVector pathv_move = sp_svg_read_pathv(svgd);
pathv_move *= Affine(r,0,0,r,0,0) * Translate(Geom::Point(start));
hp_vec.push_back(pathv_move);
}
- if(!lock_angle && lock_lenght) {
+ if(!lock_angle && lock_length) {
char const * svgd;
svgd = "M 0,9.94 C -2.56,9.91 -5.17,8.98 -7.07,7.07 c -3.91,-3.9 -3.91,-10.24 0,-14.14 1.97,-1.97 4.51,-3.02 7.07,-3.04 2.56,0.02 5.1,1.07 7.07,3.04 3.91,3.9 3.91,10.24 0,14.14 C 5.17,8.98 2.56,9.91 0,9.94 Z";
PathVector pathv_turn = sp_svg_read_pathv(svgd);
diff --git a/src/live_effects/lpe-transform_2pts.h b/src/live_effects/lpe-transform_2pts.h
index 3975a24ff..31655054e 100644
--- a/src/live_effects/lpe-transform_2pts.h
+++ b/src/live_effects/lpe-transform_2pts.h
@@ -52,7 +52,7 @@ protected:
private:
ToggleButtonParam elastic;
ToggleButtonParam from_original_width;
- ToggleButtonParam lock_lenght;
+ ToggleButtonParam lock_length;
ToggleButtonParam lock_angle;
ToggleButtonParam flip_horizontal;
ToggleButtonParam flip_vertical;
@@ -70,7 +70,7 @@ private:
bool append_path;
Geom::Angle previous_angle;
Geom::Point previous_start;
- double previous_lenght;
+ double previous_length;
LPETransform2Pts(const LPETransform2Pts&) = delete;
LPETransform2Pts& operator=(const LPETransform2Pts&) = delete;
};
diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp
index e2d5bb2cb..311f1e0ce 100644
--- a/src/live_effects/parameter/satellitesarray.cpp
+++ b/src/live_effects/parameter/satellitesarray.cpp
@@ -111,7 +111,7 @@ void SatellitesArrayParam::updateCanvasIndicators(bool mirror)
double pos = 0;
bool overflow = false;
double size_out = _vector[i][j].arcDistance(*curve_in);
- double lenght_out = curve_in->length();
+ double length_out = curve_in->length();
gint previous_index = j - 1; //Always are previous index because we skip first satellite on open paths
if (j == 0 && pathv[i].closed()) {
previous_index = pathv[i].size() - 1;
@@ -119,16 +119,16 @@ void SatellitesArrayParam::updateCanvasIndicators(bool mirror)
if ( previous_index < 0 ) {
return;
}
- double lenght_in = pathv.curveAt(previous_index).length();
+ double length_in = pathv.curveAt(previous_index).length();
if (mirror) {
curve_in = const_cast<Geom::Curve *>(&pathv.curveAt(previous_index));
pos = _vector[i][j].time(size_out, true, *curve_in);
- if (lenght_out < size_out) {
+ if (length_out < size_out) {
overflow = true;
}
} else {
pos = _vector[i][j].time(*curve_in);
- if (lenght_in < size_out) {
+ if (length_in < size_out) {
overflow = true;
}
}
diff --git a/src/object/sp-conn-end-pair.h b/src/object/sp-conn-end-pair.h
index 889e11b44..8fc3259f9 100644
--- a/src/object/sp-conn-end-pair.h
+++ b/src/object/sp-conn-end-pair.h
@@ -79,7 +79,7 @@ void sp_conn_end_pair_build(SPObject *object);
enum {
SP_CONNECTOR_NOAVOID, // Basic connector - a straight line.
SP_CONNECTOR_POLYLINE, // Object avoiding polyline.
- SP_CONNECTOR_ORTHOGONAL // Object avoiding orthogonal polyline (only horizontal and verical segments).
+ SP_CONNECTOR_ORTHOGONAL // Object avoiding orthogonal polyline (only horizontal and vertical segments).
};
diff --git a/src/object/sp-ellipse.cpp b/src/object/sp-ellipse.cpp
index 09be158eb..8e18d71ae 100644
--- a/src/object/sp-ellipse.cpp
+++ b/src/object/sp-ellipse.cpp
@@ -640,7 +640,7 @@ Geom::Point SPGenericEllipse::getPointAtAngle(double arg) const
* Convert center to endpoint parameterization and set it to repr.
*
* See SVG 1.0 Specification W3C Recommendation
- * ``F.6 Ellptical arc implementation notes'' for more detail.
+ * ``F.6 Elliptical arc implementation notes'' for more detail.
*/
bool SPGenericEllipse::set_elliptical_path_attribute(Inkscape::XML::Node *repr)
{
diff --git a/src/object/sp-item.cpp b/src/object/sp-item.cpp
index 7d8ab4b50..98ce76f2e 100644
--- a/src/object/sp-item.cpp
+++ b/src/object/sp-item.cpp
@@ -1400,7 +1400,7 @@ void SPItem::adjust_paint_recursive (Geom::Affine advertized_transform, Geom::Af
SPItem *item = dynamic_cast<SPItem *>(&o);
if (item) {
// At the level of the transformed item, t_ancestors is identity;
-// below it, it is the accmmulated chain of transforms from this level to the top level
+// below it, it is the accumulated chain of transforms from this level to the top level
item->adjust_paint_recursive (advertized_transform, t_item * t_ancestors, is_pattern);
}
}
diff --git a/src/object/sp-object.h b/src/object/sp-object.h
index 945367d76..baa2bf9c7 100644
--- a/src/object/sp-object.h
+++ b/src/object/sp-object.h
@@ -35,7 +35,7 @@ class SPObject;
#define SP_OBJECT_USER_MODIFIED_FLAG_B (1 << 6)
#define SP_OBJECT_USER_MODIFIED_FLAG_C (1 << 7)
-/* Conveneience */
+/* Convenience */
#define SP_OBJECT_FLAGS_ALL 0xff
/* Flags that mark object as modified */
diff --git a/src/object/sp-use.cpp b/src/object/sp-use.cpp
index 3618cf18f..1c85d901e 100644
--- a/src/object/sp-use.cpp
+++ b/src/object/sp-use.cpp
@@ -365,7 +365,7 @@ Geom::Affine SPUse::get_root_transform() {
chain.push_back(dynamic_cast<SPItem *>(orig));
- // calculate the accummulated transform, starting from the original
+ // calculate the accumulated transform, starting from the original
Geom::Affine t(Geom::identity());
for (auto i=chain.rbegin(); i!=chain.rend(); ++i) {
diff --git a/src/style.h b/src/style.h
index bb0705f61..9e46fa3ea 100644
--- a/src/style.h
+++ b/src/style.h
@@ -307,7 +307,7 @@ public:
* when the reference starts pointing to a different address in memory.
*
* NB It is different from fill_ps_modified signal. When paint server is modified
- * it means some of it's attributes or chilren change.
+ * it means some of it's attributes or children change.
*/
sigc::signal<void, SPObject *, SPObject *> signal_fill_ps_changed;
/**
diff --git a/src/svg/svg.h b/src/svg/svg.h
index b28358695..a65bdf26c 100644
--- a/src/svg/svg.h
+++ b/src/svg/svg.h
@@ -41,7 +41,7 @@ unsigned int sp_svg_number_write_de( char *buf, int bufLen, double val, unsigned
/*
* Parse number with optional unit specifier:
- * - for px, pt, pc, mm, cm, computed is final value accrding to SVG spec
+ * - for px, pt, pc, mm, cm, computed is final value according to SVG spec
* - for em, ex, and % computed is left untouched
* - % is divided by 100 (i.e. 100% is 1.0)
* !isalnum check is done at the end
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index 92ae94272..54261c66f 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -2100,7 +2100,7 @@ void sp_te_apply_style(SPItem *text, Inkscape::Text::Layout::iterator const &sta
has matching routines for optimising the patterns it finds. It's reasonably
easy to add new pattern matching processors. If everything gets disastrous
and neither option can be made to work, a fallback could be to reduce
- everything to a single level of nesting and drop all pretence of
+ everything to a single level of nesting and drop all pretense of
roundtrippability. */
bool has_text_decoration = false;
gchar const *root_style = (text)->getRepr()->attribute("style");
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 16053238c..160f83965 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -724,7 +724,7 @@ void Export::onAreaToggled ()
/* Notice how the switch is used to 'fall through' here to get
various backups. If you modify this without noticing you'll
- probabaly screw something up. */
+ probably screw something up. */
switch (key) {
case SELECTION_SELECTION:
if ((SP_ACTIVE_DESKTOP->getSelection())->isEmpty() == false)
@@ -1422,14 +1422,14 @@ bool Export::bbox_equal(Geom::Rect const &one, Geom::Rect const &two)
* should always check the current selection to see if it is the valid
* one. While this is a performance improvement it is also a usability
* one during the cases where things like selections and drawings match
- * size. This way buttons change less 'randomly' (atleast in the eyes
+ * size. This way buttons change less 'randomly' (at least in the eyes
* of the user). To do this an array is built where the current selection
* type is placed first, and then the others in an order from smallest
* to largest (this can be configured by reshuffling \c test_order).
*
* All of the values in this function are rounded to two decimal places
* because that is what is shown to the user. While everything is kept
- * more accurate than that, the user can't control more acurrate than
+ * more accurate than that, the user can't control more accurate than
* that, so for this to work for them - it needs to check on that level
* of accuracy.
*
@@ -1822,7 +1822,7 @@ void Export::onExportXdpiChange()
*
* This function just calls \c sp_export_value_set_px for each of the
* parameters that is passed in. This allows for setting them all in
- * one convient area.
+ * one convenient area.
*
* Update is set to suspend all of the other test running while all the
* values are being set up. This allows for a performance increase, but
diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp
index 6606f1cf6..e324afcc7 100644
--- a/src/ui/dialog/extension-editor.cpp
+++ b/src/ui/dialog/extension-editor.cpp
@@ -145,7 +145,7 @@ void ExtensionEditor::on_pagelist_selection_changed()
Inkscape::Extension::Extension * ext = Inkscape::Extension::db.get(id.c_str());
- /* Make sure we have all the widges */
+ /* Make sure we have all the widgets */
Gtk::Widget * info = nullptr;
Gtk::Widget * help = nullptr;
Gtk::Widget * params = nullptr;
diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp
index 39b6f7d52..e9c23763d 100644
--- a/src/ui/dialog/livepatheffect-add.cpp
+++ b/src/ui/dialog/livepatheffect-add.cpp
@@ -469,7 +469,7 @@ void LivePathEffectAdd::reload_effect_list()
_LPESelectorFlowBox->invalidate_filter();
if (_showfavs) {
if (_visiblelpe == 0) {
- _LPEInfo->set_text(_("You dont have any favorites jet, please disable the favorites star"));
+ _LPEInfo->set_text(_("You don't have any favorites yet, please disable the favorites star"));
_LPEInfo->set_visible(true);
_LPEInfo->get_style_context()->add_class("lpeinfowarn");
} else {
diff --git a/src/ui/dialog/styledialog.h b/src/ui/dialog/styledialog.h
index 5adc24da1..36a261c8c 100644
--- a/src/ui/dialog/styledialog.h
+++ b/src/ui/dialog/styledialog.h
@@ -93,12 +93,12 @@ class StyleDialog : public Widget::Panel {
add(_colSelectorPos);
add(_colOwner);
}
- Gtk::TreeModelColumn<bool> _colActive; // Active or inative property
+ Gtk::TreeModelColumn<bool> _colActive; // Active or inactive property
Gtk::TreeModelColumn<Glib::ustring> _colName; // Name of the property.
Gtk::TreeModelColumn<Glib::ustring> _colValue; // Value of the property.
- Gtk::TreeModelColumn<bool> _colStrike; // Propery not used, overloaded
+ Gtk::TreeModelColumn<bool> _colStrike; // Property not used, overloaded
Gtk::TreeModelColumn<Glib::ustring> _colSelector; // Style or matching object id.
- Gtk::TreeModelColumn<gint> _colSelectorPos; // Position of the selector to hadle dup selectors
+ Gtk::TreeModelColumn<gint> _colSelectorPos; // Position of the selector to handle dup selectors
Gtk::TreeModelColumn<Glib::ustring> _colOwner; // Store the owner of the property for popup
};
ModelColumns _mColumns;
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 37e522d5d..2472fa004 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -120,7 +120,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
table->set_margin_start(3);
table->set_margin_end(3);
table->set_margin_top(4);
- // panel is a cloked Gtk::VBox
+ // panel is a locked Gtk::VBox
_getContents()->pack_start(*Gtk::manage(table), Gtk::PACK_EXPAND_WIDGET);
guint row = 0;
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h
index 0d43d8159..b28f70808 100644
--- a/src/ui/tool/node.h
+++ b/src/ui/tool/node.h
@@ -274,7 +274,7 @@ private:
*
* Because paths can be cyclic, node iterators have two different ways to
* increment and decrement them. When using ++/--, the end iterator will eventually
- * be returned. Whent using advance()/retreat(), the end iterator will only be returned
+ * be returned. When using advance()/retreat(), the end iterator will only be returned
* when the path is open. If it's closed, calling advance() will cycle indefinitely.
* This is particularly useful for cases where the adjacency of nodes is more important
* than their sequence order.
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 86f497ba7..1028731d2 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -888,7 +888,7 @@ Handle *PathManipulator::_chooseHandle(Node *n, int which)
if (!next) return n->back();
if (!prev) return n->front();
- // compare X coord ofline segments
+ // compare X coord offline segments
Geom::Point npos = next->position();
Geom::Point ppos = prev->position();
if (which < 0) {
diff --git a/src/ui/toolbar/mesh-toolbar.cpp b/src/ui/toolbar/mesh-toolbar.cpp
index 3d34fd3ea..cf28d6ed3 100644
--- a/src/ui/toolbar/mesh-toolbar.cpp
+++ b/src/ui/toolbar/mesh-toolbar.cpp
@@ -326,7 +326,7 @@ MeshToolbar::MeshToolbar(SPDesktop *desktop)
_select_type_combo->append(_("Bicubic"));
// TRANSLATORS: Type of Smoothing. See https://en.wikipedia.org/wiki/Coons_patch
- _select_type_combo->set_tooltip_text(_("Coons: no smothing. Bicubic: smothing across patch boundaries."));
+ _select_type_combo->set_tooltip_text(_("Coons: no smoothing. Bicubic: smoothing across patch boundaries."));
_select_type_combo->set_sensitive( false );
_select_type_combo->set_active( 0 );
diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index 277af1809..1e7d6ffff 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -2057,7 +2057,7 @@ TextToolbar::selection_changed(Inkscape::Selection * /*selection*/, bool subsele
/*
* If no text in selection (querying returned nothing), read the style from
- * the /tools/text preferencess (default style for new texts). Return if
+ * the /tools/text preferences (default style for new texts). Return if
* tool bar already set to these preferences.
*/
if (result_family == QUERY_STYLE_NOTHING ||
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index d6ce66a9e..5522565f3 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -1142,7 +1142,7 @@ void ConnectorTool::cc_set_active_conn(SPItem *item)
if (this->active_conn == item) {
if (curve->is_empty()) {
// Connector is invisible because it is clipped to the boundary of
- // two overlpapping shapes.
+ // two overlapping shapes.
this->endpt_handle[0]->hide();
this->endpt_handle[1]->hide();
} else {
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 1c2016b9f..4e64ed4de 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -785,7 +785,7 @@ static void tweak_colors_in_gradient(SPItem *item, Inkscape::PaintTarget fill_or
// Scale its X coordinate to match the length of the gradient line:
pos = pnorm[Geom::X] / vl;
- // Calculate radius in lenfth-of-gradient-line units
+ // Calculate radius in length-of-gradient-line units
r = radius / vl;
}
diff --git a/src/ui/widget/combo-box-entry-tool-item.cpp b/src/ui/widget/combo-box-entry-tool-item.cpp
index edab0804b..48f9cb856 100644
--- a/src/ui/widget/combo-box-entry-tool-item.cpp
+++ b/src/ui/widget/combo-box-entry-tool-item.cpp
@@ -436,7 +436,7 @@ ComboBoxEntryToolItem::set_altx_name(const gchar* altx_name)
// Internal ---------------------------------------------------
// Return row of active text or -1 if not found. If exclude is true,
-// use 3d colunm if available to exclude row from checking (useful to
+// use 3d column if available to exclude row from checking (useful to
// skip rows added for font-families included in doc and not on
// system)
gint
diff --git a/src/ui/widget/point.h b/src/ui/widget/point.h
index 104bc788a..018be5bbf 100644
--- a/src/ui/widget/point.h
+++ b/src/ui/widget/point.h
@@ -95,7 +95,7 @@ public:
unsigned getDigits() const;
/**
- * Gets the current step ingrement used by the spin button.
+ * Gets the current step increment used by the spin button.
*/
double getStep() const;
diff --git a/src/ui/widget/scalar.h b/src/ui/widget/scalar.h
index 9581d86dc..29a14d15a 100644
--- a/src/ui/widget/scalar.h
+++ b/src/ui/widget/scalar.h
@@ -86,7 +86,7 @@ public:
unsigned getDigits() const;
/**
- * Gets the current step ingrement used by the spin button.
+ * Gets the current step increment used by the spin button.
*/
double getStep() const;
diff --git a/src/util/expression-evaluator.cpp b/src/util/expression-evaluator.cpp
index facf5422b..24a56b772 100644
--- a/src/util/expression-evaluator.cpp
+++ b/src/util/expression-evaluator.cpp
@@ -119,7 +119,7 @@ EvaluatorQuantity ExpressionEvaluator::evaluateExpression()
{
EvaluatorQuantity new_term = evaluateTerm();
- // If dimensions mismatch, attempt default unit assignent
+ // If dimensions mismatch, attempt default unit assignment
if ( new_term.dimension != evaluated_terms.dimension ) {
EvaluatorQuantity default_unit_factor;
diff --git a/src/util/find-if-before.h b/src/util/find-if-before.h
index b7b2de620..6d15fdfa6 100644
--- a/src/util/find-if-before.h
+++ b/src/util/find-if-before.h
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Inkscape::Algorithms::find_if_before - finds the position before
- * the first value that satisifes
+ * the first value that satisfies
* the predicate
*
* Authors:
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 874f253c1..8fc6c258c 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -2989,7 +2989,7 @@ Verb *Verb::_base_verbs[] = {
INKSCAPE_ICON("zoom-fit-drawing")),
new ZoomVerb(SP_VERB_ZOOM_SELECTION, "ZoomSelection", N_("_Selection"), N_("Zoom to fit selection in window"),
INKSCAPE_ICON("zoom-fit-selection")),
- new ZoomVerb(SP_VERB_ZOOM_CENTER_PAGE, "ZoomCenterPage", N_("_Center _Page"), N_("Center page in window"),
+ new ZoomVerb(SP_VERB_ZOOM_CENTER_PAGE, "ZoomCenterPage", N_("_Center Page"), N_("Center page in window"),
INKSCAPE_ICON("zoom-center-page")),
new ZoomVerb(SP_VERB_ROTATE_CW, "RotateClockwise", N_("Rotate Clockwise"), N_("Rotate canvas clockwise"), nullptr),
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index 8498420ae..e57d153a1 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -56,7 +56,7 @@ static void sp_attribute_table_entry_changed (Gtk::Entry *editable, SPAttributeT
*/
static void sp_attribute_table_object_modified (SPObject *object, guint flags, SPAttributeTable *spaw);
/**
- * Callback for the delection of the selected object.
+ * Callback for the deletion of the selected object.
*
* sp_attribute_table_object_release invalidates all data of
* SPAttributeTable and disables the widget.
diff --git a/src/xml/node.h b/src/xml/node.h
index b6a0df353..c32508eec 100644
--- a/src/xml/node.h
+++ b/src/xml/node.h
@@ -382,7 +382,7 @@ public:
/**
* @brief Remove all elements that not in src node
- * @param src The node to check for elemments into this node
+ * @param src The node to check for elements into this node
* @param key The attribute to use as the identity attribute
*/
virtual void cleanOriginal(Node *src, gchar const *key)=0;