Update to trunk

(bzr r11950.1.180)

4 files changed, 9 insertions, 9 deletions

diff --git a/src/extension/extension.h b/src/extension/extension.h
index 079276936..1fb8bdfec 100644
--- a/src/extension/extension.h
+++ b/src/extension/extension.h
@@ -144,12 +144,12 @@ private:
                               extension */
 
 public:
-    /** \brief  A function to get the the number of parameters that
+    /** \brief  A function to get the number of parameters that
                 the extension has.
         \return The number of parameters. */
     unsigned int param_count ( ) { return parameters == NULL ? 0 :
                                               g_slist_length(parameters); };
-    /** \brief  A function to get the the number of parameters that
+    /** \brief  A function to get the number of parameters that
                 are visible to the user that the extension has.
         \return The number of visible parameters.
 
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 4bca9dfd9..90ab763e0 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -321,7 +321,7 @@ Emf::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filena
 }
 
 
-/*  given the transformation matrix from worldTranform return the scale in the matrix part.  Assumes that the
+/*  given the transformation matrix from worldTransform return the scale in the matrix part.  Assumes that the
     matrix is not used to skew, invert, or make another distorting transformation.  */
 double Emf::current_scale(PEMF_CALLBACK_DATA d){
     double scale =
@@ -332,7 +332,7 @@ double Emf::current_scale(PEMF_CALLBACK_DATA d){
     return(scale);
 }
 
-/*  given the transformation matrix from worldTranform and the current x,y position in inkscape coordinates,
+/*  given the transformation matrix from worldTransform and the current x,y position in inkscape coordinates,
     generate an SVG transform that gives the same amount of rotation, no scaling, and maps x,y back onto x,y.  This is used for
     rotating objects when the location of at least one point in that object is known. Returns:
     "matrix(a,b,c,d,e,f)"  (WITH the double quotes)
@@ -359,7 +359,7 @@ std::string Emf::current_matrix(PEMF_CALLBACK_DATA d, double x, double y, int us
     return(cxform.str());
 }
 
-/*  given the transformation matrix from worldTranform return the rotation angle in radians.
+/*  given the transformation matrix from worldTransform return the rotation angle in radians.
     counter clocwise from the x axis.  */
 double Emf::current_rotation(PEMF_CALLBACK_DATA d){
     return -std::atan2(d->dc[d->level].worldTransform.eM12, d->dc[d->level].worldTransform.eM11);
diff --git a/src/extension/internal/text_reassemble.c b/src/extension/internal/text_reassemble.c
index 9ed6c9c3a..cd84910fc 100644
--- a/src/extension/internal/text_reassemble.c
+++ b/src/extension/internal/text_reassemble.c
@@ -1015,7 +1015,7 @@ int cxinfo_make_insertable(CX_INFO *cxi){
     \brief Insert a complex into the CX_INFO structure. (Insert may be either TR_TEXT or TR_LINE.)
     \returns 0 on success, !0 on error.
     \param cxi pointer to the CX_INFO structure (complexes).
-    \param src index of the the complex to insert.
+    \param src index of the complex to insert.
     \param src_rt_tidx index of the bounding rectangle
     \param type TR_TEXT (index is for tpi->chunks[]) or TR_LINE (index is for cxi->kids[])
 */
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index 78fcdb66d..aab98dc87 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -320,12 +320,12 @@ Wmf::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filena
 }
 
 
-/* WMF has no worldTranform, so this always returns 1.0.  Retain it to keep WMF and WMF in sync as much as possible.*/
+/* WMF has no worldTransform, so this always returns 1.0.  Retain it to keep WMF and WMF in sync as much as possible.*/
 double Wmf::current_scale(PWMF_CALLBACK_DATA d){
     return 1.0;
 }
 
-/* WMF has no worldTranform, so this always returns an Identity rotation matrix, but the offsets may have values.*/
+/* WMF has no worldTransform, so this always returns an Identity rotation matrix, but the offsets may have values.*/
 std::string Wmf::current_matrix(PWMF_CALLBACK_DATA d, double x, double y, int useoffset){
     std::stringstream cxform;
     double scale = current_scale(d);
@@ -340,7 +340,7 @@ std::string Wmf::current_matrix(PWMF_CALLBACK_DATA d, double x, double y, int us
     return(cxform.str());
 }
 
-/* WMF has no worldTranform, so this always returns 0.  Retain it to keep WMF and WMF in sync as much as possible.*/
+/* WMF has no worldTransform, so this always returns 0.  Retain it to keep WMF and WMF in sync as much as possible.*/
 double Wmf::current_rotation(PWMF_CALLBACK_DATA d){
     return 0.0;
 }