diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-11-07 22:55:26 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-11-07 22:56:38 +0000 |
| commit | 7aacbbee8e7d24a601f576ddbeb68dc164902336 (patch) | |
| tree | 3e05299dac3316d107382efcf217e404fd0e6305 | |
| parent | Fixes to Filter Dialog (diff) | |
| parent | Misc. typos (diff) | |
| download | inkscape-7aacbbee8e7d24a601f576ddbeb68dc164902336.tar.gz inkscape-7aacbbee8e7d24a601f576ddbeb68dc164902336.zip | |
Merge branch 'luzpaz/inkscape-typos' (!119)
165 files changed, 286 insertions, 286 deletions
diff --git a/CMakeScripts/HelperFunctions.cmake b/CMakeScripts/HelperFunctions.cmake index a9d7e0ab1..b564f4ef6 100644 --- a/CMakeScripts/HelperFunctions.cmake +++ b/CMakeScripts/HelperFunctions.cmake @@ -33,7 +33,7 @@ endfunction() -# Checks if the last call to execute_process() was sucessful and throws an error otherwise. +# Checks if the last call to execute_process() was successful and throws an error otherwise. # ${result} and ${stderr} should hold the value of RESULT_VARIABLE and ERROR_VARIABLE respectively # ${command} can be empty or the command that was executed during the last call of execute_process() function(check_error result stderr command) @@ -49,7 +49,7 @@ function(check_error result stderr command) if("${result}" STREQUAL 0) if(NOT "${stderr}" STREQUAL "") - MESSAGE(WARNING "${command} returned sucessfully but the following was output to stderr: ${stderr}") + MESSAGE(WARNING "${command} returned successfully but the following was output to stderr: ${stderr}") endif() else() if("${stderr}" STREQUAL "") @@ -133,7 +133,7 @@ endfunction(list_files_pip) # ROOT - the root to search the files in (if file paths are relative) # DESTINATION - the destination where to install files to # INCLUDE - a (list of) regular expression(s) specifying which files to include -# (omit or leave empty to inlcude all files) +# (omit or leave empty to include all files) # EXCLUDE - a (list of) regular expression(s) specifying which files to exclude # (takes precedence over include rules) function(install_list) @@ -66,7 +66,7 @@ Extended video: <https://www.youtube.com/watch?v=bFakiI5f0-Y> Based in Spiro Live Path Effect, now show result while drawing. • Nodes cusp (SHIFT) and Spiro. - • Handle append path on cusp and Spiro mode whith helper preview path. + • Handle append path on cusp and Spiro mode with helper preview path. Spirolive.gif @@ -103,7 +103,7 @@ The options in the Live effect dialog give you control on bspline paths. • Ignore cusp nodes, affect to all other widgets changes and, for example, retain cusp nodes when you change the power. • Change only selected nodes, affect to all other widgets changes. - • Show a helper path whith the final shape and the generated new nodes. + • Show a helper path with the final shape and the generated new nodes. @@ -189,7 +189,7 @@ A LPE version of Show Handles extension. • Work on paths, shapes and groups. • Work on clones • Node and Handle shapes resizeables - • If not a clone, is a destructive LPE, dont save styles, work on a copy! + • If not a clone, is a destructive LPE, don't save styles, work on a copy! ShowHandles.gif diff --git a/buildtools/appveyor.sh b/buildtools/appveyor.sh index d8dddb104..185feee0c 100644 --- a/buildtools/appveyor.sh +++ b/buildtools/appveyor.sh @@ -71,7 +71,7 @@ python ../buildtools/msys2checkdeps.py check inkscape/ || error "missing librar message "--- Running tests" # check if the installed executable works inkscape/inkscape.exe -V || error "installed executable won't run" -PATH= inkscape/inkscape.exe -V >/dev/null || error "installed executable won't run with empty PATH (missing dependecies?)" +PATH= inkscape/inkscape.exe -V >/dev/null || error "installed executable won't run with empty PATH (missing dependencies?)" err=$(PATH= inkscape/inkscape.exe -V 2>&1 >/dev/null) if [ -n "$err" ]; then warning "installed executable produces output on stderr:"; echo "$err"; fi # check if the uninstalled executable works @@ -81,7 +81,7 @@ if [ -n "$err" ]; then warning "uninstalled executable produces output on stderr # run tests ninja check || error "tests failed" -message "##### BUILD SUCCESSFULL #####\n\n" +message "##### BUILD SUCCESSFUL #####\n\n" ### package diff --git a/buildtools/msys2checkdeps.py b/buildtools/msys2checkdeps.py index d64d9bcbc..eebeea15c 100644 --- a/buildtools/msys2checkdeps.py +++ b/buildtools/msys2checkdeps.py @@ -8,9 +8,9 @@ # MODE # list - list dependencies in human-readable form with full path and list of dependents # list-compact - list dependencies in compact form (as a plain list of filenames) -# check - check for missing or unused dependecies (see below for details) -# check-missing - check if all required dependecies are present in PATH -# exits with error code 2 if missing dependecies are found and prints the list to stderr +# check - check for missing or unused dependencies (see below for details) +# check-missing - check if all required dependencies are present in PATH +# exits with error code 2 if missing dependencies are found and prints the list to stderr # check-unused - check if any of the libraries in the root of PATH are unused and prints the list to stderr # # PATH diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh index e2b0528e1..9400e55a7 100644 --- a/buildtools/msys2installdeps.sh +++ b/buildtools/msys2installdeps.sh @@ -35,7 +35,7 @@ $ARCH-toolchain \ $ARCH-cmake \ $ARCH-ninja -# install Inkscape dependecies (required) +# install Inkscape dependencies (required) eval pacman -S --needed --noconfirm \ $ARCH-gc \ $ARCH-gsl \ @@ -47,7 +47,7 @@ $ARCH-gtkmm3 \ $ARCH-gdl \ $ARCH-libsoup -# install Inkscape dependecies (optional) +# install Inkscape dependencies (optional) eval pacman -S --needed --noconfirm \ $ARCH-poppler \ $ARCH-potrace \ diff --git a/doc/extension_system.txt b/doc/extension_system.txt index 4902fe004..12c3ebb97 100644 --- a/doc/extension_system.txt +++ b/doc/extension_system.txt @@ -19,7 +19,7 @@ overall system. Much of the documentation that will be useful for users of the extension system is not included in this document, it is autogenerated from the source code and placed on the Inkscape webpage. While this is less -convienient, it is more correct, and maintained as the source code is +convenient, it is more correct, and maintained as the source code is modified. Please look aton the Inkscape webpage also. @@ -154,7 +154,7 @@ The Extension base class holds the attribute data that all extensions must have and establishes the base functionality that all extensions share. All extensions have the following properties: -"ID" - A unique identifier for this extension that is used for refering +"ID" - A unique identifier for this extension that is used for referring to the extension and naming its parameters in the configuration files. "Name" - The textual name of the extension, it is used for user @@ -243,7 +243,7 @@ in including its filename extension and mime type. Also, there is a space to store a tooltip for additional information on the file type in the file dialog. Lastly, there is the key of which Output extension is recommended for saving this filetype. This is useful, as there is no -other direct links between the Input and Ouput functions, and a user +other direct links between the Input and Output functions, and a user expects to be able to open and save without using the 'Save As...' dialog. diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi index 7ef5bfcc9..3b13b4708 100644 --- a/packaging/win32/inkscape.nsi +++ b/packaging/win32/inkscape.nsi @@ -836,7 +836,7 @@ Function .onInit ; initialise the installer {{{2 /DESKTOP=(OFF/ON): Desktop icon$\r$\n \ /QUICKLAUNCH=(OFF/ON): quick launch icon$\r$\n \ /SVGEDITOR=(OFF/ON): default SVG editor$\r$\n \ - /CONTEXTMENUE=(OFF/ON): context menue integration$\r$\n \ + /CONTEXTMENUE=(OFF/ON): context menu integration$\r$\n \ /PREFERENCES=(OFF/ON): delete users preference files$\r$\n \ /PYTHON=(OFF/ON): python distribution$\r$\n \ /ADDFILES=(OFF/ON): additional files$\r$\n \ @@ -844,7 +844,7 @@ Function .onInit ; initialise the installer {{{2 /EXAMPLES=(OFF/ON): examples$\r$\n \ /TUTORIALS=(OFF/ON): tutorials$\r$\n \ /DICTIONARIES=(OFF/ON): dictionaries$\r$\n \ - /LANGUAGES=(OFF/ON): translated menues, examples, etc.$\r$\n \ + /LANGUAGES=(OFF/ON): translated menus, examples, etc.$\r$\n \ /[locale code]=(OFF/ON): e.g am, es, es_MX as in Inkscape supported" Abort ${EndIf} diff --git a/packaging/win32/macros/AdvUninstLog.txt b/packaging/win32/macros/AdvUninstLog.txt index c294c3df2..74cd509ee 100644 --- a/packaging/win32/macros/AdvUninstLog.txt +++ b/packaging/win32/macros/AdvUninstLog.txt @@ -48,7 +48,7 @@ these installation blocks. See included examples for details. Supports unlimited updates/reinstallations. Supports two uninstaller modes. Interactive mode requires confirmation -to remove every other file exept those files that have been installed. +to remove every other file except those files that have been installed. Unattended mode leaves intact every other file without bothering users. In case when uninstall log (uninstall.dat) has been removed manually instead diff --git a/share/attributes/genMapDataSVG.pl b/share/attributes/genMapDataSVG.pl index 68f0bcbdb..412b94910 100755 --- a/share/attributes/genMapDataSVG.pl +++ b/share/attributes/genMapDataSVG.pl @@ -70,7 +70,7 @@ while( my $t = $p->get_token ) { if( $t->[0] eq 'S' and lc $t->[1] eq 'h2') { $t = $p->get_token; if( $t->[1] =~ /Presentation/ ) { - print "Found: $t->[1], quiting.\n"; + print "Found: $t->[1], quitting.\n"; last; } } diff --git a/share/extensions/Barcode/__init__.py b/share/extensions/Barcode/__init__.py index fcfcfdbad..486366c4c 100644 --- a/share/extensions/Barcode/__init__.py +++ b/share/extensions/Barcode/__init__.py @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ -Renderer for barcodes, SVG extention for Inkscape. +Renderer for barcodes, SVG extension for Inkscape. For supported barcodes see Barcode module directory. """ diff --git a/share/extensions/dpiswitcher.py b/share/extensions/dpiswitcher.py index 317616db5..7d9f16001 100755 --- a/share/extensions/dpiswitcher.py +++ b/share/extensions/dpiswitcher.py @@ -178,7 +178,7 @@ def check_text_on_path(svg, element, scale_x, scale_y): def check_use(svg, element, scale_x, scale_y): - """Check whether to skip scaling an instanciated element (<use>).""" + """Check whether to skip scaling an instantiated element (<use>).""" skip = False path = get_linked(svg, element) if not is_in_defs(svg, path): diff --git a/share/extensions/empty_generic.inx b/share/extensions/empty_generic.inx index b430cfba5..4a89dfec5 100644 --- a/share/extensions/empty_generic.inx +++ b/share/extensions/empty_generic.inx @@ -37,7 +37,7 @@ <inkscape:_templateinfo> <inkscape:_name>Generic canvas...</inkscape:_name> <inkscape:author>Tavmjong Bah</inkscape:author> - <inkscape:_shortdesc>Genric canvas of choosen size.</inkscape:_shortdesc> + <inkscape:_shortdesc>Genric canvas of chosen size.</inkscape:_shortdesc> <inkscape:date>2014-10-09</inkscape:date> <inkscape:_keywords>empty generic canvas</inkscape:_keywords> </inkscape:_templateinfo> diff --git a/share/extensions/empty_generic.py b/share/extensions/empty_generic.py index 62e27d220..8dd66d5df 100755 --- a/share/extensions/empty_generic.py +++ b/share/extensions/empty_generic.py @@ -61,7 +61,7 @@ class C(inkex.Effect): namedview.set( 'bordercolor', pagecolor ) namedview.set( 'borderopacity', "0" ) - # This nees more thought... we need to set "Current layer" to (root), how? + # This needs more thought... we need to set "Current layer" to (root), how? # if self.options.generic_layer: # # Add layer # inkex.debug( "We want a layer" ) diff --git a/share/extensions/funcplot.py b/share/extensions/funcplot.py index 557aac302..64f280624 100755 --- a/share/extensions/funcplot.py +++ b/share/extensions/funcplot.py @@ -306,7 +306,7 @@ class FuncPlot(inkex.Effect): clipId = self.uniqueId('clipPath') clip.set('id', clipId) newpath.set('clip-path', 'url(#'+clipId+')') - # option wether to remove the rectangle or not. + # option whether to remove the rectangle or not. if self.options.remove: node.getparent().remove(node) if newpath is None: diff --git a/share/extensions/gcodetools.py b/share/extensions/gcodetools.py index 23a3e1a1c..b00e4b58f 100755 --- a/share/extensions/gcodetools.py +++ b/share/extensions/gcodetools.py @@ -290,7 +290,7 @@ def point_inside_csp(p,csp, on_the_path = True) : if y1==y : # the point is on the path return on_the_path - # if t == 0 we sould have considered this case previously. + # if t == 0 we should have considered this case previously. if t == 1 : # we have to check the next segmant if it is on the same side of the ray st_d = csp_normalized_slope(sp1,sp2,1)[0] @@ -1319,7 +1319,7 @@ def csp_segment_convex_hull(sp1,sp2): if not (m1 and m2) and m3 : return [c,a,d] if not (m1 and m3) and m2 : return [b,c,d] - raise ValueError, "csp_segment_convex_hull happend something that shouldnot happen!" + raise ValueError, "csp_segment_convex_hull happened which is something that shouldn't happen!" ################################################################################ @@ -3038,7 +3038,7 @@ class Arangement_Genetic: def similarity(self,sp1,top) : - # Define similarity as a simple distance between two points in len(gene)*len(spiece) -th dimentions + # Define similarity as a simple distance between two points in len(gene)*len(spiece) -th dimensions # for sp2 in top_spieces sum(|sp1-sp2|)/top_count sim = 0 for sp2 in top : @@ -3603,7 +3603,7 @@ class Gcodetools(inkex.Effect): self.OptionParser.add_option("", "--min-arc-radius", action="store", type="float", dest="min_arc_radius", default=".1", help="All arc having radius less than minimum will be considered as straight line") self.OptionParser.add_option("", "--engraving-sharp-angle-tollerance",action="store", type="float", dest="engraving_sharp_angle_tollerance", default="150", help="All angles thar are less than engraving-sharp-angle-tollerance will be thought sharp") - self.OptionParser.add_option("", "--engraving-max-dist", action="store", type="float", dest="engraving_max_dist", default="10", help="Distanse from original path where engraving is not needed (usualy it's cutting tool diameter)") + self.OptionParser.add_option("", "--engraving-max-dist", action="store", type="float", dest="engraving_max_dist", default="10", help="Distanse from original path where engraving is not needed (usually it's cutting tool diameter)") self.OptionParser.add_option("", "--engraving-newton-iterations", action="store", type="int", dest="engraving_newton_iterations", default="4", help="Number of sample points used to calculate distance") self.OptionParser.add_option("", "--engraving-draw-calculation-paths",action="store", type="inkbool", dest="engraving_draw_calculation_paths", default=False, help="Draw additional graphics to debug engraving path") self.OptionParser.add_option("", "--engraving-cutter-shape-function",action="store", type="string", dest="engraving_cutter_shape_function", default="w", help="Cutter shape function z(w). Ex. cone: w. ") @@ -4108,7 +4108,7 @@ class Gcodetools(inkex.Effect): ### Errors handling function, notes are just printed into Logfile, ### warnings are printed into log file and warning message is displayed but ### extension continues working, errors causes log and execution is halted -### Notes, warnings adn errors could be assigned to space or comma or dot +### Notes, warnings and errors could be assigned to space or comma or dot ### sepparated strings (case is ignoreg). ################################################################################ def error(self, s, type_= "Warning"): @@ -4775,7 +4775,7 @@ class Gcodetools(inkex.Effect): # Reverse path if needed. if min_y!=float("-inf") : - # Move outline subpath to the begining of csp + # Move outline subpath to the beginning of csp subp = csp[min_i] del csp[min_i] j = min_j diff --git a/share/extensions/gimp_xcf.py b/share/extensions/gimp_xcf.py index e58471210..c8096b1e3 100755 --- a/share/extensions/gimp_xcf.py +++ b/share/extensions/gimp_xcf.py @@ -153,7 +153,7 @@ class MyEffect(inkex.Effect): if (self.options.saveGrid and self.document.xpath(gridXpath, namespaces=inkex.NSS)): gridNode = self.xpathSingle(gridXpath) if gridNode != None: - # These attributes could be nonexistant + # These attributes could be nonexistent spacingX = gridNode.get('spacingx') if spacingX == None: spacingX = 1 diff --git a/share/extensions/grid_cartesian.py b/share/extensions/grid_cartesian.py index e92509505..e192e8dc2 100755 --- a/share/extensions/grid_cartesian.py +++ b/share/extensions/grid_cartesian.py @@ -54,7 +54,7 @@ class Grid_Polar(inkex.Effect): self.OptionParser.add_option("--dx", action="store", type="float", dest="dx", default=100.0, - help="Major X divison Spacing") + help="Major X division Spacing") self.OptionParser.add_option("--x_subdivs", action="store", type="int", dest="x_subdivs", default=2, @@ -183,12 +183,12 @@ class Grid_Polar(inkex.Effect): draw_SVG_rect(0, 0, xmax, ymax, self.options.border_th, 'none', 'Border', grid) #border rectangle - #DO THE X DIVISONS====================================== + #DO THE X DIVISIONS====================================== sd = self.options.x_subdivs #sub divs per div ssd = self.options.x_subsubdivs #subsubdivs per subdiv - for i in range(0, self.options.x_divs): #Major x divisons - if i>0: #dont draw first line (we made a proper border) + for i in range(0, self.options.x_divs): #Major x divisions + if i>0: #don't draw first line (we made a proper border) draw_SVG_line(self.options.dx*i, 0, self.options.dx*i,ymax, self.options.x_divs_th, @@ -226,12 +226,12 @@ class Grid_Polar(inkex.Effect): self.options.x_subsubdivs_th, 'SubminorXDiv'+str(i)+':'+str(j)+':'+str(k), mminglx) - #DO THE Y DIVISONS======================================== + #DO THE Y DIVISIONS======================================== sd = self.options.y_subdivs #sub divs per div ssd = self.options.y_subsubdivs #subsubdivs per subdiv - for i in range(0, self.options.y_divs): #Major y divisons - if i>0:#dont draw first line (we will make a border) + for i in range(0, self.options.y_divs): #Major y divisions + if i>0:#don't draw first line (we will make a border) draw_SVG_line(0, self.options.dy*i, xmax, self.options.dy*i, self.options.y_divs_th, diff --git a/share/extensions/grid_isometric.py b/share/extensions/grid_isometric.py index d80be6c4d..d92b2d7a2 100755 --- a/share/extensions/grid_isometric.py +++ b/share/extensions/grid_isometric.py @@ -57,7 +57,7 @@ class Grid_Polar(inkex.Effect): self.OptionParser.add_option("--dx", action="store", type="float", dest="dx", default=10.0, - help="Major X divison Spacing") + help="Major X division Spacing") self.OptionParser.add_option("--subdivs", action="store", type="int", dest="subdivs", default=2, @@ -196,7 +196,7 @@ class Grid_Polar(inkex.Effect): 'MajorXDiv'+str(i), majglx) - #Y DIVISONS + #Y DIVISIONS #Shortcuts for divisions sd = self.options.subdivs ssd = self.options.subsubdivs diff --git a/share/extensions/grid_polar.py b/share/extensions/grid_polar.py index c5a7e7062..81ee3f049 100755 --- a/share/extensions/grid_polar.py +++ b/share/extensions/grid_polar.py @@ -181,7 +181,7 @@ class Grid_Polar(inkex.Effect): self.options.a_divs_th, 'RadialGridline'+str(i), grid) if self.options.a_subdivs > 1: #draw angular subdivs - for i in range(0, self.options.a_divs): #for each major divison + for i in range(0, self.options.a_divs): #for each major division for j in range(1, self.options.a_subdivs): #draw the subdivisions angle = i*dtheta-j*dtheta/self.options.a_subdivs+pi/2.0 # the angle of the subdivion line draw_SVG_line(dr*self.options.a_subdivs_cent*sin(angle), diff --git a/share/extensions/guides_creator.py b/share/extensions/guides_creator.py index 70144d9dd..0c3a91c77 100755 --- a/share/extensions/guides_creator.py +++ b/share/extensions/guides_creator.py @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # # # # # # # -# # # extension's begining # # # +# # # extension's beginning # # # # These two lines are only needed if you don't put the script directly into # the installation directory diff --git a/share/extensions/hpgl_encoder.py b/share/extensions/hpgl_encoder.py index b9975215f..04387a91b 100644 --- a/share/extensions/hpgl_encoder.py +++ b/share/extensions/hpgl_encoder.py @@ -284,14 +284,14 @@ class hpglEncoder: return [x, y] def processOffset(self, cmd, posX, posY, pen): - # calculate offset correction (or dont) + # calculate offset correction (or don't) if self.toolOffset == 0.0 or self.dryRun: self.storePoint(cmd, posX, posY, pen) else: # insert data into cache self.vData.pop(0) self.vData.insert(3, [cmd, posX, posY, pen]) - # decide if enough data is availabe + # decide if enough data is available if self.vData[2][1] != 'False': if self.vData[1][1] == 'False': self.storePoint(self.vData[2][0], self.vData[2][1], self.vData[2][2], self.vData[2][3]) diff --git a/share/extensions/jessyInk.js b/share/extensions/jessyInk.js index d6adaa250..e4758899e 100644 --- a/share/extensions/jessyInk.js +++ b/share/extensions/jessyInk.js @@ -118,7 +118,7 @@ function jessyInkInit() if (jessyInkInitialised) return; - // Making the presentation scaleable. + // Making the presentation scalable. var VIEWBOX = ROOT_NODE.getAttribute("viewBox"); if (VIEWBOX) diff --git a/share/extensions/jitternodes.py b/share/extensions/jitternodes.py index d6f5ce36d..fbb1d00d6 100755 --- a/share/extensions/jitternodes.py +++ b/share/extensions/jitternodes.py @@ -26,7 +26,7 @@ def randomize((x, y), rx, ry, dist): r2 = random.gauss(0.0,ry) elif dist == "Pareto": ''' - sign is used ot fake a double sided pareto distribution. + sign is used to fake a double sided pareto distribution. for parameter value between 1 and 2 the distribution has infinite variance I truncate the distribution to a high value and then normalize it. The idea is to get spiky distributions, any distribution with long-tails is diff --git a/share/extensions/param_curves.py b/share/extensions/param_curves.py index e38d5208a..6cd54a691 100755 --- a/share/extensions/param_curves.py +++ b/share/extensions/param_curves.py @@ -240,7 +240,7 @@ class ParamCurves(inkex.Effect): # add path into SVG structure node.getparent().append(newpath) - # option wether to remove the rectangle or not. + # option whether to remove the rectangle or not. if self.options.remove: node.getparent().remove(node) diff --git a/share/extensions/pathalongpath.py b/share/extensions/pathalongpath.py index 8c3d42016..b8834a940 100755 --- a/share/extensions/pathalongpath.py +++ b/share/extensions/pathalongpath.py @@ -151,7 +151,7 @@ class PathAlongPath(pathmodifier.Diffeo): def lengthtotime(self,l): ''' - Recieves an arc length l, and returns the index of the segment in self.skelcomp + Receives an arc length l, and returns the index of the segment in self.skelcomp containing the corresponding point, to gether with the position of the point on this segment. If the deformer is closed, do computations modulo the toal length. diff --git a/share/extensions/pathmodifier.py b/share/extensions/pathmodifier.py index bf45dd77a..c31702a0d 100755 --- a/share/extensions/pathmodifier.py +++ b/share/extensions/pathmodifier.py @@ -21,7 +21,7 @@ This code defines a basic class (PathModifier) of effects whose purpose is to somehow deform given objects: one common tasks for all such effect is to convert shapes, groups, clones to paths. The class has several functions to make this (more or less!) easy. -As an exemple, a second class (Diffeo) is derived from it, +As an example, a second class (Diffeo) is derived from it, to implement deformations of the form X=f(x,y), Y=g(x,y)... TODO: Several handy functions are defined, that might in fact be of general diff --git a/share/extensions/pathscatter.py b/share/extensions/pathscatter.py index 361e8f8e1..a56ab8ac2 100755 --- a/share/extensions/pathscatter.py +++ b/share/extensions/pathscatter.py @@ -183,10 +183,10 @@ class PathScatter(pathmodifier.Diffeo): def lengthtotime(self,l): ''' - Recieves an arc length l, and returns the index of the segment in self.skelcomp + Receives an arc length l, and returns the index of the segment in self.skelcomp containing the corresponding point, to gether with the position of the point on this segment. - If the deformer is closed, do computations modulo the toal length. + If the deformer is closed, do computations modulo the total length. ''' if self.skelcompIsClosed: l=l % sum(self.lengths) @@ -201,7 +201,7 @@ class PathScatter(pathmodifier.Diffeo): def localTransformAt(self,s,follow=True): ''' - receives a length, and returns the coresponding point and tangent of self.skelcomp + receives a length, and returns the corresponding point and tangent of self.skelcomp if follow is set to false, returns only the translation ''' i,t=self.lengthtotime(s) diff --git a/share/extensions/pixelsnap.py b/share/extensions/pixelsnap.py index 162822920..440cc873e 100755 --- a/share/extensions/pixelsnap.py +++ b/share/extensions/pixelsnap.py @@ -19,7 +19,7 @@ TODO: Transforming points isn't quite perfect, to say the least. In particular, BUT, some handles that are attached to a particular point are conceptually handles of the prev/next node. Best way to fix it would be to keep a list of the fractional_offsets[] of - each point, without transforming anything. Then go thru each point and + each point, without transforming anything. Then go through each point and transform the appropriate handle according to the relevant fraction_offset in the list. diff --git a/share/extensions/render_barcode_datamatrix.py b/share/extensions/render_barcode_datamatrix.py index 659e74de6..0f237297f 100755 --- a/share/extensions/render_barcode_datamatrix.py +++ b/share/extensions/render_barcode_datamatrix.py @@ -96,7 +96,7 @@ symbols = { #create a 2d list corresponding to the 1's and 0s of the DataMatrix def encode(text, (nrow, ncol) ): - #retreive the parameters of this size of DataMatrix + #retrieve the parameters of this size of DataMatrix data_nrow, data_ncol, reg_row, reg_col, nd, nc, inter = get_parameters( nrow, ncol ) if not ((nrow == 144) and (ncol == 144)): #we have a regular datamatrix diff --git a/share/extensions/run_command.py b/share/extensions/run_command.py index 950e9ed7c..b36b61203 100755 --- a/share/extensions/run_command.py +++ b/share/extensions/run_command.py @@ -88,7 +88,7 @@ def run(command_format, prog_name): except Exception: pass - # Ouput error message (if any) and exit. + # Output error message (if any) and exit. if msg is not None: sys.stderr.write(msg + "\n") sys.exit(1) diff --git a/share/extensions/simplepath.py b/share/extensions/simplepath.py index 5d99e46e7..2d30a9e33 100644 --- a/share/extensions/simplepath.py +++ b/share/extensions/simplepath.py @@ -97,7 +97,7 @@ def parsePath(d): else: command = token else: - #command was omited + #command was omitted #use last command's implicit next command needParam = False if lastCommand: diff --git a/share/extensions/simplepath.rb b/share/extensions/simplepath.rb index 3d9b7b372..dc7123b43 100755 --- a/share/extensions/simplepath.rb +++ b/share/extensions/simplepath.rb @@ -86,7 +86,7 @@ def parsePath(d) unless lastCommand or token.upcase == 'M' command = token else - #command was omited + #command was omitted #use last command's implicit next command raise 'Invalid path, no initial command.' unless lastCommand if lastCommand =~ /[A-Z]/ diff --git a/share/extensions/simplestyle.py b/share/extensions/simplestyle.py index 32328a40d..b4d4233e2 100644 --- a/share/extensions/simplestyle.py +++ b/share/extensions/simplestyle.py @@ -189,7 +189,7 @@ def isColor(c): if c.lower() in svgcolors.keys(): return True #might be "none" or some undefined color constant or rgb() - #however, rgb() shouldnt occur at this point + #however, rgb() shouldn't occur at this point return False def parseColor(c): diff --git a/share/extensions/svg2fxg.xsl b/share/extensions/svg2fxg.xsl index 3853b4d7b..d459dd123 100644 --- a/share/extensions/svg2fxg.xsl +++ b/share/extensions/svg2fxg.xsl @@ -602,7 +602,7 @@ extension-element-prefixes="math"> <!-- // Linear gradient // - Full convertion to FXG would require some math. + Full conversion to FXG would require some math. --> <xsl:template name="linearGradient"> <xsl:param name="id" /> @@ -657,7 +657,7 @@ extension-element-prefixes="math"> <!-- // Radial gradient // - Full convertion to FXG would require some math. + Full conversion to FXG would require some math. --> <xsl:template name="radialGradient"> <xsl:param name="id" /> diff --git a/share/extensions/svg2xaml.xsl b/share/extensions/svg2xaml.xsl index e4a3ca3f1..b7629901b 100644 --- a/share/extensions/svg2xaml.xsl +++ b/share/extensions/svg2xaml.xsl @@ -4,7 +4,7 @@ Copyright (c) 2005-2015 authors: Original version: Toine de Greef (a.degreef@chello.nl) Modified (2010-2015) by Nicolas Dufour (nicoduf@yahoo.fr) (blur support, units -convertion, comments, and some other fixes) +conversion, comments, and some other fixes) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -2863,7 +2863,7 @@ exclude-result-prefixes="rdf xlink xs exsl libxslt inkscape"> <!-- // Clip Geometry for path // - TODO: PathGeometry is positionned in the object's space, and thus needs to be translated. + TODO: PathGeometry is positioned in the object's space, and thus needs to be translated. --> <xsl:template mode="geometry" match="*[name(.) = 'path']"> <PathGeometry> diff --git a/share/extensions/svg_and_media_zip_output.py b/share/extensions/svg_and_media_zip_output.py index e021bfd4e..4e991e91c 100755 --- a/share/extensions/svg_and_media_zip_output.py +++ b/share/extensions/svg_and_media_zip_output.py @@ -1,7 +1,7 @@ #!/usr/bin/env python ''' svg_and_media_zip_output.py -An extention which collects all images to the documents directory and +An extension which collects all images to the documents directory and creates a zip archive containing all images and the document Copyright (C) 2005 Pim Snel, pim@lingewoud.com @@ -30,10 +30,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. TODOs - fix bug: not saving existing .zip after a Collect for Output is run - this bug occurs because after running an effect extention the inkscape:output_extension is reset to svg.inkscape + this bug occurs because after running an effect extension the inkscape:output_extension is reset to svg.inkscape the file name is still xxx.zip. after saving again the file xxx.zip is written with a plain .svg which looks like a corrupt zip -- maybe add better extention +- maybe add better extension - consider switching to lzma in order to allow cross platform compression with no encoding problem... ''' # standard library @@ -206,7 +206,7 @@ class CompressedMediaOutput(inkex.Effect): #inkex.errormsg(_('Locale: %s') % locale.getpreferredencoding()) if docname is None: docname = self.args[-1] - # TODO: replace whatever extention + # TODO: replace whatever extension docstripped = os.path.basename(docname.replace('.zip', '')) docstripped = docstripped.replace('.svg', '') docstripped = docstripped.replace('.svgz', '') diff --git a/share/extensions/test/color_randomize.test.py b/share/extensions/test/color_randomize.test.py index d8549a35a..2887b96aa 100755 --- a/share/extensions/test/color_randomize.test.py +++ b/share/extensions/test/color_randomize.test.py @@ -52,7 +52,7 @@ class ColorRandomizeColorModificationTest(unittest.TestCase): hsl = extract_hsl(self.e, self.e.colmod(150, 100, 200)) self.assertEqual([0.47, 0.59], [round(hsl[1], 2), round(hsl[2], 2)]) - @unittest.skip("Inaccurate convertion") + @unittest.skip("Inaccurate conversion") def test_random_lightness(self): """ Random lightness only. Hue and saturation not changed. """ args = ['-y 0', '-t 0', '-m 50', 'svg/empty-SVG.svg'] diff --git a/share/extensions/test/gimp_xcf.test.py b/share/extensions/test/gimp_xcf.test.py index b5a530a49..de2498ec8 100755 --- a/share/extensions/test/gimp_xcf.test.py +++ b/share/extensions/test/gimp_xcf.test.py @@ -38,7 +38,7 @@ class GimpXCFBasicTest(unittest.TestCase): self.assertEqual(e.valid, 0) def test_empty_layer_file(self): - # default-inkscape-SVG.svg is a copy of the defaut Inkscape + # default-inkscape-SVG.svg is a copy of the default Inkscape # template, with one empty layer. # The file must have at least one non empty layer and thus the # extension rejects it and send an error message. diff --git a/share/extensions/test/inkweb-debug.js b/share/extensions/test/inkweb-debug.js index a4035503a..3fd24e3c2 100644 --- a/share/extensions/test/inkweb-debug.js +++ b/share/extensions/test/inkweb-debug.js @@ -252,7 +252,7 @@ InkWeb.__logSequence = function ( msg ) { } InkWeb.logToString = function (conf) { - /* Show the log in a formated string. + /* Show the log in a formatted string. ** conf attributes: ** format: a string to format the log itens. ** formatError: to format the error log itens. diff --git a/share/extensions/triangle.py b/share/extensions/triangle.py index 32bd2a1db..4d8ff035a 100755 --- a/share/extensions/triangle.py +++ b/share/extensions/triangle.py @@ -147,7 +147,7 @@ class Grid_Polar(inkex.Effect): s_b = self.options.s_b a_a = self.options.a_a*pi/180 #in rad - if (a_a < pi/2.0) and (s_a < s_b) and (s_a > s_b*sin(a_a) ): #this is an ambigous case + if (a_a < pi/2.0) and (s_a < s_b) and (s_a > s_b*sin(a_a) ): #this is an ambiguous case ambiguous=True#we will give both answers else: ambiguous=False diff --git a/share/extensions/uniconv_output.py b/share/extensions/uniconv_output.py index de6b6409f..253f43a41 100755 --- a/share/extensions/uniconv_output.py +++ b/share/extensions/uniconv_output.py @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA """ # Run a command that generates an UniConvertor export file from a SVG file. -# On success, outputs the contents of the UniConverter convertion to stdout, +# On success, outputs the contents of the UniConverter conversion to stdout, # and exits with a return code of 0. # On failure, outputs an error message to stderr, and exits with a return # code of 1. @@ -85,7 +85,7 @@ def run(command_format, prog_name, uniconv_format): except Exception: pass - # Ouput error message (if any) and exit. + # Output error message (if any) and exit. if msg is not None: sys.stderr.write(msg + "\n") sys.exit(1) diff --git a/share/extensions/web-transmit-att.py b/share/extensions/web-transmit-att.py index 34c97cff3..d1b625321 100755 --- a/share/extensions/web-transmit-att.py +++ b/share/extensions/web-transmit-att.py @@ -28,7 +28,7 @@ class InkWebTransmitAtt(inkwebeffect.InkWebEffect): self.OptionParser.add_option("-a", "--att", action="store", type="string", dest="att", default="fill", - help="Attribute to transmited.") + help="Attribute to transmitted.") self.OptionParser.add_option("-w", "--when", action="store", type="string", dest="when", default="onclick", diff --git a/share/extensions/wireframe_sphere.py b/share/extensions/wireframe_sphere.py index 9a8d646e3..840978f80 100755 --- a/share/extensions/wireframe_sphere.py +++ b/share/extensions/wireframe_sphere.py @@ -14,7 +14,7 @@ its own group. The whole sphere can be tilted towards or away from the veiwer by a given number of degrees. If the whole sphere is then rotated normally in Inkscape, -any position can be acheived. +any position can be achieved. There is an option to hide the lines at the back of the sphere, as if the sphere were opaque. diff --git a/share/keys/acd-canvas.xml b/share/keys/acd-canvas.xml index a1c4e56e5..dd8cf02c2 100644 --- a/share/keys/acd-canvas.xml +++ b/share/keys/acd-canvas.xml @@ -38,7 +38,7 @@ has. E.g. both Airbrush, Speaker Notes and Multigon tools have A as shortcut. This is so weird for Inkscape that we cannot even emulate that properly :-) Following tools exist in Canvas and have a shortcut, but are not used in this -scheme due to reasons explained above and absense of such tools in Inkscape: +scheme due to reasons explained above and absence of such tools in Inkscape: Linear Dimensioning Tool - somewhat close to Dimensions+Measure Path Knife tool - K diff --git a/src/axis-manip.h b/src/axis-manip.h index 28875b2f5..032ee04ba 100644 --- a/src/axis-manip.h +++ b/src/axis-manip.h @@ -216,7 +216,7 @@ inline Box3D::Axis third_axis_direction (Box3D::Axis plane) { return (Box3D::Axis) (plane ^ 0x7); } -/* returns the first/second axis direction occuring in the (possibly compound) expression 'dirs' */ +/* returns the first/second axis direction occurring in the (possibly compound) expression 'dirs' */ inline Box3D::Axis extract_first_axis_direction (Box3D::Axis dirs) { if (dirs & Box3D::X) return Box3D::X; if (dirs & Box3D::Y) return Box3D::Y; @@ -231,7 +231,7 @@ inline Box3D::Axis orth_plane_or_axis (Box3D::Axis axis) { return (Box3D::Axis) (Box3D::XYZ ^ axis); } -/* returns an axis direction perpendicular to the ones occuring in the (possibly compound) expression 'dirs' */ +/* returns an axis direction perpendicular to the ones occurring in the (possibly compound) expression 'dirs' */ inline Box3D::Axis get_perpendicular_axis_direction (Box3D::Axis dirs) { if (!(dirs & Box3D::X)) return Box3D::X; if (!(dirs & Box3D::Y)) return Box3D::Y; diff --git a/src/box3d.cpp b/src/box3d.cpp index 98f49e52a..af1d00b0f 100644 --- a/src/box3d.cpp +++ b/src/box3d.cpp @@ -962,7 +962,7 @@ box3d_recompute_z_orders (SPBox3D *box) { break; default: /* - * For each VP F, check wether the half-line from the corner3 to F crosses the line segment + * For each VP F, check whether the half-line from the corner3 to F crosses the line segment * joining the other two VPs. If this is the case, it determines the "central" corner from * which the visible sides can be deduced. Otherwise, corner3 is the central corner. */ diff --git a/src/desktop.cpp b/src/desktop.cpp index 2d1aa8829..1264e0184 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -188,7 +188,7 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid SPCanvasGroup *root = canvas->getRoot(); - /* Setup adminstrative layers */ + /* Setup administrative layers */ acetate = sp_canvas_item_new (root, GNOME_TYPE_CANVAS_ACETATE, NULL); g_signal_connect (G_OBJECT (acetate), "event", G_CALLBACK (sp_desktop_root_handler), this); main = (SPCanvasGroup *) sp_canvas_item_new (root, SP_TYPE_CANVAS_GROUP, NULL); diff --git a/src/display/drawing-context.cpp b/src/display/drawing-context.cpp index 319136e06..1a1f20425 100644 --- a/src/display/drawing-context.cpp +++ b/src/display/drawing-context.cpp @@ -41,7 +41,7 @@ DrawingContext::Save::~Save() void DrawingContext::Save::save(DrawingContext &dc) { if (_dc) { - // TODO: it might be better to treat this occurence as a bug + // TODO: it might be better to treat this occurrence as a bug _dc->restore(); } _dc = &dc; diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp index c4af81efc..43db4f259 100644 --- a/src/display/drawing-item.cpp +++ b/src/display/drawing-item.cpp @@ -99,7 +99,7 @@ void set_cairo_blend_operator( DrawingContext &dc, unsigned blend_mode ) { * you always need to delete the item views of children before deleting * the view of the parent. Do not call delete on things returned from show() * - this will cause dangling pointers inside the SPItem and lead to a crash. - * Use the corresponing hide() method. + * Use the corresponding hide() method. * * Outside of the SP tree, you should not use any references after the root node * has been deleted. diff --git a/src/display/drawing-pattern.h b/src/display/drawing-pattern.h index dc1f93ed1..43e0e97e1 100644 --- a/src/display/drawing-pattern.h +++ b/src/display/drawing-pattern.h @@ -39,7 +39,7 @@ public: */ void setPatternToUserTransform(Geom::Affine const &new_trans); /** - * Set the tile rect position and dimentions in content coordinate system + * Set the tile rect position and dimensions in content coordinate system */ void setTileRect(Geom::Rect const &tile_rect); /** diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp index 1b979fa6c..c0d1ae411 100644 --- a/src/display/nr-filter-displacement-map.cpp +++ b/src/display/nr-filter-displacement-map.cpp @@ -145,7 +145,7 @@ void FilterDisplacementMap::area_enlarge(Geom::IntRect &area, Geom::Affine const double scalex = scale/2.*(std::fabs(trans[0])+std::fabs(trans[1])); double scaley = scale/2.*(std::fabs(trans[2])+std::fabs(trans[3])); - //FIXME: no +2 should be there!... (noticable only for big scales at big zoom factor) + //FIXME: no +2 should be there!... (noticeable only for big scales at big zoom factor) area.expandBy(scalex+2, scaley+2); } diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp index 24960af78..cdd01e75e 100644 --- a/src/display/nr-filter-gaussian.cpp +++ b/src/display/nr-filter-gaussian.cpp @@ -616,7 +616,7 @@ void FilterGaussian::render_cairo(FilterSlot &slot) // Decide which filter to use for X and Y // This threshold was determined by trial-and-error for one specific machine, // so there's a good chance that it's not optimal. - // Whatever you do, don't go below 1 (and preferrably not even below 2), as + // Whatever you do, don't go below 1 (and preferably not even below 2), as // the IIR filter gets unstable there. bool use_IIR_x = deviation_x > 3; bool use_IIR_y = deviation_y > 3; diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp index af89d98e0..7e859314a 100644 --- a/src/display/nr-filter-image.cpp +++ b/src/display/nr-filter-image.cpp @@ -144,7 +144,7 @@ void FilterImage::render_cairo(FilterSlot &slot) * (See http://www.w3.org/TR/xmlbase/#resolution .) */ gchar *fullname = feImageHref; if ( !g_file_test( fullname, G_FILE_TEST_EXISTS ) ) { - // Try to load from relative postion combined with document base + // Try to load from relative position combined with document base if( document ) { fullname = g_build_filename( document->getBase(), feImageHref, NULL ); } diff --git a/src/display/nr-filter-skeleton.cpp b/src/display/nr-filter-skeleton.cpp index 86ab8141e..491c7f52a 100644 --- a/src/display/nr-filter-skeleton.cpp +++ b/src/display/nr-filter-skeleton.cpp @@ -1,14 +1,14 @@ /* * Filter primitive renderer skeleton class * You can create your new filter primitive renderer by replacing - * all occurences of Skeleton, skeleton and SKELETON with your filter + * all occurrences of Skeleton, skeleton and SKELETON with your filter * type, like gaussian or blend in respective case. * * This can be accomplished with the following sed command: * sed -e "s/Skeleton/Name/g" -e "s/skeleton/name/" -e "s/SKELETON/NAME/" * nr-filter-skeleton.cpp >nr-filter-name.cpp * - * (on one line, replace occurences of 'name' with your filter name) + * (on one line, replace occurrences of 'name' with your filter name) * * Remember to convert the .h file too. The sed command is same for both * files. diff --git a/src/display/nr-filter-skeleton.h b/src/display/nr-filter-skeleton.h index e17c244c1..6c92a4a09 100644 --- a/src/display/nr-filter-skeleton.h +++ b/src/display/nr-filter-skeleton.h @@ -4,14 +4,14 @@ /* * Filter primitive renderer skeleton class * You can create your new filter primitive renderer by replacing - * all occurences of Skeleton, skeleton and SKELETON with your filter + * all occurrences of Skeleton, skeleton and SKELETON with your filter * type, like gaussian or blend in respective case. * * This can be accomplished with the following sed command: * sed -e "s/Skeleton/Name/g" -e "s/skeleton/name/" -e "s/SKELETON/NAME/" * nr-filter-skeleton.h >nr-filter-name.h * - * (on one line, replace occurences of 'name' with your filter name) + * (on one line, replace occurrences of 'name' with your filter name) * * Remember to convert the .cpp file too. The sed command is same for both * files. diff --git a/src/display/nr-filter.h b/src/display/nr-filter.h index 211d8ddd9..7028f2e81 100644 --- a/src/display/nr-filter.h +++ b/src/display/nr-filter.h @@ -40,7 +40,7 @@ public: * New primitive is placed so that it will be executed after all filter * primitives defined beforehand for this filter object. * Should this filter not have enough space for a new primitive, the filter - * is enlarged to accomodate the new filter element. It may be enlarged by + * is enlarged to accommodate the new filter element. It may be enlarged by * more that one element. * Returns a handle (non-negative integer) to the filter primitive created. * Returns -1, if type is not valid filter primitive type or filter diff --git a/src/display/nr-light.h b/src/display/nr-light.h index 94b573761..57c421f4a 100644 --- a/src/display/nr-light.h +++ b/src/display/nr-light.h @@ -42,14 +42,14 @@ class DistantLight { /** * Computes the light vector of the distant light * - * \param v a Fvector referece where we store the result + * \param v a Fvector reference where we store the result */ void light_vector(NR::Fvector &v); /** * Computes the light components of the distant light * - * \param lc a Fvector referece where we store the result, X=R, Y=G, Z=B + * \param lc a Fvector reference where we store the result, X=R, Y=G, Z=B */ void light_components(NR::Fvector &lc); @@ -77,7 +77,7 @@ class PointLight { * x, y and z are given in the arena_item coordinate, they are used as * is * - * \param v a Fvector referece where we store the result + * \param v a Fvector reference where we store the result * \param x x coordinate of the current point * \param y y coordinate of the current point * \param z z coordinate of the current point @@ -87,7 +87,7 @@ class PointLight { /** * Computes the light components of the distant light * - * \param lc a Fvector referece where we store the result, X=R, Y=G, Z=B + * \param lc a Fvector reference where we store the result, X=R, Y=G, Z=B */ void light_components(NR::Fvector &lc); @@ -118,7 +118,7 @@ class SpotLight { * x, y and z are given in the arena_item coordinate, they are used as * is * - * \param v a Fvector referece where we store the result + * \param v a Fvector reference where we store the result * \param x x coordinate of the current point * \param y y coordinate of the current point * \param z z coordinate of the current point @@ -129,7 +129,7 @@ class SpotLight { * Computes the light components of the distant light at the current * point. We only need the light vector to compute theses * - * \param lc a Fvector referece where we store the result, X=R, Y=G, Z=B + * \param lc a Fvector reference where we store the result, X=R, Y=G, Z=B * \param L the light vector of the current point */ void light_components(NR::Fvector &lc, const NR::Fvector &L); diff --git a/src/display/sodipodi-ctrlrect.cpp b/src/display/sodipodi-ctrlrect.cpp index 075e04e6d..a35f07c3d 100644 --- a/src/display/sodipodi-ctrlrect.cpp +++ b/src/display/sodipodi-ctrlrect.cpp @@ -212,7 +212,7 @@ void CtrlRect::render(SPCanvasBuf *buf) cairo_stroke_preserve(buf->ct); } - cairo_new_path( buf->ct ); // Clear path or get wierd artifacts. + cairo_new_path( buf->ct ); // Clear path or get weird artifacts. cairo_restore(buf->ct); } } diff --git a/src/document-subset.cpp b/src/document-subset.cpp index 649b1a406..02607d527 100644 --- a/src/document-subset.cpp +++ b/src/document-subset.cpp @@ -65,7 +65,7 @@ struct DocumentSubset::Relations : public GC::Managed<GC::ATOMIC>, } if ( first == last ) { - // compare to the single possiblity left + // compare to the single possibility left int pos = sp_object_compare_position(*last, obj); if ( pos < 0 ) { ++last; diff --git a/src/document-undo.cpp b/src/document-undo.cpp index f36010602..a66fb0ee8 100644 --- a/src/document-undo.cpp +++ b/src/document-undo.cpp @@ -34,7 +34,7 @@ * Gtk spinbutton) from the UI into a single undoable step. * * For controls implemented by Sodipodi itself, implementing undo as a - * single step is usually done in a more efficent way. Most controls have + * single step is usually done in a more efficient way. Most controls have * the abstract model of grab, drag, release, and change user * action. During the grab phase, all modifications are done to the * SPObject directly - i.e. they do not change XML tree, and thus do not diff --git a/src/document.h b/src/document.h index b60561c32..12f6cb724 100644 --- a/src/document.h +++ b/src/document.h @@ -312,7 +312,7 @@ private: * * 1. There is reference request dictionary, that contains * objects (styles) needing certain id. Object::build checks - * final id against it, and invokes necesary methods + * final id against it, and invokes necessary methods * * 2. Removing referenced object is simply prohibited - * needs analyse, how we can deal with situations, where diff --git a/src/event-log.h b/src/event-log.h index 6d4112a5a..c4c78d1dd 100644 --- a/src/event-log.h +++ b/src/event-log.h @@ -25,7 +25,7 @@ namespace Inkscape { class EventLogPrivate; /** - * A simple log for maintaining a history of commited, undone and redone events along with their + * A simple log for maintaining a history of committed, undone and redone events along with their * type. It implements the UndoStackObserver and should be registered with a * CompositeUndoStackObserver for each document. The event log is then notified on all commit, undo * and redo events and will store a representation of them in an internal Gtk::TreeStore. @@ -34,7 +34,7 @@ class EventLogPrivate; * as its children. * * If a Gtk::TreeView is connected to the event log, the TreeView's selection and its nodes - * expanded/collapsed state will be updated as events are commited, undone and redone. Whenever + * expanded/collapsed state will be updated as events are committed, undone and redone. Whenever * this happens, the event log will block the TreeView's callbacks to prevent circular updates. */ class EventLog : public UndoStackObserver, public sigc::trackable @@ -135,7 +135,7 @@ private: const_iterator _getUndoEvent() const; //< returns the current undoable event or NULL if none const_iterator _getRedoEvent() const; //< returns the current redoable event or NULL if none - void _clearUndo(); //< erase all previously commited events + void _clearUndo(); //< erase all previously committed events void _clearRedo(); //< erase all previously undone events void checkForVirginity(); //< marks the document as untouched if undo/redo reaches a previously saved state diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp index 513ec2f5c..c85281aa4 100644 --- a/src/extension/dbus/document-interface.cpp +++ b/src/extension/dbus/document-interface.cpp @@ -151,7 +151,7 @@ get_name_from_object (SPObject * obj) /* * Some verbs (cut, paste) only work on the active layer. - * This makes sure that the document that is about to recive a command is active. + * This makes sure that the document that is about to receive a command is active. */ void desktop_ensure_active (SPDesktop* desk) { diff --git a/src/extension/dbus/document-interface.h b/src/extension/dbus/document-interface.h index 27460de52..0150dae7e 100644 --- a/src/extension/dbus/document-interface.h +++ b/src/extension/dbus/document-interface.h @@ -125,7 +125,7 @@ document_interface_node (DocumentInterface *doc_interface, gchar *svgtype, /**************************************************************************** - ENVIORNMENT FUNCTIONS + ENVIRONMENT FUNCTIONS ****************************************************************************/ gdouble document_interface_document_get_width (DocumentInterface *doc_interface); diff --git a/src/extension/dbus/document-interface.xml b/src/extension/dbus/document-interface.xml index 7481c0893..2287e9c32 100644 --- a/src/extension/dbus/document-interface.xml +++ b/src/extension/dbus/document-interface.xml @@ -763,7 +763,7 @@ c </arg> <doc:doc> <doc:description> - <doc:para>Get the path value of an object. Equivilent to calling <doc:ref type="method" to="document.get_attribute">get_attribte()</doc:ref> with argument "d". Will not turn object into a path if it is not already.</doc:para> + <doc:para>Get the path value of an object. Equivalent to calling <doc:ref type="method" to="document.get_attribute">get_attribte()</doc:ref> with argument "d". Will not turn object into a path if it is not already.</doc:para> </doc:description> <doc:seealso><doc:ref type="interface" to="Paths">Paths</doc:ref></doc:seealso> </doc:doc> diff --git a/src/extension/dbus/proposed-interface.xml b/src/extension/dbus/proposed-interface.xml index ac74b64f9..2a45c1d52 100644 --- a/src/extension/dbus/proposed-interface.xml +++ b/src/extension/dbus/proposed-interface.xml @@ -105,7 +105,7 @@ </arg> <arg type="s" name="type" direction="in" > <doc:doc> - <doc:summary>A single letter denoting what type of node is beeing appended.</doc:summary> + <doc:summary>A single letter denoting what type of node is being appended.</doc:summary> </doc:doc> </arg> <arg type="ad" name="arguments" direction="in" > diff --git a/src/extension/dependency.h b/src/extension/dependency.h index 8f5dcc0c8..5e58fe06b 100644 --- a/src/extension/dependency.h +++ b/src/extension/dependency.h @@ -39,7 +39,7 @@ class Dependency { /** \brief All of the possible locations to look for the dependency. */ enum location_t { - LOCATION_PATH, /**< Look in the PATH for this depdendency */ + LOCATION_PATH, /**< Look in the PATH for this dependency */ LOCATION_EXTENSIONS, /**< Look in the extensions directory */ LOCATION_ABSOLUTE, /**< This dependency is already defined in absolute terms */ LOCATION_CNT /**< Number of locations to look */ diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp index 063e43f42..20dcc0f5f 100644 --- a/src/extension/error-file.cpp +++ b/src/extension/error-file.cpp @@ -50,7 +50,7 @@ ErrorFileNotice::ErrorFileNotice (void) : { // \FIXME change this - /* This is some filler text, needs to change before relase */ + /* This is some filler text, needs to change before release */ Glib::ustring dialog_text(_("<span weight=\"bold\" size=\"larger\">One or more extensions failed to load</span>\n\nThe failed extensions have been skipped. Inkscape will continue to run normally but those extensions will be unavailable. For details to troubleshoot this problem, please refer to the error log located at: ")); gchar * ext_error_file = Inkscape::IO::Resource::log_path(EXTENSION_ERROR_LOG_FILENAME); dialog_text += ext_error_file; @@ -59,7 +59,7 @@ ErrorFileNotice::ErrorFileNotice (void) : auto vbox = get_content_area(); - /* This is some filler text, needs to change before relase */ + /* This is some filler text, needs to change before release */ Inkscape::Preferences *prefs = Inkscape::Preferences::get(); checkbutton = Gtk::manage(new Gtk::CheckButton(_("Show dialog on startup"))); vbox->pack_start(*checkbutton, true, false, 5); diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp index 624813863..f75b06937 100644 --- a/src/extension/execution-env.cpp +++ b/src/extension/execution-env.cpp @@ -97,7 +97,7 @@ ExecutionEnv::genDocCache (void) { return; } -/** \brief Destory a document cache +/** \brief Destroy a document cache Just delete it. */ diff --git a/src/extension/execution-env.h b/src/extension/execution-env.h index 795f5a65a..a57c7b8c9 100644 --- a/src/extension/execution-env.h +++ b/src/extension/execution-env.h @@ -69,7 +69,7 @@ private: bool _show_errors; public: - /** \brief Create a new context for exection of an effect + /** \brief Create a new context for execution of an effect \param effect The effect to execute \param doc The document to execute the effect on \param docCache The implementation cache of the document. May be diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp index d9ea5eca7..240d28a59 100644 --- a/src/extension/extension.cpp +++ b/src/extension/extension.cpp @@ -365,7 +365,7 @@ Extension::get_name (void) mark to the world that it has been deactivated. It also removes the current implementation and replaces it with a standard one. This makes it so that we don't have to continually check if there is an - implementation, but we are gauranteed to have a benign one. + implementation, but we are guaranteed to have a benign one. \warning It is important to note that there is no 'activate' function. Running this function is irreversable. diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index 2901655f1..eb98711bc 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -426,7 +426,7 @@ ImplementationDocumentCache *Script::newDocCache( Inkscape::Extension::Extension /** \return A dialog for preferences - \brief A stub funtion right now + \brief A stub function right now \param module Module who's preferences need getting \param filename Hey, the file you're getting might be important @@ -442,7 +442,7 @@ Gtk::Widget *Script::prefs_input(Inkscape::Extension::Input *module, /** \return A dialog for preferences - \brief A stub funtion right now + \brief A stub function right now \param module Module whose preferences need getting This function should really do something, right now it doesn't. @@ -602,8 +602,8 @@ void Script::save(Inkscape::Extension::Output *module, /** \return none - \brief This function uses an extention as a effect on a document. - \param module Extention to effect with. + \brief This function uses an extension as an effect on a document. + \param module Extension to effect with. \param doc Document to run through the effect. This function is a little bit trickier than the previous two. It diff --git a/src/extension/init.cpp b/src/extension/init.cpp index 699c0382f..17c07ae1d 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -113,7 +113,7 @@ using namespace Inkscape::IO::Resource; namespace Inkscape { namespace Extension { -/** This is the extention that all files are that are pulled from +/** This is the extension that all files are that are pulled from the extension directory and parsed */ #define SP_MODULE_EXTENSION "inx" diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp index d1fe357da..1040ef194 100644 --- a/src/extension/internal/bluredge.cpp +++ b/src/extension/internal/bluredge.cpp @@ -36,7 +36,7 @@ namespace Internal { /** \brief A function to allocated anything -- just an example here \param module Unused - \return Whether the load was sucessful + \return Whether the load was successful */ bool BlurEdge::load (Inkscape::Extension::Extension */*module*/) diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index 3edb58a13..972081c0d 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -606,7 +606,7 @@ CairoRenderContext::popLayer(void) clip_ctx->setImageTarget(CAIRO_FORMAT_A8); clip_ctx->setClipMode(CLIP_MODE_MASK); // Raster // This code ties the clipping to the document coordinates. It doesn't allow - // for a clipped object intially drawn off the page and then translated onto + // for a clipped object initially drawn off the page and then translated onto // the page. if (!clip_ctx->setupSurface(_width, _height)) { TRACE(("clip: setupSurface failed\n")); @@ -1482,7 +1482,7 @@ CairoRenderContext::_prepareRenderText() } /* We need CairoPaintOrder as markers are rendered in a separate step and may be rendered - * inbetween fill and stroke. + * in between fill and stroke. */ bool CairoRenderContext::renderPathVector(Geom::PathVector const & pathv, SPStyle const *style, Geom::OptRect const &pbox, CairoPaintOrder order) diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp index 8c348dfbb..e6a429d34 100644 --- a/src/extension/internal/gimpgrad.cpp +++ b/src/extension/internal/gimpgrad.cpp @@ -35,7 +35,7 @@ namespace Internal { /** \brief A function to allocate anything -- just an example here \param module Unused - \return Whether the load was sucessful + \return Whether the load was successful */ bool GimpGrad::load (Inkscape::Extension::Extension */*module*/) { @@ -106,10 +106,10 @@ static Glib::ustring stop_svg(ColorRGBA const in_color, double const location) of entries just reading until it fails. The other small piece of trickery here is that GIMP gradients define - a left possition, right possition and middle possition. SVG gradients - have no middle possition in them. In order to handle this case the + a left position, right position and middle position. SVG gradients + have no middle position in them. In order to handle this case the left and right colors are averaged in a linear manner and the middle - possition is used for that color. + position is used for that color. That is another point, the GIMP gradients support many different types of gradients -- linear being the most simple. This plugin assumes diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp index 9e730f5e5..649859ee5 100644 --- a/src/extension/internal/grid.cpp +++ b/src/extension/internal/grid.cpp @@ -42,7 +42,7 @@ namespace Internal { /** \brief A function to allocated anything -- just an example here \param module Unused - \return Whether the load was sucessful + \return Whether the load was successful */ bool Grid::load (Inkscape::Extension::Extension */*module*/) diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp index 57142bbdd..558276999 100644 --- a/src/extension/internal/image-resolution.cpp +++ b/src/extension/internal/image-resolution.cpp @@ -414,7 +414,7 @@ void ImageResolution::readmagick(char const *fn) { x_ = image.xResolution(); y_ = image.yResolution(); -// TODO: find out why the hell the following convertion is necessary +// TODO: find out why the hell the following conversion is necessary if (type == "BMP") { x_ = Inkscape::Util::Quantity::convert(x_, "in", "cm"); y_ = Inkscape::Util::Quantity::convert(y_, "in", "cm"); diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp index d7ad7e6f7..56ea46808 100644 --- a/src/extension/internal/javafx-out.cpp +++ b/src/extension/internal/javafx-out.cpp @@ -82,7 +82,7 @@ static void err(const char *fmt, ...) * tree and finds all of the opacities and multiplies them. * * We use this for our "flat" object output. If the code is modified - * to reflect a tree of <groups>, then this will be unneccessary. + * to reflect a tree of <groups>, then this will be unnecessary. */ static double effective_opacity(const SPStyle *style) { diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index f885ef5e5..db18dd2ca 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -6,7 +6,7 @@ * within Inkscape. Although the initial implementations will be very lossy * due to the differences in the models of SVG and ODF, they will hopefully * improve greatly with time. People should consider this to be a framework - * that can be continously upgraded for ever improving fidelity. Potential + * that can be continuously upgraded for ever improving fidelity. Potential * developers should especially look in preprocess() and writeTree() to see how * the SVG tree is scanned, read, translated, and then written to ODF. * @@ -1400,7 +1400,7 @@ bool OdfOutput::processStyle(SPItem *item, const Glib::ustring &id, const Glib:: } } - // Dont need a new style + // Don't need a new style if (styleMatch) { return false; diff --git a/src/extension/internal/text_reassemble.c b/src/extension/internal/text_reassemble.c index b23176ed5..b191d4ea2 100644 --- a/src/extension/internal/text_reassemble.c +++ b/src/extension/internal/text_reassemble.c @@ -63,7 +63,7 @@ Optional compiler switches for development: -DDBG_TR_INPUT draw input text and their bounding rectangles in SVG output -DTEST build the test program -DDBG_LOOP force the test program to cycle 5 times. Useful for finding - memory leaks. Ouput file is overwritten each time. + memory leaks. Output file is overwritten each time. File: text_reassemble.c diff --git a/src/extension/internal/text_reassemble.h b/src/extension/internal/text_reassemble.h index 6c1acafe5..1c6c17c78 100644 --- a/src/extension/internal/text_reassemble.h +++ b/src/extension/internal/text_reassemble.h @@ -231,7 +231,7 @@ typedef struct { \brief List of all members of a single complex. */ typedef struct { - int *members; /**< array of immediate children (for TR_PARA_* these are indicies + int *members; /**< array of immediate children (for TR_PARA_* these are indices for TR_TEXT or TR_LINE complexes also in cxi. For TR_TEXT and TR_LINE these are indices to the actual text in tpi.) */ uint32_t space; /**< storage slots allocated */ diff --git a/src/extension/param/parameter.h b/src/extension/param/parameter.h index 96cc055d8..b1825d444 100644 --- a/src/extension/param/parameter.h +++ b/src/extension/param/parameter.h @@ -158,7 +158,7 @@ public: const static int GUI_PARAM_WIDGETS_SPACING = 4; /** Recommended indentation width of parameters (in px) */ const static int GUI_INDENTATION = 12; - /** Recommended maximum line lenght for wrapping textual parameters (in chars) */ + /** Recommended maximum line length for wrapping textual parameters (in chars) */ const static int GUI_MAX_LINE_LENGTH = 60; diff --git a/src/extension/plugins/grid2/grid.cpp b/src/extension/plugins/grid2/grid.cpp index 233d4e522..256bb8dc2 100644 --- a/src/extension/plugins/grid2/grid.cpp +++ b/src/extension/plugins/grid2/grid.cpp @@ -42,7 +42,7 @@ namespace Internal { /** \brief A function to allocated anything -- just an example here \param module Unused - \return Whether the load was sucessful + \return Whether the load was successful */ bool Grid::load (Inkscape::Extension::Extension */*module*/) diff --git a/src/extension/system.cpp b/src/extension/system.cpp index afa8346df..e5b83cd20 100644 --- a/src/extension/system.cpp +++ b/src/extension/system.cpp @@ -323,7 +323,7 @@ save(Extension *key, SPDocument *doc, gchar const *filename, bool setextension, doc->changeUriAndHrefs(saved_uri); } doc->setModifiedSinceSave(saved_modified); - // free used ressources + // free used resources g_free(saved_output_extension); g_free(saved_dataloss); g_free(saved_uri); diff --git a/src/helper/geom-nodetype.h b/src/helper/geom-nodetype.h index 2d299d545..0272318a2 100644 --- a/src/helper/geom-nodetype.h +++ b/src/helper/geom-nodetype.h @@ -32,7 +32,7 @@ typedef enum { NODE_CUSP, /** This node continuously joins two segments, with continuous *unit* tangent. */ NODE_SMOOTH, -/** This node is symmetric. I.e. continously joins two segments with continuous derivative */ +/** This node is symmetric. I.e. continuously joins two segments with continuous derivative */ NODE_SYMM } NodeType; diff --git a/src/helper/geom-satellite.cpp b/src/helper/geom-satellite.cpp index 8a92273d0..e3f4eb90f 100644 --- a/src/helper/geom-satellite.cpp +++ b/src/helper/geom-satellite.cpp @@ -113,7 +113,7 @@ double Satellite::radToLen( return len; } -///Convert a satelite length -point position where fillet/chamfer knot be on original curve- to a arc radius of fillet/chamfer +///Convert a satellite length -point position where fillet/chamfer knot be on original curve- to a arc radius of fillet/chamfer double Satellite::lenToRad( double const A, Geom::Curve const &curve_in, Geom::Curve const &curve_out, diff --git a/src/helper/geom-satellite.h b/src/helper/geom-satellite.h index b8ca2a490..198a95c9f 100644 --- a/src/helper/geom-satellite.h +++ b/src/helper/geom-satellite.h @@ -79,8 +79,8 @@ public: void setSatelliteType(gchar const *A); gchar const *getSatelliteTypeGchar() const; SatelliteType satellite_type; - //The value stored could be a time value of the satellite in the curve or a lenght of distance to the node from the satellite - //"is_time" tell is if is a time or lenght value + //The value stored could be a time value of the satellite in the curve or a length of distance to the node from the satellite + //"is_time" tells us if it's a time or length value bool is_time; bool selected; bool has_mirror; diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp index 8d7202111..8881f54a5 100644 --- a/src/helper/pixbuf-ops.cpp +++ b/src/helper/pixbuf-ops.cpp @@ -58,7 +58,7 @@ static void hide_other_items_recursively(SPObject *o, SPItem *i, unsigned dkey) // The following is a mutation of the flood fill code, the marker preview, and random other samplings. -// The dpi settings dont do anything yet, but I want them to, and was wanting to keep reasonably close +// The dpi settings don't do anything yet, but I want them to, and was wanting to keep reasonably close // to the call for the interface to the png writing. bool sp_export_jpg_file(SPDocument *doc, gchar const *filename, diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp index 647e42916..930640a6c 100644 --- a/src/helper/stock-items.cpp +++ b/src/helper/stock-items.cpp @@ -171,7 +171,7 @@ sp_gradient_load_from_svg(gchar const *name, SPDocument *current_doc) // get_stock_item returns a pointer to an instance of the desired stock object in the current doc // if necessary it will import the object. Copes with name clashes through use of the inkscape:stockid property -// This should be set to be the same as the id in the libary file. +// This should be set to be the same as the id in the library file. SPObject *get_stock_item(gchar const *urn, gboolean stock) { diff --git a/src/inkview.cpp b/src/inkview.cpp index 0b2b07f42..5b27e9168 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -60,8 +60,8 @@ public: // this list contains all arguments that are not recognized as an option (so needs to be checked) Glib::OptionGroup::vecustrings filenames; - bool fullscreen = false; // wether to launch in fullscreen mode - bool recursive = false; // wether to search folders for SVG files recursively + bool fullscreen = false; // whether to launch in fullscreen mode + bool recursive = false; // whether to search folders for SVG files recursively int timer = 0; // time (in seconds) after which the next image of the slideshow is automatically loaded double scale = 1; // scale factor for images // (currently only applied to the first image - others are resized to window dimensions) diff --git a/src/io/base64stream.cpp b/src/io/base64stream.cpp index 28c819347..c0c5e1a02 100644 --- a/src/io/base64stream.cpp +++ b/src/io/base64stream.cpp @@ -268,7 +268,7 @@ void Base64OutputStream::flush() { if (closed) return; - //dont flush here. do it on close() + //don't flush here. do it on close() destination.flush(); } diff --git a/src/io/resource.cpp b/src/io/resource.cpp index 3f970dfa1..13da37d7a 100644 --- a/src/io/resource.cpp +++ b/src/io/resource.cpp @@ -134,7 +134,7 @@ Glib::ustring get_path_ustring(Domain domain, Type type, char const *filename) } /* - * Same as get_path, but checks for file's existance and falls back + * Same as get_path, but checks for file's existence and falls back * from USER to SYSTEM modes. * * type - The type of file to get, such as extension, template, ui etc @@ -214,7 +214,7 @@ Glib::ustring get_filename(Glib::ustring path, Glib::ustring filename) * domain - Optional domain (overload), will check return domains if not. * type - The type of files, e.g. TEMPLATES * path - Instead of Domain and Type, specify the path to get the files from. - * extentions - A list of extensions to return, e.g. xml, svg + * extensions - A list of extensions to return, e.g. xml, svg * exclusions - A list of names to exclude e.g. default.xml */ std::vector<Glib::ustring> get_filenames(Type type, std::vector<const char *> extensions, std::vector<const char *> exclusions) diff --git a/src/layer-model.cpp b/src/layer-model.cpp index b941e43b1..3de96e0d1 100644 --- a/src/layer-model.cpp +++ b/src/layer-model.cpp @@ -138,7 +138,7 @@ void LayerModel::toggleLockOtherLayers(SPObject *object) { bool othersLocked = false; std::vector<SPObject*> layers; for ( SPObject* obj = Inkscape::next_layer(currentRoot(), object); obj; obj = Inkscape::next_layer(currentRoot(), obj) ) { - // Dont lock any ancestors, since that would in turn lock the layer as well + // Don't lock any ancestors, since that would in turn lock the layer as well if (!obj->isAncestorOf(object)) { layers.push_back(obj); othersLocked |= !SP_ITEM(obj)->isLocked(); diff --git a/src/libcroco/cr-parser.c b/src/libcroco/cr-parser.c index 449533c6e..6d1e64d28 100644 --- a/src/libcroco/cr-parser.c +++ b/src/libcroco/cr-parser.c @@ -169,7 +169,7 @@ if ((status) != CR_OK) \ *@a_is_exception: in case of error, if is TRUE, the status *is set to CR_PARSING_ERROR before goto error. If is false, the *real low level status is kept and will be returned by the - *upper level function that called this macro. Usally,this must + *upper level function that called this macro. Usually, this must *be set to FALSE. * *same as CHECK_PARSING_STATUS() but this one pushes an error @@ -557,7 +557,7 @@ cr_parser_push_error (CRParser * a_this, *@param a_this the current instance of #CRParser. *@param a_clear_errs whether to clear the error stack *after the dump or not. - *@return CR_OK upon successfull completion, an error code + *@return CR_OK upon successful completion, an error code *otherwise. */ static enum CRStatus @@ -615,7 +615,7 @@ cr_parser_clear_errors (CRParser * a_this) *Same as cr_parser_try_to_skip_spaces() but this one skips *spaces and comments. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_try_to_skip_spaces_and_comments (CRParser * a_this) @@ -752,7 +752,7 @@ cr_parser_parse_stylesheet_core (CRParser * a_this) *in chapter 4.1 in the css2 spec. *at-rule : ATKEYWORD S* any* [ block | ';' S* ]; *@param a_this the current instance of #CRParser. - *@return CR_OK upon successfull completion, an error code + *@return CR_OK upon successful completion, an error code *otherwise. */ static enum CRStatus @@ -828,7 +828,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) *4.1 of the css2 spec. *ruleset ::= selector? '{' S* declaration? [ ';' S* declaration? ]* '}' S*; *@param a_this the current instance of #CRParser. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_ruleset_core (CRParser * a_this) @@ -916,7 +916,7 @@ cr_parser_parse_ruleset_core (CRParser * a_this) *grammar. *selector : any+; *@param a_this the current instance of #CRParser. - *@return CR_OK upon successfull completion, an error code + *@return CR_OK upon successful completion, an error code *otherwise. */ static enum CRStatus @@ -1081,7 +1081,7 @@ cr_parser_parse_declaration_core (CRParser * a_this) *in chapter 4.1. *value ::= [ any | block | ATKEYWORD S* ]+; *@param a_this the current instance of #CRParser. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_value_core (CRParser * a_this) @@ -1162,7 +1162,7 @@ cr_parser_parse_value_core (CRParser * a_this) * | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*; * *@param a_this the current instance of #CRParser. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_any_core (CRParser * a_this) @@ -1319,7 +1319,7 @@ cr_parser_parse_any_core (CRParser * a_this) *@param a_this the "this pointer" of the current instance of *#CRParser . *@param a_sel out parameter. The successfully parsed attribute selector. - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_attribute_selector (CRParser * a_this, @@ -1458,7 +1458,7 @@ cr_parser_parse_attribute_selector (CRParser * a_this, *new instance of GString and set it content to the parsed property. *If not, the property is just appended to a_property's previous content. *In both cases, it is up to the caller to free a_property. - *@return CR_OK upon successfull completion, CR_PARSING_ERROR if the + *@return CR_OK upon successful completion, CR_PARSING_ERROR if the *next construction was not a "property", or an error code. */ static enum CRStatus @@ -1504,7 +1504,7 @@ cr_parser_parse_property (CRParser * a_this, * *TODO: handle parsing of 'RGB' * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_term (CRParser * a_this, CRTerm ** a_term) @@ -1666,7 +1666,7 @@ cr_parser_parse_term (CRParser * a_this, CRTerm ** a_term) *and where pseudo is: *pseudo ::= ':' [ IDENT | FUNCTION S* IDENT S* ')' ] * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_simple_selector (CRParser * a_this, CRSimpleSel ** a_sel) @@ -1934,7 +1934,7 @@ cr_parser_parse_simple_selector (CRParser * a_this, CRSimpleSel ** a_sel) *Parses a "selector" as defined by the css2 spec in appendix D.1: *selector ::= simple_selector [ combinator simple_selector ]* * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_simple_sels (CRParser * a_this, @@ -2136,7 +2136,7 @@ cr_parser_parse_selector (CRParser * a_this, *function ::= FUNCTION S* expr ')' S* *FUNCTION ::= ident'(' * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_function (CRParser * a_this, @@ -2222,7 +2222,7 @@ cr_parser_parse_function (CRParser * a_this, * URI ::= url\({w}{string}{w}\) * |url\({w}([!#$%&*-~]|{nonascii}|{escape})*{w}\) * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_uri (CRParser * a_this, CRString ** a_str) @@ -2241,10 +2241,10 @@ cr_parser_parse_uri (CRParser * a_this, CRString ** a_str) /** * cr_parser_parse_string: *@a_this: the current instance of #CRParser. - *@a_start: out parameter. Upon successfull completion, + *@a_start: out parameter. Upon successful completion, *points to the beginning of the string, points to an undefined value *otherwise. - *@a_end: out parameter. Upon successfull completion, points to + *@a_end: out parameter. Upon successful completion, points to *the beginning of the string, points to an undefined value otherwise. * *Parses a string type as defined in css spec [4.1.1]: @@ -2253,7 +2253,7 @@ cr_parser_parse_uri (CRParser * a_this, CRString ** a_str) *string1 ::= \"([\t !#$%&(-~]|\\{nl}|\'|{nonascii}|{escape})*\" *string2 ::= \'([\t !#$%&(-~]|\\{nl}|\"|{nonascii}|{escape})*\' * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_string (CRParser * a_this, CRString ** a_str) @@ -2280,7 +2280,7 @@ cr_parser_parse_string (CRParser * a_this, CRString ** a_str) *the function just appends the parsed string to the one passed. *In both cases it is up to the caller to free *a_str. * - *@return CR_OK upon successfull completion, an error code + *@return CR_OK upon successful completion, an error code *otherwise. */ static enum CRStatus @@ -2313,7 +2313,7 @@ cr_parser_parse_ident (CRParser * a_this, CRString ** a_str) *@param a_end out parameter. A pointer to the first character of *the successfully parsed string. * - *@return CR_OK upon successfull completion, an error code otherwise. + *@return CR_OK upon successful completion, an error code otherwise. */ static enum CRStatus cr_parser_parse_stylesheet (CRParser * a_this) @@ -2760,7 +2760,7 @@ cr_parser_parse_stylesheet (CRParser * a_this) *coming the input stream given in parameter. * *Returns the newly created instance of #CRParser, - *or NULL if an error occured. + *or NULL if an error occurred. */ CRParser * cr_parser_new (CRTknzr * a_tknzr) @@ -2872,7 +2872,7 @@ cr_parser_new_from_file (const guchar * a_file_uri, enum CREncoding a_enc) * *Sets a SAC document handler to the parser. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_set_sac_handler (CRParser * a_this, CRDocHandler * a_handler) @@ -2897,7 +2897,7 @@ cr_parser_set_sac_handler (CRParser * a_this, CRDocHandler * a_handler) * *Gets the SAC document handler. * - *Returns CR_OK upon successfull completion, an error code + *Returns CR_OK upon successful completion, an error code *otherwise. */ enum CRStatus @@ -2917,7 +2917,7 @@ cr_parser_get_sac_handler (CRParser * a_this, CRDocHandler ** a_handler) *Sets the SAC handler associated to the current instance *of #CRParser to the default SAC handler. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_set_default_sac_handler (CRParser * a_this) @@ -2946,7 +2946,7 @@ cr_parser_set_default_sac_handler (CRParser * a_this) * @a_this: the current instance of #CRParser. * @a_use_core_grammar: where to parse against the css core grammar. * - * Returns CR_OK upon succesful completion, an error code otherwise. + * Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_set_use_core_grammar (CRParser * a_this, @@ -2962,9 +2962,9 @@ cr_parser_set_use_core_grammar (CRParser * a_this, /** * cr_parser_get_use_core_grammar: * @a_this: the current instance of #CRParser. - * @a_use_core_grammar: wether to use the core grammar or not. + * @a_use_core_grammar: whether to use the core grammar or not. * - * Returns CR_OK upon succesful completion, an error code otherwise. + * Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_get_use_core_grammar (CRParser const * a_this, @@ -2986,7 +2986,7 @@ cr_parser_get_use_core_grammar (CRParser const * a_this, * *Parses a the given in parameter. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_file (CRParser * a_this, @@ -3178,7 +3178,7 @@ cr_parser_parse_prio (CRParser * a_this, CRString ** a_prio) *Parses a "declaration" as defined by the css2 spec in appendix D.1: *declaration ::= [property ':' S* expr prio?]? * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_declaration (CRParser * a_this, @@ -3272,7 +3272,7 @@ cr_parser_parse_declaration (CRParser * a_this, *chapter 4.1 of the css2 spec. *statement : ruleset | at-rule; * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_statement_core (CRParser * a_this) @@ -3336,7 +3336,7 @@ cr_parser_parse_statement_core (CRParser * a_this) *See the documentation of #CRDocHandler (the SAC handler) to know *when which SAC handler is called. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_ruleset (CRParser * a_this) @@ -3552,7 +3552,7 @@ cr_parser_parse_ruleset (CRParser * a_this) *import ::= *\@import [STRING|URI] S* [ medium [ ',' S* medium]* ]? ';' S* * - *Returns CR_OK upon sucessfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_import (CRParser * a_this, @@ -3713,7 +3713,7 @@ cr_parser_parse_import (CRParser * a_this, *to notify media productions. See #CRDocHandler to know the callback called *during \@media parsing. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_media (CRParser * a_this) @@ -3883,7 +3883,7 @@ cr_parser_parse_media (CRParser * a_this) *encounters a construction that must *be reported to the calling application. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_page (CRParser * a_this) @@ -4134,7 +4134,7 @@ cr_parser_parse_page (CRParser * a_this) *appendix D.1: *charset ::= CHARSET_SYM S* STRING S* ';' * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_charset (CRParser * a_this, CRString ** a_value, @@ -4225,7 +4225,7 @@ cr_parser_parse_charset (CRParser * a_this, CRString ** a_value, * *This function will call SAC handlers whenever it is necessary. * - *Returns CR_OK upon successfull completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse_font_face (CRParser * a_this) @@ -4382,7 +4382,7 @@ cr_parser_parse_font_face (CRParser * a_this) *input previously associated to the current instance of *#CRParser. * - *Returns CR_OK upon succesful completion, an error code otherwise. + *Returns CR_OK upon successful completion, an error code otherwise. */ enum CRStatus cr_parser_parse (CRParser * a_this) @@ -4432,7 +4432,7 @@ cr_parser_set_tknzr (CRParser * a_this, CRTknzr * a_tknzr) * *Getter of the parser's underlying tokenizer * - *Returns CR_OK upon succesful completion, an error code + *Returns CR_OK upon successful completion, an error code *otherwise */ enum CRStatus @@ -4452,7 +4452,7 @@ cr_parser_get_tknzr (CRParser * a_this, CRTknzr ** a_tknzr) * *Gets the current parsing location. * - *Returns CR_OK upon succesful completion, an error code + *Returns CR_OK upon successful completion, an error code *otherwise. */ enum CRStatus diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 5674e29dc..f4aad4f53 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -835,13 +835,13 @@ Effect::defaultParamSet() bool valid = prefs->getEntry(pref_path).isValid(); const gchar * set_or_upd; Glib::ustring def = Glib::ustring(_("<b>Default value:</b> ")) + Glib::ustring(param->param_getDefaultSVGValue()) + Glib::ustring("\n"); - Glib::ustring ove = Glib::ustring(_("<b>Default value overrided:</b> ")) + Glib::ustring(prefs->getString(pref_path)) + Glib::ustring("\n"); + Glib::ustring ove = Glib::ustring(_("<b>Default value overridden:</b> ")) + Glib::ustring(prefs->getString(pref_path)) + Glib::ustring("\n"); if (valid) { set_or_upd = _("Update"); def = Glib::ustring(_("<b>Default value:</b> <s>")) + Glib::ustring(param->param_getDefaultSVGValue()) + Glib::ustring("</s>\n"); } else { set_or_upd = _("Set"); - ove = Glib::ustring(_("<b>Default value overrided:</b> None\n")); + ove = Glib::ustring(_("<b>Default value overridden:</b> None\n")); } Glib::ustring cur = Glib::ustring(_("<b>Current parameter value:</b> ")) + Glib::ustring(param->param_getSVGValue()); Gtk::HBox * vbox_param = Gtk::manage( new Gtk::HBox(true) ); @@ -892,7 +892,7 @@ Effect::setDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, gchar * set->set_label((Glib::ustring)label); unset->set_sensitive(true); Glib::ustring def = Glib::ustring(_("<b>Default value:</b> <s>")) + Glib::ustring(defvalue) + Glib::ustring("</s>\n"); - Glib::ustring ove = Glib::ustring(_("<b>Default value overrided:</b> ")) + Glib::ustring(value) + Glib::ustring("\n"); + Glib::ustring ove = Glib::ustring(_("<b>Default value overridden:</b> ")) + Glib::ustring(value) + Glib::ustring("\n"); Glib::ustring cur = Glib::ustring(_("<b>Current parameter value:</b> ")) + Glib::ustring(value); parameter_label->set_tooltip_markup((tooltip + def + ove + cur).c_str()); } @@ -906,7 +906,7 @@ Effect::unsetDefaultParam(Glib::ustring pref_path, Glib::ustring tooltip, gchar set->set_label((Glib::ustring)label); unset->set_sensitive(false); Glib::ustring def = Glib::ustring(_("<b>Default value:</b> ")) + Glib::ustring(defvalue) + Glib::ustring("\n"); - Glib::ustring ove = Glib::ustring(_("<b>Default value overrided:</b> None\n")); + Glib::ustring ove = Glib::ustring(_("<b>Default value overridden:</b> None\n")); Glib::ustring cur = Glib::ustring(_("<b>Current parameter value:</b> ")) + Glib::ustring(value); parameter_label->set_tooltip_markup((tooltip + def + ove + cur).c_str()); } diff --git a/src/live_effects/lpe-bool.cpp b/src/live_effects/lpe-bool.cpp index 2930414b3..6299b282b 100644 --- a/src/live_effects/lpe-bool.cpp +++ b/src/live_effects/lpe-bool.cpp @@ -121,7 +121,7 @@ sp_pathvector_boolop_slice_intersect(Geom::PathVector const &pathva, Geom::PathV // (i) filter the descr_cmd of the result path with this bool vector // // The main inefficieny here is step (e) because I use a winding function of the area-shape which goes - // through teh complete edge list for each point I ask for, so effort is n-edges-contour * n-edges-area. + // through the complete edge list for each point I ask for, so effort is n-edges-contour * n-edges-area. // It is tricky to improve this without building into the livarot code. // One way might be to decide at the intersection points which edges touching the intersection points are // in by making a loop through all edges on the intersection vertex. Since this is a directed non intersecting diff --git a/src/live_effects/lpe-dynastroke.cpp b/src/live_effects/lpe-dynastroke.cpp index 33e754a8a..d0655d9bd 100644 --- a/src/live_effects/lpe-dynastroke.cpp +++ b/src/live_effects/lpe-dynastroke.cpp @@ -22,7 +22,7 @@ namespace Inkscape { namespace LivePathEffect { //TODO: growfor/fadefor can be expressed in unit of width. -//TODO: make round/sharp end choices independant for start and end. +//TODO: make round/sharp end choices independent for start and end. //TODO: define more styles like in calligtool. //TODO: allow fancy ends. @@ -166,7 +166,7 @@ LPEDynastroke::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & p // General formula: n1 = w*u with ||u||=1 and u.v = -dw/dt Piecewise<SBasis> dw = derivative(w); Piecewise<SBasis> ncomp = sqrt(dot(v,v)-dw*dw,.1,3); - //FIXME: is force continuity usefull? compatible with corners? + //FIXME: is force continuity useful? compatible with corners? // std::cout<<"ici\n"; n1 = -dw*v + ncomp*rot90(v); n1 = w*force_continuity(unitVector(n1),.1); diff --git a/src/live_effects/lpe-embrodery-stitch-ordering.h b/src/live_effects/lpe-embrodery-stitch-ordering.h index b2b5d36db..c307ec555 100644 --- a/src/live_effects/lpe-embrodery-stitch-ordering.h +++ b/src/live_effects/lpe-embrodery-stitch-ordering.h @@ -195,7 +195,7 @@ struct OrderingGroupConnection { Connect(1, toIn); } - // Connect one of the conection endpoints to the given point + // Connect one of the connection endpoints to the given point void Connect(int index, OrderingGroupPoint *point) { assert(point); diff --git a/src/live_effects/lpe-embrodery-stitch.cpp b/src/live_effects/lpe-embrodery-stitch.cpp index f2342032b..282419fd8 100644 --- a/src/live_effects/lpe-embrodery-stitch.cpp +++ b/src/live_effects/lpe-embrodery-stitch.cpp @@ -345,7 +345,7 @@ PathVector LPEEmbroderyStitch::doEffect_path(PathVector const &path_in) Piecewise<D2<SBasis> > pwOneEqdist = arc_length_parametrization(pwOne); Interval pwdomain = pwOneEqdist.domain(); - // Compute the points of teh shortened piece + // Compute the points of the shortened piece Coord len = pwdomain.max() - pwdomain.min(); Coord offs = 0.5 * (show_stitch_gap < 0.5 * len ? show_stitch_gap : 0.5 * len); Point p1 = pwOneEqdist.valueAt(pwdomain.min() + offs); diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp index 8528ab14d..688841617 100644 --- a/src/live_effects/lpe-envelope.cpp +++ b/src/live_effects/lpe-envelope.cpp @@ -205,7 +205,7 @@ LPEEnvelope::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd output /= 2.; return output; - /*Of course, the result is not perfect, but on a graphical point of view, this is sufficent.*/ + /*Of course, the result is not perfect, but on a graphical point of view, this is sufficient.*/ } diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp index 2b052ace1..fb78c2065 100644 --- a/src/live_effects/lpe-fillet-chamfer.cpp +++ b/src/live_effects/lpe-fillet-chamfer.cpp @@ -131,7 +131,7 @@ void LPEFilletChamfer::doOnApply(SPLPEItem const *lpeItem) } //we add the last satellite on open path because _pathvector_satellites is related to nodes, not curves //so maybe in the future we can need this last satellite in other effects - //dont remove for this effect because _pathvector_satellites class has methods when the path is modiffied + //don't remove for this effect because _pathvector_satellites class has methods when the path is modiffied //and we want one method for all uses if (!path_it->closed()) { Satellite satellite(satellite_type); @@ -323,7 +323,7 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem) //mandatory call satellites_param.setEffectType(effectType()); Geom::PathVector const pathv = pathv_to_linear_and_cubic_beziers(sp_curve->get_pathvector()); - //if are diferent sizes call to recalculate + //if are different sizes call to recalculate //TODO: Update the satellite data in paths modified, Satellites satellites = satellites_param.data(); if (satellites.empty()) { @@ -468,7 +468,7 @@ LPEFilletChamfer::doEffect_path(Geom::PathVector const &path_in) Satellite satellite = satellites[path][next_index]; if (Geom::are_near((*curve_it1).initialPoint(), (*curve_it1).finalPoint())) { _degenerate_hide = true; - g_warning("Knots hidded if consecutive nodes has the same position."); + g_warning("Knots hidden if consecutive nodes has the same position."); return path_in; } if (!curve) { //curve == 0 diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp index 22c548c1d..b21181ffc 100644 --- a/src/live_effects/lpe-knot.cpp +++ b/src/live_effects/lpe-knot.cpp @@ -520,7 +520,7 @@ collectPathsAndWidths (SPLPEItem const *lpeitem, Geom::PathVector &paths, std::v Geom::PathVector subpaths = pathv_to_linear_and_cubic_beziers(c->get_pathvector()); for (unsigned i=0; i<subpaths.size(); i++){ paths.push_back(subpaths[i]); - //FIXME: do we have to be more carefull when trying to access stroke width? + //FIXME: do we have to be more careful when trying to access stroke width? stroke_widths.push_back(lpeitem->style->stroke_width.computed); } } diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp index e827491c0..e8642d4e7 100644 --- a/src/live_effects/lpe-lattice2.cpp +++ b/src/live_effects/lpe-lattice2.cpp @@ -103,7 +103,7 @@ Geom::Piecewise<Geom::D2<Geom::SBasis> > LPELattice2::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_in) { PathVector pathv = path_from_piecewise(pwd2_in,0.001); - //this is because strange problems whith sb2 and LineSegment + //this is because strange problems with sb2 and LineSegment PathVector cubic = pathv_to_cubicbezier(pathv); Geom::Piecewise<Geom::D2<Geom::SBasis> > const &pwd2_in_linear_and_cubic = paths_to_pw(cubic); D2<SBasis2d> sb2; diff --git a/src/live_effects/lpe-ruler.cpp b/src/live_effects/lpe-ruler.cpp index 7ba5a7913..7726af176 100644 --- a/src/live_effects/lpe-ruler.cpp +++ b/src/live_effects/lpe-ruler.cpp @@ -171,7 +171,7 @@ LPERuler::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_i if (border_marks == BORDERMARK_END || border_marks == BORDERMARK_BOTH){ Point A = pwd2_in.lastValue(); Point n = rot90(unit_vector(speed.lastValue()))*sign; - //speed.lastValue() is somtimes wrong when the path is closed: a tiny line seg might added at the end to fix rounding errors... + //speed.lastValue() is sometimes wrong when the path is closed: a tiny line seg might added at the end to fix rounding errors... //TODO: Find a better fix!! (How do we know if the path was closed?) if ( A == pwd2_in.firstValue() && speed.segs.size() > 1 && diff --git a/src/live_effects/lpe-sketch.cpp b/src/live_effects/lpe-sketch.cpp index e3376b7e5..dfb860de8 100644 --- a/src/live_effects/lpe-sketch.cpp +++ b/src/live_effects/lpe-sketch.cpp @@ -107,7 +107,7 @@ LPESketch::LPESketch(LivePathEffectObject *lpeobject) : tgtlength_rdm.param_set_range(0, 1.); tgt_places_rdmness.param_set_range(0, 1.); //this is not very smart, but required to avoid having lot of tangents stacked on short components. - //Nota: we could specify a density instead of an absolute number, but this would be scale dependant. + //Note: we could specify a density instead of an absolute number, but this would be scale dependent. concatenate_before_pwd2 = true; #endif } diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp index b9fd8908a..f04c243f6 100644 --- a/src/live_effects/lpe-vonkoch.cpp +++ b/src/live_effects/lpe-vonkoch.cpp @@ -169,7 +169,7 @@ LPEVonKoch::doEffect_path (Geom::PathVector const & path_in) } -//Usefull?? +//Useful?? //void //LPEVonKoch::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector<Geom::PathVector> &hp_vec) /*{ diff --git a/src/live_effects/lpe-vonkoch.h b/src/live_effects/lpe-vonkoch.h index bffbebd54..c0cb7ce42 100644 --- a/src/live_effects/lpe-vonkoch.h +++ b/src/live_effects/lpe-vonkoch.h @@ -55,7 +55,7 @@ public: virtual void doBeforeEffect(SPLPEItem const* item); - //Usefull?? + //Useful?? // protected: //virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec); diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h index 374e715ec..baee35614 100644 --- a/src/live_effects/lpeobject-reference.h +++ b/src/live_effects/lpeobject-reference.h @@ -32,7 +32,7 @@ public: SPObject *owner; - // concerning the LPEObject that is refered to: + // concerning the LPEObject that is referred to: char *lpeobject_href; Inkscape::XML::Node *lpeobject_repr; LivePathEffectObject *lpeobject; diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index bd6608737..f89fad3ee 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -343,7 +343,7 @@ PathParam::set_new_value (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & newpa * * If write_to_svg = true : * The new path data is written to SVG. In this case the signal_path_changed signal - * is not directly emited in this method, because writing to SVG + * is not directly emitted in this method, because writing to SVG * triggers the LPEObject to which this belongs to call Effect::setParameter which calls * PathParam::readSVGValue, which finally emits the signal_path_changed signal. * If write_to_svg = false : diff --git a/src/live_effects/parameter/satellitesarray.h b/src/live_effects/parameter/satellitesarray.h index 5ae372ac2..3039eb432 100644 --- a/src/live_effects/parameter/satellitesarray.h +++ b/src/live_effects/parameter/satellitesarray.h @@ -5,14 +5,14 @@ * Inkscape::LivePathEffectParameters * Copyright (C) Jabiertxo Arraiza Cenoz <jabier.arraiza@marker.es> * Special thanks to Johan Engelen for the base of the effect -powerstroke- - * Also to ScislaC for point me to the idea - * Also su_v for his construvtive feedback and time + * Also to ScislaC for pointing me to the idea + * Also su_v for his constructive feedback and time * To Nathan Hurst for his review and help on refactor - * and finaly to Liam P. White for his big help on coding, that save me a lot of - * hours + * and finally to Liam P. White for his big help on coding, + * that saved me a lot of hours * * - * This parameter act as bridge from pathVectorSatellites class to serialize it as a LPE + * This parameter acts as a bridge from pathVectorSatellites class to serialize it as a LPE * parameter * * Released under GNU GPL, read the file 'COPYING' for more information diff --git a/src/persp3d-reference.h b/src/persp3d-reference.h index cce497d94..871b29623 100644 --- a/src/persp3d-reference.h +++ b/src/persp3d-reference.h @@ -35,7 +35,7 @@ public: SPObject *owner; - // concerning the Persp3D (we only use SPBox3D) that is refered to: + // concerning the Persp3D (we only use SPBox3D) that is referred to: char *persp_href; Inkscape::XML::Node *persp_repr; Persp3D *persp; diff --git a/src/preferences.cpp b/src/preferences.cpp index b02e71e46..958e879f8 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -774,7 +774,7 @@ void Preferences::_setRawValue(Glib::ustring const &path, Glib::ustring const &v node->setAttribute(attr_key.c_str(), value.c_str()); } -// The _extract* methods are where the actual wrok is done - they define how preferences are stored +// The _extract* methods are where the actual work is done - they define how preferences are stored // in the XML file. bool Preferences::_extractBool(Entry const &v) diff --git a/src/rdf.cpp b/src/rdf.cpp index 938dc60c6..c70c32e51 100644 --- a/src/rdf.cpp +++ b/src/rdf.cpp @@ -1100,7 +1100,7 @@ struct rdf_license_t *RDFImpl::getLicense(SPDocument *document) return license_by_uri; } else if (license_by_uri != NULL) { - // Only cc:license property, set structure for backward compatiblity + // Only cc:license property, set structure for backward compatibility setLicense(document, license_by_uri); return license_by_uri; @@ -1224,7 +1224,7 @@ void rdf_add_from_preferences(SPDocument *doc) return; } - // If there is already some metadata in the doc (from a template) dont add default metadata + // If there is already some metadata in the doc (from a template) don't add default metadata for (struct rdf_work_entity_t *entity = rdf_work_entities; entity && entity->name; entity++) { if ( entity->editable == RDF_EDIT_GENERIC && rdf_get_work_entity (doc, entity)) { diff --git a/src/resource-manager.cpp b/src/resource-manager.cpp index 4901cf424..af81298e3 100644 --- a/src/resource-manager.cpp +++ b/src/resource-manager.cpp @@ -130,7 +130,7 @@ public: /** * Try to parse href into a local filename using standard methods. * - * @return true if successfull. + * @return true if successful. */ bool extractFilepath( Glib::ustring const &href, std::string &uri ); @@ -138,7 +138,7 @@ public: * Try to parse href into a local filename using some non-standard methods. * This means the href is likely invalid and should be rewritten. * - * @return true if successfull. + * @return true if successful. */ bool reconstructFilepath( Glib::ustring const &href, std::string &uri ); @@ -362,7 +362,7 @@ bool ResourceManagerImpl::fixupBrokenLinks(SPDocument *doc) SPObject *updated = doc->getObjectByRepr(ir); if (updated) { - // force immediate update of dependant attributes + // force immediate update of dependent attributes updated->updateRepr(); } diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index b8a769d1c..efc378845 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -1,5 +1,5 @@ /** @file - * Miscellanous operations on selected items. + * Miscellaneous operations on selected items. */ /* Authors: * Lauris Kaplinski <lauris@kaplinski.com> @@ -1998,7 +1998,7 @@ std::vector<SPItem*> sp_get_same_fill_or_stroke_color(SPItem *sel, std::vector<S if (iter) { SPIPaint *iter_paint = (type == SP_FILL_COLOR) ? &(iter->style->fill) : &(iter->style->stroke); match = false; - if (sel_paint->isColor() && iter_paint->isColor() // color == color comparision doesnt seem to work here. + if (sel_paint->isColor() && iter_paint->isColor() // color == color comparison doesn't seem to work here. && (sel_paint->value.color.toRGBA32(1.0) == iter_paint->value.color.toRGBA32(1.0))) { match = true; } else if (sel_paint->isPaintserver() && iter_paint->isPaintserver()) { diff --git a/src/selection-chemistry.h b/src/selection-chemistry.h index c82c5a4a5..82fc473b9 100644 --- a/src/selection-chemistry.h +++ b/src/selection-chemistry.h @@ -2,7 +2,7 @@ #define SEEN_SELECTION_CHEMISTRY_H /* - * Miscellanous operations on selected items + * Miscellaneous operations on selected items * * Authors: * Lauris Kaplinski <lauris@kaplinski.com> diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index 0a1e0c4a9..d49bdc29d 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -291,7 +291,7 @@ Inkscape::XML::Document *sp_shortcut_create_template_file(char const *filename) /* * Get a list of keyboard shortcut files names and paths from the system and users paths - * Dont add the users custom keyboards file + * Don't add the users custom keyboards file */ void sp_shortcut_get_file_names(std::vector<Glib::ustring> *names, std::vector<Glib::ustring> *paths) { using namespace Inkscape::IO::Resource; diff --git a/src/snap-enums.h b/src/snap-enums.h index ab82aaf37..64a147ea9 100644 --- a/src/snap-enums.h +++ b/src/snap-enums.h @@ -48,7 +48,7 @@ enum SnapSourceType { // When adding source types here, then also update Inkscap SNAPSOURCE_IMG_CORNER, SNAPSOURCE_TEXT_ANCHOR, SNAPSOURCE_OTHER_HANDLE, // eg. the handle of a gradient or of a connector (ie not being tied to a stroke) - SNAPSOURCE_GRID_PITCH, // eg. when pasting or alt-dragging in the selector tool; not realy a snap source + SNAPSOURCE_GRID_PITCH, // eg. when pasting or alt-dragging in the selector tool; not really a snap source }; enum SnapTargetType { 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; diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index 2655e219b..dd44c5855 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -238,7 +238,7 @@ gchar* SPTRef::description() const { } -/* For the sigc::connection changes (i.e. when the object being refered to changes) */ +/* For the sigc::connection changes (i.e. when the object being referred to changes) */ static void sp_tref_href_changed(SPObject */*old_ref*/, SPObject */*ref*/, SPTRef *tref) { diff --git a/src/sp-use.cpp b/src/sp-use.cpp index 61e8002bb..0af7c7ebc 100644 --- a/src/sp-use.cpp +++ b/src/sp-use.cpp @@ -386,7 +386,7 @@ Geom::Affine SPUse::get_root_transform() { /** * Returns the transform that leads to the use from its immediate original. - * Does not inlcude the original's transform if any. + * Does not include the original's transform if any. */ Geom::Affine SPUse::get_parent_transform() { Geom::Affine t(Geom::identity()); diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 3410a2635..f6544872f 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -744,7 +744,7 @@ BoolOpErrors Inkscape::ObjectSet::pathBoolOp(bool_op bop, const bool skip_undo, // that's why you needed the nesting // ConvertToFormeNested() dumped all the subpath in a single Path "res", so we need // to get the path for each part of the polygon. that's why you need the nesting info: - // to know in wich subpath to add a subpath + // to know in which subpath to add a subpath resPath=res->SubPathsWithNesting(nbRP, true, nbNest, nesting, conts); // cleaning @@ -864,7 +864,7 @@ void sp_selected_path_outline_add_marker( SPObject *marker_object, Geom::Affine if (marker_item->getRepr()) { Inkscape::XML::Node *m_repr = marker_item->getRepr()->duplicate(xml_doc); g_repr->appendChild(m_repr); - //There is a special group to markers whith this reverse the order in clussion + //There is a special group to markers with this reverse the order in clussion m_repr->setPosition(0); SPItem *marker_item = (SPItem *) doc->getObjectByRepr(m_repr); marker_item->doWriteTransform(tr); diff --git a/src/style-internal.h b/src/style-internal.h index d8d2a37bc..5c22c093d 100644 --- a/src/style-internal.h +++ b/src/style-internal.h @@ -103,12 +103,12 @@ enum SPStyleSrc { * The C structures that these classes are evolved from were designed to be embedded in to the * style structure (i.e they are "internal" and thus have an "I" in the SPI prefix). However, * they should be reasonably stand-alone and can provide some functionality outside of the style - * stucture (i.e. reading and writing style strings). Some properties do need access to other + * structure (i.e. reading and writing style strings). Some properties do need access to other * properties from the same object (e.g. SPILength sometimes needs to know font size) to - * calculate 'computed' values. Inheritence, of course, requires access to the parent object's + * calculate 'computed' values. Inheritance, of course, requires access to the parent object's * style class. * - * The only real outside dependancy is SPObject... which is needed in the cases of SPIPaint and + * The only real outside dependency is SPObject... which is needed in the cases of SPIPaint and * SPIFilter for setting up the "href". (Currently, SPDocument is needed but this dependency * should be removed as an "href" only needs the SPDocument for attaching an external document to * the XML tree [see uri-references.cpp]. If SPDocument is really needed, it can be obtained from diff --git a/src/style.cpp b/src/style.cpp index 608cca1e6..a417e4331 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -610,7 +610,7 @@ SPStyle::read( SPObject *object, Inkscape::XML::Node *repr ) { // Shorthands are not allowed as presentation properites. Note: text-decoration and // font-variant are converted to shorthands in CSS 3 but can still be read as a - // non-shorthand for compatability with older renders, so they should not be in this list. + // non-shorthand for compatibility with older renders, so they should not be in this list. // We could add a flag to SPIBase to avoid string comparison. if( _properties[i]->name.compare( "font" ) != 0 && _properties[i]->name.compare( "marker" ) != 0 ) { @@ -2039,7 +2039,7 @@ css_quote(Glib::ustring &val) quote = true; } if( it == val.begin() && !g_ascii_isalpha(*it) ) { - // A non-ASCII/non-alpha initial value on any indentifier needs quotes. + // A non-ASCII/non-alpha initial value on any identifier needs quotes. // (Actually it's a bit more complicated but as it never hurts to quote...) quote = true; } diff --git a/src/svg-profile.h b/src/svg-profile.h index 8945ee313..0baaf08e5 100644 --- a/src/svg-profile.h +++ b/src/svg-profile.h @@ -133,7 +133,7 @@ private: This function first find which integer the bit is in by dividing by \c BITS_IN_INT and then which bit in the integer by getting the modulus. The selected integer is - the \c |= with a \c 1 shifted left by the possition. + the \c |= with a \c 1 shifted left by the position. */ inline void set (const unsigned int pos) { unsigned int array_pos = pos / BITS_IN_INT; diff --git a/src/svg-view-slideshow.h b/src/svg-view-slideshow.h index 02159ed6b..bd0881021 100644 --- a/src/svg-view-slideshow.h +++ b/src/svg-view-slideshow.h @@ -45,7 +45,7 @@ private: std::vector<Glib::ustring> _slides; // list of filenames for each slide int _current; // index of the currently displayed slide SPDocument *_doc; // parsed SPDocument of the currently displayed slide - bool _fullscreen; // is window fullscreen? (also controls wether to launch in fullscreen mode) + bool _fullscreen; // is window fullscreen? (also controls whether to launch in fullscreen mode) int _timer; // time after which slides are automatically changed (in seconds) double _scale; // scale factor for images GtkWidget *_view; // the canvas to which the images are drawn diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index 33ad4401c..dbeee644c 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -656,7 +656,7 @@ Glib::ustring ClipboardManagerImpl::getShapeOrTextObjectId(SPDesktop *desktop) /** * Get all objects id from the clipboard. * @return A vector containing all IDs or empty if no shape or text item was found. - * type. Set to "*" to retrive all elements of the types vector inside, feel free to populate more + * type. Set to "*" to retrieve all elements of the types vector inside, feel free to populate more */ std::vector<Glib::ustring> ClipboardManagerImpl::getElementsOfType(SPDesktop *desktop, gchar const* type) { diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 27bfa681f..52f31e046 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -275,7 +275,7 @@ public : private : virtual void on_button_click() { - //Retreive selected objects + //Retrieve selected objects SPDesktop *desktop = _dialog.getDesktop(); if (!desktop) return; diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h index acb3d02ed..ce45fcccd 100644 --- a/src/ui/dialog/align-and-distribute.h +++ b/src/ui/dialog/align-and-distribute.h @@ -185,7 +185,7 @@ private : virtual void on_button_click() { - //Retreive selected objects + //Retrieve selected objects SPDesktop *desktop = _dialog.getDesktop(); if (!desktop) return; diff --git a/src/ui/dialog/dock-behavior.h b/src/ui/dialog/dock-behavior.h index de7386ad9..15429f1c9 100644 --- a/src/ui/dialog/dock-behavior.h +++ b/src/ui/dialog/dock-behavior.h @@ -70,7 +70,7 @@ private: /** Internal helpers */ Gtk::Paned *_getPaned(); //< gives the parent pane, if the dock item has one - void _requestHeight(int height); //< tries to resize the dock item to the requested hieght + void _requestHeight(int height); //< tries to resize the dock item to the requested height /** Internal signal handlers */ void _onHide(); diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 2765e63f4..baf70ea82 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -1217,7 +1217,7 @@ void DocumentProperties::changeEmbeddedScript(){ //XML Tree being used directly here while it shouldn't be. SPObject* child = obj->firstChild(); - //TODO: shouldnt we get all children instead of simply the first child? + //TODO: shouldn't we get all children instead of simply the first child? if (child && child->getRepr()){ const gchar* content = child->getRepr()->content(); diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp index 248f4f67f..a710a2fb4 100644 --- a/src/ui/dialog/extension-editor.cpp +++ b/src/ui/dialog/extension-editor.cpp @@ -116,7 +116,7 @@ ExtensionEditor::setExtensionIter(const Gtk::TreeModel::iterator &iter) } /** - * Called every time a new extention is selected + * Called every time a new extension is selected * * This function is set up to handle the signal for a changed extension * from the tree view in the left pane. It figure out which extension diff --git a/src/ui/dialog/filedialog.h b/src/ui/dialog/filedialog.h index 175031bcf..8ee63e654 100644 --- a/src/ui/dialog/filedialog.h +++ b/src/ui/dialog/filedialog.h @@ -352,7 +352,7 @@ public: virtual Glib::ustring getDestinationUnits() = 0; /** - * Return the destination DPI image resulution, if bitmap + * Return the destination DPI image resolution, if bitmap */ virtual double getDestinationDPI() = 0; diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp index 64f6c98c6..86ad8649d 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.cpp +++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp @@ -694,7 +694,7 @@ FileOpenDialogImplGtk::FileOpenDialogImplGtk(Gtk::Window &parentWindow, const Gl set_local_only(false); - /* Initalize to Autodetect */ + /* Initialize to Autodetect */ extension = NULL; /* No filename to start out with */ myFilename = ""; @@ -956,7 +956,7 @@ FileSaveDialogImplGtk::FileSaveDialogImplGtk(Gtk::Window &parentWindow, const Gl set_local_only(false); - /* Initalize to Autodetect */ + /* Initialize to Autodetect */ extension = NULL; /* No filename to start out with */ myFilename = ""; @@ -1438,7 +1438,7 @@ FileExportDialogImpl::FileExportDialogImpl(Gtk::Window &parentWindow, const Glib set_local_only(false); - /* Initalize to Autodetect */ + /* Initialize to Autodetect */ extension = NULL; /* No filename to start out with */ myFilename = ""; diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h index 7501b5e14..82ca75065 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.h +++ b/src/ui/dialog/filedialogimpl-gtkmm.h @@ -446,7 +446,7 @@ public: { return destUnitsSpinner.getUnitAbbr(); } /** - * Return the destination DPI image resulution, if bitmap + * Return the destination DPI image resolution, if bitmap */ double getDestinationDPI() { return destDPISpinner.getValue(); } diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index 7f0bf58c5..7aca8e242 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -146,7 +146,7 @@ FileOpenDialogImplWin32::FileOpenDialogImplWin32(Gtk::Window &parent, const gchar *title) : FileDialogBaseWin32(parent, dir, title, fileTypes, "dialogs.open") { - // Initalize to Autodetect + // Initialize to Autodetect _extension = NULL; // Set our dialog type (open, import, etc...) @@ -1329,7 +1329,7 @@ void FileOpenDialogImplWin32::render_preview() GetBValue(background) / 255.0); context->paint(); - //----- Draw the drop shaddow -----// + //----- Draw the drop shadow -----// // Left Edge x = frameX + shaddowOffsetX - halfBlurRadius; diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp index abae8ea70..ad035aa8d 100644 --- a/src/ui/dialog/font-substitution.cpp +++ b/src/ui/dialog/font-substitution.cpp @@ -130,7 +130,7 @@ FontSubstitution::show(Glib::ustring out, std::vector<SPItem*> &l) * * Return a list of SPItems where fonts have been substituted. * - * Walk thru all the objects ... + * Walk through all the objects ... * a. Build up a list of the objects with fonts defined in the style attribute * b. Build up a list of the objects rendered fonts - taken for the objects layout/spans * If there are fonts in a. that are not in b. then those fonts have been substituted. diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp index c16e60c5f..96e6acb3c 100644 --- a/src/ui/dialog/grid-arrange-tab.cpp +++ b/src/ui/dialog/grid-arrange-tab.cpp @@ -215,7 +215,7 @@ } - /// Make sure the top and left of the grid dont move by compensating for align values. + /// Make sure the top and left of the grid don't move by compensating for align values. if (RowHeightButton.get_active()){ grid_top = grid_top - (((row_height - row_heights[0]) / 2)*(VertAlign)); } diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp index 5b316936d..5a27056f3 100644 --- a/src/ui/dialog/input.cpp +++ b/src/ui/dialog/input.cpp @@ -559,7 +559,7 @@ Glib::RefPtr<Gdk::Pixbuf> InputDialogImpl::getPix(PixId id) } -// Now that we've defined the *Impl class, we can do the method to aquire one. +// Now that we've defined the *Impl class, we can do the method to acquire one. InputDialog &InputDialog::getInstance() { InputDialog *dialog = new InputDialogImpl(); diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index 72a2814ed..13ce4e4cd 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -84,7 +84,7 @@ ExportDialog::ExportDialog(Gtk::Window &parentWindow, * and a Entry to take the filename * Later put the extension selection and checkbox (?) */ - /* Initalize to Autodetect */ + /* Initialize to Autodetect */ /* extension = NULL; */ @@ -1063,7 +1063,7 @@ ImportDialog::ImportDialog(Gtk::Window& parent_window, FileDialogType file_types const Glib::ustring &title) : FileDialogBase(title, parent_window) { - // Initalize to Autodetect + // Initialize to Autodetect extension = NULL; // No filename to start out with Glib::ustring search_keywords = ""; diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp index 75e1a56b8..2f18d5c0d 100644 --- a/src/ui/dialog/polar-arrange-tab.cpp +++ b/src/ui/dialog/polar-arrange-tab.cpp @@ -183,7 +183,7 @@ static Geom::Point calcPoint(float cx, float cy, float rx, float ry, float angle /** * Returns the selected anchor point in document coordinates. If anchor - * is 0 to 8, then a bounding box point has been choosen. If it is 9 however + * is 0 to 8, then a bounding box point has been chosen. If it is 9 however * the rotational center is chosen. * @todo still using a hack to get the real coordinate space (subtracting document height * and inverting axes) diff --git a/src/ui/dialog/print-colors-preview-dialog.cpp b/src/ui/dialog/print-colors-preview-dialog.cpp index ef5c1b6f6..5e96a8e61 100644 --- a/src/ui/dialog/print-colors-preview-dialog.cpp +++ b/src/ui/dialog/print-colors-preview-dialog.cpp @@ -19,7 +19,7 @@ namespace UI { namespace Dialog { //Yes, I know we shouldn't hardcode CMYK. This class needs to be refactored -// in order to accomodate spot colors and color components defined using +// in order to accommodate spot colors and color components defined using // ICC colors. --Juca void PrintColorsPreviewDialog::toggle_cyan(){ diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp index 60138fa89..5ca085094 100644 --- a/src/ui/dialog/styledialog.cpp +++ b/src/ui/dialog/styledialog.cpp @@ -191,7 +191,7 @@ StyleDialog::TreeStore::row_draggable_vfunc(const Gtk::TreeModel::Path& path) co /** - * Allow dropping only inbetween other selectors. + * Allow dropping only in between other selectors. */ bool StyleDialog::TreeStore::row_drop_possible_vfunc(const Gtk::TreeModel::Path& dest, @@ -750,7 +750,7 @@ void StyleDialog::_removeFromSelector(Gtk::TreeModel::Row row) /** * @brief StyleDialog::_getIdList * @param sel - * @return This function returns a comma seperated list of ids for objects in input vector. + * @return This function returns a comma separated list of ids for objects in input vector. * It is used in creating an 'id' selector. It relies on objects having 'id's. */ Glib::ustring StyleDialog::_getIdList(std::vector<SPObject*> sel) diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index c245890bc..5747c7726 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -1004,7 +1004,7 @@ void XmlTree::cmd_delete_attr() SPObject *updated = current_document->getObjectByRepr(selected_repr); if (updated) { - // force immediate update of dependant attributes + // force immediate update of dependent attributes updated->updateRepr(); } @@ -1028,7 +1028,7 @@ void XmlTree::cmd_set_attr() SPObject *updated = current_document->getObjectByRepr(selected_repr); if (updated) { - // force immediate update of dependant attributes + // force immediate update of dependent attributes updated->updateRepr(); } diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp index 4f42400d4..67768571d 100644 --- a/src/ui/tool/node.cpp +++ b/src/ui/tool/node.cpp @@ -168,7 +168,7 @@ void Handle::move(Geom::Point const &new_pos) } setPosition(new_pos); - //move the handler and its oposite the same proportion + //move the handler and its opposite the same proportion if(_pm()._isBSpline()){ setPosition(_pm()._bsplineHandleReposition(this, false)); bspline_weight = _pm()._bsplineHandlePosition(this, false); @@ -186,7 +186,7 @@ void Handle::move(Geom::Point const &new_pos) / Geom::L2sq(direction)) * direction; setRelativePos(new_delta); - //move the handler and its oposite the same proportion + //move the handler and its opposite the same proportion if(_pm()._isBSpline()){ setPosition(_pm()._bsplineHandleReposition(this, false)); bspline_weight = _pm()._bsplineHandlePosition(this, false); @@ -213,7 +213,7 @@ void Handle::move(Geom::Point const &new_pos) } setPosition(new_pos); - // moves the handler and its oposite the same proportion + // moves the handler and its opposite the same proportion if(_pm()._isBSpline()){ setPosition(_pm()._bsplineHandleReposition(this, false)); bspline_weight = _pm()._bsplineHandlePosition(this, false); @@ -307,7 +307,7 @@ bool Handle::_eventHandler(Inkscape::UI::Tools::ToolBase *event_context, GdkEven return ControlPoint::_eventHandler(event_context, event); } -//this function moves the handler and its oposite to the default proportion of DEFAULT_START_POWER +//this function moves the handler and its opposite to the default proportion of DEFAULT_START_POWER void Handle::handle_2button_press(){ if(_pm()._isBSpline()){ setPosition(_pm()._bsplineHandleReposition(this, DEFAULT_START_POWER)); @@ -364,7 +364,7 @@ void Handle::dragged(Geom::Point &new_pos, GdkEventMotion *event) ctrl_constraint = Inkscape::Snapper::SnapConstraint(parent_pos, parent_pos - perp_pos); } new_pos = result; - // moves the handler and its oposite in X fixed positions depending on parameter "steps with control" + // moves the handler and its opposite in X fixed positions depending on parameter "steps with control" // by default in live BSpline if(_pm()._isBSpline()){ setPosition(new_pos); @@ -478,7 +478,7 @@ Glib::ustring Handle::_getTip(unsigned state) const { char const *more; // a trick to mark as bspline if the node has no strength, we are going to use it later - // to show the appropiate messages. We cannot do it in any different way becasue the function is constant + // to show the appropriate messages. We cannot do it in any different way because the function is constant Handle *h = const_cast<Handle *>(this); bool isBSpline = _pm()._isBSpline(); bool can_shift_rotate = _parent->type() == NODE_CUSP && !other()->isDegenerate(); diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index 2c99e7fc8..f39afb8c4 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -1688,7 +1688,7 @@ void PathManipulator::_updateOutlineOnZoomChange() if (_show_path_direction) _updateOutline(); } -/** Compute the radius from the edge of the path where clicks chould initiate a curve drag +/** Compute the radius from the edge of the path where clicks should initiate a curve drag * or segment selection, in window coordinates. */ double PathManipulator::_getStrokeTolerance() { diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp index 1735a78df..81d2f6a5b 100644 --- a/src/ui/tools/gradient-tool.cpp +++ b/src/ui/tools/gradient-tool.cpp @@ -636,7 +636,7 @@ bool GradientTool::root_handler(GdkEvent* event) { } } else if (this->item_to_select) { if (over_line && line) { - // Clicked on an existing gradient line, dont change selection. This stops + // Clicked on an existing gradient line, don't change selection. This stops // possible change in selection during a double click with overlapping objects } else { // no dragging, select clicked item if any diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 24295e7cf..bd2964d94 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -1236,7 +1236,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, bool to_phantom, sp_canvas_item_destroy(measure_tmp_items[idx]); } measure_tmp_items.clear(); - //TODO:Calculate the measure area for current lenght and origin + //TODO:Calculate the measure area for current length and origin // and use canvas->requestRedraw. In the calculation need a gap for outside text // maybe this remove the trash lines on measure use Inkscape::Preferences *prefs = Inkscape::Preferences::get(); diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp index ba333d0ed..bd4b21bdb 100644 --- a/src/ui/widget/color-notebook.cpp +++ b/src/ui/widget/color-notebook.cpp @@ -289,7 +289,7 @@ void ColorNotebook::_updateICCButtons() /* Some literature states that when the sum of paint values exceed 320%, it is considered to be a satured color, - which means the paper can get too wet due to an excessive ammount of ink. This may lead to several + which means the paper can get too wet due to an excessive amount of ink. This may lead to several issues such as misalignment and poor quality of printing in general.*/ if (ink_sum > 3.2) diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp index d1755a6d5..f6c81df3b 100644 --- a/src/ui/widget/font-variants.cpp +++ b/src/ui/widget/font-variants.cpp @@ -563,7 +563,7 @@ namespace Widget { if( (it = table_copy.find("zero")) != table_copy.end() ) table_copy.erase( it ); std::string ott_list = "OpenType tables not included above: "; for(it = table_copy.begin(); it != table_copy.end(); ++it) { - // std::cout << "Other: " << it->first << " Occurances: " << it->second << std::endl; + // std::cout << "Other: " << it->first << " Occurrences: " << it->second << std::endl; ott_list += it->first; ott_list += ", "; } diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index ca33a845c..5f5b801d1 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -67,7 +67,7 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co show_all_children(); - // These signals dont properly detect change in desktop, rely on owner dialog to call setSubject() from setTargetDesktop() + // These signals don't properly detect change in desktop, rely on owner dialog to call setSubject() from setTargetDesktop() //_desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_activate), this ); //_desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "deactivate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_deactivate), this ); } diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h index b5498498d..06b65dfbc 100644 --- a/src/ui/widget/panel.h +++ b/src/ui/widget/panel.h @@ -104,7 +104,7 @@ public: void setDefaultResponse(int response_id); void setResponseSensitive(int response_id, bool setting); - /* Return signals. Signals emited by PanelDialog. */ + /* Return signals. Signals emitted by PanelDialog. */ virtual sigc::signal<void, SPDesktop *, SPDocument *> &signalDocumentReplaced(); virtual sigc::signal<void, SPDesktop *> &signalActivateDesktop(); virtual sigc::signal<void, SPDesktop *> &signalDeactiveDesktop(); diff --git a/src/uri.cpp b/src/uri.cpp index 219792b6e..881b322b4 100644 --- a/src/uri.cpp +++ b/src/uri.cpp @@ -158,7 +158,7 @@ const std::string URI::getFullPath(std::string const &base) const { if(!base.empty() && !path.empty() && path[0] != '/') { path = Glib::build_filename(base, path); } - // Check the existance of the file + // Check the existence of the file if(! g_file_test(path.c_str(), G_FILE_TEST_EXISTS) || g_file_test(path.c_str(), G_FILE_TEST_IS_DIR) ) { path.clear(); @@ -53,7 +53,7 @@ public: /** * Determines if the URI represented is 'relative' as per RFC 2396. * - * Relative URI references are distinguished by not begining with a + * Relative URI references are distinguished by not beginning with a * scheme name. * * @return \c true if the URI is relative, \c false if it is absolute. diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp index 597c697cb..3d46fd81d 100644 --- a/src/widgets/ege-adjustment-action.cpp +++ b/src/widgets/ege-adjustment-action.cpp @@ -779,7 +779,7 @@ static void value_changed_cb( GtkSpinButton* spin, EgeAdjustmentAction* act ) if (GTK_IS_EDITABLE(spin) && gtk_editable_get_selection_bounds (GTK_EDITABLE(spin), &start, &end) && start != end) { // #167846, #363000 If the spin button has a selection, its probably - // because we got here from a Tab key from another spin, if so dont defocus + // because we got here from a Tab key from another spin, if so don't defocus return; } ege_adjustment_action_defocus( act ); diff --git a/src/widgets/ege-adjustment-action.h b/src/widgets/ege-adjustment-action.h index 8cfaa3e52..5cb21a481 100644 --- a/src/widgets/ege-adjustment-action.h +++ b/src/widgets/ege-adjustment-action.h @@ -96,7 +96,7 @@ GType ege_adjustment_action_get_type( void ); /* * Note: This normally could be implemented via a GType property for the class to construct, - * but gtkmm classes implemented in C++ only will often not funciton properly. + * but gtkmm classes implemented in C++ only will often not function properly. * */ diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp index 8946eb4b3..c61a857e7 100644 --- a/src/widgets/fill-style.cpp +++ b/src/widgets/fill-style.cpp @@ -733,7 +733,7 @@ void FillNStroke::updateFromPaint() if (!pattern) { /* No Pattern in paint selector should mean that we just - * changed mode - dont do jack. + * changed mode - don't do jack. */ } else { diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp index 196264315..976423aaf 100644 --- a/src/widgets/gradient-toolbar.cpp +++ b/src/widgets/gradient-toolbar.cpp @@ -669,7 +669,7 @@ static void select_stop_by_drag(GtkWidget *combo_box, SPGradient *gradient, Tool } if (n > 1) { - // Mulitple stops selected + // Multiple stops selected GtkListStore *store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(combo_box)); if (!store) { return; diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index 4457b712d..840a64f95 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -572,7 +572,7 @@ sp_paint_selector_clear_frame(SPPaintSelector *psel) if (psel->selector) { //This is a hack to work around GtkNotebook bug in ColorSelector. Is sends signal switch-page on destroy - //The widget is hidden firts so it can recognize that it should not process signals from notebook child + //The widget is hidden first so it can recognize that it should not process signals from notebook child gtk_widget_set_visible(psel->selector, false); gtk_widget_destroy(psel->selector); psel->selector = NULL; diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp index 159350012..8a30b276b 100644 --- a/src/widgets/sp-color-selector.cpp +++ b/src/widgets/sp-color-selector.cpp @@ -248,7 +248,7 @@ void ColorSelector::_updateInternals( const SPColor& color, gfloat alpha, gboole gboolean grabbed = held && !_held; gboolean released = !held && _held; - // Store these before emmiting any signals + // Store these before emitting any signals _held = held; if ( colorDifferent ) { diff --git a/src/widgets/stroke-marker-selector.h b/src/widgets/stroke-marker-selector.h index 24389526c..fb68aad58 100644 --- a/src/widgets/stroke-marker-selector.h +++ b/src/widgets/stroke-marker-selector.h @@ -66,7 +66,7 @@ private: class MarkerColumns : public Gtk::TreeModel::ColumnRecord { public: Gtk::TreeModelColumn<Glib::ustring> label; - Gtk::TreeModelColumn<const gchar *> marker; // ustring doesnt work here on windows due to unicode + Gtk::TreeModelColumn<const gchar *> marker; // ustring doesn't work here on windows due to unicode Gtk::TreeModelColumn<gboolean> stock; Gtk::TreeModelColumn<Gtk::Image *> image; Gtk::TreeModelColumn<gboolean> history; diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index 3115a32db..fba6157e2 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -578,7 +578,7 @@ StrokeStyle::forkMarker(SPObject *marker, int loc, SPItem *item) /* * Optimization when all the references to this marker are from this item - * then we can reuse it and dont need to fork + * then we can reuse it and don't need to fork */ Glib::ustring urlId = Glib::ustring::format("url(#", marker->getRepr()->attribute("id"), ")"); unsigned int refs = 0; diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 9e138bb08..3ca5bf2dc 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -1654,7 +1654,7 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ // If unit is set to 'px', use the preferred display unit (if absolute). line_height_unit = prefs->getInt("/tools/text/lineheight/display_unit", SP_CSS_UNIT_PT); - // But not if prefered unit is relative + // But not if preferred unit is relative if (line_height_unit != SP_CSS_UNIT_NONE && line_height_unit != SP_CSS_UNIT_EM && line_height_unit != SP_CSS_UNIT_EX && diff --git a/src/xml/rebase-hrefs.cpp b/src/xml/rebase-hrefs.cpp index c023dc670..e2af1afe2 100644 --- a/src/xml/rebase-hrefs.cpp +++ b/src/xml/rebase-hrefs.cpp @@ -174,7 +174,7 @@ std::string Inkscape::XML::calc_abs_doc_base(gchar const *doc_base) * It's probably not worth trying to address this until we're using proper * relative URL/IRI href processing (with liburiparser). * - * (Note that one possibile difficulty with `..' is symlinks.) */ + * (Note that one possible difficulty with `..' is symlinks.) */ std::string ret; if (!doc_base) { |
