spelling fixes

Author: jef-n

scripts/spell_check/.agignore

@@ -11,7 +11,6 @@ python/plugins/processing/algs/otb/
 python/plugins/processing/algs/saga/
 python/qsci_apis/
 src/astyle
-src/app/dwg/libdxfrw/
 src/app/gps/qwtpolar-1.0/
 src/app/gps/qwtpolar-1.1.1/
 src/core/pal

scripts/spell_check/check_spelling.sh

@@ -50,8 +50,8 @@ while getopts ":rdl:" opt; do
 done
 shift $(expr $OPTIND - 1)
 
-if [ ! $# -eq 0 ]; then
-  EXCLUDE=$(cat $AGIGNORE |${GP}sed -e 's/\s*#.*$//' -e '/^\s*$/d' | tr '\n' '|' |${GP}sed -e 's/|$//')
+if [ $# -ne 0 ]; then
+  EXCLUDE=$(${GP}sed -e 's/\s*#.*$//' -e '/^\s*$/d' $AGIGNORE | tr '\n' '|' | ${GP}sed -e 's/|$//')
   INPUTFILES=$(echo $@ | tr -s '[[:blank:]]' '\n' | egrep -iv "$EXCLUDE" | tr '\n' ' ' )
   if [[ -z $INPUTFILES  ]]; then
     exit 0
@@ -151,11 +151,11 @@ for I in $(seq -f '%02g' 0  $(($SPLIT-1)) ) ; do
         # also make error small case and escape special chars: ( ) |
         ERRORSMALLCASE=$(echo ${ERROR,,} |${GP}sed -r 's/\(/\\(/g' |${GP}sed -r 's/\)/\\)/g' |${GP}sed -r 's/\|/\\|/g')
         if [[ ! "${ERRORSMALLCASE}" =~ $IGNORECASE_INWORD ]]; then
-         if [[ ! -z $(ag --nonumbers --case-sensitive "^${ERRORSMALLCASE:1:-1}${ERRORSMALLCASE: -1}?:" scripts/spell_check/spelling.dat) ]]; then
+         if [[ -n $(ag --nonumbers --case-sensitive "^${ERRORSMALLCASE:1:-1}${ERRORSMALLCASE: -1}?:" scripts/spell_check/spelling.dat) ]]; then
            ERRORSMALLCASE=${ERRORSMALLCASE#?}
            ERROR=${ERROR#?}
          fi
-         if [[ ! -z $(ag --nonumbers --case-sensitive "^${ERRORSMALLCASE::-1}:" scripts/spell_check/spelling.dat) ]]; then
+         if [[ -n $(ag --nonumbers --case-sensitive "^${ERRORSMALLCASE::-1}:" scripts/spell_check/spelling.dat) ]]; then
            ERRORSMALLCASE=${ERRORSMALLCASE::-1}
            ERROR=${ERROR::-1}
          fi
@@ -170,16 +170,16 @@ for I in $(seq -f '%02g' 0  $(($SPLIT-1)) ) ; do
           MATCHCASE="$ERROR:$CORRECTION"
           CORRECTIONCASE=$(echo "$MATCHCASE" | ${GP}sed -r 's/([A-Z]+):(.*)/\1:\U\2/; s/([A-Z][a-z]+):([a-z])/\1:\U\2\L/' | cut -d: -f2)
 
-          if [[ ! -z $OUTPUTLOG ]]; then
+          if [[ -n $OUTPUTLOG ]]; then
             echo "$FILE $NUMBER $ERROR $CORRECTIONCASE" >> $OUTPUTLOG
           fi
           if [[ "$INTERACTIVE" =~ YES ]]; then
             # Skip global replace
-            if [[ !  -z  ${GLOBREP_ALLFILES["$ERROR"]} ]]; then
+            if [[ -n ${GLOBREP_ALLFILES["$ERROR"]} ]]; then
               echo -e "replace \x1B[33m$ERROR\x1B[0m by \x1B[33m$CORRECTIONCASE\x1B[0m in \x1B[33m$FILE\x1B[0m"
               ${GP}sed -i -r "/${SPELLOKRX}/! s/$ERROR/$CORRECTIONCASE/g" $FILE
               continue
-            elif [[ ( ! -z  ${GLOBREP_CURRENTFILE["$ERROR"]} ) || ( ! -z  ${GLOBREP_IGNORE["$ERROR"]} ) ]]; then
+            elif [[ ( -n ${GLOBREP_CURRENTFILE["$ERROR"]} ) || ( -n ${GLOBREP_IGNORE["$ERROR"]} ) ]]; then
               echo "skipping occurrence"
               continue
             else

src/app/dwg/libdxfrw/drw_base.h

@@ -126,7 +126,7 @@ namespace DRW
   //! Shadow mode
   enum ShadowMode
   {
-    CastAndReceieveShadows = 0,
+    CastAndReceiveShadows = 0,
     CastShadows = 1,
     ReceiveShadows = 2,
     IgnoreShadows = 3

src/app/dwg/libdxfrw/drw_entities.cpp

@@ -28,9 +28,9 @@
     throw e; \
   }
 
-//! Calculate arbitary axis
+//! Calculate arbitrary axis
 /*!
-*   Calculate arbitary axis for apply extrusions
+*   Calculate arbitrary axis for apply extrusions
 *  @author Rallaz
 */
 void DRW_Entity::calculateAxis( DRW_Coord extPoint )
@@ -65,9 +65,9 @@ void DRW_Entity::calculateAxis( DRW_Coord extPoint )
   extAxisY.unitize();
 }
 
-//! Extrude a point using arbitary axis
+//! Extrude a point using arbitrary axis
 /*!
-*   apply extrusion in a point using arbitary axis (previous calculated)
+*   apply extrusion in a point using arbitrary axis (previously calculated)
 *  @author Rallaz
 */
 void DRW_Entity::extrudePoint( DRW_Coord extPoint, DRW_Coord *point )
@@ -881,11 +881,11 @@ void DRW_Ellipse::applyExtrusion()
   {
     calculateAxis( extPoint );
     extrudePoint( extPoint, &secPoint );
-    double intialparam = staparam;
+    double initialparam = staparam;
     if ( extPoint.z < 0. )
     {
       staparam = M_PIx2 - endparam;
-      endparam = M_PIx2 - intialparam;
+      endparam = M_PIx2 - initialparam;
     }
   }
 }
@@ -1139,7 +1139,7 @@ bool DRW_3Dface::parseDwg( DRW::Version v, dwgBuffer *buf, duint32 bs )
     invisibleflag = has_no_flag ? ( int )NoEdge : buf->getBitShort();
   }
   drw_assert( invisibleflag >= NoEdge );
-  drw_assert( invisibleflag <= AllEdges );
+  drw_assert( invisibleflag <= AllEdges );  //#spellok
 
   QgsDebugMsg( QString( "base:%1 sec:%2 third:%3 fourth:%4 invisibleFlag:%5" )
                .arg( QString( "%1,%2,%3" ).arg( basePoint.x ).arg( basePoint.y ).arg( basePoint.z ) )
@@ -1633,7 +1633,7 @@ bool DRW_Text::parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs )
   duint8 data_flags = 0x00;
   if ( version > DRW::AC1014 )  //2000+
   {
-    data_flags = buf->getRawChar8(); /* DataFlags RC Used to determine presence of subsquent data */
+    data_flags = buf->getRawChar8(); /* DataFlags RC Used to determine presence of subsequent data */
 
     QgsDebugMsg( QString( "data_flags:%1" ).arg( data_flags, 0, 16 ) );
 
@@ -1681,11 +1681,11 @@ bool DRW_Text::parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs )
 
   if ( version > DRW::AC1014 )  //2000+
   {
-    if ( !( data_flags & 0x04 ) ) /* Oblique ang RD 51 present if !(DataFlags & 0x04) */
+    if ( !( data_flags & 0x04 ) ) /* Oblique angle RD 51 present if !(DataFlags & 0x04) */
     {
       oblique = buf->getRawDouble();
     }
-    if ( !( data_flags & 0x08 ) ) /* Rotation ang RD 50 present if !(DataFlags & 0x08) */
+    if ( !( data_flags & 0x08 ) ) /* Rotation angle RD 50 present if !(DataFlags & 0x08) */
     {
       angle = buf->getRawDouble();
     }
@@ -1697,21 +1697,21 @@ bool DRW_Text::parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs )
   }
   else  //14-
   {
-    oblique = buf->getBitDouble(); /* Oblique ang BD 51 */
-    angle = buf->getBitDouble(); /* Rotation ang BD 50 */
+    oblique = buf->getBitDouble(); /* Oblique angle BD 51 */
+    anglele = buf->getBitDouble(); /* Rotation angle BD 50 */
     height = buf->getBitDouble(); /* Height BD 40 */
     widthscale = buf->getBitDouble(); /* Width factor BD 41 */
   }
 
-  QgsDebugMsg( QString( "thickness:%1, Oblique ang:%2, Width:%3, rotation:%4, height:%5" )
+  QgsDebugMsg( QString( "thickness:%1, Oblique angle:%2, Width:%3, rotation:%4, height:%5" )
                .arg( thickness ).arg( oblique ).arg( widthscale ).arg( angle ).arg( height )
              );
 
   text = sBuf->getVariableText( version, false ); /* Text value TV 1 */
 
   QgsDebugMsg( QString( "text string:%1" ).arg( text.c_str() ) );
 
-  //textgen, alignH, alignV always present in R14-, data_flags set in initialisation
+  //textgen, alignH, alignV always present in R14-, data_flags set in initialization
   if ( !( data_flags & 0x20 ) ) /* Generation BS 71 present if !(DataFlags & 0x20) */
   {
     textgen = buf->getBitShort();
@@ -1807,7 +1807,7 @@ bool DRW_MText::parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs )
   DRW_UNUSED( ext_ht );
   /* Extents wid BD Undocumented and not present in DXF or entget The extents
   rectangle, when rotated the same as the text, fits the actual text image on
-  the screen (altough we've seen it include an extra row of text in height). */
+  the screen (although we've seen it include an extra row of text in height). */
   double ext_wid = buf->getBitDouble();
   DRW_UNUSED( ext_wid );
   /* Text TV 1 All text in one long string (without '\n's 3 for line wrapping).

src/app/dwg/libdxfrw/drw_entities.h

@@ -121,7 +121,7 @@ class DRW_Entity
       , colorName( std::string() )
       , transparency( DRW::Opaque )
       , plotStyle( DRW::DefaultPlotStyle )
-      , shadow( DRW::CastAndReceieveShadows )
+      , shadow( DRW::CastAndReceiveShadows )
       , haveExtrusion( false )
       , extData()
       , haveNextLinks( 0 )
@@ -515,7 +515,7 @@ class DRW_3Dface : public DRW_Trace
       SecondEdge = 0x02,
       ThirdEdge = 0x04,
       FourthEdge = 0x08,
-      AllEdges = 0x0F
+      AllEdges = 0x0F  //#spellok
     };
 
     DRW_3Dface( enum DRW::ETYPE type = DRW::E3DFACE )
@@ -1422,7 +1422,7 @@ class DRW_DimDiametric : public DRW_Dimension
 
     DRW_Coord getDiameter1Point() const {return getPt5();}      //!< First definition point for diameter, code 15, 25 & 35
     void setDiameter1Point( const DRW_Coord &p ) {setPt5( p );}
-    DRW_Coord getDiameter2Point() const {return getDefPoint();} //!< Oposite point for diameter, code 10, 20 & 30
+    DRW_Coord getDiameter2Point() const {return getDefPoint();} //!< Opposite point for diameter, code 10, 20 & 30
     void setDiameter2Point( const DRW_Coord &p ) {setDefPoint( p );}
     double getLeaderLength() const {return getRa40();}          //!< Leader length, code 40
     void setLeaderLength( const double d ) {setRa40( d );}

src/app/dwg/libdxfrw/drw_header.cpp

@@ -1699,7 +1699,7 @@ void DRW_Header::write( dxfWriter *writer, DRW::Version ver )
     else
       writer->writeDouble( 40, 50.0 );
     writer->writeString( 9, "$CAMERAHEIGHT" );
-    if ( getDouble( "$CAMERAHEIGTH", &varDouble ) )
+    if ( getDouble( "$CAMERAHEIGHT", &varDouble ) )
       writer->writeDouble( 40, varDouble );
     else
       writer->writeDouble( 40, 0.0 );
@@ -2179,7 +2179,7 @@ bool DRW_Header::parseDwg( DRW::Version version, dwgBuffer *buf, dwgBuffer *hBbu
 //    vars["TDUSRTIMER"]=new DRW_Variant(40, buf->getBitLong());//RLZ: TODO convert to day.msec
 //    vars["TDUSRTIMER"]=new DRW_Variant(40, buf->getBitLong());//RLZ: TODO convert to day.msec
   vars["CECOLOR"] = new DRW_Variant( 62, buf->getCmColor( version ) );//RLZ: TODO read CMC or EMC color
-  dwgHandle HANDSEED = buf->getHandle();//allways present in data stream
+  dwgHandle HANDSEED = buf->getHandle();//always present in data stream
   QgsDebugMsg( QString( "HANDSEED: %1.%2 0x%3" ).arg( HANDSEED.code ).arg( HANDSEED.size ).arg( HANDSEED.ref, 0, 16 ) );
   dwgHandle CLAYER = hBbuf->getHandle();
   QgsDebugMsg( QString( "CLAYER: %1.%2 0x%3" ).arg( CLAYER.code ).arg( CLAYER.size ).arg( CLAYER.ref, 0, 16 ) );

src/app/dwg/libdxfrw/drw_objects.cpp

@@ -1151,7 +1151,7 @@ bool DRW_Vport::parseDwg( DRW::Version version, dwgBuffer *buf, duint32 bs )
     /*dint16 xrefindex =*/
     buf->getBitShort();
   }
-  flags |= buf->getBit() << 4; //is refx dependant, style code 70, bit 5 (16)
+  flags |= buf->getBit() << 4; //is refx dependent, style code 70, bit 5 (16)
   height = buf->getBitDouble();
   ratio = buf->getBitDouble();
 

src/app/dwg/libdxfrw/intern/drw_cptable932.h

@@ -5,8 +5,8 @@
 
 //first entry in this table are 0xA1
 #define CPOFFSET932 0xFEC0
-//#define CP1LENGHT932 63
-#define CPLENGHT932 7724
+//#define CP1LENGTH932 63
+#define CPLENGTH932 7724
 #define NOTFOUND932 0x30FB
 
 //Table 932 one byte are

src/app/dwg/libdxfrw/intern/drw_cptable936.h

@@ -5,7 +5,7 @@
 
 //first entry in this tables are 0x80
 #define CPOFFSET936 0x80
-#define CPLENGHT936 21791
+#define CPLENGTH936 21791
 #define NOTFOUND936 0x003F
 
 //Table 949 one byte
@@ -6948,7 +6948,7 @@ static const int DRW_DoubleTable936[][2] =
   {0xA8E1, 0x3121}, //6796 #BOPOMOFO LETTER OU
   {0xA8E2, 0x3122}, //6797 #BOPOMOFO LETTER AN
   {0xA8E3, 0x3123}, //6798 #BOPOMOFO LETTER EN
-  {0xA8E4, 0x3124}, //6799 #BOPOMOFO LETTER ANG
+  {0xA8E4, 0x3124}, //6799 #BOPOMOFO LETTER ANG  //#spellok
   {0xA8E5, 0x3125}, //6800 #BOPOMOFO LETTER ENG
   {0xA8E6, 0x3126}, //6801 #BOPOMOFO LETTER ER
   {0xA8E7, 0x3127}, //6802 #BOPOMOFO LETTER I
@@ -15821,7 +15821,7 @@ static const int DRW_DoubleTable936[][2] =
   {0xDAEA, 0x9649}, //15669 #CJK UNIFIED IDEOGRAPH
   {0xDAEB, 0x9654}, //15670 #CJK UNIFIED IDEOGRAPH
   {0xDAEC, 0x965F}, //15671 #CJK UNIFIED IDEOGRAPH
-  {0xDAED, 0x9667}, //15672 #CJK UNIFIED IDEOGRAPH
+  {0xDAED, 0x9667}, //15672 #CJK UNIFIED IDEOGRAPH  //#spellok
   {0xDAEE, 0x966C}, //15673 #CJK UNIFIED IDEOGRAPH
   {0xDAEF, 0x9672}, //15674 #CJK UNIFIED IDEOGRAPH
   {0xDAF0, 0x9674}, //15675 #CJK UNIFIED IDEOGRAPH

src/app/dwg/libdxfrw/intern/drw_cptable949.h

@@ -5,7 +5,7 @@
 
 //first entry in this table are 0x80
 #define CPOFFSET949 0x80
-#define CPLENGHT949 17048
+#define CPLENGTH949 17048
 #define NOTFOUND949 0x003F
 
 //Table 949 one byte
@@ -480,7 +480,7 @@ static const int DRW_DoubleTable949[][2] =
   {0x82E3, 0xADD9}, //329 #HANGUL SYLLABLE KIYEOK WI THIEUTH
   {0x82E4, 0xADDA}, //330 #HANGUL SYLLABLE KIYEOK WI PHIEUPH
   {0x82E5, 0xADDB}, //331 #HANGUL SYLLABLE KIYEOK WI HIEUH
-  {0x82E6, 0xADDD}, //332 #HANGUL SYLLABLE KIYEOK YU KIYEOK
+  {0x82E6, 0xADDD}, //332 #HANGUL SYLLABLE KIYEOK YU KIYEOK  //#spellok
   {0x82E7, 0xADDE}, //333 #HANGUL SYLLABLE KIYEOK YU SSANGKIYEOK
   {0x82E8, 0xADDF}, //334 #HANGUL SYLLABLE KIYEOK YU KIYEOKSIOS
   {0x82E9, 0xADE1}, //335 #HANGUL SYLLABLE KIYEOK YU NIEUNCIEUC
@@ -13889,7 +13889,7 @@ static const int DRW_DoubleTable949[][2] =
   {0xDAEA, 0x6CEE}, //13738 #CJK UNIFIED IDEOGRAPH
   {0xDAEB, 0x6F58}, //13739 #CJK UNIFIED IDEOGRAPH
   {0xDAEC, 0x73ED}, //13740 #CJK UNIFIED IDEOGRAPH
-  {0xDAED, 0x7554}, //13741 #CJK UNIFIED IDEOGRAPH
+  {0xDAED, 0x7554}, //13741 #CJK UNIFIED IDEOGRAPH  //#spellok
   {0xDAEE, 0x7622}, //13742 #CJK UNIFIED IDEOGRAPH
   {0xDAEF, 0x76E4}, //13743 #CJK UNIFIED IDEOGRAPH
   {0xDAF0, 0x76FC}, //13744 #CJK UNIFIED IDEOGRAPH

src/app/dwg/libdxfrw/intern/drw_cptable950.h

@@ -5,7 +5,7 @@
 
 //first entry in this table are 0x80
 #define CPOFFSET950 0x80
-#define CPLENGHT950 13503
+#define CPLENGTH950 13503
 #define NOTFOUND950 0x003F
 
 //Table 950 one byte
@@ -546,7 +546,7 @@ static const int DRW_DoubleTable950[][2] =
   {0xA3B2, 0x3121}, //395 #BOPOMOFO LETTER OU
   {0xA3B3, 0x3122}, //396 #BOPOMOFO LETTER AN
   {0xA3B4, 0x3123}, //397 #BOPOMOFO LETTER EN
-  {0xA3B5, 0x3124}, //398 #BOPOMOFO LETTER ANG
+  {0xA3B5, 0x3124}, //398 #BOPOMOFO LETTER ANG  //#spellok
   {0xA3B6, 0x3125}, //399 #BOPOMOFO LETTER ENG
   {0xA3B7, 0x3126}, //400 #BOPOMOFO LETTER ER
   {0xA3B8, 0x3127}, //401 #BOPOMOFO LETTER I
@@ -2094,7 +2094,7 @@ static const int DRW_DoubleTable950[][2] =
   {0xADDA, 0x4FFE}, //1943 #CJK UNIFIED IDEOGRAPH
   {0xADDB, 0x502B}, //1944 #CJK UNIFIED IDEOGRAPH
   {0xADDC, 0x5009}, //1945 #CJK UNIFIED IDEOGRAPH
-  {0xADDD, 0x517C}, //1946 #CJK UNIFIED IDEOGRAPH
+  {0xADDD, 0x517C}, //1946 #CJK UNIFIED IDEOGRAPH  //#spellok
   {0xADDE, 0x51A4}, //1947 #CJK UNIFIED IDEOGRAPH
   {0xADDF, 0x51A5}, //1948 #CJK UNIFIED IDEOGRAPH
   {0xADE0, 0x51A2}, //1949 #CJK UNIFIED IDEOGRAPH
@@ -8767,7 +8767,7 @@ static const int DRW_DoubleTable950[][2] =
   {0xDAEA, 0x7CA1}, //8616 #CJK UNIFIED IDEOGRAPH
   {0xDAEB, 0x7D58}, //8617 #CJK UNIFIED IDEOGRAPH
   {0xDAEC, 0x7D6F}, //8618 #CJK UNIFIED IDEOGRAPH
-  {0xDAED, 0x7D63}, //8619 #CJK UNIFIED IDEOGRAPH
+  {0xDAED, 0x7D63}, //8619 #CJK UNIFIED IDEOGRAPH  //#spellok
   {0xDAEE, 0x7D53}, //8620 #CJK UNIFIED IDEOGRAPH
   {0xDAEF, 0x7D56}, //8621 #CJK UNIFIED IDEOGRAPH
   {0xDAF0, 0x7D67}, //8622 #CJK UNIFIED IDEOGRAPH

src/app/dwg/libdxfrw/intern/drw_cptables.h

@@ -3,7 +3,7 @@
 
 //first entry in all tables are 0x80
 #define CPOFFSET 0x80
-#define CPLENGHTCOMMON 128
+#define CPLENGTHCOMMON 128
 
 //Table 874
 static const int DRW_Table874[] =
@@ -85,7 +85,7 @@ static const int DRW_Table874[] =
   0x0E2A, //75 #THAI CHARACTER SO SUA
   0x0E2B, //76 #THAI CHARACTER HO HIP
   0x0E2C, //77 #THAI CHARACTER LO CHULA
-  0x0E2D, //78 #THAI CHARACTER O ANG
+  0x0E2D, //78 #THAI CHARACTER O ANG  //#spellok
   0x0E2E, //79 #THAI CHARACTER HO NOKHUK
   0x0E2F, //80 #THAI CHARACTER PAIYANNOI
   0x0E30, //81 #THAI CHARACTER SARA A
@@ -1014,8 +1014,8 @@ static const int DRW_Table1256[] =
   0x0626, //71 #ARABIC LETTER YEH WITH HAMZA ABOVE
   0x0627, //72 #ARABIC LETTER ALEF
   0x0628, //73 #ARABIC LETTER BEH
-  0x0629, //74 #ARABIC LETTER TEH MARBUTA
-  0x062A, //75 #ARABIC LETTER TEH
+  0x0629, //74 #ARABIC LETTER TEH MARBUTA  //#spellok
+  0x062A, //75 #ARABIC LETTER TEH  //#spellok
   0x062B, //76 #ARABIC LETTER THEH
   0x062C, //77 #ARABIC LETTER JEEM
   0x062D, //78 #ARABIC LETTER HAH