Fix inadvertent "TQ" changes.

17 files changed, 80 insertions, 80 deletions

diff --git a/doc/Scintilla/ScintillaDoc.html b/doc/Scintilla/ScintillaDoc.html
index 0c6177a..3767b3b 100755
--- a/doc/Scintilla/ScintillaDoc.html
+++ b/doc/Scintilla/ScintillaDoc.html
@@ -2370,10 +2370,10 @@ struct TextToFind {
     20 Windows system colours.</p>
 
     <p>To see an example of how to enable palette support in Scintilla, search the text of SciTE
-    for <code>WM_PALETTECHANGED</code>, <code>WM_TQUERYNEWPALETTE</code> and
+    for <code>WM_PALETTECHANGED</code>, <code>WM_QUERYNEWPALETTE</code> and
     <code>SCI_SETUSEPALETTE</code>. The Windows messages to forward are:<br />
      <code>WM_SYSCOLORCHANGE</code>, <code>WM_PALETTECHANGED</code>,
-    <code>WM_TQUERYNEWPALETTE</code> (should return <code>TRUE</code>).</p>
+    <code>WM_QUERYNEWPALETTE</code> (should return <code>TRUE</code>).</p>
 
     <p>To forward a message <code>(WM_XXXX, WPARAM, LPARAM)</code> to Scintilla, you can use
     <code>SendMessage(hScintilla, WM_XXXX, WPARAM, LPARAM)</code> where <code>hScintilla</code> is
@@ -2935,7 +2935,7 @@ struct TextToFind {
         </tr>
 
         <tr>
-          <td align="left"><code>INDIC_STQUIGGLE</code></td>
+          <td align="left"><code>INDIC_SQUIGGLE</code></td>
 
           <td align="center">1</td>
 
@@ -2994,7 +2994,7 @@ struct TextToFind {
     </table>
 
     <p>The default indicator styles are equivalent to:<br />
-     <code>SCI_INDICSETSTYLE(0, INDIC_STQUIGGLE);</code><br />
+     <code>SCI_INDICSETSTYLE(0, INDIC_SQUIGGLE);</code><br />
      <code>SCI_INDICSETSTYLE(1, INDIC_TT);</code><br />
      <code>SCI_INDICSETSTYLE(2, INDIC_PLAIN);</code></p>
 
diff --git a/doc/html/classQextScintilla-members.html b/doc/html/classQextScintilla-members.html
index 90ed520..eefb9ec 100644
--- a/doc/html/classQextScintilla-members.html
+++ b/doc/html/classQextScintilla-members.html
@@ -119,7 +119,7 @@
   <tr bgcolor="#f0f0f0"><td><b>INDIC_MAX</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
   <tr bgcolor="#f0f0f0"><td><b>INDIC_PLAIN</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
   <tr bgcolor="#f0f0f0"><td><b>INDIC_ROUNDBOX</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
-  <tr bgcolor="#f0f0f0"><td><b>INDIC_STQUIGGLE</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
+  <tr bgcolor="#f0f0f0"><td><b>INDIC_SQUIGGLE</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
   <tr bgcolor="#f0f0f0"><td><b>INDIC_STRIKE</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
   <tr bgcolor="#f0f0f0"><td><b>INDIC_TT</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
   <tr bgcolor="#f0f0f0"><td><b>INDICS_MASK</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
diff --git a/doc/html/classQextScintillaBase-members.html b/doc/html/classQextScintillaBase-members.html
index 4983d70..8ad3068 100644
--- a/doc/html/classQextScintillaBase-members.html
+++ b/doc/html/classQextScintillaBase-members.html
@@ -38,7 +38,7 @@
   <tr bgcolor="#f0f0f0"><td><b>INDIC_MAX</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
   <tr bgcolor="#f0f0f0"><td><b>INDIC_PLAIN</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
   <tr bgcolor="#f0f0f0"><td><b>INDIC_ROUNDBOX</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
-  <tr bgcolor="#f0f0f0"><td><b>INDIC_STQUIGGLE</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
+  <tr bgcolor="#f0f0f0"><td><b>INDIC_SQUIGGLE</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
   <tr bgcolor="#f0f0f0"><td><b>INDIC_STRIKE</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
   <tr bgcolor="#f0f0f0"><td><b>INDIC_TT</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
   <tr bgcolor="#f0f0f0"><td><b>INDICS_MASK</b> enum value (defined in <a class="el" href="classQextScintillaBase.html">QextScintillaBase</a>)</td><td><a class="el" href="classQextScintillaBase.html">QextScintillaBase</a></td><td></td></tr>
diff --git a/doc/html/classQextScintillaBase.html b/doc/html/classQextScintillaBase.html
index d6e700d..c4cf43b 100644
--- a/doc/html/classQextScintillaBase.html
+++ b/doc/html/classQextScintillaBase.html
@@ -1019,8 +1019,8 @@ Inherited by <a class="el" href="classQextScintilla.html">QextScintilla</a>.
 <b>INDIC_MAX</b> = 7
 <li><a class="anchor" name="f0ac599400a5a4c4e87bcc6f3a5e46e99964f1af8196517a968b650be288dec6"></a><!-- doxytag: member="QextScintillaBase::INDIC_PLAIN" ref="f0ac599400a5a4c4e87bcc6f3a5e46e99964f1af8196517a968b650be288dec6" args="" -->
 <b>INDIC_PLAIN</b> = 0
-<li><a class="anchor" name="f0ac599400a5a4c4e87bcc6f3a5e46e98b45e209c4c10f8a9000367b8362ae32"></a><!-- doxytag: member="QextScintillaBase::INDIC_STQUIGGLE" ref="f0ac599400a5a4c4e87bcc6f3a5e46e98b45e209c4c10f8a9000367b8362ae32" args="" -->
-<b>INDIC_STQUIGGLE</b> = 1
+<li><a class="anchor" name="f0ac599400a5a4c4e87bcc6f3a5e46e98b45e209c4c10f8a9000367b8362ae32"></a><!-- doxytag: member="QextScintillaBase::INDIC_SQUIGGLE" ref="f0ac599400a5a4c4e87bcc6f3a5e46e98b45e209c4c10f8a9000367b8362ae32" args="" -->
+<b>INDIC_SQUIGGLE</b> = 1
 <li><a class="anchor" name="f0ac599400a5a4c4e87bcc6f3a5e46e9058cdeeca5dc565e845e8e30003b0b2c"></a><!-- doxytag: member="QextScintillaBase::INDIC_TT" ref="f0ac599400a5a4c4e87bcc6f3a5e46e9058cdeeca5dc565e845e8e30003b0b2c" args="" -->
 <b>INDIC_TT</b> = 2
 <li><a class="anchor" name="f0ac599400a5a4c4e87bcc6f3a5e46e98e0b41acd0deff611a66050b0c1bfec2"></a><!-- doxytag: member="QextScintillaBase::INDIC_DIAGONAL" ref="f0ac599400a5a4c4e87bcc6f3a5e46e98e0b41acd0deff611a66050b0c1bfec2" args="" -->
@@ -1997,7 +1997,7 @@ Inherited by <a class="el" href="classQextScintilla.html">QextScintilla</a>.
 <li>enum { <br>
 &nbsp;&nbsp;<b>INDIC_MAX</b> =  7, 
 <b>INDIC_PLAIN</b> =  0, 
-<b>INDIC_STQUIGGLE</b> =  1, 
+<b>INDIC_SQUIGGLE</b> =  1, 
 <br>
 &nbsp;&nbsp;<b>INDIC_TT</b> =  2, 
 <b>INDIC_DIAGONAL</b> =  3, 
diff --git a/include/SciLexer.h b/include/SciLexer.h
index 4c9d912..22d016d 100755
--- a/include/SciLexer.h
+++ b/include/SciLexer.h
@@ -132,8 +132,8 @@
 #define SCE_TCL_COMMENT 1
 #define SCE_TCL_COMMENTLINE 2
 #define SCE_TCL_NUMBER 3
-#define SCE_TCL_WORD_IN_TQUOTE 4
-#define SCE_TCL_IN_TQUOTE 5
+#define SCE_TCL_WORD_IN_QUOTE 4
+#define SCE_TCL_IN_QUOTE 5
 #define SCE_TCL_OPERATOR 6
 #define SCE_TCL_IDENTIFIER 7
 #define SCE_TCL_SUBSTITUTION 8
@@ -280,7 +280,7 @@
 #define SCE_PL_VARIABLE_INDEXER 16
 #define SCE_PL_REGEX 17
 #define SCE_PL_REGSUBST 18
-#define SCE_PL_LONGTQUOTE 19
+#define SCE_PL_LONGQUOTE 19
 #define SCE_PL_BACKTICKS 20
 #define SCE_PL_DATASECTION 21
 #define SCE_PL_HERE_DELIM 22
@@ -520,7 +520,7 @@
 #define SCE_MATLAB_STRING 5
 #define SCE_MATLAB_OPERATOR 6
 #define SCE_MATLAB_IDENTIFIER 7
-#define SCE_MATLAB_DOUBLETQUOTESTRING 8
+#define SCE_MATLAB_DOUBLEQUOTESTRING 8
 #define SCE_SCRIPTOL_DEFAULT 0
 #define SCE_SCRIPTOL_WHITE 1
 #define SCE_SCRIPTOL_COMMENTLINE 2
@@ -691,7 +691,7 @@
 #define SCE_CLW_BUILTIN_PROCEDURES_FUNCTION 11
 #define SCE_CLW_STRUCTURE_DATA_TYPE 12
 #define SCE_CLW_ATTRIBUTE 13
-#define SCE_CLW_STANDARD_ETQUATE 14
+#define SCE_CLW_STANDARD_EQUATE 14
 #define SCE_CLW_ERROR 15
 #define SCE_CLW_DEPRECATED 16
 #define SCE_LOT_DEFAULT 0
@@ -933,7 +933,7 @@
 #define SCE_REBOL_PREFACE 3
 #define SCE_REBOL_OPERATOR 4
 #define SCE_REBOL_CHARACTER 5
-#define SCE_REBOL_TQUOTEDSTRING 6
+#define SCE_REBOL_QUOTEDSTRING 6
 #define SCE_REBOL_BRACEDSTRING 7
 #define SCE_REBOL_NUMBER 8
 #define SCE_REBOL_PAIR 9
@@ -977,7 +977,7 @@
 #define SCE_SQL_USER2 20
 #define SCE_SQL_USER3 21
 #define SCE_SQL_USER4 22
-#define SCE_SQL_TQUOTEDIDENTIFIER 23
+#define SCE_SQL_QUOTEDIDENTIFIER 23
 #define SCE_ST_DEFAULT 0
 #define SCE_ST_STRING 1
 #define SCE_ST_NUMBER 2
diff --git a/include/Scintilla.h b/include/Scintilla.h
index ffb1ffa..426c8d4 100755
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -214,7 +214,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_ENDUNDOACTION 2079
 #define INDIC_MAX 7
 #define INDIC_PLAIN 0
-#define INDIC_STQUIGGLE 1
+#define INDIC_SQUIGGLE 1
 #define INDIC_TT 2
 #define INDIC_DIAGONAL 3
 #define INDIC_STRIKE 4
diff --git a/qt/qextscintillabase.h b/qt/qextscintillabase.h
index fea745d..8936bf0 100644
--- a/qt/qextscintillabase.h
+++ b/qt/qextscintillabase.h
@@ -1773,7 +1773,7 @@ public:
 	{
 		INDIC_MAX = 7,
 		INDIC_PLAIN = 0,
-		INDIC_STQUIGGLE = 1,
+		INDIC_SQUIGGLE = 1,
 		INDIC_TT = 2,
 		INDIC_DIAGONAL = 3,
 		INDIC_STRIKE = 4,
diff --git a/src/Indicator.cpp b/src/Indicator.cpp
index de321a0..7624a4a 100755
--- a/src/Indicator.cpp
+++ b/src/Indicator.cpp
@@ -13,7 +13,7 @@
 void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine) {
 	surface->PenColour(fore.allocated);
 	int ymid = (rc.bottom + rc.top) / 2;
-	if (style == INDIC_STQUIGGLE) {
+	if (style == INDIC_SQUIGGLE) {
 		surface->MoveTo(rc.left, rc.top);
 		int x = rc.left + 2;
 		int y = 2;
diff --git a/src/LexCLW.cpp b/src/LexCLW.cpp
index 5bacdb6..e28e4b1 100755
--- a/src/LexCLW.cpp
+++ b/src/LexCLW.cpp
@@ -277,7 +277,7 @@ static void ColouriseClarionDoc(unsigned int uiStartPos, int iLength, int iInitS
 				// If statement string is in the equate list
 				if (wlStandardEquates.InList(cEquate)) {
 					// Change to equate state
-					scDoc.ChangeState(SCE_CLW_STANDARD_ETQUATE);
+					scDoc.ChangeState(SCE_CLW_STANDARD_EQUATE);
 				}
 			}
 			// If the character is not a valid label character
@@ -322,7 +322,7 @@ static void ColouriseClarionDoc(unsigned int uiStartPos, int iLength, int iInitS
 				// Else if statement string is in the standard equate keyword list
 				else if (wlStandardEquates.InList(cStatement)) {
 					// Change the statement string to the standard equate state
-					scDoc.ChangeState(SCE_CLW_STANDARD_ETQUATE);
+					scDoc.ChangeState(SCE_CLW_STANDARD_EQUATE);
 				}
 				// Else if statement string is in the deprecated or legacy keyword list
 				else if (wlLegacyStatements.InList(cStatement)) {
@@ -380,7 +380,7 @@ static void ColouriseClarionDoc(unsigned int uiStartPos, int iLength, int iInitS
 			}
 		}
 		// Standard Equate State Handling
-		else if (scDoc.state == SCE_CLW_STANDARD_ETQUATE) {
+		else if (scDoc.state == SCE_CLW_STANDARD_EQUATE) {
 			if (!isalnum(scDoc.ch)) {
 				scDoc.SetState(SCE_CLW_DEFAULT);
 			}
diff --git a/src/LexCaml.cpp b/src/LexCaml.cpp
index 4c5ac4a..5f4fad5 100644
--- a/src/LexCaml.cpp
+++ b/src/LexCaml.cpp
@@ -355,7 +355,7 @@ void ColouriseCamlDoc(
 				else
 					state2 = SCE_CAML_DEFAULT;
 				chColor++;
-			// enable "magic" (read-only) comment AS RETQUIRED
+			// enable "magic" (read-only) comment AS REQUIRED
 			} else if (useMagic && sc.currentPos - chToken == 4
 				&& sc.Match('c') && sc.chPrev == 'r' && sc.GetRelative(-2) == '@')
 				sc.state |= 0x10;	// (switch to read-only comment style)
diff --git a/src/LexErlang.cpp b/src/LexErlang.cpp
index 633ea96..9444eb9 100755
--- a/src/LexErlang.cpp
+++ b/src/LexErlang.cpp
@@ -47,17 +47,17 @@ static int is_radix(int radix, int ch) {
 
 typedef enum {
    STATE_NULL,
-   ATOM_UNTQUOTED,
-   ATOM_TQUOTED,
+   ATOM_UNQUOTED,
+   ATOM_QUOTED,
    ATOM_FUN_NAME,
-   NODE_NAME_UNTQUOTED,
-   NODE_NAME_TQUOTED,
+   NODE_NAME_UNQUOTED,
+   NODE_NAME_QUOTED,
    MACRO_START,
-   MACRO_UNTQUOTED,
-   MACRO_TQUOTED,
+   MACRO_UNQUOTED,
+   MACRO_QUOTED,
    RECORD_START,
-   RECORD_UNTQUOTED,
-   RECORD_TQUOTED,
+   RECORD_UNQUOTED,
+   RECORD_QUOTED,
    NUMERAL_START,
    NUMERAL_SIGNED,
    NUMERAL_RADIX_LITERAL,
@@ -85,9 +85,9 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
          case STATE_NULL:
 				sc.SetState(SCE_ERLANG_DEFAULT);
             break;
-         case ATOM_UNTQUOTED:
+         case ATOM_UNQUOTED:
             if ( '@' == sc.ch ){
-               parse_state = NODE_NAME_UNTQUOTED;
+               parse_state = NODE_NAME_UNQUOTED;
             } else if ( !isalnum(sc.ch) && sc.ch != '_' ) {
                char s[100];
                sc.GetCurrent(s, sizeof(s));
@@ -106,9 +106,9 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
                }
             }
             break;
-         case ATOM_TQUOTED:
+         case ATOM_QUOTED:
             if ( '@' == sc.ch ){
-               parse_state = NODE_NAME_TQUOTED;
+               parse_state = NODE_NAME_QUOTED;
             } else if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
                sc.ChangeState(SCE_ERLANG_ATOM);
                sc.ForwardSetState(SCE_ERLANG_DEFAULT);
@@ -122,7 +122,7 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
                parse_state = STATE_NULL;
             }
             break;
-         case NODE_NAME_TQUOTED:
+         case NODE_NAME_QUOTED:
             if ( '@' == sc.ch ) {
                sc.SetState(SCE_ERLANG_DEFAULT);
                parse_state = STATE_NULL;
@@ -132,7 +132,7 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
                parse_state = STATE_NULL;
             }
             break;
-         case NODE_NAME_UNTQUOTED:
+         case NODE_NAME_UNQUOTED:
             if ( '@' == sc.ch ) {
                sc.SetState(SCE_ERLANG_DEFAULT);
                parse_state = STATE_NULL;
@@ -144,22 +144,22 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
             break;
          case RECORD_START:
             if ( '\'' == sc.ch ) {
-               parse_state = RECORD_TQUOTED;
+               parse_state = RECORD_QUOTED;
             } else if (isalpha(sc.ch) && islower(sc.ch)) {
-               parse_state = RECORD_UNTQUOTED;
+               parse_state = RECORD_UNQUOTED;
             } else { // error
                sc.SetState(SCE_ERLANG_DEFAULT);
                parse_state = STATE_NULL;
             }
             break;
-         case RECORD_TQUOTED:
+         case RECORD_QUOTED:
             if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
                sc.ChangeState(SCE_ERLANG_RECORD);
                sc.ForwardSetState(SCE_ERLANG_DEFAULT);
                parse_state = STATE_NULL;
             }
             break;
-         case RECORD_UNTQUOTED:
+         case RECORD_UNQUOTED:
             if ( !isalpha(sc.ch) && '_' != sc.ch ) {
                sc.ChangeState(SCE_ERLANG_RECORD);
                sc.SetState(SCE_ERLANG_DEFAULT);
@@ -168,22 +168,22 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
             break;
          case MACRO_START:
             if ( '\'' == sc.ch ) {
-               parse_state = MACRO_TQUOTED;
+               parse_state = MACRO_QUOTED;
             } else if (isalpha(sc.ch)) {
-               parse_state = MACRO_UNTQUOTED;
+               parse_state = MACRO_UNQUOTED;
             } else { // error
                sc.SetState(SCE_ERLANG_DEFAULT);
                parse_state = STATE_NULL;
             }
             break;
-         case MACRO_UNTQUOTED:
+         case MACRO_UNQUOTED:
             if ( !isalpha(sc.ch) && '_' != sc.ch ) {
                sc.ChangeState(SCE_ERLANG_MACRO);
                sc.SetState(SCE_ERLANG_DEFAULT);
                parse_state = STATE_NULL;
             }
             break;
-         case MACRO_TQUOTED:
+         case MACRO_QUOTED:
             if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
                sc.ChangeState(SCE_ERLANG_MACRO);
                sc.ForwardSetState(SCE_ERLANG_DEFAULT);
@@ -327,7 +327,7 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
          } else if (sc.ch == '$') {
 				sc.SetState(SCE_ERLANG_CHARACTER);
          } else if (sc.ch == '\'') {
-            parse_state = ATOM_TQUOTED;
+            parse_state = ATOM_QUOTED;
 				sc.SetState(SCE_ERLANG_UNKNOWN);
 			} else if ( isdigit(sc.ch) ) {
             parse_state = NUMERAL_START;
@@ -339,7 +339,7 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
 			} else if (isalpha(sc.ch) && isupper(sc.ch)) {
 				sc.SetState(SCE_ERLANG_VARIABLE);
 			} else if (isalpha(sc.ch)) {
-            parse_state = ATOM_UNTQUOTED;
+            parse_state = ATOM_UNQUOTED;
 				sc.SetState(SCE_ERLANG_UNKNOWN);
 			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '\\') {
 				sc.SetState(SCE_ERLANG_OPERATOR);
diff --git a/src/LexMatlab.cpp b/src/LexMatlab.cpp
index 79b4101..249fa67 100755
--- a/src/LexMatlab.cpp
+++ b/src/LexMatlab.cpp
@@ -103,7 +103,7 @@ static void ColouriseMatlabOctaveDoc(
 			if (sc.ch == '\'' && sc.chPrev != '\\') {
 				sc.ForwardSetState(SCE_MATLAB_DEFAULT);
 			}
-		} else if (sc.state == SCE_MATLAB_DOUBLETQUOTESTRING) {
+		} else if (sc.state == SCE_MATLAB_DOUBLEQUOTESTRING) {
 			if (sc.ch == '"' && sc.chPrev != '\\') {
 				sc.ForwardSetState(SCE_MATLAB_DEFAULT);
 			}
@@ -126,7 +126,7 @@ static void ColouriseMatlabOctaveDoc(
 					sc.SetState(SCE_MATLAB_STRING);
 				}
 			} else if (sc.ch == '"') {
-              sc.SetState(SCE_MATLAB_DOUBLETQUOTESTRING);
+              sc.SetState(SCE_MATLAB_DOUBLEQUOTESTRING);
 			} else if (isdigit(sc.ch) || (sc.ch == '.' && isdigit(sc.chNext))) {
 				sc.SetState(SCE_MATLAB_NUMBER);
 			} else if (isalpha(sc.ch)) {
diff --git a/src/LexRebol.cpp b/src/LexRebol.cpp
index 79d194a..f829c1e 100644
--- a/src/LexRebol.cpp
+++ b/src/LexRebol.cpp
@@ -190,7 +190,7 @@ static void ColouriseRebolDoc(unsigned int startPos, int length, int initStyle,
 		}
 
 		//--- Determine if the current state should terminate
-		if (sc.state == SCE_REBOL_TQUOTEDSTRING || sc.state == SCE_REBOL_CHARACTER) {
+		if (sc.state == SCE_REBOL_QUOTEDSTRING || sc.state == SCE_REBOL_CHARACTER) {
 			if (sc.ch == '^' && sc.chNext == '\"') {
 				sc.Forward();
 			} else if (sc.ch == '\"') {
@@ -243,7 +243,7 @@ static void ColouriseRebolDoc(unsigned int startPos, int length, int initStyle,
 				dotCount = 0;
 				sc.SetState(SCE_REBOL_NUMBER);
 			} else if (sc.ch == '\"') {
-				sc.SetState(SCE_REBOL_TQUOTEDSTRING);
+				sc.SetState(SCE_REBOL_QUOTEDSTRING);
 			} else if (sc.ch == '{') {
 				sc.SetState(blockComment ? SCE_REBOL_COMMENTBLOCK : SCE_REBOL_BRACEDSTRING);
 				++stringLevel;
diff --git a/src/LexSQL.cpp b/src/LexSQL.cpp
index f5d3598..d8e14b9 100755
--- a/src/LexSQL.cpp
+++ b/src/LexSQL.cpp
@@ -100,7 +100,7 @@ static void ColouriseSQLDoc(unsigned int startPos, int length, int initStyle, Wo
 				sc.SetState(nextState);
 			}
 			break;
-		case SCE_SQL_TQUOTEDIDENTIFIER:
+		case SCE_SQL_QUOTEDIDENTIFIER:
 			if (sc.ch == 0x60) {
 				if (sc.chNext == 0x60) {
 					sc.Forward();	// Ignore it
@@ -181,7 +181,7 @@ static void ColouriseSQLDoc(unsigned int startPos, int length, int initStyle, Wo
 			} else if (IsAWordStart(sc.ch)) {
 				sc.SetState(SCE_SQL_IDENTIFIER);
 			} else if (sc.ch == 0x60 && sqlBackticksIdentifier) {
-				sc.SetState(SCE_SQL_TQUOTEDIDENTIFIER);
+				sc.SetState(SCE_SQL_QUOTEDIDENTIFIER);
 			} else if (sc.Match('/', '*')) {
 				if (sc.Match("/**") || sc.Match("/*!")) {	// Support of Doxygen doc. style
 					sc.SetState(SCE_SQL_COMMENTDOC);
diff --git a/src/LexTADS3.cpp b/src/LexTADS3.cpp
index 03a4074..9938f63 100644
--- a/src/LexTADS3.cpp
+++ b/src/LexTADS3.cpp
@@ -50,7 +50,7 @@
 #include "Scintilla.h"
 #include "SciLexer.h"
 
-static const int T3_SINGLE_TQUOTE = 1;
+static const int T3_SINGLE_QUOTE = 1;
 static const int T3_INT_EXPRESSION = 2;
 
 static inline bool IsEOL(const int ch, const int chNext) {
@@ -106,7 +106,7 @@ static void ColouriseTADSHTMLString(StyleContext &sc, int &lineState) {
 	int endState = sc.state;
 	int chQuote = sc.ch;
 	if (endState == SCE_T3_HTML_STRING) {
-		if (lineState&T3_SINGLE_TQUOTE) {
+		if (lineState&T3_SINGLE_QUOTE) {
 			endState = SCE_T3_S_STRING;
 			chQuote = '"';
 		} else if (lineState&T3_INT_EXPRESSION) {
@@ -171,7 +171,7 @@ static void ColouriseTADS3HTMLTag(StyleContext &sc, int &lineState) {
 			sc.SetState(SCE_T3_HTML_DEFAULT);
 			break;
 		case SCE_T3_HTML_DEFAULT:
-			if (lineState&T3_SINGLE_TQUOTE) {
+			if (lineState&T3_SINGLE_QUOTE) {
 				endState = SCE_T3_S_STRING;
 				chQuote = '\'';
 				chString = '"';
@@ -261,7 +261,7 @@ static void ColouriseTADS3MsgParam(StyleContext &sc, int &lineState) {
 			sc.Forward();
 			break;
 		case SCE_T3_MSG_PARAM:
-			if (lineState&T3_SINGLE_TQUOTE) {
+			if (lineState&T3_SINGLE_QUOTE) {
 				endState = SCE_T3_S_STRING;
 				chQuote = '\'';
 			} else if (lineState&T3_INT_EXPRESSION) {
@@ -301,7 +301,7 @@ static void ColouriseTADS3LibDirective(StyleContext &sc, int &lineState) {
 			sc.Forward(2);
 			break;
 		case SCE_T3_LIB_DIRECTIVE:
-			if (lineState&T3_SINGLE_TQUOTE) {
+			if (lineState&T3_SINGLE_QUOTE) {
 				initState = SCE_T3_S_STRING;
 				chQuote = '\'';
 			} else {
@@ -337,10 +337,10 @@ static void ColouriseTADS3String(StyleContext &sc, int &lineState) {
 				} else {
 					sc.SetState(SCE_T3_X_STRING);
 				}
-				lineState &= ~T3_SINGLE_TQUOTE;
+				lineState &= ~T3_SINGLE_QUOTE;
 			} else {
 				sc.SetState(SCE_T3_S_STRING);
-				lineState |= T3_SINGLE_TQUOTE;
+				lineState |= T3_SINGLE_QUOTE;
 			}
 			sc.Forward();
 			break;
@@ -528,7 +528,7 @@ static void ColouriseTADS3Doc(unsigned int startPos, int length, int initStyle,
 						   && sc.Match('>', '>')) {
 					sc.Forward(2);
 					sc.SetState(SCE_T3_D_STRING);
-					lineState &= ~(T3_SINGLE_TQUOTE|T3_INT_EXPRESSION);
+					lineState &= ~(T3_SINGLE_QUOTE|T3_INT_EXPRESSION);
 				} else if (IsATADS3Operator(sc.ch)) {
 					if (sc.state == SCE_T3_X_DEFAULT) {
 						if (sc.ch == '(') {
diff --git a/src/LexTCL.cpp b/src/LexTCL.cpp
index 4a651bc..c782141 100644
--- a/src/LexTCL.cpp
+++ b/src/LexTCL.cpp
@@ -43,7 +43,7 @@ static void ColouriseTCLDoc(unsigned int startPos, int length, int , WordList *k
 	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
 	bool commentLevel = false;
     bool subBrace = false; // substitution begin with a brace ${.....}
-	enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_TQUOTE, LS_COMMENT_BOX, LS_MASK_STATE = 0xf, 
+	enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_QUOTE, LS_COMMENT_BOX, LS_MASK_STATE = 0xf, 
         LS_COMMAND_EXPECTED = 16, LS_BRACE_ONLY = 32 } lineState = LS_DEFAULT;
 	bool prevSlash = false;
 	int currentLevel = 0;
@@ -89,8 +89,8 @@ next:
             sc.SetState(SCE_TCL_DEFAULT);
             if (lineState == LS_OPEN_COMMENT)
                 sc.SetState(SCE_TCL_COMMENTLINE);
-            else if (lineState == LS_OPEN_DOUBLE_TQUOTE)
-                sc.SetState(SCE_TCL_IN_TQUOTE);
+            else if (lineState == LS_OPEN_DOUBLE_QUOTE)
+                sc.SetState(SCE_TCL_IN_QUOTE);
             else if (lineState == LS_COMMENT_BOX && (sc.ch == '#' || (sc.ch == ' ' && sc.chNext=='#')))
                 sc.SetState(SCE_TCL_COMMENT_BOX);
             lineState = LS_DEFAULT;
@@ -144,16 +144,16 @@ next:
                     w[strlen(w)-1]=0;
                 while(*s == ':') // ignore leading : like in ::set a 10
                     ++s;
-                bool quote = sc.state == SCE_TCL_IN_TQUOTE;
+                bool quote = sc.state == SCE_TCL_IN_QUOTE;
                 if (commentLevel  || expected) {
                     if (keywords.InList(s)) {
-                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_TQUOTE : SCE_TCL_WORD);
+                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD);
                     } else if (keywords2.InList(s)) {
-                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_TQUOTE : SCE_TCL_WORD2);
+                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD2);
                     } else if (keywords3.InList(s)) {
-                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_TQUOTE : SCE_TCL_WORD3);
+                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD3);
                     } else if (keywords4.InList(s)) {
-                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_TQUOTE : SCE_TCL_WORD4);
+                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD4);
                     } else if (sc.GetRelative(-static_cast<int>(strlen(s))-1) == '{' &&
                         keywords5.InList(s) && sc.ch == '}') { // {keyword} exactly no spaces
                             sc.ChangeState(SCE_TCL_EXPAND);
@@ -169,7 +169,7 @@ next:
                     } 
                 }
                 expected = false;
-                sc.SetState(quote ? SCE_TCL_IN_TQUOTE : SCE_TCL_DEFAULT);
+                sc.SetState(quote ? SCE_TCL_IN_QUOTE : SCE_TCL_DEFAULT);
             } else if (sc.state == SCE_TCL_MODIFIER || sc.state == SCE_TCL_IDENTIFIER) {
                 sc.SetState(SCE_TCL_DEFAULT);
             }
@@ -199,8 +199,8 @@ next:
 			styler.SetLevel(currentLine, flag + previousLevel + SC_FOLDLEVELBASE + (currentLevel << 17) + (commentLevel << 16));
 
 			// Update the line state, so it can be seen by next line
-			if (sc.state == SCE_TCL_IN_TQUOTE)
-				lineState = LS_OPEN_DOUBLE_TQUOTE;
+			if (sc.state == SCE_TCL_IN_QUOTE)
+				lineState = LS_OPEN_DOUBLE_QUOTE;
 			else {
 			     if (prevSlash) {
 				    if (isComment(sc.state))
@@ -213,8 +213,8 @@ next:
                 (expected ? LS_COMMAND_EXPECTED : 0)  | lineState);
             if (lineState == LS_COMMENT_BOX)
                 sc.ForwardSetState(SCE_TCL_COMMENT_BOX);
-            else if (lineState == LS_OPEN_DOUBLE_TQUOTE)
-                sc.ForwardSetState(SCE_TCL_IN_TQUOTE);
+            else if (lineState == LS_OPEN_DOUBLE_QUOTE)
+                sc.ForwardSetState(SCE_TCL_IN_QUOTE);
             else
                 sc.ForwardSetState(SCE_TCL_DEFAULT);
 			prevSlash = false;
@@ -233,7 +233,7 @@ next:
             continue;
 		if (sc.atLineStart) {
 			visibleChars = false;
-			if (sc.state!=SCE_TCL_IN_TQUOTE && !isComment(sc.state))
+			if (sc.state!=SCE_TCL_IN_QUOTE && !isComment(sc.state))
             {
 				sc.SetState(SCE_TCL_DEFAULT);
                 expected = IsAWordStart(sc.ch)|| isspacechar(static_cast<unsigned char>(sc.ch));
@@ -245,7 +245,7 @@ next:
 			if (!IsANumberChar(sc.ch))
 				sc.SetState(SCE_TCL_DEFAULT);
 			break;
-		case SCE_TCL_IN_TQUOTE:
+		case SCE_TCL_IN_QUOTE:
 			if (sc.ch == '"') {
 				sc.ForwardSetState(SCE_TCL_DEFAULT);
 				visibleChars = true; // necessary if a " is the first and only character on a line
@@ -253,7 +253,7 @@ next:
 			} else if (sc.ch == '[' || sc.ch == ']' || sc.ch == '$') {
 				sc.SetState(SCE_TCL_OPERATOR);
                 expected = sc.ch == '[';
-                sc.ForwardSetState(SCE_TCL_IN_TQUOTE);
+                sc.ForwardSetState(SCE_TCL_IN_QUOTE);
 				goto next;
 			}
             continue;
@@ -264,7 +264,7 @@ next:
 
 		if (sc.ch == '#') {
 			if (visibleChars) {
-                if (sc.state != SCE_TCL_IN_TQUOTE && expected)
+                if (sc.state != SCE_TCL_IN_QUOTE && expected)
 					sc.SetState(SCE_TCL_COMMENT);
 			} else {
                 sc.SetState(SCE_TCL_COMMENTLINE);
@@ -293,7 +293,7 @@ next:
 			} else {
 				switch (sc.ch) {
 				case '\"':
-					sc.SetState(SCE_TCL_IN_TQUOTE);
+					sc.SetState(SCE_TCL_IN_QUOTE);
 					break;
 				case '{':
 					sc.SetState(SCE_TCL_OPERATOR);
diff --git a/src/ViewStyle.cpp b/src/ViewStyle.cpp
index 0ae93d4..b4da30a 100755
--- a/src/ViewStyle.cpp
+++ b/src/ViewStyle.cpp
@@ -124,7 +124,7 @@ void ViewStyle::Init() {
 	fontNames.Clear();
 	ResetDefaultStyle();
 
-	indicators[0].style = INDIC_STQUIGGLE;
+	indicators[0].style = INDIC_SQUIGGLE;
 	indicators[0].fore = ColourDesired(0, 0x7f, 0);
 	indicators[1].style = INDIC_TT;
 	indicators[1].fore = ColourDesired(0, 0, 0xff);