diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | NEWS.md | 20 | ||||
| -rw-r--r-- | src/proj_pt.h | 6 | ||||
| -rw-r--r-- | src/rdf.cpp | 44 | ||||
| -rw-r--r-- | src/ui/dialog/find.h | 18 |
5 files changed, 45 insertions, 45 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa35ecdc2..f51c75407 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,7 +146,7 @@ translations: except: - schedules script: - # make sure dependecies for inkscape.pot are up-to-date + # make sure dependencies for inkscape.pot are up-to-date - mkdir build && cd build && cmake .. && make inkscape_pot && cd .. - cd po/ @@ -92,7 +92,7 @@ Bspline.gif Bspline2.gif Live Path Effect mode Bspline3.gif - + The options in the Live effect dialog give you control on bspline paths. @@ -100,18 +100,18 @@ The options in the Live effect dialog give you control on bspline paths. * Make cusp nodes. * Numeric input for weight. * Steps with CONTROL snaps in node/handle editing. -* Ignore cusp nodes, affect to all other widgets changes and, for example, +* 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 with the final shape and the generated new nodes. - + Roughen --- Roughen.png - + [Extended video](https://www.youtube.com/watch?v=130Dbt0juvY) @@ -129,7 +129,7 @@ Simplify --- Simplify.png - + [Extended video](https://www.youtube.com/watch?v=gaWujN_iTSk) @@ -147,7 +147,7 @@ Perspective/Envelope --- Perspective-envelope.png - + [Extended video](https://www.youtube.com/watch?v=CjKGatyxTZ8) @@ -163,7 +163,7 @@ Lattice Deformation 2 --- Latice2.png - + [Extended video](https://www.youtube.com/watch?v=YlK9L88_tWE) [Symmetry video](https://www.youtube.com/watch?v=jhuVjqFA6ig) @@ -180,7 +180,7 @@ Show Handles --- ShowHandles.png - + [Extended video](https://www.youtube.com/watch?v=h9ul_PR9XYo) @@ -196,7 +196,7 @@ ShowHandles.gif Transform by two points TransformByTwoKnots.png - + [Extended video](https://www.youtube.com/watch?v=ZLmYdWoXXIw) [Extended video (Elastic rubber)](https://www.youtube.com/watch?v=lOWTeZC_LjM) @@ -325,7 +325,7 @@ settings, so only change these if you know what you are doing. HPGL Export -The HPGL export (File -> Save as -> HP Grafics Language file) has now the same +The HPGL export (File -> Save as -> HP Graphics Language file) has now the same multiple pens feature as the #Plotter Driver. HPGL Import diff --git a/src/proj_pt.h b/src/proj_pt.h index 1ee4b7f14..dc2283813 100644 --- a/src/proj_pt.h +++ b/src/proj_pt.h @@ -48,7 +48,7 @@ public: } /*** For convenience, we define addition/subtraction etc. as "affine" operators (i.e., - the result for finite points is the same as if the affine points were addes ***/ + the result for finite points is the same as if the affine points were added ***/ inline Pt2 &operator+(Pt2 &rhs) const { Pt2 *result = new Pt2 (*this); result->normalize(); @@ -105,7 +105,7 @@ public: } /*** For convenience, we define addition/subtraction etc. as "affine" operators (i.e., - the result for finite points is the same as if the affine points were addes ***/ + the result for finite points is the same as if the affine points were added ***/ inline Pt3 &operator+(Pt3 &rhs) const { Pt3 *result = new Pt3 (*this); result->normalize(); @@ -134,7 +134,7 @@ public: } return *result; } - + inline double operator[] (unsigned int index) const { if (index > 3) { return Geom::infinity(); } return pt[index]; diff --git a/src/rdf.cpp b/src/rdf.cpp index 2d85fa48a..d6efcf5c6 100644 --- a/src/rdf.cpp +++ b/src/rdf.cpp @@ -25,7 +25,7 @@ /* Example RDF XML from various places... - + <rdf:RDF xmlns="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> @@ -41,7 +41,7 @@ </Agent></dc:rights> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> <dc:source rdf:resource="source"/> - <license rdf:resource="http://creativecommons.org/licenses/by/4.0/" + <license rdf:resource="http://creativecommons.org/licenses/by/4.0/" /> </Work> @@ -57,13 +57,13 @@ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> <license rdf:resource="http://creativecommons.org/ns#PublicDomain" /> </Work> - + <License rdf:about="http://creativecommons.org/ns#PublicDomain"> <permits rdf:resource="http://creativecommons.org/ns#Reproduction" /> <permits rdf:resource="http://creativecommons.org/ns#Distribution" /> <permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> </License> - + </rdf:RDF> @@ -174,32 +174,32 @@ struct rdf_double_t rdf_license_ofl [] = { }; struct rdf_license_t rdf_licenses [] = { - { N_("CC Attribution"), + { N_("CC Attribution"), "http://creativecommons.org/licenses/by/4.0/", rdf_license_cc_a, }, - { N_("CC Attribution-ShareAlike"), + { N_("CC Attribution-ShareAlike"), "http://creativecommons.org/licenses/by-sa/4.0/", rdf_license_cc_a_sa, }, - { N_("CC Attribution-NoDerivs"), + { N_("CC Attribution-NoDerivs"), "http://creativecommons.org/licenses/by-nd/4.0/", rdf_license_cc_a_nd, }, - { N_("CC Attribution-NonCommercial"), + { N_("CC Attribution-NonCommercial"), "http://creativecommons.org/licenses/by-nc/4.0/", rdf_license_cc_a_nc, }, - { N_("CC Attribution-NonCommercial-ShareAlike"), + { N_("CC Attribution-NonCommercial-ShareAlike"), "http://creativecommons.org/licenses/by-nc-sa/4.0/", rdf_license_cc_a_nc_sa, }, - { N_("CC Attribution-NonCommercial-NoDerivs"), + { N_("CC Attribution-NonCommercial-NoDerivs"), "http://creativecommons.org/licenses/by-nc-nd/4.0/", rdf_license_cc_a_nc_nd, }, @@ -335,7 +335,7 @@ public: * @return A pointer to the entity's static contents as a string * @param repr The XML element to extract from * @param entity The desired RDF/Work entity - * + * */ static const gchar *getReprText( Inkscape::XML::Node const * repr, struct rdf_work_entity_t const & entity ); @@ -353,7 +353,7 @@ public: * * @return A pointer to an RDF/Work entity * @param name The desired RDF/Work entity - * + * */ struct rdf_work_entity_t *rdf_find_entity(gchar const * name) { @@ -495,7 +495,7 @@ const gchar *RDFImpl::getReprText( Inkscape::XML::Node const * repr, struct rdf_ case RDF_CONTENT: temp = repr->firstChild(); if ( temp == nullptr ) return nullptr; - + return temp->content(); case RDF_AGENT: @@ -526,7 +526,7 @@ const gchar *RDFImpl::getReprText( Inkscape::XML::Node const * repr, struct rdf_ /* backwards compatible: read contents */ temp = repr->firstChild(); if ( temp == nullptr ) return nullptr; - + return temp->content(); } @@ -782,7 +782,7 @@ Inkscape::XML::Node const *RDFImpl::getXmlRepr( SPDocument const * doc, gchar co } else if ( !doc->getReprDoc() ) { g_critical("XML doc is null."); } else if (!name) { - g_critical("Null name passed to getXmlRepr()"); + g_critical("Null name passed to getXmlRepr()"); } else { Inkscape::XML::Node const * rdf = getRdfRootRepr( doc ); if ( rdf ) { @@ -807,7 +807,7 @@ Inkscape::XML::Node *RDFImpl::ensureXmlRepr( SPDocument * doc, gchar const * nam } else if ( !doc->getReprDoc() ) { g_critical("XML doc is null."); } else if (!name) { - g_critical("Null name passed to ensureXmlRepr()"); + g_critical("Null name passed to ensureXmlRepr()"); } else { Inkscape::XML::Node * rdf = ensureRdfRootRepr( doc ); if ( rdf ) { @@ -836,7 +836,7 @@ Inkscape::XML::Node const *RDFImpl::getWorkRepr( SPDocument const * doc, gchar c } else if ( !doc->getReprDoc() ) { g_critical("XML doc is null."); } else if (!name) { - g_critical("Null name passed to getWorkRepr()"); + g_critical("Null name passed to getWorkRepr()"); } else { Inkscape::XML::Node const* work = getXmlRepr( doc, XML_TAG_NAME_WORK ); if ( work ) { @@ -854,7 +854,7 @@ Inkscape::XML::Node *RDFImpl::ensureWorkRepr( SPDocument * doc, gchar const * na } else if ( !doc->getReprDoc() ) { g_critical("XML doc is null."); } else if (!name) { - g_critical("Null name passed to ensureWorkRepr()"); + g_critical("Null name passed to ensureWorkRepr()"); } else { Inkscape::XML::Node * work = ensureXmlRepr( doc, XML_TAG_NAME_WORK ); if ( work ) { @@ -1067,9 +1067,9 @@ struct rdf_license_t *RDFImpl::getLicense(SPDocument *document) // TODO: would it be better to do this code on document load? Is // sp_metadata_build() then the right place to put the call to sort out // any RDF mess? - + struct rdf_license_t * license_by_properties = nullptr; - + Inkscape::XML::Node const *repr = getXmlRepr( document, XML_TAG_NAME_LICENSE ); if (repr) { for ( struct rdf_license_t * license = rdf_licenses; license->name; license++ ) { @@ -1113,7 +1113,7 @@ struct rdf_license_t *RDFImpl::getLicense(SPDocument *document) g_warning("No %s metadata found, derived license URI from %s: %s", XML_TAG_NAME_LICENSE_PROP, XML_TAG_NAME_LICENSE, license_by_properties->uri); - + // Set license property to match setWorkEntity(document, *entity, license_by_properties->uri); @@ -1216,7 +1216,7 @@ void RDFImpl::setDefaults( SPDocument * doc ) /* * Add the metadata stored in the users preferences to the document if - * a) the preference 'Input/Output->Add default metatdata to new documents' is true, and + * a) the preference 'Input/Output->Add default metadata to new documents' is true, and * b) there is no metadata already in the file (such as from a template) */ void rdf_add_from_preferences(SPDocument *doc) diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h index 2ed341122..d4b8fb661 100644 --- a/src/ui/dialog/find.h +++ b/src/ui/dialog/find.h @@ -18,7 +18,7 @@ #include "ui/widget/panel.h" #include "ui/widget/button.h" -#include "ui/widget/entry.h" +#include "ui/widget/entry.h" #include "ui/widget/frame.h" #include <gtkmm/box.h> @@ -64,7 +64,7 @@ protected: /** * Callbacks for pressing the dialog buttons. */ - void onFind(); + void onFind(); void onReplace(); void onExpander(); void onAction(); @@ -83,7 +83,7 @@ protected: * * @param item the SPItem to check * @param id the value to compare with - * @param exact do an exacty match + * @param exact do an exact match * @param casematch match the text case exactly * @param replace replace the value if found * @@ -94,7 +94,7 @@ protected: * * @param item the SPItem to check * @param name the value to compare with - * @param exact do an exacty match + * @param exact do an exact match * @param casematch match the text case exactly * @param replace replace the value if found * @@ -106,7 +106,7 @@ protected: * * @param item the SPItem to check * @param name the value to compare with - * @param exact do an exacty match + * @param exact do an exact match * @param casematch match the text case exactly * @param replace replace the value if found * @@ -117,7 +117,7 @@ protected: * * @param item the SPItem to check * @param name the value to compare with - * @param exact do an exacty match + * @param exact do an exact match * @param casematch match the text case exactly * @param replace replace the value if found * @@ -128,7 +128,7 @@ protected: * * @param item the SPItem to check * @param name the value to compare with - * @param exact do an exacty match + * @param exact do an exact match * @param casematch match the text case exactly * @param replace replace the value if found * @@ -139,7 +139,7 @@ protected: * * @param item the SPItem to check * @param name the value to compare with - * @param exact do an exacty match + * @param exact do an exact match * @param casematch match the text case exactly * @param replace replace the value if found * @@ -192,7 +192,7 @@ protected: * Is invoked by the desktop tracker when the desktop changes. */ void setTargetDesktop(SPDesktop *desktop); - + /** * Called when desktop selection changes */ |