Merge branch 'misc-typos' of gitlab.com:luzpaz/inkscape

15 files changed, 31 insertions, 31 deletions

diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index 4f2f50ddd..97dd13bac 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -1117,7 +1117,7 @@ DrawingItem::_markForUpdate(unsigned flags, bool propagate)
 /**
  * Compute the caching score.
  *
- * Higher scores mean the item is more aggresively prioritized for automatic
+ * Higher scores mean the item is more aggressively prioritized for automatic
  * caching by Inkscape::Drawing.
  */
 double
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index a0f454da7..e0da6f7a0 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -174,7 +174,7 @@ enum {
 };
 
 /**
- * Callback that removes item from all referers and destroys it.
+ * Callback that removes item from all referrers and destroys it.
  */
 void sp_canvas_item_dispose(GObject           *object);
 void sp_canvas_item_finalize(GObject          *object);
diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
index fe5412c4e..6f5d6002e 100644
--- a/src/helper/png-write.cpp
+++ b/src/helper/png-write.cpp
@@ -117,7 +117,7 @@ void PngTextList::add(gchar const* key, gchar const* text)
         item->lang_key = nullptr;
 #endif // PNG_iTXt_SUPPORTED
     } else {
-        g_warning("Unable to allocate arrary for %d PNG text data.", count);
+        g_warning("Unable to allocate array for %d PNG text data.", count);
         textItems = nullptr;
         count = 0;
     }
diff --git a/src/main-cmdlinexact.cpp b/src/main-cmdlinexact.cpp
index a407d3c0e..46f42d0d2 100644
--- a/src/main-cmdlinexact.cpp
+++ b/src/main-cmdlinexact.cpp
@@ -399,7 +399,7 @@ parseVerbsYAMLFile(gchar const *yaml_filename)
             handling_value = true;
             break;
 
-            /* Block delimeters */
+            /* Block delimiters */
         case YAML_BLOCK_SEQUENCE_START_TOKEN:
             if( state == HANDLING_ROOT ) {
                 if( key == "run" )
diff --git a/src/object/sp-mesh-array.cpp b/src/object/sp-mesh-array.cpp
index 2e1ff988f..4815ec5c1 100644
--- a/src/object/sp-mesh-array.cpp
+++ b/src/object/sp-mesh-array.cpp
@@ -2126,7 +2126,7 @@ guint SPMeshNodeArray::tensor_toggle( std::vector<guint> corners ) {
 }
 
 /**
-   Atempts to smooth color transitions across corners.
+   Attempts to smooth color transitions across corners.
    Input is a list of selected corner draggable indices.
 */
 guint SPMeshNodeArray::color_smooth( std::vector<guint> corners ) {
diff --git a/src/object/sp-object.cpp b/src/object/sp-object.cpp
index d9a003074..c76196d98 100644
--- a/src/object/sp-object.cpp
+++ b/src/object/sp-object.cpp
@@ -604,7 +604,7 @@ void SPObject::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref)
 
     SPObject* ochild = SPFactory::createObject(type_string);
     if (ochild == nullptr) {
-        // Currenty, there are many node types that do not have
+        // Currently, there are many node types that do not have
         // corresponding classes in the SPObject tree.
         // (rdf:RDF, inkscape:clipboard, ...)
         // Thus, simply ignore this case for now.
@@ -673,7 +673,7 @@ void SPObject::build(SPDocument *document, Inkscape::XML::Node *repr) {
 
         SPObject* child = SPFactory::createObject(typeString);
         if (child == nullptr) {
-            // Currenty, there are many node types that do not have
+            // Currently, there are many node types that do not have
             // corresponding classes in the SPObject tree.
             // (rdf:RDF, inkscape:clipboard, ...)
             // Thus, simply ignore this case for now.
diff --git a/src/object/sp-offset.cpp b/src/object/sp-offset.cpp
index 9f9297077..7d2997185 100644
--- a/src/object/sp-offset.cpp
+++ b/src/object/sp-offset.cpp
@@ -350,8 +350,8 @@ void SPOffset::set_shape() {
 
     if ( fabs(this->rad) < 0.01 ) {
         // grosso modo: 0
-        // just put the source this as the offseted one, no one will notice
-        // it's also useless to compute the offset with a 0 radius
+        // just put the source of this (almost-non-offsetted) object as being the actual offset, 
+        // no one will notice. it's also useless to compute the offset with a 0 radius
 
         //XML Tree being used directly here while it shouldn't be.
         const char *res_d = this->getRepr()->attribute("inkscape:original");
@@ -370,7 +370,7 @@ void SPOffset::set_shape() {
         return;
     }
 
-    // extra paraniac careful check. the preceding if () should take care of this case
+    // extra paranoiac careful check. the preceding if () should take care of this case
     if (fabs (this->rad) < 0.01) {
     	this->rad = (this->rad < 0) ? -0.01 : 0.01;
     }
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index bc27d380c..b2a54244a 100755
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -37,7 +37,7 @@
 
 #include "file.h"
 
-// TOOD fixme: This should be moved into preference repr
+// TODO FIXME: This should be moved into preference repr
 SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 
 
diff --git a/src/selection-chemistry.h b/src/selection-chemistry.h
index 387e9b840..d51f4fa3a 100644
--- a/src/selection-chemistry.h
+++ b/src/selection-chemistry.h
@@ -121,7 +121,7 @@ enum SPCycleType
 
 
 
-// TOOD fixme: This should be moved into preference repr
+// TODO FIXME: This should be moved into preference repr
 extern SPCycleType SP_CYCLING;
 
 #endif // SEEN_SELECTION_CHEMISTRY_H
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index 39e334d1f..97ba2cdec 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -1973,7 +1973,7 @@ void
 SPIFilter::cascade( const SPIBase* const parent ) {
     if( const SPIFilter* p = dynamic_cast<const SPIFilter*>(parent) ) {
         if( inherit ) {  // Only inherits if 'inherit' true/
-            // This is rather unlikely so ignore for now. FIXME
+            // FIXME: This is rather unlikely so ignore for now. 
             (void)p;
             std::cerr << "SPIFilter::cascade: value 'inherit' not supported." << std::endl;
         } else {
@@ -1994,7 +1994,7 @@ SPIFilter::merge( const SPIBase* const parent ) {
             set     = p->set;
             inherit = p->inherit;
             if( href ) {
-                // If we alread have an href, use it (unlikely but heck...)
+                // If we already have an href, use it (unlikely but heck...)
                 if( href->getObject() ) {
                     href->detach();
                 }
diff --git a/src/syseq.h b/src/syseq.h
index 4b232052c..97a8039de 100644
--- a/src/syseq.h
+++ b/src/syseq.h
@@ -243,7 +243,7 @@ static double projectify (std::vector<int> const &cols, const double B[S][T], co
  *
  * Since our application will be to finding preimages of projective mappings, we provide
  * an additional argument \a proj. If this is true, we find a solution of
- * \a x[\a index]/\a x[\T - 1] = \a val insted (i.e., we want the corresponding coordinate
+ * \a x[\a index]/\a x[\T - 1] = \a val instead (i.e., we want the corresponding coordinate
  * of the _affine image_ of the point with homogeneous coordinate vector \a x to be equal
  * to \a val.
  *
diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h
index 168bff9b7..2eff808ef 100644
--- a/src/ui/dialog/xml-tree.h
+++ b/src/ui/dialog/xml-tree.h
@@ -68,7 +68,7 @@ private:
     void set_tree_desktop(SPDesktop *desktop);
 
     /**
-     * Is invoked when the documnet changes
+     * Is invoked when the document changes
      */
     void set_tree_document(SPDocument *document);
 
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index a00f065d8..05e691f07 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -1506,7 +1506,7 @@ void PathManipulator::_setGeometry()
             LIVEPATHEFFECT(_path)->requestModified(SP_OBJECT_MODIFIED_FLAG);
         }
     } else {
-        // return true to leave the decission on empty to the caller. 
+        // return true to leave the decision on empty to the caller.
         // Maybe the path become empty and we want to update to empty
         if (empty()) return;
         if (SPCurve * original = _path->getCurveBeforeLPE()){
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 9191af081..a7f8d2af2 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -100,7 +100,7 @@ bool SortLabelPlacement(LabelPlacement const &first, LabelPlacement const &secon
     }
 }
 
-//precision is for give the number of decimal positions 
+//precision is for give the number of decimal positions
 //of the label to calculate label width
 void repositionOverlappingLabels(std::vector<LabelPlacement> &placements, SPDesktop *desktop, Geom::Point const &normal, double fontsize, int precision)
 {
@@ -190,10 +190,10 @@ Geom::Point calcAngleDisplayAnchor(SPDesktop *desktop, double angle, double base
 }
 
 /**
- * Create a measure iten in current document.
+ * Create a measure item in current document.
  *
  * @param pathv the path to create.
- * @param markers, if the path resuts get markers.
+ * @param markers if the path resuts get markers.
  * @param color of the stroke.
  * @param measure_repr container element.
  */
@@ -437,8 +437,8 @@ void MeasureTool::writeMeasurePoint(Geom::Point point, bool is_start) {
     namedview->setAttribute (measure_point, meassure_point_str.str().c_str());
 }
 
-//This function is used to reverse the Measure, I do it in two steps because when move the knot the 
-//start_ or the end_p are overwrite so I need the original values.
+//This function is used to reverse the Measure, I do it in two steps because when
+//we move the knot the start_ or the end_p are overwritten so I need the original values.
 void MeasureTool::reverseKnots()
 {
     Geom::Point start = start_p;
@@ -877,7 +877,7 @@ void MeasureTool::setGuide(Geom::Point origin,double angle, const char *label)
         angle *= -1.0;
     }
 
-    origin *= affine; 
+    origin *= affine;
     //measure angle
     Inkscape::XML::Node *guide;
     guide = xml_doc->createElement("sodipodi:guide");
@@ -1119,7 +1119,7 @@ void MeasureTool::setMeasureCanvasItem(Geom::Point position, bool to_item, bool
     }
     sp_canvas_item_show(canvasitem);
     sp_canvas_item_move_to_z(canvasitem, 0);
-    
+
     if(to_item) {
         setPoint(position, measure_repr);
     }
@@ -1176,8 +1176,8 @@ void MeasureTool::showInfoBox(Geom::Point cursor, bool into_groups)
         sp_canvas_item_destroy(measure_item[idx]);
     }
     measure_item.clear();
-    
-    SPItem *newover = desktop->getItemAtPoint(cursor, into_groups); 
+
+    SPItem *newover = desktop->getItemAtPoint(cursor, into_groups);
     if (newover) {
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         double fontsize = prefs->getDouble("/tools/measure/fontsize", 10.0);
@@ -1196,7 +1196,7 @@ void MeasureTool::showInfoBox(Geom::Point cursor, bool into_groups)
             SPItem::BBoxType bbox_type = !prefs_bbox ? SPItem::VISUAL_BBOX : SPItem::GEOMETRIC_BBOX;
             Geom::OptRect bbox = over->bounds(bbox_type);
             if (bbox) {
-                
+
                 item_width = Inkscape::Util::Quantity::convert((*bbox).width() * scale, unit->abbr, unit_name);
                 item_height = Inkscape::Util::Quantity::convert((*bbox).height() * scale, unit->abbr, unit_name);
                 item_x = Inkscape::Util::Quantity::convert((*bbox).left(), unit->abbr, unit_name);
@@ -1389,7 +1389,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, bool to_phantom,
     repositionOverlappingLabels(placements, desktop, windowNormal, fontsize, precision);
     for (std::vector<LabelPlacement>::iterator it = placements.begin(); it != placements.end(); ++it) {
         LabelPlacement &place = *it;
-        
+
         setMeasureCanvasText(false, precision, place.lengthVal * scale, fontsize, unit_name, place.end, 0x0000007f, TEXT_ANCHOR_CENTER, to_item, to_phantom, measure_repr);
     }
     Geom::Point angleDisplayPt = calcAngleDisplayAnchor(desktop, angle, baseAngle,
@@ -1455,7 +1455,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, bool to_phantom,
 
     if (intersections.size() > 2) {
         setMeasureCanvasControlLine(desktop->doc2dt(intersections[0]) + normal * dimension_offset, desktop->doc2dt(intersections[intersections.size() - 1]) + normal * dimension_offset, to_item, to_phantom, CTLINE_PRIMARY , measure_repr);
-        
+
         setMeasureCanvasControlLine(desktop->doc2dt(intersections[0]), desktop->doc2dt(intersections[0]) + normal * dimension_offset, to_item, to_phantom, CTLINE_PRIMARY , measure_repr);
 
         setMeasureCanvasControlLine(desktop->doc2dt(intersections[intersections.size() - 1]), desktop->doc2dt(intersections[intersections.size() - 1]) + normal * dimension_offset, to_item, to_phantom, CTLINE_PRIMARY , measure_repr);
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index 4ec771490..4f7960474 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -643,7 +643,7 @@ void PrefCombo::init(Glib::ustring const &prefs_path, std::vector<Glib::ustring>
     size_t values_size = values.size();
     if (values_size != labels_size) {
         std::cout << "PrefCombo::"
-                  << "Diferent number of values/labels in " << prefs_path << std::endl;
+                  << "Different number of values/labels in " << prefs_path << std::endl;
         return;
     }
     _prefs_path = prefs_path;
@@ -667,7 +667,7 @@ void PrefCombo::init(Glib::ustring const &prefs_path, std::vector<Glib::ustring>
     size_t values_size = values.size();
     if (values_size != labels_size) {
         std::cout << "PrefCombo::"
-                  << "Diferent number of values/labels in " << prefs_path << std::endl;
+                  << "Different number of values/labels in " << prefs_path << std::endl;
         return;
     }
     _prefs_path = prefs_path;