Skip to content

Commit 0ec9018

Browse files
committed
Fix misc. typos in documentation and source comments
Found via `codespell`
1 parent 998939f commit 0ec9018

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+73
-73
lines changed

cgal/export_nef.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#pragma pop_macro("NDEBUG")
1818

1919
using namespace CGALUtils;
20-
namespace fs=boost::fileystem;
20+
namespace fs=boost::filesystem;
2121

2222
#define STL_FACET_NUMBYTES 4*3*4+2
2323
// as there is no 'float32_t' standard, we assume the systems 'float'

cmake/Modules/FindHarfBuzz.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
# Try to find Harfbuzz include and library directories.
2828
#
2929
# After successful discovery, this will set for inclusion where needed:
30-
# HARFBUZZ_INCLUDE_DIRS - containg the HarfBuzz headers
31-
# HARFBUZZ_LIBRARIES - containg the HarfBuzz library
30+
# HARFBUZZ_INCLUDE_DIRS - containing the HarfBuzz headers
31+
# HARFBUZZ_LIBRARIES - containing the HarfBuzz library
3232

3333
find_package(PkgConfig REQUIRED QUIET)
3434

cmake/Modules/FindQt5QScintilla.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# QT5QSCINTILLA_INCLUDE_DIR - where to find qsciscintilla.h
77
# QT5QSCINTILLA_INCLUDE_DIRS - qscintilla includes
88
# QT5QSCINTILLA_LIBRARY - where to find the QScintilla library
9-
# QT5QSCINTILLA_LIBRARIES - aditional libraries
9+
# QT5QSCINTILLA_LIBRARIES - additional libraries
1010
# QT5QSCINTILLA_MAJOR_VERSION - major version
1111
# QT5QSCINTILLA_MINOR_VERSION - minor version
1212
# QT5QSCINTILLA_PATCH_VERSION - patch version

doc/TODO.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ o Built-in modules
157157
o Advanced Transformations
158158
- Add statement for intersections in cartesian product of childs
159159
o Function-Module-Interface
160-
- Pass a module instanciation to a function (e.g. for a volume() function)
161-
- Pass a function to a module instanciation (e.g. for dynamic extrusion paths)
160+
- Pass a module instantiation to a function (e.g. for a volume() function)
161+
- Pass a function to a module instantiation (e.g. for dynamic extrusion paths)
162162
o Language Frontend
163163
- Allow local variables and functions everywhere (not only on module level)
164164
- Rethink for vs. intersection_for vs. group. Should for loops

doc/translation.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ There is no need to add a context preemptively, please wait until a specific
7272
need arises.
7373

7474
Please note that message context should follow some constrains:
75-
- message context comes at some perfomance penalty
75+
- message context comes at some performance penalty
7676
- Keep the context name short
7777
- try to pick a context name that is unlikely to change
7878
(changing the context name requires the translates to update the translation)

examples/Advanced/animation.scad

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// animation.scad - Demo of animation usage
22

3-
// The animation funtionality is based simply on a variable $t
3+
// The animation functionality is based simply on a variable $t
44
// that is changed automatically by OpenSCAD while repeatedly
55
// showing the model.
66
// To activate animation, select "View->Animation" from the

examples/Parametric/candleStand.scad

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ count=7; //[3:14]
1616
centerCandle=true;
1717

1818
/* [ Candle Holder ]*/
19-
//Lenght of candle holder
19+
//Length of candle holder
2020
candleSize=7;
2121

2222
//Width of candle holder

fonts-osx/conf.d/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ enabled/disabled by adjusting the symlinks.
99
The files are loaded in numeric order, the structure of the configuration
1010
has led to the following conventions in usage:
1111

12-
Files begining with: Contain:
12+
Files beginning with: Contain:
1313

1414
00 through 09 Font directories
1515
10 through 19 system rendering defaults (AA, etc)

openscad.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ netbsd* {
139139
!isEmpty(OPENSCAD_LIBDIR) {
140140
unix:!macx {
141141
QMAKE_LFLAGS = -Wl,-R$$OPENSCAD_LIBDIR/lib $$QMAKE_LFLAGS
142-
# need /lib64 beause GLEW installs itself there on 64 bit machines
142+
# need /lib64 because GLEW installs itself there on 64 bit machines
143143
QMAKE_LFLAGS = -Wl,-R$$OPENSCAD_LIBDIR/lib64 $$QMAKE_LFLAGS
144144
}
145145
}

releases/2019.02.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@
3737
* Duplicate passed argument
3838
* Children passed to module not accepting children
3939
* Reference to inknown $special_variables
40-
* Duplicate assigment
40+
* Duplicate assignment
4141
* New translations: Ukrainian, Polish

scripts/LogicLib.nsh

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
!ifndef _${Type}
125125
!error "Cannot use _Pop${Type} without a preceding _Push${Type}"
126126
!endif
127-
!ifdef ${_${Type}}Prev${Type} ; If a previous statment was active then restore it
127+
!ifdef ${_${Type}}Prev${Type} ; If a previous statement was active then restore it
128128
!define _Cur${Type} ${_${Type}}
129129
!undef _${Type}
130130
!define _${Type} ${${_Cur${Type}}Prev${Type}}

scripts/check-dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ qscintilla2_sysver()
250250
debug using qtincdir: $qtincdir
251251
debug using qscipath: $qscipath
252252
if [ ! -e $qscipath ]; then
253-
debug qscipath doesnt exist. giving up on version.
253+
debug qscipath doesn't exist. giving up on version.
254254
return
255255
fi
256256

scripts/chrpath_linux.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,11 @@ figure out enough to find and change the rpath string. That was fun!
182182
183183
This program assumes (unlike your original program) that there is only
184184
one DT_RPATH tag in the dynamic section as even with multiple '-Wl,-rpath,'
185-
commands in the link this seems to occur (they all get concatonated into
185+
commands in the link this seems to occur (they all get concatenated into
186186
a : separated path).
187187
188188
Thanks for your help. If you want to use this on non-x86 you have to change
189-
the occurances of LSB back to MSB:)
189+
the occurrences of LSB back to MSB:)
190190
191191
Peeter
192192
--

scripts/macosx-sanity-check.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22

33
#
4-
# This is be used to verify that all the dependant libraries of a Mac OS X executable
4+
# This is used to verify that all the dependant libraries of a Mac OS X executable
55
# are present and that they are backwards compatible with at least 10.9.
66
# Run with an executable as parameter
77
# Will return 0 if the executable an all libraries are OK
@@ -145,7 +145,7 @@ def validate_lib(lib):
145145
lc_rpath = m.group(2)
146146
if DEBUG: print('Runpath search path: ' + lc_rpath)
147147

148-
# processed is a dict {libname : [parents]} - each parent is dependant on libname
148+
# processed is a dict {libname : [parents]} - each parent is dependent on libname
149149
processed = {}
150150
pending = [executable]
151151
processed[executable] = []

scripts/release-common.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ case $OS in
157157
if [ "`command -v makensis`" ]; then
158158
MAKENSIS=makensis
159159
elif [ "`command -v i686-pc-mingw32-makensis`" ]; then
160-
# we cant find systems nsis so look for the MXE's version.
160+
# we can't find systems nsis so look for the MXE's version.
161161
# MXE has its own makensis, but its only available under
162162
# 32-bit MXE. note that the cross-version in theory works
163163
# the same as the linux version so we can use them, in
@@ -232,7 +232,7 @@ case $OS in
232232
touch -t 200012121010 parser_yacc.h parser_yacc.cpp lexer_lex.cpp
233233
;;
234234
UNIX_CROSS_WIN)
235-
# kludge to enable paralell make
235+
# kludge to enable parallel make
236236
touch -t 200012121010 $OPENSCADDIR/src/parser_yacc.h
237237
touch -t 200012121010 $OPENSCADDIR/src/parser_yacc.cpp
238238
touch -t 200012121010 $OPENSCADDIR/src/parser_yacc.hpp
@@ -252,14 +252,14 @@ case $OS in
252252
make $TARGET -j$NUMCPU
253253
fi
254254
if [ ! -e $TARGET/openscad.exe ]; then
255-
echo "cant find $TARGET/openscad.exe. build failed. stopping."
255+
echo "can't find $TARGET/openscad.exe. build failed. stopping."
256256
exit
257257
fi
258258
# make console pipe-able openscad.com - see winconsole.pro for info
259259
qmake ../winconsole/winconsole.pro
260260
make
261261
if [ ! -e $TARGET/openscad.com ]; then
262-
echo "cant find $TARGET/openscad.com. build failed. stopping."
262+
echo "can't find $TARGET/openscad.com. build failed. stopping."
263263
exit
264264
fi
265265
cd $OPENSCADDIR

scripts/setenv-unibuild.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ setenv_netbsd()
5858
{
5959
setenv_common
6060
echo --- netbsd build situation is complex. it comes with gcc4.5
61-
echo --- which is incompatable with updated CGAL.
61+
echo --- which is incompatible with updated CGAL.
6262
echo --- you may need to hack with newer gcc to make it work
6363
QMAKESPEC=netbsd-g++
6464
QTDIR=/usr/pkg/qt4

scripts/uni-build-dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ if [ "`command -v dirname`" ]; then
753753
cd $RUNDIR
754754
else
755755
if [ ! -f openscad.pro ]; then
756-
echo "Must be run from the OpenSCAD source root directory (dont have 'dirname')"
756+
echo "Must be run from the OpenSCAD source root directory (don't have 'dirname')"
757757
exit 1
758758
else
759759
OPENSCAD_SCRIPTDIR=$PWD

src/FileModule.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ AbstractNode *FileModule::instantiateWithFileContext(FileContext *ctx, const Mod
183183
}
184184

185185
//please preferably use getFilename
186-
//if you compare filenames (which is the origin of this methode),
187-
//please call getFilename first and use this methode only as a fallback
186+
//if you compare filenames (which is the origin of this method),
187+
//please call getFilename first and use this method only as a fallback
188188
const std::string FileModule::getFullpath() const {
189189
if(fs::path(this->filename).is_absolute()){
190190
return this->filename;

src/GLView.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ void GLView::decodeMarkerValue(double i, double l, int size_div_sm)
671671
{polarity*((i+((char_num)*dig_wk))+(dig_w/2)),dig_buf,0}};
672672

673673
// convert the char into lines appropriate for the axis being used
674-
// psuedo 7 segment vertices are:
674+
// pseudo 7 segment vertices are:
675675
// A--B
676676
// | |
677677
// C--D

src/OffscreenContextGLX.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ static int XCreateWindow_error(Display *dpy, XErrorEvent *event)
119119
"failed to create drawable" errors, and Mesa "WARNING: Application calling
120120
GLX 1.3 function when GLX 1.3 is not supported! This is an application bug!"
121121
122-
This function will alter ctx.openGLContext and ctx.xwindow if successfull
122+
This function will alter ctx.openGLContext and ctx.xwindow if successful
123123
*/
124124
bool create_glx_dummy_window(OffscreenContext &ctx)
125125
{
@@ -252,7 +252,7 @@ bool save_framebuffer(OffscreenContext *ctx, std::ostream &output)
252252
#pragma GCC diagnostic ignored "-Waddress"
253253
bool create_glx_dummy_context(OffscreenContext &ctx)
254254
{
255-
// This will alter ctx.openGLContext and ctx.xdisplay and ctx.xwindow if successfull
255+
// This will alter ctx.openGLContext and ctx.xdisplay and ctx.xwindow if successful
256256
int major;
257257
int minor;
258258
auto result = false;

src/OffscreenContextWGL.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)
9595
bool create_wgl_dummy_context(OffscreenContext &ctx)
9696
{
9797
// this function alters ctx->window and ctx->openGLContext
98-
// and ctx->dev_context if successfull
98+
// and ctx->dev_context if successful
9999

100100
// create window
101101

@@ -202,7 +202,7 @@ OffscreenContext *create_offscreen_context(int w, int h)
202202

203203
// Before an FBO can be setup, a WGL context must be created.
204204
// This call alters ctx->window and ctx->openGLContext
205-
// and ctx->dev_context if successfull
205+
// and ctx->dev_context if successful
206206
if (!create_wgl_dummy_context( *ctx )) {
207207
return nullptr;
208208
}

src/PlatformUtils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ namespace PlatformUtils {
7474
* to not leak too detail data about the system but still enough
7575
* to give some indication for troubleshooting on server side.
7676
*
77-
* @return the short system infor
77+
* @return the short system info
7878
*/
7979
const std::string user_agent();
8080

src/boosty.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
versions of boost found on popular versions of linux, circa early 2012.
1010
1111
design
12-
the boost filsystem changed around 1.46-1.48. we do a large #ifdef
12+
the boost filesystem changed around 1.46-1.48. we do a large #ifdef
1313
based on boost version that wraps various functions appropriately.
1414
in a few years, this file should be deleted as unnecessary.
1515

src/cgalutils-project.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ namespace CGALUtils {
200200
try {
201201
PRINTD("Trying alternative intersection using very large thin box: ");
202202
std::vector<CGAL_Point_3> pts;
203-
// dont use z of 0. there are bugs in CGAL.
203+
// don't use z of 0. there are bugs in CGAL.
204204
double inf = 1e8;
205205
double eps = 0.001;
206206
CGAL_Point_3 minpt(-inf, -inf, -eps);

src/cgalutils-tess-old.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ polygons because they all require input polygons to pass the
3737
triangles.
3838
3939
There is also the question of which underlying number type to use. Some
40-
of the CGAL functions simply dont guarantee good results with a type
40+
of the CGAL functions simply don't guarantee good results with a type
4141
like double. Although much the math here is somewhat simple, like
4242
line-line intersection, and involves only simple algebra, the
4343
approximations required when using floating-point types can cause the
@@ -134,7 +134,7 @@ polygon mirror-image and vice versa.
134134
135135
Now, there is a second curious fact that helps us here. In 3d, we are
136136
using the plane equation of ax+by+cz+d=0, where a,b,c determine its
137-
direction. If you notice, there are actually mutiple sets of numbers
137+
direction. If you notice, there are actually multiple sets of numbers
138138
a:b:c that will describe the exact same plane. For example the 'ground'
139139
plane, called the XYplane, where z is everywhere 0, has the equation
140140
0x+0y+1z+0=0, simplifying to a solution for x,y,z of z=0 and x,y = any

src/clipper-utils.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ namespace ClipperUtils {
242242
fill_minkowski_insides(lhs, rhs, minkowski_terms);
243243
fill_minkowski_insides(rhs, lhs, minkowski_terms);
244244

245-
// This union operation must be performed at each interation since the minkowski_terms
245+
// This union operation must be performed at each iteration since the minkowski_terms
246246
// now contain lots of small quads
247247
c.Clear();
248248
c.AddPaths(minkowski_terms, ClipperLib::ptSubject, true);

src/context.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@ bool Context::has_local_variable(const std::string &name) const
187187
* noinline prevents compiler optimization, as we here specifically
188188
* optimize for stack usage during normal operating, not runtime during
189189
* error handling.
190-
*
190+
*
191191
* @param what what is ignored
192192
* @param name name of the ignored object
193-
* @param loc location of the function/modul call
193+
* @param loc location of the function/module call
194194
* @param docPath document path of the root file, used to calculate the relative path
195195
*/
196196
static void NOINLINE print_ignore_warning(const char *what, const char *name, const Location &loc, const char *docPath){

src/control.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void ControlModule::for_eval(AbstractNode &node, const ModuleInstantiation &inst
118118
const EvalContext* ControlModule::getLastModuleCtx(const EvalContext *evalctx)
119119
{
120120
// Find the last custom module invocation, which will contain
121-
// an eval context with the children of the module invokation
121+
// an eval context with the children of the module invocation
122122
const Context *tmpc = evalctx;
123123
while (tmpc->getParent()) {
124124
const ModuleContext *modulectx = dynamic_cast<const ModuleContext*>(tmpc->getParent());
@@ -186,7 +186,7 @@ AbstractNode *ControlModule::instantiate(const Context* ctx, const ModuleInstant
186186
}
187187

188188
// Find the last custom module invocation, which will contain
189-
// an eval context with the children of the module invokation
189+
// an eval context with the children of the module invocation
190190
const EvalContext *modulectx = getLastModuleCtx(evalctx);
191191
if (modulectx==nullptr) {
192192
return nullptr;

src/input/AxisConfigWidget.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void AxisConfigWidget::AxesChanged(int nr, double val) const{
5151

5252
//QProgressBar generates the shown string from the format string.
5353
//By setting a format string without a place holder,
54-
//we can set arbitrary text, like a custom formated double.
54+
//we can set arbitrary text, like a custom formatted double.
5555
//(Note: QProgressBar internally works on int, so has no formating for double values)
5656
//(Note: The text of a QProgressBar can not be set directly)
5757
QString s = QString::number(val, 'f', 2 );

src/parameter/ParameterWidget.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ void ParameterWidget::readFile(QString scadFile)
174174
}
175175

176176
//Write the json file if the parameter sets are not empty.
177-
//This prevents creating unneccesary json filess.
178-
//This methode also updates the UI state (change indicator, file name, ...)
177+
//This prevents creating unnecessary json filess.
178+
//This method also updates the UI state (change indicator, file name, ...)
179179
void ParameterWidget::writeFileIfNotEmpty(QString scadFile)
180180
{
181181
setFile(scadFile);

src/parameter/parameterset.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void ParameterSet::addParameterSet(const std::string setName, const pt::ptree &
7373
}
7474

7575
/*!
76-
Returns true if the file was succesfully read
76+
Returns true if the file was successfully read
7777
*/
7878
bool ParameterSet::readParameterSet(const std::string &filename)
7979
{

src/parser.y

+4-4
Original file line numberDiff line numberDiff line change
@@ -221,15 +221,15 @@ assignment:
221221
const auto uncPathCurr = boostfs_uncomplete(currFile, mainFilePath.parent_path());
222222
const auto uncPathPrev = boostfs_uncomplete(prevFile, mainFilePath.parent_path());
223223
if(fileEnded){
224-
//assigments via commandline
224+
//assignments via commandline
225225
}else if(prevFile==mainFile && currFile == mainFile){
226-
//both assigments in the mainFile
226+
//both assignments in the mainFile
227227
PRINTB("WARNING: %s was assigned on line %i but was overwritten on line %i",
228228
assignment.name%
229229
assignment.location().firstLine()%
230230
LOC(@$).firstLine());
231231
}else if(uncPathCurr == uncPathPrev){
232-
//assigment overwritten within the same file
232+
//assignment overwritten within the same file
233233
//the line number being equal happens, when a file is included multiple times
234234
if(assignment.location().firstLine() != LOC(@$).firstLine()){
235235
PRINTB("WARNING: %s was assigned on line %i of %s but was overwritten on line %i",
@@ -239,7 +239,7 @@ assignment:
239239
LOC(@$).firstLine());
240240
}
241241
}else if(prevFile==mainFile && currFile != mainFile){
242-
//assigment from the mainFile overwritten by an include
242+
//assignment from the mainFile overwritten by an include
243243
PRINTB("WARNING: %s was assigned on line %i of %s but was overwritten on line %i of %s",
244244
assignment.name%
245245
assignment.location().firstLine()%

0 commit comments

Comments
 (0)