Browse Source

Fix inadvertent "TQ" changes.

tags/r14.0.0
Darrell Anderson 7 years ago
parent
commit
fd8d92656e

+ 4
- 4
doc/Scintilla/ScintillaDoc.html View File

@@ -2370,10 +2370,10 @@ struct TextToFind {
2370 2370
     20 Windows system colours.</p>
2371 2371
 
2372 2372
     <p>To see an example of how to enable palette support in Scintilla, search the text of SciTE
2373
-    for <code>WM_PALETTECHANGED</code>, <code>WM_TQUERYNEWPALETTE</code> and
2373
+    for <code>WM_PALETTECHANGED</code>, <code>WM_QUERYNEWPALETTE</code> and
2374 2374
     <code>SCI_SETUSEPALETTE</code>. The Windows messages to forward are:<br />
2375 2375
      <code>WM_SYSCOLORCHANGE</code>, <code>WM_PALETTECHANGED</code>,
2376
-    <code>WM_TQUERYNEWPALETTE</code> (should return <code>TRUE</code>).</p>
2376
+    <code>WM_QUERYNEWPALETTE</code> (should return <code>TRUE</code>).</p>
2377 2377
 
2378 2378
     <p>To forward a message <code>(WM_XXXX, WPARAM, LPARAM)</code> to Scintilla, you can use
2379 2379
     <code>SendMessage(hScintilla, WM_XXXX, WPARAM, LPARAM)</code> where <code>hScintilla</code> is
@@ -2935,7 +2935,7 @@ struct TextToFind {
2935 2935
         </tr>
2936 2936
 
2937 2937
         <tr>
2938
-          <td align="left"><code>INDIC_STQUIGGLE</code></td>
2938
+          <td align="left"><code>INDIC_SQUIGGLE</code></td>
2939 2939
 
2940 2940
           <td align="center">1</td>
2941 2941
 
@@ -2994,7 +2994,7 @@ struct TextToFind {
2994 2994
     </table>
2995 2995
 
2996 2996
     <p>The default indicator styles are equivalent to:<br />
2997
-     <code>SCI_INDICSETSTYLE(0, INDIC_STQUIGGLE);</code><br />
2997
+     <code>SCI_INDICSETSTYLE(0, INDIC_SQUIGGLE);</code><br />
2998 2998
      <code>SCI_INDICSETSTYLE(1, INDIC_TT);</code><br />
2999 2999
      <code>SCI_INDICSETSTYLE(2, INDIC_PLAIN);</code></p>
3000 3000
 

+ 1
- 1
doc/html/classQextScintilla-members.html View File

@@ -119,7 +119,7 @@
119 119
   <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>
120 120
   <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>
121 121
   <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>
122
-  <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>
122
+  <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>
123 123
   <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>
124 124
   <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>
125 125
   <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>

+ 1
- 1
doc/html/classQextScintillaBase-members.html View File

@@ -38,7 +38,7 @@
38 38
   <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>
39 39
   <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>
40 40
   <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>
41
-  <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>
41
+  <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>
42 42
   <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>
43 43
   <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>
44 44
   <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>

+ 3
- 3
doc/html/classQextScintillaBase.html View File

@@ -1019,8 +1019,8 @@ Inherited by <a class="el" href="classQextScintilla.html">QextScintilla</a>.
1019 1019
 <b>INDIC_MAX</b> = 7
1020 1020
 <li><a class="anchor" name="f0ac599400a5a4c4e87bcc6f3a5e46e99964f1af8196517a968b650be288dec6"></a><!-- doxytag: member="QextScintillaBase::INDIC_PLAIN" ref="f0ac599400a5a4c4e87bcc6f3a5e46e99964f1af8196517a968b650be288dec6" args="" -->
1021 1021
 <b>INDIC_PLAIN</b> = 0
1022
-<li><a class="anchor" name="f0ac599400a5a4c4e87bcc6f3a5e46e98b45e209c4c10f8a9000367b8362ae32"></a><!-- doxytag: member="QextScintillaBase::INDIC_STQUIGGLE" ref="f0ac599400a5a4c4e87bcc6f3a5e46e98b45e209c4c10f8a9000367b8362ae32" args="" -->
1023
-<b>INDIC_STQUIGGLE</b> = 1
1022
+<li><a class="anchor" name="f0ac599400a5a4c4e87bcc6f3a5e46e98b45e209c4c10f8a9000367b8362ae32"></a><!-- doxytag: member="QextScintillaBase::INDIC_SQUIGGLE" ref="f0ac599400a5a4c4e87bcc6f3a5e46e98b45e209c4c10f8a9000367b8362ae32" args="" -->
1023
+<b>INDIC_SQUIGGLE</b> = 1
1024 1024
 <li><a class="anchor" name="f0ac599400a5a4c4e87bcc6f3a5e46e9058cdeeca5dc565e845e8e30003b0b2c"></a><!-- doxytag: member="QextScintillaBase::INDIC_TT" ref="f0ac599400a5a4c4e87bcc6f3a5e46e9058cdeeca5dc565e845e8e30003b0b2c" args="" -->
1025 1025
 <b>INDIC_TT</b> = 2
1026 1026
 <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>.
1997 1997
 <li>enum { <br>
1998 1998
 &nbsp;&nbsp;<b>INDIC_MAX</b> =  7, 
1999 1999
 <b>INDIC_PLAIN</b> =  0, 
2000
-<b>INDIC_STQUIGGLE</b> =  1, 
2000
+<b>INDIC_SQUIGGLE</b> =  1, 
2001 2001
 <br>
2002 2002
 &nbsp;&nbsp;<b>INDIC_TT</b> =  2, 
2003 2003
 <b>INDIC_DIAGONAL</b> =  3, 

+ 7
- 7
include/SciLexer.h View File

@@ -132,8 +132,8 @@
132 132
 #define SCE_TCL_COMMENT 1
133 133
 #define SCE_TCL_COMMENTLINE 2
134 134
 #define SCE_TCL_NUMBER 3
135
-#define SCE_TCL_WORD_IN_TQUOTE 4
136
-#define SCE_TCL_IN_TQUOTE 5
135
+#define SCE_TCL_WORD_IN_QUOTE 4
136
+#define SCE_TCL_IN_QUOTE 5
137 137
 #define SCE_TCL_OPERATOR 6
138 138
 #define SCE_TCL_IDENTIFIER 7
139 139
 #define SCE_TCL_SUBSTITUTION 8
@@ -280,7 +280,7 @@
280 280
 #define SCE_PL_VARIABLE_INDEXER 16
281 281
 #define SCE_PL_REGEX 17
282 282
 #define SCE_PL_REGSUBST 18
283
-#define SCE_PL_LONGTQUOTE 19
283
+#define SCE_PL_LONGQUOTE 19
284 284
 #define SCE_PL_BACKTICKS 20
285 285
 #define SCE_PL_DATASECTION 21
286 286
 #define SCE_PL_HERE_DELIM 22
@@ -520,7 +520,7 @@
520 520
 #define SCE_MATLAB_STRING 5
521 521
 #define SCE_MATLAB_OPERATOR 6
522 522
 #define SCE_MATLAB_IDENTIFIER 7
523
-#define SCE_MATLAB_DOUBLETQUOTESTRING 8
523
+#define SCE_MATLAB_DOUBLEQUOTESTRING 8
524 524
 #define SCE_SCRIPTOL_DEFAULT 0
525 525
 #define SCE_SCRIPTOL_WHITE 1
526 526
 #define SCE_SCRIPTOL_COMMENTLINE 2
@@ -691,7 +691,7 @@
691 691
 #define SCE_CLW_BUILTIN_PROCEDURES_FUNCTION 11
692 692
 #define SCE_CLW_STRUCTURE_DATA_TYPE 12
693 693
 #define SCE_CLW_ATTRIBUTE 13
694
-#define SCE_CLW_STANDARD_ETQUATE 14
694
+#define SCE_CLW_STANDARD_EQUATE 14
695 695
 #define SCE_CLW_ERROR 15
696 696
 #define SCE_CLW_DEPRECATED 16
697 697
 #define SCE_LOT_DEFAULT 0
@@ -933,7 +933,7 @@
933 933
 #define SCE_REBOL_PREFACE 3
934 934
 #define SCE_REBOL_OPERATOR 4
935 935
 #define SCE_REBOL_CHARACTER 5
936
-#define SCE_REBOL_TQUOTEDSTRING 6
936
+#define SCE_REBOL_QUOTEDSTRING 6
937 937
 #define SCE_REBOL_BRACEDSTRING 7
938 938
 #define SCE_REBOL_NUMBER 8
939 939
 #define SCE_REBOL_PAIR 9
@@ -977,7 +977,7 @@
977 977
 #define SCE_SQL_USER2 20
978 978
 #define SCE_SQL_USER3 21
979 979
 #define SCE_SQL_USER4 22
980
-#define SCE_SQL_TQUOTEDIDENTIFIER 23
980
+#define SCE_SQL_QUOTEDIDENTIFIER 23
981 981
 #define SCE_ST_DEFAULT 0
982 982
 #define SCE_ST_STRING 1
983 983
 #define SCE_ST_NUMBER 2

+ 1
- 1
include/Scintilla.h View File

@@ -214,7 +214,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
214 214
 #define SCI_ENDUNDOACTION 2079
215 215
 #define INDIC_MAX 7
216 216
 #define INDIC_PLAIN 0
217
-#define INDIC_STQUIGGLE 1
217
+#define INDIC_SQUIGGLE 1
218 218
 #define INDIC_TT 2
219 219
 #define INDIC_DIAGONAL 3
220 220
 #define INDIC_STRIKE 4

+ 1
- 1
qt/qextscintillabase.h View File

@@ -1773,7 +1773,7 @@ public:
1773 1773
 	{
1774 1774
 		INDIC_MAX = 7,
1775 1775
 		INDIC_PLAIN = 0,
1776
-		INDIC_STQUIGGLE = 1,
1776
+		INDIC_SQUIGGLE = 1,
1777 1777
 		INDIC_TT = 2,
1778 1778
 		INDIC_DIAGONAL = 3,
1779 1779
 		INDIC_STRIKE = 4,

+ 1
- 1
src/Indicator.cpp View File

@@ -13,7 +13,7 @@
13 13
 void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine) {
14 14
 	surface->PenColour(fore.allocated);
15 15
 	int ymid = (rc.bottom + rc.top) / 2;
16
-	if (style == INDIC_STQUIGGLE) {
16
+	if (style == INDIC_SQUIGGLE) {
17 17
 		surface->MoveTo(rc.left, rc.top);
18 18
 		int x = rc.left + 2;
19 19
 		int y = 2;

+ 3
- 3
src/LexCLW.cpp View File

@@ -277,7 +277,7 @@ static void ColouriseClarionDoc(unsigned int uiStartPos, int iLength, int iInitS
277 277
 				// If statement string is in the equate list
278 278
 				if (wlStandardEquates.InList(cEquate)) {
279 279
 					// Change to equate state
280
-					scDoc.ChangeState(SCE_CLW_STANDARD_ETQUATE);
280
+					scDoc.ChangeState(SCE_CLW_STANDARD_EQUATE);
281 281
 				}
282 282
 			}
283 283
 			// If the character is not a valid label character
@@ -322,7 +322,7 @@ static void ColouriseClarionDoc(unsigned int uiStartPos, int iLength, int iInitS
322 322
 				// Else if statement string is in the standard equate keyword list
323 323
 				else if (wlStandardEquates.InList(cStatement)) {
324 324
 					// Change the statement string to the standard equate state
325
-					scDoc.ChangeState(SCE_CLW_STANDARD_ETQUATE);
325
+					scDoc.ChangeState(SCE_CLW_STANDARD_EQUATE);
326 326
 				}
327 327
 				// Else if statement string is in the deprecated or legacy keyword list
328 328
 				else if (wlLegacyStatements.InList(cStatement)) {
@@ -380,7 +380,7 @@ static void ColouriseClarionDoc(unsigned int uiStartPos, int iLength, int iInitS
380 380
 			}
381 381
 		}
382 382
 		// Standard Equate State Handling
383
-		else if (scDoc.state == SCE_CLW_STANDARD_ETQUATE) {
383
+		else if (scDoc.state == SCE_CLW_STANDARD_EQUATE) {
384 384
 			if (!isalnum(scDoc.ch)) {
385 385
 				scDoc.SetState(SCE_CLW_DEFAULT);
386 386
 			}

+ 1
- 1
src/LexCaml.cpp View File

@@ -355,7 +355,7 @@ void ColouriseCamlDoc(
355 355
 				else
356 356
 					state2 = SCE_CAML_DEFAULT;
357 357
 				chColor++;
358
-			// enable "magic" (read-only) comment AS RETQUIRED
358
+			// enable "magic" (read-only) comment AS REQUIRED
359 359
 			} else if (useMagic && sc.currentPos - chToken == 4
360 360
 				&& sc.Match('c') && sc.chPrev == 'r' && sc.GetRelative(-2) == '@')
361 361
 				sc.state |= 0x10;	// (switch to read-only comment style)

+ 24
- 24
src/LexErlang.cpp View File

@@ -47,17 +47,17 @@ static int is_radix(int radix, int ch) {
47 47
 
48 48
 typedef enum {
49 49
    STATE_NULL,
50
-   ATOM_UNTQUOTED,
51
-   ATOM_TQUOTED,
50
+   ATOM_UNQUOTED,
51
+   ATOM_QUOTED,
52 52
    ATOM_FUN_NAME,
53
-   NODE_NAME_UNTQUOTED,
54
-   NODE_NAME_TQUOTED,
53
+   NODE_NAME_UNQUOTED,
54
+   NODE_NAME_QUOTED,
55 55
    MACRO_START,
56
-   MACRO_UNTQUOTED,
57
-   MACRO_TQUOTED,
56
+   MACRO_UNQUOTED,
57
+   MACRO_QUOTED,
58 58
    RECORD_START,
59
-   RECORD_UNTQUOTED,
60
-   RECORD_TQUOTED,
59
+   RECORD_UNQUOTED,
60
+   RECORD_QUOTED,
61 61
    NUMERAL_START,
62 62
    NUMERAL_SIGNED,
63 63
    NUMERAL_RADIX_LITERAL,
@@ -85,9 +85,9 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
85 85
          case STATE_NULL:
86 86
 				sc.SetState(SCE_ERLANG_DEFAULT);
87 87
             break;
88
-         case ATOM_UNTQUOTED:
88
+         case ATOM_UNQUOTED:
89 89
             if ( '@' == sc.ch ){
90
-               parse_state = NODE_NAME_UNTQUOTED;
90
+               parse_state = NODE_NAME_UNQUOTED;
91 91
             } else if ( !isalnum(sc.ch) && sc.ch != '_' ) {
92 92
                char s[100];
93 93
                sc.GetCurrent(s, sizeof(s));
@@ -106,9 +106,9 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
106 106
                }
107 107
             }
108 108
             break;
109
-         case ATOM_TQUOTED:
109
+         case ATOM_QUOTED:
110 110
             if ( '@' == sc.ch ){
111
-               parse_state = NODE_NAME_TQUOTED;
111
+               parse_state = NODE_NAME_QUOTED;
112 112
             } else if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
113 113
                sc.ChangeState(SCE_ERLANG_ATOM);
114 114
                sc.ForwardSetState(SCE_ERLANG_DEFAULT);
@@ -122,7 +122,7 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
122 122
                parse_state = STATE_NULL;
123 123
             }
124 124
             break;
125
-         case NODE_NAME_TQUOTED:
125
+         case NODE_NAME_QUOTED:
126 126
             if ( '@' == sc.ch ) {
127 127
                sc.SetState(SCE_ERLANG_DEFAULT);
128 128
                parse_state = STATE_NULL;
@@ -132,7 +132,7 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
132 132
                parse_state = STATE_NULL;
133 133
             }
134 134
             break;
135
-         case NODE_NAME_UNTQUOTED:
135
+         case NODE_NAME_UNQUOTED:
136 136
             if ( '@' == sc.ch ) {
137 137
                sc.SetState(SCE_ERLANG_DEFAULT);
138 138
                parse_state = STATE_NULL;
@@ -144,22 +144,22 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
144 144
             break;
145 145
          case RECORD_START:
146 146
             if ( '\'' == sc.ch ) {
147
-               parse_state = RECORD_TQUOTED;
147
+               parse_state = RECORD_QUOTED;
148 148
             } else if (isalpha(sc.ch) && islower(sc.ch)) {
149
-               parse_state = RECORD_UNTQUOTED;
149
+               parse_state = RECORD_UNQUOTED;
150 150
             } else { // error
151 151
                sc.SetState(SCE_ERLANG_DEFAULT);
152 152
                parse_state = STATE_NULL;
153 153
             }
154 154
             break;
155
-         case RECORD_TQUOTED:
155
+         case RECORD_QUOTED:
156 156
             if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
157 157
                sc.ChangeState(SCE_ERLANG_RECORD);
158 158
                sc.ForwardSetState(SCE_ERLANG_DEFAULT);
159 159
                parse_state = STATE_NULL;
160 160
             }
161 161
             break;
162
-         case RECORD_UNTQUOTED:
162
+         case RECORD_UNQUOTED:
163 163
             if ( !isalpha(sc.ch) && '_' != sc.ch ) {
164 164
                sc.ChangeState(SCE_ERLANG_RECORD);
165 165
                sc.SetState(SCE_ERLANG_DEFAULT);
@@ -168,22 +168,22 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
168 168
             break;
169 169
          case MACRO_START:
170 170
             if ( '\'' == sc.ch ) {
171
-               parse_state = MACRO_TQUOTED;
171
+               parse_state = MACRO_QUOTED;
172 172
             } else if (isalpha(sc.ch)) {
173
-               parse_state = MACRO_UNTQUOTED;
173
+               parse_state = MACRO_UNQUOTED;
174 174
             } else { // error
175 175
                sc.SetState(SCE_ERLANG_DEFAULT);
176 176
                parse_state = STATE_NULL;
177 177
             }
178 178
             break;
179
-         case MACRO_UNTQUOTED:
179
+         case MACRO_UNQUOTED:
180 180
             if ( !isalpha(sc.ch) && '_' != sc.ch ) {
181 181
                sc.ChangeState(SCE_ERLANG_MACRO);
182 182
                sc.SetState(SCE_ERLANG_DEFAULT);
183 183
                parse_state = STATE_NULL;
184 184
             }
185 185
             break;
186
-         case MACRO_TQUOTED:
186
+         case MACRO_QUOTED:
187 187
             if ( '\'' == sc.ch && '\\' != sc.chPrev ) {
188 188
                sc.ChangeState(SCE_ERLANG_MACRO);
189 189
                sc.ForwardSetState(SCE_ERLANG_DEFAULT);
@@ -327,7 +327,7 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
327 327
          } else if (sc.ch == '$') {
328 328
 				sc.SetState(SCE_ERLANG_CHARACTER);
329 329
          } else if (sc.ch == '\'') {
330
-            parse_state = ATOM_TQUOTED;
330
+            parse_state = ATOM_QUOTED;
331 331
 				sc.SetState(SCE_ERLANG_UNKNOWN);
332 332
 			} else if ( isdigit(sc.ch) ) {
333 333
             parse_state = NUMERAL_START;
@@ -339,7 +339,7 @@ static void ColouriseErlangDoc(unsigned int startPos, int length, int initStyle,
339 339
 			} else if (isalpha(sc.ch) && isupper(sc.ch)) {
340 340
 				sc.SetState(SCE_ERLANG_VARIABLE);
341 341
 			} else if (isalpha(sc.ch)) {
342
-            parse_state = ATOM_UNTQUOTED;
342
+            parse_state = ATOM_UNQUOTED;
343 343
 				sc.SetState(SCE_ERLANG_UNKNOWN);
344 344
 			} else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '\\') {
345 345
 				sc.SetState(SCE_ERLANG_OPERATOR);

+ 2
- 2
src/LexMatlab.cpp View File

@@ -103,7 +103,7 @@ static void ColouriseMatlabOctaveDoc(
103 103
 			if (sc.ch == '\'' && sc.chPrev != '\\') {
104 104
 				sc.ForwardSetState(SCE_MATLAB_DEFAULT);
105 105
 			}
106
-		} else if (sc.state == SCE_MATLAB_DOUBLETQUOTESTRING) {
106
+		} else if (sc.state == SCE_MATLAB_DOUBLEQUOTESTRING) {
107 107
 			if (sc.ch == '"' && sc.chPrev != '\\') {
108 108
 				sc.ForwardSetState(SCE_MATLAB_DEFAULT);
109 109
 			}
@@ -126,7 +126,7 @@ static void ColouriseMatlabOctaveDoc(
126 126
 					sc.SetState(SCE_MATLAB_STRING);
127 127
 				}
128 128
 			} else if (sc.ch == '"') {
129
-              sc.SetState(SCE_MATLAB_DOUBLETQUOTESTRING);
129
+              sc.SetState(SCE_MATLAB_DOUBLEQUOTESTRING);
130 130
 			} else if (isdigit(sc.ch) || (sc.ch == '.' && isdigit(sc.chNext))) {
131 131
 				sc.SetState(SCE_MATLAB_NUMBER);
132 132
 			} else if (isalpha(sc.ch)) {

+ 2
- 2
src/LexRebol.cpp View File

@@ -190,7 +190,7 @@ static void ColouriseRebolDoc(unsigned int startPos, int length, int initStyle,
190 190
 		}
191 191
 
192 192
 		//--- Determine if the current state should terminate
193
-		if (sc.state == SCE_REBOL_TQUOTEDSTRING || sc.state == SCE_REBOL_CHARACTER) {
193
+		if (sc.state == SCE_REBOL_QUOTEDSTRING || sc.state == SCE_REBOL_CHARACTER) {
194 194
 			if (sc.ch == '^' && sc.chNext == '\"') {
195 195
 				sc.Forward();
196 196
 			} else if (sc.ch == '\"') {
@@ -243,7 +243,7 @@ static void ColouriseRebolDoc(unsigned int startPos, int length, int initStyle,
243 243
 				dotCount = 0;
244 244
 				sc.SetState(SCE_REBOL_NUMBER);
245 245
 			} else if (sc.ch == '\"') {
246
-				sc.SetState(SCE_REBOL_TQUOTEDSTRING);
246
+				sc.SetState(SCE_REBOL_QUOTEDSTRING);
247 247
 			} else if (sc.ch == '{') {
248 248
 				sc.SetState(blockComment ? SCE_REBOL_COMMENTBLOCK : SCE_REBOL_BRACEDSTRING);
249 249
 				++stringLevel;

+ 2
- 2
src/LexSQL.cpp View File

@@ -100,7 +100,7 @@ static void ColouriseSQLDoc(unsigned int startPos, int length, int initStyle, Wo
100 100
 				sc.SetState(nextState);
101 101
 			}
102 102
 			break;
103
-		case SCE_SQL_TQUOTEDIDENTIFIER:
103
+		case SCE_SQL_QUOTEDIDENTIFIER:
104 104
 			if (sc.ch == 0x60) {
105 105
 				if (sc.chNext == 0x60) {
106 106
 					sc.Forward();	// Ignore it
@@ -181,7 +181,7 @@ static void ColouriseSQLDoc(unsigned int startPos, int length, int initStyle, Wo
181 181
 			} else if (IsAWordStart(sc.ch)) {
182 182
 				sc.SetState(SCE_SQL_IDENTIFIER);
183 183
 			} else if (sc.ch == 0x60 && sqlBackticksIdentifier) {
184
-				sc.SetState(SCE_SQL_TQUOTEDIDENTIFIER);
184
+				sc.SetState(SCE_SQL_QUOTEDIDENTIFIER);
185 185
 			} else if (sc.Match('/', '*')) {
186 186
 				if (sc.Match("/**") || sc.Match("/*!")) {	// Support of Doxygen doc. style
187 187
 					sc.SetState(SCE_SQL_COMMENTDOC);

+ 8
- 8
src/LexTADS3.cpp View File

@@ -50,7 +50,7 @@
50 50
 #include "Scintilla.h"
51 51
 #include "SciLexer.h"
52 52
 
53
-static const int T3_SINGLE_TQUOTE = 1;
53
+static const int T3_SINGLE_QUOTE = 1;
54 54
 static const int T3_INT_EXPRESSION = 2;
55 55
 
56 56
 static inline bool IsEOL(const int ch, const int chNext) {
@@ -106,7 +106,7 @@ static void ColouriseTADSHTMLString(StyleContext &sc, int &lineState) {
106 106
 	int endState = sc.state;
107 107
 	int chQuote = sc.ch;
108 108
 	if (endState == SCE_T3_HTML_STRING) {
109
-		if (lineState&T3_SINGLE_TQUOTE) {
109
+		if (lineState&T3_SINGLE_QUOTE) {
110 110
 			endState = SCE_T3_S_STRING;
111 111
 			chQuote = '"';
112 112
 		} else if (lineState&T3_INT_EXPRESSION) {
@@ -171,7 +171,7 @@ static void ColouriseTADS3HTMLTag(StyleContext &sc, int &lineState) {
171 171
 			sc.SetState(SCE_T3_HTML_DEFAULT);
172 172
 			break;
173 173
 		case SCE_T3_HTML_DEFAULT:
174
-			if (lineState&T3_SINGLE_TQUOTE) {
174
+			if (lineState&T3_SINGLE_QUOTE) {
175 175
 				endState = SCE_T3_S_STRING;
176 176
 				chQuote = '\'';
177 177
 				chString = '"';
@@ -261,7 +261,7 @@ static void ColouriseTADS3MsgParam(StyleContext &sc, int &lineState) {
261 261
 			sc.Forward();
262 262
 			break;
263 263
 		case SCE_T3_MSG_PARAM:
264
-			if (lineState&T3_SINGLE_TQUOTE) {
264
+			if (lineState&T3_SINGLE_QUOTE) {
265 265
 				endState = SCE_T3_S_STRING;
266 266
 				chQuote = '\'';
267 267
 			} else if (lineState&T3_INT_EXPRESSION) {
@@ -301,7 +301,7 @@ static void ColouriseTADS3LibDirective(StyleContext &sc, int &lineState) {
301 301
 			sc.Forward(2);
302 302
 			break;
303 303
 		case SCE_T3_LIB_DIRECTIVE:
304
-			if (lineState&T3_SINGLE_TQUOTE) {
304
+			if (lineState&T3_SINGLE_QUOTE) {
305 305
 				initState = SCE_T3_S_STRING;
306 306
 				chQuote = '\'';
307 307
 			} else {
@@ -337,10 +337,10 @@ static void ColouriseTADS3String(StyleContext &sc, int &lineState) {
337 337
 				} else {
338 338
 					sc.SetState(SCE_T3_X_STRING);
339 339
 				}
340
-				lineState &= ~T3_SINGLE_TQUOTE;
340
+				lineState &= ~T3_SINGLE_QUOTE;
341 341
 			} else {
342 342
 				sc.SetState(SCE_T3_S_STRING);
343
-				lineState |= T3_SINGLE_TQUOTE;
343
+				lineState |= T3_SINGLE_QUOTE;
344 344
 			}
345 345
 			sc.Forward();
346 346
 			break;
@@ -528,7 +528,7 @@ static void ColouriseTADS3Doc(unsigned int startPos, int length, int initStyle,
528 528
 						   && sc.Match('>', '>')) {
529 529
 					sc.Forward(2);
530 530
 					sc.SetState(SCE_T3_D_STRING);
531
-					lineState &= ~(T3_SINGLE_TQUOTE|T3_INT_EXPRESSION);
531
+					lineState &= ~(T3_SINGLE_QUOTE|T3_INT_EXPRESSION);
532 532
 				} else if (IsATADS3Operator(sc.ch)) {
533 533
 					if (sc.state == SCE_T3_X_DEFAULT) {
534 534
 						if (sc.ch == '(') {

+ 18
- 18
src/LexTCL.cpp View File

@@ -43,7 +43,7 @@ static void ColouriseTCLDoc(unsigned int startPos, int length, int , WordList *k
43 43
 	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
44 44
 	bool commentLevel = false;
45 45
     bool subBrace = false; // substitution begin with a brace ${.....}
46
-	enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_TQUOTE, LS_COMMENT_BOX, LS_MASK_STATE = 0xf, 
46
+	enum tLineState {LS_DEFAULT, LS_OPEN_COMMENT, LS_OPEN_DOUBLE_QUOTE, LS_COMMENT_BOX, LS_MASK_STATE = 0xf, 
47 47
         LS_COMMAND_EXPECTED = 16, LS_BRACE_ONLY = 32 } lineState = LS_DEFAULT;
48 48
 	bool prevSlash = false;
49 49
 	int currentLevel = 0;
@@ -89,8 +89,8 @@ next:
89 89
             sc.SetState(SCE_TCL_DEFAULT);
90 90
             if (lineState == LS_OPEN_COMMENT)
91 91
                 sc.SetState(SCE_TCL_COMMENTLINE);
92
-            else if (lineState == LS_OPEN_DOUBLE_TQUOTE)
93
-                sc.SetState(SCE_TCL_IN_TQUOTE);
92
+            else if (lineState == LS_OPEN_DOUBLE_QUOTE)
93
+                sc.SetState(SCE_TCL_IN_QUOTE);
94 94
             else if (lineState == LS_COMMENT_BOX && (sc.ch == '#' || (sc.ch == ' ' && sc.chNext=='#')))
95 95
                 sc.SetState(SCE_TCL_COMMENT_BOX);
96 96
             lineState = LS_DEFAULT;
@@ -144,16 +144,16 @@ next:
144 144
                     w[strlen(w)-1]=0;
145 145
                 while(*s == ':') // ignore leading : like in ::set a 10
146 146
                     ++s;
147
-                bool quote = sc.state == SCE_TCL_IN_TQUOTE;
147
+                bool quote = sc.state == SCE_TCL_IN_QUOTE;
148 148
                 if (commentLevel  || expected) {
149 149
                     if (keywords.InList(s)) {
150
-                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_TQUOTE : SCE_TCL_WORD);
150
+                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD);
151 151
                     } else if (keywords2.InList(s)) {
152
-                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_TQUOTE : SCE_TCL_WORD2);
152
+                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD2);
153 153
                     } else if (keywords3.InList(s)) {
154
-                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_TQUOTE : SCE_TCL_WORD3);
154
+                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD3);
155 155
                     } else if (keywords4.InList(s)) {
156
-                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_TQUOTE : SCE_TCL_WORD4);
156
+                        sc.ChangeState(quote ? SCE_TCL_WORD_IN_QUOTE : SCE_TCL_WORD4);
157 157
                     } else if (sc.GetRelative(-static_cast<int>(strlen(s))-1) == '{' &&
158 158
                         keywords5.InList(s) && sc.ch == '}') { // {keyword} exactly no spaces
159 159
                             sc.ChangeState(SCE_TCL_EXPAND);
@@ -169,7 +169,7 @@ next:
169 169
                     } 
170 170
                 }
171 171
                 expected = false;
172
-                sc.SetState(quote ? SCE_TCL_IN_TQUOTE : SCE_TCL_DEFAULT);
172
+                sc.SetState(quote ? SCE_TCL_IN_QUOTE : SCE_TCL_DEFAULT);
173 173
             } else if (sc.state == SCE_TCL_MODIFIER || sc.state == SCE_TCL_IDENTIFIER) {
174 174
                 sc.SetState(SCE_TCL_DEFAULT);
175 175
             }
@@ -199,8 +199,8 @@ next:
199 199
 			styler.SetLevel(currentLine, flag + previousLevel + SC_FOLDLEVELBASE + (currentLevel << 17) + (commentLevel << 16));
200 200
 
201 201
 			// Update the line state, so it can be seen by next line
202
-			if (sc.state == SCE_TCL_IN_TQUOTE)
203
-				lineState = LS_OPEN_DOUBLE_TQUOTE;
202
+			if (sc.state == SCE_TCL_IN_QUOTE)
203
+				lineState = LS_OPEN_DOUBLE_QUOTE;
204 204
 			else {
205 205
 			     if (prevSlash) {
206 206
 				    if (isComment(sc.state))
@@ -213,8 +213,8 @@ next:
213 213
                 (expected ? LS_COMMAND_EXPECTED : 0)  | lineState);
214 214
             if (lineState == LS_COMMENT_BOX)
215 215
                 sc.ForwardSetState(SCE_TCL_COMMENT_BOX);
216
-            else if (lineState == LS_OPEN_DOUBLE_TQUOTE)
217
-                sc.ForwardSetState(SCE_TCL_IN_TQUOTE);
216
+            else if (lineState == LS_OPEN_DOUBLE_QUOTE)
217
+                sc.ForwardSetState(SCE_TCL_IN_QUOTE);
218 218
             else
219 219
                 sc.ForwardSetState(SCE_TCL_DEFAULT);
220 220
 			prevSlash = false;
@@ -233,7 +233,7 @@ next:
233 233
             continue;
234 234
 		if (sc.atLineStart) {
235 235
 			visibleChars = false;
236
-			if (sc.state!=SCE_TCL_IN_TQUOTE && !isComment(sc.state))
236
+			if (sc.state!=SCE_TCL_IN_QUOTE && !isComment(sc.state))
237 237
             {
238 238
 				sc.SetState(SCE_TCL_DEFAULT);
239 239
                 expected = IsAWordStart(sc.ch)|| isspacechar(static_cast<unsigned char>(sc.ch));
@@ -245,7 +245,7 @@ next:
245 245
 			if (!IsANumberChar(sc.ch))
246 246
 				sc.SetState(SCE_TCL_DEFAULT);
247 247
 			break;
248
-		case SCE_TCL_IN_TQUOTE:
248
+		case SCE_TCL_IN_QUOTE:
249 249
 			if (sc.ch == '"') {
250 250
 				sc.ForwardSetState(SCE_TCL_DEFAULT);
251 251
 				visibleChars = true; // necessary if a " is the first and only character on a line
@@ -253,7 +253,7 @@ next:
253 253
 			} else if (sc.ch == '[' || sc.ch == ']' || sc.ch == '$') {
254 254
 				sc.SetState(SCE_TCL_OPERATOR);
255 255
                 expected = sc.ch == '[';
256
-                sc.ForwardSetState(SCE_TCL_IN_TQUOTE);
256
+                sc.ForwardSetState(SCE_TCL_IN_QUOTE);
257 257
 				goto next;
258 258
 			}
259 259
             continue;
@@ -264,7 +264,7 @@ next:
264 264
 
265 265
 		if (sc.ch == '#') {
266 266
 			if (visibleChars) {
267
-                if (sc.state != SCE_TCL_IN_TQUOTE && expected)
267
+                if (sc.state != SCE_TCL_IN_QUOTE && expected)
268 268
 					sc.SetState(SCE_TCL_COMMENT);
269 269
 			} else {
270 270
                 sc.SetState(SCE_TCL_COMMENTLINE);
@@ -293,7 +293,7 @@ next:
293 293
 			} else {
294 294
 				switch (sc.ch) {
295 295
 				case '\"':
296
-					sc.SetState(SCE_TCL_IN_TQUOTE);
296
+					sc.SetState(SCE_TCL_IN_QUOTE);
297 297
 					break;
298 298
 				case '{':
299 299
 					sc.SetState(SCE_TCL_OPERATOR);

+ 1
- 1
src/ViewStyle.cpp View File

@@ -124,7 +124,7 @@ void ViewStyle::Init() {
124 124
 	fontNames.Clear();
125 125
 	ResetDefaultStyle();
126 126
 
127
-	indicators[0].style = INDIC_STQUIGGLE;
127
+	indicators[0].style = INDIC_SQUIGGLE;
128 128
 	indicators[0].fore = ColourDesired(0, 0x7f, 0);
129 129
 	indicators[1].style = INDIC_TT;
130 130
 	indicators[1].fore = ColourDesired(0, 0, 0xff);

Loading…
Cancel
Save