Git commit fccbebc2c0af3254cddb2389c49ca86c697a2ccc by Kunda Ki. Committed on 20/09/2025 at 00:59. Pushed by aacid into branch 'master'.
Fix various typos Fixes user-facing and non-user-facing typos. M +1 -1 DESIGN M +1 -1 TODO M +1 -1 doc/index.docbook M +1 -1 filters/asyexporterimpvisitor.cc M +1 -1 filters/xfigexporter.cc M +2 -2 geogebra/README M +1 -1 geogebra/geogebratransformer.cpp M +2 -2 kig/kig_view.cpp M +1 -1 misc/conic-common.cpp M +1 -1 misc/kigpainter.h M +1 -1 misc/object_hierarchy.cc M +1 -1 misc/special_constructors.cc M +1 -1 modes/label.cc M +1 -2 objects/cubic_imp.cc M +2 -2 objects/curve_imp.cc M +2 -2 objects/intersection_types.cc M +2 -2 objects/inversion_type.cc M +1 -1 objects/polygon_imp.cc M +2 -2 objects/polygon_type.cc M +1 -1 objects/special_imptypes.h M +1 -1 scripting-api/CMakeLists.txt M +1 -1 scripting/newscriptwizard.cc M +2 -2 scripting/python-kig.xml https://invent.kde.org/education/kig/-/commit/fccbebc2c0af3254cddb2389c49ca86c697a2ccc diff --git a/DESIGN b/DESIGN index 4382fa77..35e5ab4c 100644 --- a/DESIGN +++ b/DESIGN @@ -6,7 +6,7 @@ EXPLANATION OF THE KIG DESIGN The Kig Object System is a design I'm particularly proud of. It started out pretty basic, but has undergone some major revisions, that -have proven very succesful. Currently, I have just made one more +have proven very successful. Currently, I have just made one more major change, and I think this will be the last majore change to it for quite some time to come. That's also why I'm writing this explanation for other developers. diff --git a/TODO b/TODO index f6a8bb19..f10248bc 100644 --- a/TODO +++ b/TODO @@ -47,7 +47,7 @@ 1. decrease de amount of coincident points 2. the constructed point will always be "the other" intersection also when moving objects around. This is not the case now, which - leads to unexpected behavious sometimes (from the user perspective) + leads to unexpected behaviours sometimes (from the user perspective) (done: 2006-01-19, post-kde-3.5) - Two new transformations: projection on a line, orthogonally and diff --git a/doc/index.docbook b/doc/index.docbook index a836b742..c5989c2f 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -565,7 +565,7 @@ However, &kig; does allow you to do more with the macros. If you select <menuchoice><guimenu>Types</guimenu><guimenuitem>Manage Types...</guimenuitem></menuchoice> from the menu, you will see a dialog where you can edit your types. It allows you to modify -the existant types, delete types that are no longer used, export +the existent types, delete types that are no longer used, export them to a file, or even load them from another file. </para> <screenshot> diff --git a/filters/asyexporterimpvisitor.cc b/filters/asyexporterimpvisitor.cc index 503bc62e..07bce553 100644 --- a/filters/asyexporterimpvisitor.cc +++ b/filters/asyexporterimpvisitor.cc @@ -142,7 +142,7 @@ void AsyExporterImpVisitor::plotGenericCurve(const CurveImp *imp) // special case for ellipse if (const ConicImp *conic = dynamic_cast<const ConicImp *>(imp)) { // if ellipse, close its path - // THSI IS WRONG, think of ellipse arcs!! + // THIS IS WRONG, think of ellipse arcs!! if (conic->conicType() == 1 && coordlist.size() == 1 && coordlist[0].size() > 1) { coordlist[0].push_back(coordlist[0][0]); } diff --git a/filters/xfigexporter.cc b/filters/xfigexporter.cc index 1ba8a64e..aacc7fb7 100644 --- a/filters/xfigexporter.cc +++ b/filters/xfigexporter.cc @@ -227,7 +227,7 @@ void XFigExportImpVisitor::visit(const TextImp *imp) QPoint coord = convertCoord(imp->surroundingRect().bottomLeft()); mstream << "4 " // text type - << "0 " // subtype: left justfied + << "0 " // subtype: left justified << mcurcolorid << " " // color: black << "50 " // depth: 50 << "-1 " // pen style: unused diff --git a/geogebra/README b/geogebra/README index 0eee8393..285cad49 100644 --- a/geogebra/README +++ b/geogebra/README @@ -6,7 +6,7 @@ The Geogebra Filter makes use of XSLT ( Extensible Stylesheet Language Transform Qt's XmlPatterns Module is used for providing support for XSLT. Using XSLT we first convert the XML representation of the Geogebra files into a more suitable intermediate representation from which constructing the ObjectCalcers ( and thus the objectHolders ) -is easier and homogenous for most object-types. We use the callback interface provided +is easier and homogeneous for most object-types. We use the callback interface provided by the QAbstractXmlReceiver class to read the transformed XML and construct the objects present in the document. @@ -26,7 +26,7 @@ There are two important classes involved : This class transforms the XML representation of the Geogebra files into a more suitable intermediate XML representation from which readingand allocating corresponding objectHolders is easier and - homogenous. The two filters - worksheet-filter and tool-filter make use of objects of this class. + homogeneous. The two filters - worksheet-filter and tool-filter make use of objects of this class. File-Types Supported and Usage : diff --git a/geogebra/geogebratransformer.cpp b/geogebra/geogebratransformer.cpp index aef18357..869e335f 100644 --- a/geogebra/geogebratransformer.cpp +++ b/geogebra/geogebratransformer.cpp @@ -48,7 +48,7 @@ void GeogebraTransformer::attribute(const QXmlName &name, const QStringRef &valu * <output a0="c"/> * * Notice the attribute 'a1' of the 'input' element. The value - '3' is the radius of the circle. - * First, we try to convert that value to Double. If the conversion suceeds, we stack a DoubleImp (Calcer) + * First, we try to convert that value to Double. If the conversion succeeds, we stack a DoubleImp (Calcer) * in the m_currentArgStack and break. Otherwise, we check the m_objectMap for that label entry. */ DoubleImp *doubleImp = new DoubleImp(dblval); diff --git a/kig/kig_view.cpp b/kig/kig_view.cpp index f5c3a6ca..534c65fb 100644 --- a/kig/kig_view.cpp +++ b/kig/kig_view.cpp @@ -199,8 +199,8 @@ void KigWidget::slotZoomOut() nr.setCenter(c); // zooming in is undoable. I know this isn't really correct, - // because the current view doesn't really belong to the document ( - // althought KGeo and KSeg both save them along, iirc ). However, + // because the current view doesn't really belong to the document + // ( although KGeo and KSeg both save them along, iirc ). However, // undoing a zoom or another operation affecting the window seems a // bit too useful to not be available. Please try to convince me if // you feel otherwise ;-) diff --git a/misc/conic-common.cpp b/misc/conic-common.cpp index f2b37213..b5a05ccc 100644 --- a/misc/conic-common.cpp +++ b/misc/conic-common.cpp @@ -619,7 +619,7 @@ const LineData calcConicRadical(const ConicCartesianData &cequation1, const Coni const int maxiterations = 30; while (iterations++ < maxiterations) // using Newton, iterations should be very few { - // compute value of function and polinomial + // compute value of function and polynomial fval = fpval = af; fval = bf + lambda * fval; // b + xa fpval = fval + lambda * fpval; // b + 2xa diff --git a/misc/kigpainter.h b/misc/kigpainter.h index 3165de65..9d9c1df5 100644 --- a/misc/kigpainter.h +++ b/misc/kigpainter.h @@ -38,7 +38,7 @@ class KigPainter // : public Qt { protected: - // don't blaim me for this mutable hack. It's TT that hasn't got + // don't blame me for this mutable hack. It's TT that hasn't got // its consts correctly... mutable QPainter mP; diff --git a/misc/object_hierarchy.cc b/misc/object_hierarchy.cc index 4fcc3f90..8a6c9153 100644 --- a/misc/object_hierarchy.cc +++ b/misc/object_hierarchy.cc @@ -698,7 +698,7 @@ const ObjectImpType *lowermost(const ObjectImpType *a, const ObjectImpType *b, c // this function is part of the visit procedure really. It is // factored out, because it recurses for cache ObjectImp's. What this -// does is, it makes sure that object o is calcable, by putting +// does is, it makes sure that object o is calculable, by putting // appropriate Node's in mnodes. po is o->parents() and pl contains // the location of objects that are already in mnodes and -1 // otherwise. -1 means we have to store their ObjectImp, unless diff --git a/misc/special_constructors.cc b/misc/special_constructors.cc index 8eeb2184..3b527d8e 100644 --- a/misc/special_constructors.cc +++ b/misc/special_constructors.cc @@ -1625,7 +1625,7 @@ QString MeasureTransportConstructor::useText(const ObjectCalcer &o, const std::v return i18n("Start transport from this point of the line"); else return i18n("Start transport from this point of the curve"); - // well, this isn't impemented yet, should never get here + // well, this isn't implemented yet, should never get here } return QLatin1String(""); } diff --git a/modes/label.cc b/modes/label.cc index f49847f3..1ef13baa 100644 --- a/modes/label.cc +++ b/modes/label.cc @@ -119,7 +119,7 @@ void TextLabelModeBase::leftReleased(QMouseEvent *e, KigWidget *v, ObjectTypeCal return; /* * in case we are redefining a text label: - * we postpone the circular recursion check untill the + * we postpone the circular recursion check until the * finish() method is called. This is not the optimal * solution, since the user receives confusing feedback * from the cursor, which seemingly indicates that some diff --git a/objects/cubic_imp.cc b/objects/cubic_imp.cc index 8d0cd80a..d8b8e46a 100644 --- a/objects/cubic_imp.cc +++ b/objects/cubic_imp.cc @@ -173,8 +173,7 @@ const Coordinate CubicImp::getPoint(double p) const else x = p / (1 + p); - // calc the third degree polynomial: - // compute the third degree polinomial: + // compute the third degree polynomial: // double a000 = mdata.coeffs[0]; // double a001 = mdata.coeffs[1]; // double a002 = mdata.coeffs[2]; diff --git a/objects/curve_imp.cc b/objects/curve_imp.cc index 7ac49cba..6432a8db 100644 --- a/objects/curve_imp.cc +++ b/objects/curve_imp.cc @@ -129,7 +129,7 @@ double CurveImp::getParam(const Coordinate &p, const KigDocument &doc) const // differential geometry constructions like tangent, center of curvature,... // such constructions need to recover the param associated to a (constrained) // PointImp, but do not have direct access to it since it is a parent of the - // calcer accociated to the ConstrainedPointType, whereas we only have the + // calcer associated to the ConstrainedPointType, whereas we only have the // ObjectImps of the Curve and of the Point; in such case the only possibility // consists in a call to getParam, which is unnecessarily heavy since the PointImp // was itself computed previously using getPoint. So the param used in getPoint @@ -326,7 +326,7 @@ QString CurveImp::cartesianEquationString(const KigDocument &doc) const break; } } - if (test == true) // now we can costruct the cartesian equation of the locus + if (test == true) // now we can construct the cartesian equation of the locus { assert(deglocus >= 0 && deglocus <= degmax); for (deg = deglocus; deg > 0; --deg) { diff --git a/objects/intersection_types.cc b/objects/intersection_types.cc index 7112d804..3d9324ed 100644 --- a/objects/intersection_types.cc +++ b/objects/intersection_types.cc @@ -53,7 +53,7 @@ ObjectImp *ConicLineIntersectionType::calc(const Args &parents, const KigDocumen /* * mp: In this case only one of the two points must be valid (the other is "pushed" * to infinity). The choice of which one is done such that we avoid abrupt points exchange - * when dinamically movint points + * when dynamically movint points */ if (side * vecprod < 0) { Coordinate p = calcIntersectionPoint(degline, line); @@ -560,7 +560,7 @@ ObjectImp *ArcLineIntersectionType::calc(const Args &parents, const KigDocument /* * mp: In this case only one of the two points must be valid (the other is "pushed" * to infinity). The choice of which one is done such that we avoid abrupt points exchange - * when dinamically movint points + * when dynamically movint points */ if (side * vecprod < 0) { Coordinate p = calcIntersectionPoint(degline, line); diff --git a/objects/inversion_type.cc b/objects/inversion_type.cc index a55b56e9..e6867be0 100644 --- a/objects/inversion_type.cc +++ b/objects/inversion_type.cc @@ -50,7 +50,7 @@ ObjectImp *CircularInversionType::calc(const Args &args, const KigDocument &) co if (args.size() == 2 && args[1]->inherits(LineImp::stype())) { /* we also accept the special case when the circle becomes a * straight line (this is not accepted during interactive construction, - * but could happen dinamically when a construction can result either + * but could happen dynamically when a construction can result either * with a circle or a line. * In this case we simply have a reflection */ @@ -316,7 +316,7 @@ ObjectImp *InvertPointType::calc(const Args &args, const KigDocument &) const } /* - * old-style invertion types. These can be safely removed, since trying + * old-style inversion types. These can be safely removed, since trying * to load kig files that use these constructions are correctly converted * into the new CircularInversion. */ diff --git a/objects/polygon_imp.cc b/objects/polygon_imp.cc index c08b85d1..90681bd5 100644 --- a/objects/polygon_imp.cc +++ b/objects/polygon_imp.cc @@ -777,7 +777,7 @@ int AbstractPolygonImp::windingNumber() const * boundary of the polygon. * In the end we only need to count how many time we cross the (1,0) * direction (positive x-axis) with a positive sign if we cross while - * steering left and a negative sign viceversa + * steering left and a negative sign vice-versa */ int winding = 0; diff --git a/objects/polygon_type.cc b/objects/polygon_type.cc index a0d99e30..bc59c08c 100644 --- a/objects/polygon_type.cc +++ b/objects/polygon_type.cc @@ -860,7 +860,7 @@ ObjectImp *PolygonPolygonIntersectionType::calc(const Args &parents, const KigDo do { if (t2 == 1.0) { /* - * in this case I will continue cicling along the current polygon + * in this case I will continue cycling along the current polygon */ iprevprevpoint = iprevpoint; /* we need this in the special case */ iprevpoint = ipoint; @@ -888,7 +888,7 @@ ObjectImp *PolygonPolygonIntersectionType::calc(const Args &parents, const KigDo } } else { /* - * in this case I must cicle along the other polygon + * in this case I must cycle along the other polygon */ ppointsc = ppointsa; ppointsa = ppointsb; diff --git a/objects/special_imptypes.h b/objects/special_imptypes.h index e81f94fa..f5d047a9 100644 --- a/objects/special_imptypes.h +++ b/objects/special_imptypes.h @@ -59,7 +59,7 @@ public: extern WeightImpType weightimptypeinstance; /* - * The "InvertibleImpType" class, inherited fron ObjectImpType + * The "InvertibleImpType" class, inherited from ObjectImpType * is used to recognize non-point objects that we know how to * circular-invert, namely: lines, segments, rays, circles, arcs. * The trick is done by redefining the "match" method of the diff --git a/scripting-api/CMakeLists.txt b/scripting-api/CMakeLists.txt index f5240544..b4799728 100644 --- a/scripting-api/CMakeLists.txt +++ b/scripting-api/CMakeLists.txt @@ -10,7 +10,7 @@ #original Makefile.am contents follow: -## generate the Kig Python Scriptin APIdocs from the Kig source code +## generate the Kig Python Scripting APIdocs from the Kig source code # #all-local: build-kig-python-scripting-apidocs #build-kig-python-scripting-apidocs: diff --git a/scripting/newscriptwizard.cc b/scripting/newscriptwizard.cc index c8f4f13c..42ba5366 100644 --- a/scripting/newscriptwizard.cc +++ b/scripting/newscriptwizard.cc @@ -73,7 +73,7 @@ NewScriptWizard::NewScriptWizard(QWidget *parent, ScriptModeBase *mode, KIconLoa if (!editor) { // there is no KDE textditor component installed, so we'll use a - // simplier KTextEdit + // simpler KTextEdit textedit = new QTextEdit(secondPage); textedit->setObjectName(QStringLiteral("textedit")); textedit->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont)); diff --git a/scripting/python-kig.xml b/scripting/python-kig.xml index 16fbca8e..7760cc1e 100644 --- a/scripting/python-kig.xml +++ b/scripting/python-kig.xml @@ -5,7 +5,7 @@ <!ENTITY beforeDigit "(?<![\.\w[:^ascii:]])"> <!ENTITY beforePointFloat "(?<![\w[:^ascii:]])"> ]> -<!-- Python syntax highlightning v0.9 by Per Wigren --> +<!-- Python syntax highlighting v0.9 by Per Wigren --> <!-- Python syntax highlighting v1.9 by Michael Bueker (improved keyword differentiation) --> <!-- Python syntax highlighting v1.97 by Paul Giannaros --> <!-- Python syntax highlighting v1.99 by Primoz Anzur --> @@ -18,7 +18,7 @@ <!-- v2.06 decorator names can (and often do) contain periods --> <!-- v2.07 add support for %prog and co, see bug 142832 --> <!-- v2.08 add missing overloaders, new Python 3 statements, builtins, and keywords --> -<!-- v2.29 recognize escape sequenzes correctly --> +<!-- v2.29 recognize escape sequences correctly --> <!-- v2.29.1 for Kig by Pino Toscano --> <language name="Python-Kig" version="11.1" style="python" indenter="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript;*.FCMacro" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license=""> <highlighting>
