Remove line end whitespace.

48 files changed, 302 insertions, 302 deletions

diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 982ca0423..4aa1d209c 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -545,7 +545,7 @@ static std::string EncodedBytesString(CFStringRef cfsRef, CFStringEncoding encod
 	CFIndex usedLen = 0;
 	CFStringGetBytes(cfsRef, rangeAll, encoding, '?', false,
                          NULL, 0, &usedLen);
-	
+
 	std::string buffer(usedLen, '\0');
 	if (usedLen > 0) {
 		CFStringGetBytes(cfsRef, rangeAll, encoding, '?', false,
@@ -852,45 +852,45 @@ sptr_t ScintillaCocoa::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lPar
     {
       case SCI_GETDIRECTFUNCTION:
         return reinterpret_cast<sptr_t>(DirectFunction);
-        
+
       case SCI_GETDIRECTPOINTER:
         return reinterpret_cast<sptr_t>(this);
-        
+
       case SCI_TARGETASUTF8:
         return TargetAsUTF8(reinterpret_cast<char*>(lParam));
-        
+
       case SCI_ENCODEDFROMUTF8:
         return EncodedFromUTF8(reinterpret_cast<char*>(wParam),
                                reinterpret_cast<char*>(lParam));
-        
+
       case SCI_SETIMEINTERACTION:
         // Only inline IME supported on Cocoa
         break;
-        
+
       case SCI_GRABFOCUS:
         [[ContentView() window] makeFirstResponder:ContentView()];
         break;
-        
+
       case SCI_SETBUFFEREDDRAW:
         // Buffered drawing not supported on Cocoa
         view.bufferedDraw = false;
         break;
-        
+
       case SCI_FINDINDICATORSHOW:
         ShowFindIndicatorForRange(NSMakeRange(wParam, lParam-wParam), YES);
         return 0;
-        
+
       case SCI_FINDINDICATORFLASH:
         ShowFindIndicatorForRange(NSMakeRange(wParam, lParam-wParam), NO);
         return 0;
-        
+
       case SCI_FINDINDICATORHIDE:
         HideFindIndicator();
         return 0;
-        
+
       default:
         sptr_t r = ScintillaBase::WndProc(iMessage, wParam, lParam);
-        
+
         return r;
     }
   } catch (std::bad_alloc &) {
@@ -1284,11 +1284,11 @@ void ScintillaCocoa::DragScroll()
 - (id)initWithSelectedText:(const SelectionText *)other
 {
   self = [super init];
-  
+
   if (self) {
     selectedText.Copy(*other);
   }
-  
+
   return self;
 }
 
@@ -1307,7 +1307,7 @@ void ScintillaCocoa::DragScroll()
   CFStringRef cfsVal = CFStringCreateWithBytes(kCFAllocatorDefault,
                                                reinterpret_cast<const UInt8 *>(selectedText.Data()),
                                                selectedText.Length(), encoding, false);
-  
+
   if ([type compare: NSPasteboardTypeString] == NSOrderedSame)
   {
     [pasteboard setString:(NSString *)cfsVal forType: NSStringPboardType];
@@ -1320,7 +1320,7 @@ void ScintillaCocoa::DragScroll()
   }
 
   if (cfsVal)
-    CFRelease(cfsVal);  
+    CFRelease(cfsVal);
 }
 
 @end
@@ -1468,17 +1468,17 @@ void ScintillaCocoa::StartDrag()
   NSPoint startPoint;
   startPoint.x = selectionRectangle.origin.x + client.left;
   startPoint.y = selectionRectangle.origin.y + selectionRectangle.size.height + client.top;
-  
+
   NSPasteboardItem *pbItem = [NSPasteboardItem new];
   DragProviderSource *dps = [[[DragProviderSource alloc] initWithSelectedText:&selectedText] autorelease];
-  
+
   NSArray *pbTypes = selectedText.rectangular ?
   @[NSPasteboardTypeString, ScintillaRecPboardType] :
   @[NSPasteboardTypeString];
   [pbItem setDataProvider:dps forTypes:pbTypes];
   NSDraggingItem *dragItem = [[NSDraggingItem alloc ]initWithPasteboardWriter:pbItem];
   [pbItem release];
-  
+
   NSScrollView *scrollContainer = ScrollContainer();
   NSRect contentRect = [[scrollContainer contentView] bounds];
   NSRect draggingRect = NSOffsetRect(selectionRectangle, contentRect.origin.x, contentRect.origin.y);
@@ -1670,9 +1670,9 @@ int ScintillaCocoa::TargetAsUTF8(char *text)
     CFStringRef cfsVal = CFStringCreateWithBytes(kCFAllocatorDefault,
                                                  reinterpret_cast<const UInt8 *>(s.c_str()),
                                                  s.length(), encoding, false);
-	  
+
     const std::string tmputf = EncodedBytesString(cfsVal, kCFStringEncodingUTF8);
-    
+
     if (text)
       memcpy(text, tmputf.c_str(), tmputf.length());
     CFRelease(cfsVal);
@@ -1699,7 +1699,7 @@ int ScintillaCocoa::EncodedFromUTF8(char *utf8, char *encoded) const
     // Need to convert
     const CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
                                                          vs.styles[STYLE_DEFAULT].characterSet);
-    
+
     CFStringRef cfsVal = CFStringCreateWithBytes(kCFAllocatorDefault,
                                                  reinterpret_cast<const UInt8 *>(utf8),
                                                  inputLength, kCFStringEncodingUTF8, false);
@@ -2181,7 +2181,7 @@ int ScintillaCocoa::InsertText(NSString* input)
   CFStringEncoding encoding = EncodingFromCharacterSet(IsUnicodeMode(),
                                                        vs.styles[STYLE_DEFAULT].characterSet);
   std::string encoded = EncodedBytesString((CFStringRef)input, encoding);
-  
+
   if (encoded.length() > 0)
   {
     AddCharUTF((char*) encoded.c_str(), static_cast<unsigned int>(encoded.length()), false);
diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index 5bfdce138..b4827cc90 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -181,7 +181,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
 {
   if (trackingArea)
     [self removeTrackingArea:trackingArea];
-  
+
   int opts = (NSTrackingActiveAlways | NSTrackingInVisibleRect | NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved);
   trackingArea = [[NSTrackingArea alloc] initWithRect:[self bounds]
                                               options:opts
@@ -199,7 +199,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
 - (void) setFrame: (NSRect) frame
 {
   [super setFrame: frame];
-	
+
   mOwner.backend->Resize();
 }
 
@@ -537,7 +537,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
     // Must perform deletion before entering composition mode or else
     // both document and undo history will not contain the deleted text
     // leading to an inaccurate and unusable undo history.
-    
+
     // Convert selection virtual space into real space
     mOwner.backend->ConvertSelectionVirtualSpace();
 
@@ -568,7 +568,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
   {
     // Switching into composition.
     mOwner.backend->CompositionStart();
-    
+
     NSRange posRangeCurrent = mOwner.backend->PositionsFromCharacters(NSMakeRange(replacementRange.location, 0));
     // Note: Scintilla internally works almost always with bytes instead chars, so we need to take
     //       this into account when determining selection ranges and such.
@@ -751,7 +751,7 @@ sourceOperationMaskForDraggingContext: (NSDraggingContext) context
   {
     case NSDraggingContextOutsideApplication:
       return NSDragOperationCopy | NSDragOperationMove | NSDragOperationDelete;
-      
+
     case NSDraggingContextWithinApplication:
     default:
       return NSDragOperationCopy | NSDragOperationMove | NSDragOperationDelete;
@@ -1208,7 +1208,7 @@ sourceOperationMaskForDraggingContext: (NSDraggingContext) context
                selector:@selector(windowWillMove:)
                    name:NSWindowWillMoveNotification
                  object:[self window]];
-    
+
     [[scrollView contentView] setPostsBoundsChangedNotifications:YES];
     [center addObserver:self
 	       selector:@selector(scrollerAction:)
diff --git a/doc/Design.html b/doc/Design.html
index a68390558..9c4b70a1f 100644
--- a/doc/Design.html
+++ b/doc/Design.html
@@ -49,7 +49,7 @@
       library and with limited use of templates.
     </p>
     <p>
-       The currently supported platforms, Windows, GTK+/Linux and wxWindows are fairly similar in 
+       The currently supported platforms, Windows, GTK+/Linux and wxWindows are fairly similar in
       many ways.
       Each has windows, menus and bitmaps. These features generally work in similar ways so each
       has a way to move a window or draw a red line. Sometimes one platform requires a sequence of
@@ -100,7 +100,7 @@
       have to use the limited set of already available colours.
     </p>
     A Palette object holds a set of colour pairs and can make the appropriate calls to ask to
-    allocate these colours and to see what the platform has decided will be allowed. 
+    allocate these colours and to see what the platform has decided will be allowed.
     <h4>
        Font
     </h4>
@@ -164,7 +164,7 @@
     </h3>
     <p>
        The bulk of Scintilla's code is platform independent. This is made up of the CellBuffer,
-      ContractionState, Document, Editor, Indicator, LineMarker, Style, ViewStyle, KeyMap, 
+      ContractionState, Document, Editor, Indicator, LineMarker, Style, ViewStyle, KeyMap,
       ScintillaBase, CallTip,
       and AutoComplete primary classes.
     </p>
@@ -204,14 +204,14 @@
     </h4>
     <p>
        The Editor object is central to Scintilla. It is responsible for displaying a document and
-      responding to user actions and requests from the container. It uses ContractionState, Indicator, 
-      LineMarker, Style, and ViewStyle objects to display the document and a KeyMap class to 
-      map key presses to functions. 
-      The visibility of each line is kept in the ContractionState which is also responsible for mapping 
+      responding to user actions and requests from the container. It uses ContractionState, Indicator,
+      LineMarker, Style, and ViewStyle objects to display the document and a KeyMap class to
+      map key presses to functions.
+      The visibility of each line is kept in the ContractionState which is also responsible for mapping
       from display lines to documents lines and vice versa.
     </p>
     <p>
-       There may be multiple Editor objects attached to one Document object. Changes to a 
+       There may be multiple Editor objects attached to one Document object. Changes to a
        document are broadcast to the editors through the DocWatcher mechanism.
     </p>
     <h4>
diff --git a/doc/Icons.html b/doc/Icons.html
index cb6232728..314b759a6 100644
--- a/doc/Icons.html
+++ b/doc/Icons.html
@@ -27,10 +27,10 @@
        Icons
     </h2>
     <p>
-       These images may be used under the same license as Scintilla. 
+       These images may be used under the same license as Scintilla.
     </p>
     <p>
-       Drawn by Iago Rubio, Philippe Lhoste, and Neil Hodgson. 
+       Drawn by Iago Rubio, Philippe Lhoste, and Neil Hodgson.
     </p>
     <p>
        <a href="http://prdownloads.sourceforge.net/scintilla/icons1.zip?download">zip format</a> (70K)
diff --git a/doc/Lexer.txt b/doc/Lexer.txt
index 0aeb66bae..9b9e54f5a 100644
--- a/doc/Lexer.txt
+++ b/doc/Lexer.txt
@@ -47,7 +47,7 @@ The task of a lexer can be summarized briefly: for each range r of
 characters that are to be colored the same, the lexer should call
 
     styler.ColourTo(i, state)
-        
+
 where i is the position of the last character of the range r.  The lexer
 should set the state variable to the coloring state of the character at
 position i and continue until the entire text has been colored.
@@ -139,8 +139,8 @@ characters in ASCII for operators, comment markers, etc.
 
 Special case: Folding
 
-Folding may be performed in the lexer function. It is better to use a 
-separate folder function as that avoids some troublesome interaction 
+Folding may be performed in the lexer function. It is better to use a
+separate folder function as that avoids some troublesome interaction
 between styling and folding. The folder function will be run after the
 lexer function if folding is enabled. The rest of this section explains
 how to perform folding within the lexer function.
@@ -148,15 +148,15 @@ how to perform folding within the lexer function.
 During initialization, lexers that support folding set
 
     bool fold = styler.GetPropertyInt("fold");
-        
+
 If folding is enabled in the editor, fold will be TRUE and the lexer
 should call:
 
     styler.SetLevel(line, level);
-        
+
 at the end of each line and just before exiting.
 
-The line parameter is simply the count of the number of newlines seen. 
+The line parameter is simply the count of the number of newlines seen.
 It's initial value is styler.GetLine(startPos) and it is incremented
 (after calling styler.SetLevel) whenever a newline is seen.
 
@@ -169,7 +169,7 @@ comments, of course).
 The following flag bits, defined in Scintilla.h, may be set or cleared
 in the flags parameter. The SC_FOLDLEVELWHITEFLAG flag is set if the
 lexer considers that the line contains nothing but whitespace.  The
-SC_FOLDLEVELHEADERFLAG flag indicates that the line is a fold point. 
+SC_FOLDLEVELHEADERFLAG flag indicates that the line is a fold point.
 This normally means that the next line has a greater level than present
 line.  However, the lexer may have some other basis for determining a
 fold point.  For example, a lexer might create a header line for the
@@ -193,7 +193,7 @@ seen:
     if ((levelCurrent > levelPrev) && (visChars > 0))
       lev |= SC_FOLDLEVELHEADERFLAG;
       styler.SetLevel(lineCurrent, lev);
-        
+
     // reinitialize the folding vars describing the present line.
     lineCurrent++;
     visChars = 0;  // Number of non-whitespace characters on the line.
@@ -210,7 +210,7 @@ The following code appears in the C++ lexer just before exit:
     flagsNext &= ~SC_FOLDLEVELNUMBERMASK;
     styler.SetLevel(lineCurrent, levelPrev | flagsNext);
   }
-        
+
 
 Don't worry about performance
 
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 34722f259..5a5a3a532 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -2730,7 +2730,7 @@ struct Sci_TextToFind {
     <p><b id="SCI_STYLESETCASE">SCI_STYLESETCASE(int styleNumber, int caseMode)</b><br />
     <b id="SCI_STYLEGETCASE">SCI_STYLEGETCASE(int styleNumber)</b><br />
     The value of caseMode determines how text is displayed. You can set upper case
-    (<code>SC_CASE_UPPER</code>, 1) or lower case (<code>SC_CASE_LOWER</code>, 2) or camel case (<code>SC_CASE_CAMEL</code>, 3) 
+    (<code>SC_CASE_UPPER</code>, 1) or lower case (<code>SC_CASE_LOWER</code>, 2) or camel case (<code>SC_CASE_CAMEL</code>, 3)
     or display normally (<code>SC_CASE_MIXED</code>, 0). This does not change the stored text, only how it is
     displayed.</p>
 
@@ -4256,9 +4256,9 @@ struct Sci_TextToFind {
      <b id="SCI_INDICSETHOVERFORE">SCI_INDICSETHOVERFORE(int indicatorNumber, int <a class="jump" href="#colour">colour</a>)</b><br />
      <b id="SCI_INDICGETHOVERFORE">SCI_INDICGETHOVERFORE(int indicatorNumber)</b><br />
      These messages set and get the colour and style used to draw indicators when the mouse is over them or the caret moved into them.
-     The mouse cursor also changes when an indicator is drawn in hover style. 
+     The mouse cursor also changes when an indicator is drawn in hover style.
      The default is for the hover appearance to be the same as the normal appearance and calling
-     <a class="message" href="#SCI_INDICSETFORE">SCI_INDICSETFORE</a> or 
+     <a class="message" href="#SCI_INDICSETFORE">SCI_INDICSETFORE</a> or
      <a class="message" href="#SCI_INDICSETSTYLE">SCI_INDICSETSTYLE</a> will
      also reset the hover attribute.</p>
 
@@ -6575,7 +6575,7 @@ struct SCNotification {
 	int token;		/* SCN_MODIFIED with SC_MOD_CONTAINER */
 	int annotationLinesAdded;	/* SCN_MODIFIED with SC_MOD_CHANGEANNOTATION */
 	int updated;	/* SCN_UPDATEUI */
-	int listCompletionMethod; 
+	int listCompletionMethod;
 	/* SCN_AUTOCSELECTION, SCN_AUTOCCOMPLETED, SCN_USERLISTSELECTION */
 
 };
@@ -7268,19 +7268,19 @@ for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next
         <tr>
           <td align="left"><code>ch</code></td>
 
-          <td align="left">If a fillup character was the method of selection, the used 
+          <td align="left">If a fillup character was the method of selection, the used
             character, otherwise 0.</td>
         </tr>
         <tr>
           <td align="left"><code>listCompletionMethod</code></td>
 
-          <td align="left">A value indicating the way in which the completion 
+          <td align="left">A value indicating the way in which the completion
             occurred. See the table below.</td>
         </tr>
       </tbody>
     </table>
     <br />
-  
+
      See the <code><a class="jump" href="#SCN_AUTOCCOMPLETED">SCN_AUTOCCOMPLETED</a></code> notification
     for the possible values for <code>listCompletionMethod.</code>
     <p><b id="SCN_URIDROPPED">SCN_URIDROPPED</b><br />
@@ -7396,13 +7396,13 @@ for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next
         <tr>
           <td align="left"><code>ch</code></td>
 
-          <td align="left">If a fillup character was the method of selection, the used 
+          <td align="left">If a fillup character was the method of selection, the used
             character, otherwise 0.</td>
         </tr>
         <tr>
           <td align="left"><code>listCompletionMethod</code></td>
 
-          <td align="left">A value indicating the way in which the completion 
+          <td align="left">A value indicating the way in which the completion
             occurred. See the table below.</td>
         </tr>
       </tbody>
@@ -7426,7 +7426,7 @@ for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next
 
           <td align="center">0x01</td>
 
-          <td>A fillup character triggered the completion. The character used is 
+          <td>A fillup character triggered the completion. The character used is
             in ch. </td>
 
         </tr>
@@ -7465,7 +7465,7 @@ for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next
 
           <td>The
     <code>
-     <a class="message" href="#SCI_AUTOCSELECT">SCI_AUTOCSELECT</a></code> message 
+     <a class="message" href="#SCI_AUTOCSELECT">SCI_AUTOCSELECT</a></code> message
           triggered the completion. ch is 0.</td>
 
         </tr>
@@ -7486,7 +7486,7 @@ for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next
     <code>SCN_FOCUSOUT</code> (2029) when it loses focus.</p>
 
     <p><b id="SCN_AUTOCCOMPLETED">SCN_AUTOCCOMPLETED<br />
-    </b>This notification is generated after an autocompletion has inserted its 
+    </b>This notification is generated after an autocompletion has inserted its
     text. The fields are identical to the
     <code>
      <a class="jump" href="#SCN_AUTOCSELECTION">SCN_AUTOCSELECTION</a></code>
@@ -7643,7 +7643,7 @@ EM_FORMATRANGE
     <b id="SCI_GETUSEPALETTE">SCI_GETUSEPALETTE</b> Deprecated<br />
      Scintilla no longer supports palette mode. The last version to support palettes was 2.29.
      Any calls to these methods should be removed.</p>
- 
+
     <p><b id="SCI_SETKEYSUNICODE">SCI_SETKEYSUNICODE(bool keysUnicode)</b> Deprecated<br />
      <b id="SCI_GETKEYSUNICODE">SCI_GETKEYSUNICODE</b> Deprecated<br />
      On Windows, Scintilla no longer supports narrow character windows so input is always treated as Unicode.</p>
diff --git a/doc/ScintillaUsage.html b/doc/ScintillaUsage.html
index 1ddafafd3..984360d39 100644
--- a/doc/ScintillaUsage.html
+++ b/doc/ScintillaUsage.html
@@ -191,7 +191,7 @@ SPAN {
     class='S11'>linebuf</span><span class='S10'>)));</span><span class='S0'><br />
      &nbsp;&nbsp;&nbsp;&nbsp;</span> <span class='S10'>}</span><span class='S0'><br />
     </span> <span class='S10'>}</span><br />
-     
+
     <p style="margin-bottom: 0in">
        Of course, fancier handling could be implemented. For example, if the previous line was the
       start of a control construct, the next line could be automatically indented one tab further.
@@ -249,7 +249,7 @@ SPAN {
     class='S11'>endStyled</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
     class='S11'>notification</span><span class='S10'>-&gt;</span><span
     class='S11'>position</span><span class='S10'>);</span><br />
-     
+
     <p>
        Colourize(start, end) retrieves the specified range of text and then calls ColourizeDoc in
       keywords.cxx. It starts the process by calling:
@@ -259,7 +259,7 @@ SPAN {
     class='S11'>SCI_STARTSTYLING</span><span class='S10'>,</span><span class='S0'>&nbsp;</span>
     <span class='S11'>startPos</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
     class='S4'>31</span><span class='S10'>);</span><br />
-     
+
     <p>
        and then for each token of the text, calling:
     </p>
@@ -268,7 +268,7 @@ SPAN {
     class='S11'>SCI_SETSTYLING</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
     class='S11'>length</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
     class='S11'>style</span><span class='S10'>);</span><br />
-     
+
     <p>
        where style is a number from 0 to 31 whose appearance has been defined using the
       SCI_STYLESET... messages.
@@ -324,7 +324,7 @@ SPAN {
     class='S10'>=</span><span class='S0'>&nbsp;</span> <span class='S11'>linebuf</span><span
     class='S0'>&nbsp;</span> <span class='S10'>+</span><span class='S0'>&nbsp;</span> <span
     class='S11'>startword</span><span class='S10'>;</span><br />
-     
+
     <p>
        Then if a calltip is available it can be displayed. The calltip appears immediately below
       the position specified. The calltip can be multiple lines separated by newlines (\n).
@@ -344,7 +344,7 @@ SPAN {
     class='S11'>wordLen</span><span class='S0'>&nbsp;</span> <span class='S10'>-</span><span
     class='S0'>&nbsp;</span> <span class='S4'>1</span><span class='S10'>,</span><span
     class='S0'>&nbsp;</span> <span class='S11'>calltip</span><span class='S10'>);</span><br />
-     
+
     <p>
        The calltip can be removed when a closing parenthesis is entered:
     </p>
@@ -360,7 +360,7 @@ SPAN {
     SCI_CALLTIPCANCEL</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span
     class='S4'>0</span><span class='S10'>,</span><span class='S0'>&nbsp;</span> <span class='S4'>
     0</span><span class='S10'>);</span><br />
-     
+
     <p>
        Obviously, it is up the application to look after supplying the appropriate calltip text.
     </p>
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 58b0e1364..063c42b3a 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -1608,7 +1608,7 @@ void ListBoxX::Create(Window &, int, Point, int, bool, int) {
 		cssProvider = gtk_css_provider_new();
 	}
 #endif
-	
+
 	wid = widCached = gtk_window_new(GTK_WINDOW_POPUP);
 
 	frame = gtk_frame_new(NULL);
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index b5385ec2f..9977f0db0 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -306,7 +306,7 @@ private:
 	static void Destroy(GObject *object);
 	static void SelectionReceived(GtkWidget *widget, GtkSelectionData *selection_data,
 	                              guint time);
-	static void ClipboardReceived(GtkClipboard *clipboard, GtkSelectionData *selection_data, 
+	static void ClipboardReceived(GtkClipboard *clipboard, GtkSelectionData *selection_data,
 	                              gpointer data);
 	static void SelectionGet(GtkWidget *widget, GtkSelectionData *selection_data,
 	                         guint info, guint time);
@@ -1930,7 +1930,7 @@ gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) {
 		// intensity of scrolling info in the native message, gtk doesn't
 		// support this so we simulate similarly adaptive scrolling)
 		// Note that this is disabled on OS X (Darwin) with the X11 backend
-		// where the X11 server already has an adaptive scrolling algorithm 
+		// where the X11 server already has an adaptive scrolling algorithm
 		// that fights with this one
 		int cLineScroll;
 #if defined(__APPLE__) && !defined(GDK_WINDOWING_QUARTZ)
diff --git a/include/Platform.h b/include/Platform.h
index 4ef7e2aab..63269d003 100644
--- a/include/Platform.h
+++ b/include/Platform.h
@@ -145,7 +145,7 @@ public:
 			(pt.y >= top) && (pt.y <= bottom);
 	}
 	bool ContainsWholePixel(Point pt) const {
-		// Does the rectangle contain all of the pixel to left/below the point 
+		// Does the rectangle contain all of the pixel to left/below the point
 		return (pt.x >= left) && ((pt.x+1) <= right) &&
 			(pt.y >= top) && ((pt.y+1) <= bottom);
 	}
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 04fd767cd..a96cd643c 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -253,7 +253,7 @@ val SC_IME_INLINE=1
 get int GetIMEInteraction=2678(,)
 
 # Choose to display the the IME in a winow or inline.
-set void SetIMEInteraction=2679(int imeInteraction,) 
+set void SetIMEInteraction=2679(int imeInteraction,)
 
 enu MarkerSymbol=SC_MARK_
 val MARKER_MAX=31
diff --git a/lexers/LexA68k.cxx b/lexers/LexA68k.cxx
index e74c0b90a..b5f48987e 100644
--- a/lexers/LexA68k.cxx
+++ b/lexers/LexA68k.cxx
@@ -117,20 +117,20 @@ static inline bool IsDoxygenChar (const int ch)
 
 static void ColouriseA68kDoc (Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler)
 {
-    // Used to buffer a string, to be able to compare it using built-in functions 
-    char Buffer[100]; 
- 
- 
-    // Used to know the length of an operator 
-    int OpType; 
- 
+    // Used to buffer a string, to be able to compare it using built-in functions
+    char Buffer[100];
+
+
+    // Used to know the length of an operator
+    int OpType;
+
 
     // Get references to keywords lists
     WordList &cpuInstruction = *keywordlists[0];
     WordList &registers = *keywordlists[1];
     WordList &directive = *keywordlists[2];
     WordList &extInstruction = *keywordlists[3];
-    WordList &alert          = *keywordlists[4]; 
+    WordList &alert          = *keywordlists[4];
     WordList &doxygenKeyword = *keywordlists[5];
 
 
@@ -140,109 +140,109 @@ static void ColouriseA68kDoc (Sci_PositionU startPos, Sci_Position length, int i
 
     /************************************************************
     *
-    *   Parse the source 
+    *   Parse the source
     *
     ************************************************************/
 
     for ( ; sc.More(); sc.Forward())
     {
-        /************************************************************ 
-        * 
-        *   A style always terminates at the end of a line, even for 
-        *   comments (no multi-lines comments) 
-        * 
-        ************************************************************/ 
-        if (sc.atLineStart) { 
+        /************************************************************
+        *
+        *   A style always terminates at the end of a line, even for
+        *   comments (no multi-lines comments)
+        *
+        ************************************************************/
+        if (sc.atLineStart) {
             sc.SetState(SCE_A68K_DEFAULT);
-        } 
+        }
 
 
         /************************************************************
         *
-        *   If we are not in "default style", check if the style continues 
-        *   In this case, we just have to loop 
+        *   If we are not in "default style", check if the style continues
+        *   In this case, we just have to loop
         *
         ************************************************************/
 
         if (sc.state != SCE_A68K_DEFAULT)
         {
-            if (   ((sc.state == SCE_A68K_NUMBER_DEC)        && isdigit(sc.ch))                      // Decimal number 
+            if (   ((sc.state == SCE_A68K_NUMBER_DEC)        && isdigit(sc.ch))                      // Decimal number
                 || ((sc.state == SCE_A68K_NUMBER_BIN) && IsBin(sc.ch))                                      // Binary number
                 || ((sc.state == SCE_A68K_NUMBER_HEX) && isxdigit(sc.ch))                                   // Hexa number
-                || ((sc.state == SCE_A68K_MACRO_ARG)         && isdigit(sc.ch))                      // Macro argument 
+                || ((sc.state == SCE_A68K_MACRO_ARG)         && isdigit(sc.ch))                      // Macro argument
                 || ((sc.state == SCE_A68K_STRING1)    && (sc.ch != '\''))                                   // String single-quoted
                 || ((sc.state == SCE_A68K_STRING2)    && (sc.ch != '\"'))                                   // String double-quoted
-                || ((sc.state == SCE_A68K_MACRO_DECLARATION) && IsIdentifierChar(sc.ch))             // Macro declaration (or global label, we don't know at this point) 
-                || ((sc.state == SCE_A68K_IDENTIFIER)        && IsIdentifierChar(sc.ch))             // Identifier 
-                || ((sc.state == SCE_A68K_LABEL)             && IsIdentifierChar(sc.ch))             // Label (local) 
-                || ((sc.state == SCE_A68K_COMMENT_DOXYGEN)   && IsDoxygenChar(sc.ch))                // Doxygen keyword 
-                || ((sc.state == SCE_A68K_COMMENT_SPECIAL)   && isalpha(sc.ch))                      // Alert 
-                || ((sc.state == SCE_A68K_COMMENT)           && !isalpha(sc.ch) && (sc.ch != '\\'))) // Normal comment 
+                || ((sc.state == SCE_A68K_MACRO_DECLARATION) && IsIdentifierChar(sc.ch))             // Macro declaration (or global label, we don't know at this point)
+                || ((sc.state == SCE_A68K_IDENTIFIER)        && IsIdentifierChar(sc.ch))             // Identifier
+                || ((sc.state == SCE_A68K_LABEL)             && IsIdentifierChar(sc.ch))             // Label (local)
+                || ((sc.state == SCE_A68K_COMMENT_DOXYGEN)   && IsDoxygenChar(sc.ch))                // Doxygen keyword
+                || ((sc.state == SCE_A68K_COMMENT_SPECIAL)   && isalpha(sc.ch))                      // Alert
+                || ((sc.state == SCE_A68K_COMMENT)           && !isalpha(sc.ch) && (sc.ch != '\\'))) // Normal comment
             {
                 continue;
             }
 
-        /************************************************************ 
-        * 
-        *   Check if current state terminates 
-        * 
-        ************************************************************/ 
+        /************************************************************
+        *
+        *   Check if current state terminates
+        *
+        ************************************************************/
 
-            // Strings: include terminal ' or " in the current string by skipping it 
-            if ((sc.state == SCE_A68K_STRING1) || (sc.state == SCE_A68K_STRING2)) { 
-                sc.Forward(); 
+            // Strings: include terminal ' or " in the current string by skipping it
+            if ((sc.state == SCE_A68K_STRING1) || (sc.state == SCE_A68K_STRING2)) {
+                sc.Forward();
                 }
- 
- 
-            // If a macro declaration was terminated with ':', it was a label 
-            else if ((sc.state == SCE_A68K_MACRO_DECLARATION) && (sc.chPrev == ':')) { 
-                sc.ChangeState(SCE_A68K_LABEL); 
+
+
+            // If a macro declaration was terminated with ':', it was a label
+            else if ((sc.state == SCE_A68K_MACRO_DECLARATION) && (sc.chPrev == ':')) {
+                sc.ChangeState(SCE_A68K_LABEL);
             }
 
- 
-            // If it wasn't a Doxygen keyword, change it to normal comment 
-            else if (sc.state == SCE_A68K_COMMENT_DOXYGEN) { 
+
+            // If it wasn't a Doxygen keyword, change it to normal comment
+            else if (sc.state == SCE_A68K_COMMENT_DOXYGEN) {
                 sc.GetCurrent(Buffer, sizeof(Buffer));
-                if (!doxygenKeyword.InList(Buffer)) { 
+                if (!doxygenKeyword.InList(Buffer)) {
                     sc.ChangeState(SCE_A68K_COMMENT);
                 }
                 sc.SetState(SCE_A68K_COMMENT);
                 continue;
             }
 
- 
-            // If it wasn't an Alert, change it to normal comment 
-            else if (sc.state == SCE_A68K_COMMENT_SPECIAL) { 
-                sc.GetCurrent(Buffer, sizeof(Buffer)); 
-                if (!alert.InList(Buffer)) { 
+
+            // If it wasn't an Alert, change it to normal comment
+            else if (sc.state == SCE_A68K_COMMENT_SPECIAL) {
+                sc.GetCurrent(Buffer, sizeof(Buffer));
+                if (!alert.InList(Buffer)) {
                     sc.ChangeState(SCE_A68K_COMMENT);
                 }
-                // Reset style to normal comment, or to Doxygen keyword if it begins with '\'  
-                if (sc.ch == '\\') { 
-                    sc.SetState(SCE_A68K_COMMENT_DOXYGEN); 
-                } 
-                else { 
+                // Reset style to normal comment, or to Doxygen keyword if it begins with '\'
+                if (sc.ch == '\\') {
+                    sc.SetState(SCE_A68K_COMMENT_DOXYGEN);
+                }
+                else {
                 sc.SetState(SCE_A68K_COMMENT);
-                } 
+                }
                 continue;
             }
 
- 
-            // If we are in a comment, it's a Doxygen keyword or an Alert 
-            else if (sc.state == SCE_A68K_COMMENT) { 
-                if (sc.ch == '\\') { 
-                    sc.SetState(SCE_A68K_COMMENT_DOXYGEN); 
-                } 
-                else { 
-                    sc.SetState(SCE_A68K_COMMENT_SPECIAL); 
-                } 
-                continue; 
+
+            // If we are in a comment, it's a Doxygen keyword or an Alert
+            else if (sc.state == SCE_A68K_COMMENT) {
+                if (sc.ch == '\\') {
+                    sc.SetState(SCE_A68K_COMMENT_DOXYGEN);
+                }
+                else {
+                    sc.SetState(SCE_A68K_COMMENT_SPECIAL);
+                }
+                continue;
             }
 
- 
+
             // Check if we are at the end of an identifier
             // In this case, colourise it if was a keyword.
-            else if ((sc.state == SCE_A68K_IDENTIFIER) && !IsIdentifierChar(sc.ch)) { 
+            else if ((sc.state == SCE_A68K_IDENTIFIER) && !IsIdentifierChar(sc.ch)) {
                 sc.GetCurrentLowered(Buffer, sizeof(Buffer));                           // Buffer the string of the current context
                 if (cpuInstruction.InList(Buffer)) {                                    // And check if it belongs to a keyword list
                     sc.ChangeState(SCE_A68K_CPUINSTRUCTION);
@@ -269,30 +269,30 @@ static void ColouriseA68kDoc (Sci_PositionU startPos, Sci_Position length, int i
         *
         ************************************************************/
 
-        // Something which begins at the beginning of a line, and with  
-        // - '\' + an identifier start char, or 
-        // - '\\@' + an identifier start char 
-        // is a local label (second case is used for macro local labels). We set it already as a label, it can't be a macro/equ declaration 
-        if (sc.atLineStart && (sc.ch < 0x80) && IsIdentifierStart(sc.chNext) && (sc.ch == '\\')) { 
-            sc.SetState(SCE_A68K_LABEL); 
-        } 
- 
-        if (sc.atLineStart && (sc.ch < 0x80) && (sc.ch == '\\') && (sc.chNext == '\\')) { 
-            sc.Forward(2); 
-            if ((sc.ch == '@') && IsIdentifierStart(sc.chNext)) { 
-                sc.ChangeState(SCE_A68K_LABEL); 
-                sc.SetState(SCE_A68K_LABEL); 
-            } 
-        } 
-         
+        // Something which begins at the beginning of a line, and with
+        // - '\' + an identifier start char, or
+        // - '\\@' + an identifier start char
+        // is a local label (second case is used for macro local labels). We set it already as a label, it can't be a macro/equ declaration
+        if (sc.atLineStart && (sc.ch < 0x80) && IsIdentifierStart(sc.chNext) && (sc.ch == '\\')) {
+            sc.SetState(SCE_A68K_LABEL);
+        }
+
+        if (sc.atLineStart && (sc.ch < 0x80) && (sc.ch == '\\') && (sc.chNext == '\\')) {
+            sc.Forward(2);
+            if ((sc.ch == '@') && IsIdentifierStart(sc.chNext)) {
+                sc.ChangeState(SCE_A68K_LABEL);
+                sc.SetState(SCE_A68K_LABEL);
+            }
+        }
+
         // Label and macro identifiers start at the beginning of a line
-        // We set both as a macro id, but if it wasn't one (':' at the end), 
-        // it will be changed as a label. 
+        // We set both as a macro id, but if it wasn't one (':' at the end),
+        // it will be changed as a label.
         if (sc.atLineStart && (sc.ch < 0x80) && IsIdentifierStart(sc.ch)) {
-            sc.SetState(SCE_A68K_MACRO_DECLARATION); 
+            sc.SetState(SCE_A68K_MACRO_DECLARATION);
         }
-        else if ((sc.ch < 0x80) && (sc.ch == ';')) {                            // Default: alert in a comment. If it doesn't match 
-            sc.SetState(SCE_A68K_COMMENT);                                      // with an alert, it will be toggle to a normal comment 
+        else if ((sc.ch < 0x80) && (sc.ch == ';')) {                            // Default: alert in a comment. If it doesn't match
+            sc.SetState(SCE_A68K_COMMENT);                                      // with an alert, it will be toggle to a normal comment
         }
         else if ((sc.ch < 0x80) && isdigit(sc.ch)) {                            // Decimal numbers haven't prefix
             sc.SetState(SCE_A68K_NUMBER_DEC);
@@ -309,7 +309,7 @@ static void ColouriseA68kDoc (Sci_PositionU startPos, Sci_Position length, int i
         else if ((sc.ch < 0x80) && (sc.ch == '\"')) {                           // String (double-quoted)
             sc.SetState(SCE_A68K_STRING2);
         }
-        else if ((sc.ch < 0x80) && (sc.ch == '\\') && (isdigit(sc.chNext))) {   // Replacement symbols in macro are prefixed with '\' 
+        else if ((sc.ch < 0x80) && (sc.ch == '\\') && (isdigit(sc.chNext))) {   // Replacement symbols in macro are prefixed with '\'
             sc.SetState(SCE_A68K_MACRO_ARG);
         }
         else if ((sc.ch < 0x80) && IsIdentifierStart(sc.ch)) {                  // An identifier: constant, label, etc...
diff --git a/lexers/LexAVS.cxx b/lexers/LexAVS.cxx
index 6e0980715..129c3563b 100644
--- a/lexers/LexAVS.cxx
+++ b/lexers/LexAVS.cxx
@@ -83,7 +83,7 @@ static void ColouriseAvsDoc(
 				styler.SetLineState(currentLine, 0);
 			}
 		}
-		
+
 		// Determine if the current state should terminate.
 		if (sc.state == SCE_AVS_OPERATOR) {
 			sc.SetState(SCE_AVS_DEFAULT);
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index 628672b9e..fc9b5b86b 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -374,7 +374,7 @@ struct OptionSetCPP : public OptionSet<OptionsCPP> {
 
 		DefineProperty("lexer.cpp.verbatim.strings.allow.escapes", &OptionsCPP::verbatimStringsAllowEscapes,
 			"Set to 1 to allow verbatim strings to contain escape sequences.");
-		
+
 		DefineProperty("lexer.cpp.triplequoted.strings", &OptionsCPP::triplequotedStrings,
 			"Set to 1 to enable highlighting of triple-quoted strings.");
 
@@ -1467,7 +1467,7 @@ void LexerCPP::EvaluateTokens(std::vector<std::string> &tokens, const SymbolTabl
 							}
 							iMacro++;
 						}
-								
+
 						// Insert results back into tokens
 						tokens.insert(tokens.begin() + i, macroTokens.begin(), macroTokens.end());
 
@@ -1481,7 +1481,7 @@ void LexerCPP::EvaluateTokens(std::vector<std::string> &tokens, const SymbolTabl
 					tokens.insert(tokens.begin() + i, macroTokens.begin(), macroTokens.end());
 				}
 			} else {
-				// Identifier not found 
+				// Identifier not found
 				tokens.erase(tokens.begin() + i);
 			}
 		} else {
diff --git a/lexers/LexECL.cxx b/lexers/LexECL.cxx
index 7c49be1be..2e5433e6e 100644
--- a/lexers/LexECL.cxx
+++ b/lexers/LexECL.cxx
@@ -175,7 +175,7 @@ static void ColouriseEclDoc(Sci_PositionU startPos, Sci_Position length, int ini
 					} else if (keywords5.InList(s)) {
 						sc.ChangeState(SCE_ECL_WORD5);
 					}
-					else	//Data types are of from KEYWORD## 
+					else	//Data types are of from KEYWORD##
 					{
 						int i = static_cast<int>(strlen(s)) - 1;
 						while(i >= 0 && (isdigit(s[i]) || s[i] == '_'))
@@ -186,7 +186,7 @@ static void ColouriseEclDoc(Sci_PositionU startPos, Sci_Position length, int ini
 						s2[i + 1] = 0;
 						if (keywords3.InList(s2)) {
 							sc.ChangeState(SCE_ECL_WORD3);
-						} 
+						}
 					}
 					sc.SetState(SCE_ECL_DEFAULT);
 				}
@@ -393,7 +393,7 @@ static bool MatchNoCase(Accessor & styler, Sci_PositionU & pos, const char *s) {
 	for (; *s; i++) {
 		char compare_char = tolower(*s);
 		char styler_char = tolower(styler.SafeGetCharAt(pos+i));
-		if (compare_char != styler_char) 
+		if (compare_char != styler_char)
 			return false;
 		s++;
 	}
@@ -405,7 +405,7 @@ static bool MatchNoCase(Accessor & styler, Sci_PositionU & pos, const char *s) {
 // Store both the current line's fold level and the next lines in the
 // level store to make it easy to pick up with each increment
 // and to make it possible to fiddle the current level for "} else {".
-static void FoldEclDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, 
+static void FoldEclDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
 					   WordList *[], Accessor &styler) {
 	bool foldComment = true;
 	bool foldPreprocessor = true;
@@ -473,7 +473,7 @@ static void FoldEclDoc(Sci_PositionU startPos, Sci_Position length, int initStyl
 			}
 		}
 		if (style == SCE_ECL_WORD2) {
-			if (MatchNoCase(styler, i, "record") || MatchNoCase(styler, i, "transform") || MatchNoCase(styler, i, "type") || MatchNoCase(styler, i, "function") || 
+			if (MatchNoCase(styler, i, "record") || MatchNoCase(styler, i, "transform") || MatchNoCase(styler, i, "type") || MatchNoCase(styler, i, "function") ||
 				MatchNoCase(styler, i, "module") || MatchNoCase(styler, i, "service") || MatchNoCase(styler, i, "interface") || MatchNoCase(styler, i, "ifblock") ||
 				MatchNoCase(styler, i, "macro") || MatchNoCase(styler, i, "beginc++")) {
 				levelNext++;
diff --git a/lexers/LexKVIrc.cxx b/lexers/LexKVIrc.cxx
index 76259db7e..75cb8331b 100644
--- a/lexers/LexKVIrc.cxx
+++ b/lexers/LexKVIrc.cxx
@@ -359,7 +359,7 @@ static void FoldKVIrcDoc(Sci_PositionU startPos, Sci_Position length, int /*init
                       WordList *[], Accessor &styler)
 {
     /* Based on CMake's folder */
-    
+
     /* Exiting if folding isnt enabled */
     if ( styler.GetPropertyInt("fold") == 0 )
         return;
diff --git a/lexers/LexLaTeX.cxx b/lexers/LexLaTeX.cxx
index 7e03a9c4c..6dc0617e1 100644
--- a/lexers/LexLaTeX.cxx
+++ b/lexers/LexLaTeX.cxx
@@ -60,7 +60,7 @@ private:
 		if (static_cast<Sci_Position>(modes.size()) > numLines * 2 + 256)
 			modes.resize(numLines + 128);
 	}
-	
+
 	vector<latexFoldSave> saves;
 	void setSave(Sci_Position line, const latexFoldSave &save) {
 		if (line >= static_cast<Sci_Position>(saves.size())) saves.resize(line + 1);
@@ -192,7 +192,7 @@ void SCI_METHOD LexerLaTeX::Lex(Sci_PositionU startPos, Sci_Position length, int
 	int state = initStyle;
 	if (state == SCE_L_ERROR || state == SCE_L_SHORTCMD || state == SCE_L_SPECIAL)   // should not happen
 		latexStateReset(mode, state);
-	
+
 	char chNext = styler.SafeGetCharAt(startPos);
 	char chVerbatimDelim = '\0';
 	styler.StartSegment(startPos);
@@ -207,7 +207,7 @@ void SCI_METHOD LexerLaTeX::Lex(Sci_PositionU startPos, Sci_Position length, int
 			chNext = styler.SafeGetCharAt(i + 1);
 			continue;
 		}
-		
+
 		if (ch == '\r' || ch == '\n')
 			setMode(styler.GetLine(i), mode);
 
@@ -256,7 +256,7 @@ void SCI_METHOD LexerLaTeX::Lex(Sci_PositionU startPos, Sci_Position length, int
 				state = SCE_L_COMMENT;
 				break;
 			}
-			break;	
+			break;
 		// These 3 will never be reached.
 		case SCE_L_ERROR:
 		case SCE_L_SPECIAL:
@@ -400,7 +400,7 @@ void SCI_METHOD LexerLaTeX::Lex(Sci_PositionU startPos, Sci_Position length, int
 					chNext = styler.SafeGetCharAt(i + 1);
 					mode = 0;
 					state = SCE_L_DEFAULT;
-				} else { // This may not be an error, e.g. \begin{equation}\text{$a$}\end{equation}	
+				} else { // This may not be an error, e.g. \begin{equation}\text{$a$}\end{equation}
 					styler.ColourTo(i, SCE_L_SHORTCMD);
 				}
 				break;
diff --git a/lexers/LexMatlab.cxx b/lexers/LexMatlab.cxx
index 563b31b46..6b4b2a92a 100644
--- a/lexers/LexMatlab.cxx
+++ b/lexers/LexMatlab.cxx
@@ -67,7 +67,7 @@ static void ColouriseMatlabOctaveDoc(
 
 	styler.StartAt(startPos);
 
-	// boolean for when the ' is allowed to be transpose vs the start/end 
+	// boolean for when the ' is allowed to be transpose vs the start/end
 	// of a string
 	bool transpose = false;
 
@@ -86,13 +86,13 @@ static void ColouriseMatlabOctaveDoc(
 	for (; sc.More(); sc.Forward(), column++) {
 
                	if(sc.atLineStart) {
-			// set the line state to the current commentDepth 
+			// set the line state to the current commentDepth
 			curLine = styler.GetLine(sc.currentPos);
                         styler.SetLineState(curLine, commentDepth);
 
 			// reset the column to 0, nonSpace to -1 (not set)
 			column = 0;
-			nonSpaceColumn = -1; 
+			nonSpaceColumn = -1;
 		}
 
 		// save the column position of first non space character in a line
@@ -111,7 +111,7 @@ static void ColouriseMatlabOctaveDoc(
 					sc.ForwardSetState(SCE_MATLAB_DEFAULT);
 					transpose = true;
                                 } else if(sc.ch == '.' && sc.chNext == '.') {
-                                        // we werent an operator, but a '...' 
+                                        // we werent an operator, but a '...'
                                         sc.ChangeState(SCE_MATLAB_COMMENT);
                                         transpose = false;
 				} else {
@@ -165,7 +165,7 @@ static void ColouriseMatlabOctaveDoc(
 			// end or start of a nested a block comment?
 			if( IsCommentChar(sc.ch) && sc.chNext == '}' && nonSpaceColumn == column) {
                            	if(commentDepth > 0) commentDepth --;
- 
+
 				curLine = styler.GetLine(sc.currentPos);
 				styler.SetLineState(curLine, commentDepth);
 				sc.Forward();
diff --git a/lexers/LexMySQL.cxx b/lexers/LexMySQL.cxx
index 4609619f4..703b24daf 100644
--- a/lexers/LexMySQL.cxx
+++ b/lexers/LexMySQL.cxx
@@ -362,7 +362,7 @@ static void FoldMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initSt
 	int styleNext = styler.StyleAt(startPos);
 	int style = initStyle;
   int activeState = (style == SCE_MYSQL_HIDDENCOMMAND) ? HIDDENCOMMAND_STATE : style & HIDDENCOMMAND_STATE;
-	
+
   bool endPending = false;
 	bool whenPending = false;
 	bool elseIfPending = false;
@@ -375,11 +375,11 @@ static void FoldMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initSt
 		style = styleNext;
 		styleNext = styler.StyleAt(i + 1);
     activeState = (style == SCE_MYSQL_HIDDENCOMMAND) ? HIDDENCOMMAND_STATE : style & HIDDENCOMMAND_STATE;
-    
+
     char currentChar = nextChar;
     nextChar = styler.SafeGetCharAt(i + 1);
 		bool atEOL = (currentChar == '\r' && nextChar != '\n') || (currentChar == '\n');
-	
+
     switch (MASKACTIVE(style))
     {
       case SCE_MYSQL_COMMENT:
@@ -392,7 +392,7 @@ static void FoldMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initSt
         break;
       case SCE_MYSQL_COMMENTLINE:
         if (foldComment)
-        { 
+        {
           // Not really a standard, but we add support for single line comments
           // with special curly braces syntax as foldable comments too.
           // MySQL needs -- comments to be followed by space or control char
@@ -500,12 +500,12 @@ static void FoldMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initSt
                 }
               }
             }
-          
+
           // Keep the current end state for the next round.
           endPending = endFound;
         }
         break;
-        
+
       default:
         if (!isspacechar(currentChar) && endPending)
         {
@@ -547,7 +547,7 @@ static void FoldMySQLDoc(Sci_PositionU startPos, Sci_Position length, int initSt
         lev |= SC_FOLDLEVELHEADERFLAG;
       if (lev != styler.LevelAt(lineCurrent))
         styler.SetLevel(lineCurrent, lev);
-      
+
       lineCurrent++;
       levelCurrent = levelNext;
       visibleChars = 0;
diff --git a/lexers/LexOScript.cxx b/lexers/LexOScript.cxx
index 8d4fe7950..ee2dddd6f 100644
--- a/lexers/LexOScript.cxx
+++ b/lexers/LexOScript.cxx
@@ -205,12 +205,12 @@ static void ColouriseOScriptDoc(Sci_PositionU startPos, Sci_Position length,
 	bool isFirstToken = true;
 	// It starts with true at the beginning of a line and changes to false as
 	// soon as the first identifier on the line is passed by.
-	bool isFirstIdentifier = true; 
+	bool isFirstIdentifier = true;
 	// It becomes false when #ifdef DOC (the preprocessor directive often
 	// used to start a documentation comment) is encountered and remain false
 	// until the end of the documentation block is not detected. This is done
 	// by checking for the complementary #endif preprocessor directive.
-	bool endDocComment = false; 
+	bool endDocComment = false;
 
 	for (; sc.More(); sc.Forward()) {
 
diff --git a/lexers/LexPO.cxx b/lexers/LexPO.cxx
index 61e601126..fcf886d6c 100644
--- a/lexers/LexPO.cxx
+++ b/lexers/LexPO.cxx
@@ -41,7 +41,7 @@ static void ColourisePODoc(Sci_PositionU startPos, Sci_Position length, int init
 	Sci_Position curLine = styler.GetLine(startPos);
 	// the line state holds the last state on or before the line that isn't the default style
 	int curLineState = curLine > 0 ? styler.GetLineState(curLine - 1) : SCE_PO_DEFAULT;
-	
+
 	for (; sc.More(); sc.Forward()) {
 		// whether we should leave a state
 		switch (sc.state) {
@@ -57,19 +57,19 @@ static void ColourisePODoc(Sci_PositionU startPos, Sci_Position length, int init
 					// on its own like a keyword rather than changing the whole flags style
 					sc.ChangeState(SCE_PO_FUZZY);
 				break;
-			
+
 			case SCE_PO_MSGCTXT:
 			case SCE_PO_MSGID:
 			case SCE_PO_MSGSTR:
 				if (isspacechar(sc.ch))
 					sc.SetState(SCE_PO_DEFAULT);
 				break;
-			
+
 			case SCE_PO_ERROR:
 				if (sc.atLineEnd)
 					sc.SetState(SCE_PO_DEFAULT);
 				break;
-			
+
 			case SCE_PO_MSGCTXT_TEXT:
 			case SCE_PO_MSGID_TEXT:
 			case SCE_PO_MSGSTR_TEXT:
@@ -92,7 +92,7 @@ static void ColourisePODoc(Sci_PositionU startPos, Sci_Position length, int init
 				}
 				break;
 		}
-		
+
 		// whether we should enter a new state
 		if (sc.state == SCE_PO_DEFAULT) {
 			// forward to the first non-white character on the line
@@ -103,11 +103,11 @@ static void ColourisePODoc(Sci_PositionU startPos, Sci_Position length, int init
 				// and anyway the styling don't use line state for comments
 				if (curLineState == SCE_PO_COMMENT)
 					curLineState = SCE_PO_DEFAULT;
-				
+
 				while (sc.More() && ! sc.atLineEnd && isspacechar(sc.ch))
 					sc.Forward();
 			}
-			
+
 			if (atLineStart && sc.ch == '#') {
 				if (sc.chNext == '.')
 					sc.SetState(SCE_PO_PROGRAMMER_COMMENT);
@@ -134,11 +134,11 @@ static void ColourisePODoc(Sci_PositionU startPos, Sci_Position length, int init
 					sc.SetState(SCE_PO_ERROR);
 			} else if (! isspacechar(sc.ch))
 				sc.SetState(SCE_PO_ERROR);
-			
+
 			if (sc.state != SCE_PO_DEFAULT)
 				curLineState = sc.state;
 		}
-		
+
 		if (sc.atLineEnd) {
 			// Update the line state, so it can be seen by next line
 			curLine = styler.GetLine(sc.currentPos);
@@ -163,7 +163,7 @@ static void FoldPODoc(Sci_PositionU startPos, Sci_Position length, int, WordList
 		return;
 	bool foldCompact = styler.GetPropertyInt("fold.compact") != 0;
 	bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
-	
+
 	Sci_PositionU endPos = startPos + length;
 	Sci_Position curLine = styler.GetLine(startPos);
 	int lineState = styler.GetLineState(curLine);
@@ -172,17 +172,17 @@ static void FoldPODoc(Sci_PositionU startPos, Sci_Position length, int, WordList
 	int nextLevel;
 	int visible = 0;
 	int chNext = styler[startPos];
-	
+
 	for (Sci_PositionU i = startPos; i < endPos; i++) {
 		int ch = chNext;
 		chNext = styler.SafeGetCharAt(i+1);
-		
+
 		if (! isspacechar(ch)) {
 			visible++;
 		} else if ((ch == '\r' && chNext != '\n') || ch == '\n' || i+1 >= endPos) {
 			int lvl = level;
 			Sci_Position nextLine = curLine + 1;
-			
+
 			nextLineState = styler.GetLineState(nextLine);
 			if ((lineState != SCE_PO_COMMENT || foldComment) &&
 					nextLineState == lineState &&
@@ -190,14 +190,14 @@ static void FoldPODoc(Sci_PositionU startPos, Sci_Position length, int, WordList
 				nextLevel = SC_FOLDLEVELBASE + 1;
 			else
 				nextLevel = SC_FOLDLEVELBASE;
-			
+
 			if (nextLevel > level)
 				lvl |= SC_FOLDLEVELHEADERFLAG;
 			if (visible == 0 && foldCompact)
 				lvl |= SC_FOLDLEVELWHITEFLAG;
-			
+
 			styler.SetLevel(curLine, lvl);
-			
+
 			lineState = nextLineState;
 			curLine = nextLine;
 			level = nextLevel;
diff --git a/lexers/LexRust.cxx b/lexers/LexRust.cxx
index f98296bb3..ca5f3c7f1 100644
--- a/lexers/LexRust.cxx
+++ b/lexers/LexRust.cxx
@@ -287,7 +287,7 @@ static void ScanNumber(Accessor& styler, Sci_Position& pos) {
 	} else if (!error) {
 		/* If there's a period, it's a floating point literal unless it's
 		 * followed by an identifier (meaning this is a method call, e.g.
-		 * `1.foo()`) or another period, in which case it's a range (e.g. 1..2) 
+		 * `1.foo()`) or another period, in which case it's a range (e.g. 1..2)
 		 */
 		n = styler.SafeGetCharAt(pos + 1, '\0');
 		if (c == '.' && !(IsIdentifierStart(n) || n == '.')) {
@@ -308,7 +308,7 @@ static void ScanNumber(Accessor& styler, Sci_Position& pos) {
 			/* It is invalid to have no digits in the exponent. */
 			error |= !ScanDigits(styler, pos, 10);
 		}
-		
+
 		/* Scan the floating point suffix. */
 		c = styler.SafeGetCharAt(pos, '\0');
 		if (c == 'f') {
@@ -620,7 +620,7 @@ static void ResumeRawString(Accessor &styler, Sci_Position& pos, Sci_Position ma
 		} else if (pos >= max) {
 			break;
 		} else {
-			if (ascii_only && !IsASCII((char)c)) 
+			if (ascii_only && !IsASCII((char)c))
 				break;
 			pos++;
 		}
diff --git a/lexers/LexSQL.cxx b/lexers/LexSQL.cxx
index 34b601fba..1d0091806 100644
--- a/lexers/LexSQL.cxx
+++ b/lexers/LexSQL.cxx
@@ -567,8 +567,8 @@ void SCI_METHOD LexerSQL::Lex(Sci_PositionU startPos, Sci_Position length, int i
 					break;
 				}
 			}
-			
-			char qComplement = 0x00;						
+
+			char qComplement = 0x00;
 
 			if (qOperator == '<') {
 				qComplement = '>';
@@ -580,8 +580,8 @@ void SCI_METHOD LexerSQL::Lex(Sci_PositionU startPos, Sci_Position length, int i
 				qComplement = ']';
 			} else {
 				qComplement = qOperator;
-			}	
-				
+			}
+
 			if (sc.Match(qComplement, '\'')) {
 				sc.Forward();
 				sc.ForwardSetState(SCE_SQL_DEFAULT);
@@ -592,7 +592,7 @@ void SCI_METHOD LexerSQL::Lex(Sci_PositionU startPos, Sci_Position length, int i
 		// Determine if a new state should be entered.
 		if (sc.state == SCE_SQL_DEFAULT) {
 			if (sc.Match('q', '\'') || sc.Match('Q', '\'')) {
-				sc.SetState(SCE_SQL_QOPERATOR);			
+				sc.SetState(SCE_SQL_QOPERATOR);
 				sc.Forward();
 			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext)) ||
 			          ((sc.ch == '-' || sc.ch == '+') && IsADigit(sc.chNext) && !IsADigit(sc.chPrev))) {
diff --git a/lexers/LexTCMD.cxx b/lexers/LexTCMD.cxx
index 150ceb32b..03895c56a 100644
--- a/lexers/LexTCMD.cxx
+++ b/lexers/LexTCMD.cxx
@@ -52,7 +52,7 @@ static unsigned int GetBatchVarLen( char *wordBuffer )
 {
 	int nLength = 0;
 	if ( wordBuffer[0] == '%' ) {
-		
+
 		if ( wordBuffer[1] == '~' )
 			nLength = 2;
 		else if (( wordBuffer[1] == '%' ) && ( wordBuffer[2] == '~' ))
@@ -244,7 +244,7 @@ static void ColouriseTCMDLine( char *lineBuffer, Sci_PositionU lengthLine, Sci_P
 			if ((CompareCaseInsensitive(sKeywordBuffer, "echo") == 0) ||
 			  (CompareCaseInsensitive(sKeywordBuffer, "echos") == 0) ||
 			  (CompareCaseInsensitive(sKeywordBuffer, "echoerr") == 0) ||
-			  (CompareCaseInsensitive(sKeywordBuffer, "echoserr") == 0) || 
+			  (CompareCaseInsensitive(sKeywordBuffer, "echoserr") == 0) ||
 			  (CompareCaseInsensitive(sKeywordBuffer, "cd") == 0) ||
 			  (CompareCaseInsensitive(sKeywordBuffer, "path") == 0) ||
 			  (CompareCaseInsensitive(sKeywordBuffer, "prompt") == 0)) {
diff --git a/lexers/LexVisualProlog.cxx b/lexers/LexVisualProlog.cxx
index 5166ab2ae..d05413d7b 100644
--- a/lexers/LexVisualProlog.cxx
+++ b/lexers/LexVisualProlog.cxx
@@ -396,7 +396,7 @@ void SCI_METHOD LexerVisualProlog::Lex(Sci_PositionU startPos, Sci_Position leng
         if (sc.atLineEnd) {
             // Update the line state, so it can be seen by next line
             int lineState = 0;
-            if (SCE_VISUALPROLOG_STRING_VERBATIM_EOL == sc.state) { 
+            if (SCE_VISUALPROLOG_STRING_VERBATIM_EOL == sc.state) {
                 lineState = closingQuote;
             } else if (SCE_VISUALPROLOG_COMMENT_BLOCK == sc.state) {
                 lineState = nestLevel;
diff --git a/qt/ScintillaEdit/ScintillaDocument.h b/qt/ScintillaEdit/ScintillaDocument.h
index 1d571a73c..510127f94 100644
--- a/qt/ScintillaEdit/ScintillaDocument.h
+++ b/qt/ScintillaEdit/ScintillaDocument.h
@@ -77,7 +77,7 @@ public:
     int get_eol_mode();
     void set_eol_mode(int eol_mode);
     int move_position_outside_char(int pos, int move_dir, bool check_line_end);
-    
+
     int get_character(int pos); // Calls GetCharacterAndWidth(pos, NULL)
 
 private:
diff --git a/qt/ScintillaEdit/WidgetGen.py b/qt/ScintillaEdit/WidgetGen.py
index 92ebfd687..2c8ef2033 100644
--- a/qt/ScintillaEdit/WidgetGen.py
+++ b/qt/ScintillaEdit/WidgetGen.py
@@ -107,7 +107,7 @@ def printHFile(f, options):
 			if feat in ["fun", "get", "set"]:
 				if checkTypes(name, v):
 					constDeclarator = " const" if feat == "get" else ""
-					returnType = cppAlias(v["ReturnType"])					
+					returnType = cppAlias(v["ReturnType"])
 					if returnType == "int":
 						returnType = "sptr_t"
 					stringResult = v["Param2Type"] == "stringresult"
@@ -230,7 +230,7 @@ def main(argv):
 	options = {"qtStyle": qtStyleInterface}
 	f = readInterface(cleanGenerated)
 	try:
-		GenerateFile("ScintillaEdit.cpp.template", "ScintillaEdit.cpp", 
+		GenerateFile("ScintillaEdit.cpp.template", "ScintillaEdit.cpp",
 			"/* ", True, printCPPFile(f, options))
 		GenerateFile("ScintillaEdit.h.template", "ScintillaEdit.h",
 			"/* ", True, printHFile(f, options))
@@ -256,6 +256,6 @@ def main(argv):
 				os.remove(file)
 			except OSError:
 				pass
-		
+
 if __name__ == "__main__":
 	main(sys.argv[1:])
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 35e4aee78..a31473948 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -984,7 +984,7 @@ void ListBoxImpl::RegisterQPixmapImage(int type, const QPixmap& pm)
 	if (list != NULL) {
 		QSize iconSize = list->iconSize();
 		if (pm.width() > iconSize.width() || pm.height() > iconSize.height())
-			list->setIconSize(QSize(qMax(pm.width(), iconSize.width()), 
+			list->setIconSize(QSize(qMax(pm.width(), iconSize.width()),
 						 qMax(pm.height(), iconSize.height())));
 	}
 
@@ -1005,7 +1005,7 @@ void ListBoxImpl::RegisterRGBAImage(int type, int width, int height, const unsig
 void ListBoxImpl::ClearRegisteredImages()
 {
 	images.clear();
-	
+
 	ListWidget *list = static_cast<ListWidget *>(wid);
 	if (list != NULL)
 		list->setIconSize(QSize(0, 0));
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index e2377edc4..6ca1ae1de 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -409,10 +409,10 @@ bool ScintillaEditBase::IsHangul(const QChar qchar)
 	const bool HangulJamoExtendedB = (0xD7B0 <= unicode && unicode <= 0xD7FF);
 	const bool HangulSyllable = (0xAC00 <= unicode && unicode <= 0xD7A3);
 	return HangulJamo || HangulCompatibleJamo  || HangulSyllable ||
-				HangulJamoExtendedA || HangulJamoExtendedB; 
+				HangulJamoExtendedA || HangulJamoExtendedB;
 }
 
-void ScintillaEditBase::MoveImeCarets(int offset) 
+void ScintillaEditBase::MoveImeCarets(int offset)
 {
 	// Move carets relatively by bytes
 	for (size_t r=0; r < sqt->sel.Count(); r++) {
@@ -421,8 +421,8 @@ void ScintillaEditBase::MoveImeCarets(int offset)
 		sqt->sel.Range(r).anchor.SetPosition(positionInsert + offset);
  	}
 }
- 
-void ScintillaEditBase::DrawImeIndicator(int indicator, int len) 
+
+void ScintillaEditBase::DrawImeIndicator(int indicator, int len)
 {
 	// Emulate the visual style of IME characters with indicators.
 	// Draw an indicator on the character before caret by the character bytes of len
@@ -506,7 +506,7 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event)
 					case QTextCharFormat::SpellCheckUnderline:
 						indicator = SC_INDICATOR_CONVERTED;
 						break;
-		
+
 					default:
 						indicator = SC_INDICATOR_UNKNOWN;
 				}
@@ -555,7 +555,7 @@ void ScintillaEditBase::inputMethodEvent(QInputMethodEvent *event)
 			DrawImeIndicator(imeIndicator[i], oneCharLen);
 #endif
 			i += ucWidth;
-		} 
+		}
 		sqt->recordingMacro = recording;
 
 		// Move IME carets.
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h
index c4453334c..7c52e5690 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.h
+++ b/qt/ScintillaEditBase/ScintillaEditBase.h
@@ -145,7 +145,7 @@ private:
 	int wheelDelta;
 
 	static bool IsHangul(const QChar qchar);
-	void MoveImeCarets(int offset); 
+	void MoveImeCarets(int offset);
 	void DrawImeIndicator(int indicator, int len);
 };
 
diff --git a/qt/ScintillaEditPy/sepbuild.py b/qt/ScintillaEditPy/sepbuild.py
index c399eb3e9..8fa9b4b26 100644
--- a/qt/ScintillaEditPy/sepbuild.py
+++ b/qt/ScintillaEditPy/sepbuild.py
@@ -172,7 +172,7 @@ class SepBuilder:
 		self.qtStyleInterface = True
 
 	def _setPySideBase(self, base):
-		
+
 		self.PySideBase = base
 		def _try_pkgconfig(var, package, *relpath):
 			try:
@@ -209,7 +209,7 @@ class SepBuilder:
 		f = WidgetGen.readInterface(False)
 		os.chdir(os.path.join("..", "ScintillaEditPy"))
 		options = {"qtStyle": self.qtStyleInterface}
-		GenerateFile("typesystem_ScintillaEdit.xml.template", "typesystem_ScintillaEdit.xml", 
+		GenerateFile("typesystem_ScintillaEdit.xml.template", "typesystem_ScintillaEdit.xml",
 			"<!-- ", True, printTypeSystemFile(f, options))
 
 	def runGenerator(self):
@@ -221,7 +221,7 @@ class SepBuilder:
 			if os.path.exists(name):
 				generatorrunner = name
 				break
-				
+
 		args = [
 			generatorrunner,
 			"--generator-set=" + self.ShibokenGenerator,
@@ -263,7 +263,7 @@ class SepBuilder:
 	def cleanEverything(self):
 		self.generateAPI(["--clean"])
 		runProgram([self.MakeCommand, "distclean"], exitOnFailure=False)
-		filesToRemove = [self.ProInclude, "typesystem_ScintillaEdit.xml", 
+		filesToRemove = [self.ProInclude, "typesystem_ScintillaEdit.xml",
 			"../../bin/ScintillaEditPy.so", "../../bin/ScintillaConstants.py"]
 		for file in filesToRemove:
 			try:
@@ -282,7 +282,7 @@ class SepBuilder:
 	def buildEverything(self):
 		cleanGenerated = False
 		opts, args = getopt.getopt(sys.argv[1:], "hcdub",
-					["help", "clean", "debug=", 
+					["help", "clean", "debug=",
 					"underscore-names", "pyside-base="])
 		for opt, arg in opts:
 			if opt in ("-h", "--help"):
@@ -308,18 +308,18 @@ class SepBuilder:
 			self.runGenerator()
 			self.make()
 			self.copyScintillaConstants()
-			
+
 	def copyScintillaConstants(self):
-		
+
 		orig = 'ScintillaConstants.py'
 		dest = '../../bin/' + orig
 		if IsFileNewer(dest, orig):
 			return
-		
+
 		f = open(orig, 'r')
 		contents = f.read()
 		f.close()
-		
+
 		f = open(dest, 'w')
 		f.write(contents)
 		f.close()
diff --git a/scripts/Face.py b/scripts/Face.py
index 17d161fd7..05864f17c 100644
--- a/scripts/Face.py
+++ b/scripts/Face.py
@@ -9,7 +9,7 @@ def sanitiseLine(line):
 		line = line[:line.find("##")]
 	line = line.strip()
 	return line
-	
+
 def decodeFunction(featureVal):
 	retType, rest = featureVal.split(" ", 1)
 	nameIdent, params = rest.split("(")
@@ -17,13 +17,13 @@ def decodeFunction(featureVal):
 	params, rest = params.split(")")
 	param1, param2 = params.split(",")
 	return retType, name, value, param1, param2
-	
+
 def decodeEvent(featureVal):
 	retType, rest = featureVal.split(" ", 1)
 	nameIdent, params = rest.split("(")
 	name, value = nameIdent.split("=")
 	return retType, name, value
-	
+
 def decodeParam(p):
 	param = p.strip()
 	type = ""
@@ -44,7 +44,7 @@ class Face:
 		self.features = {}
 		self.values = {}
 		self.events = {}
-		
+
 	def ReadFromFile(self, name):
 		currentCategory = ""
 		currentComment = []
@@ -70,11 +70,11 @@ class Face:
 							raise
 						p1 = decodeParam(param1)
 						p2 = decodeParam(param2)
-						self.features[name] = { 
-							"FeatureType": featureType, 
+						self.features[name] = {
+							"FeatureType": featureType,
 							"ReturnType": retType,
-							"Value": value, 
-							"Param1Type": p1[0], "Param1Name": p1[1], "Param1Value": p1[2], 
+							"Value": value,
+							"Param1Type": p1[0], "Param1Name": p1[1], "Param1Value": p1[2],
 							"Param2Type": p2[0],	"Param2Name": p2[1], "Param2Value": p2[2],
 							"Category": currentCategory, "Comment": currentComment
 						}
@@ -84,10 +84,10 @@ class Face:
 						self.order.append(name)
 					elif featureType == "evt":
 						retType, name, value = decodeEvent(featureVal)
-						self.features[name] = { 
-							"FeatureType": featureType, 
+						self.features[name] = {
+							"FeatureType": featureType,
 							"ReturnType": retType,
-							"Value": value, 
+							"Value": value,
 							"Category": currentCategory, "Comment": currentComment
 						}
 						if value in self.events:
@@ -102,16 +102,16 @@ class Face:
 						except ValueError:
 							print("Failure %s" % featureVal)
 							raise Exception()
-						self.features[name] = { 
-							"FeatureType": featureType, 
-							"Category": currentCategory, 
+						self.features[name] = {
+							"FeatureType": featureType,
+							"Category": currentCategory,
 							"Value": value }
 						self.order.append(name)
 					elif featureType == "enu" or featureType == "lex":
 						name, value = featureVal.split("=", 1)
-						self.features[name] = { 
-							"FeatureType": featureType, 
-							"Category": currentCategory, 
+						self.features[name] = {
+							"FeatureType": featureType,
+							"Category": currentCategory,
 							"Value": value }
 						self.order.append(name)
 
diff --git a/scripts/FileGenerator.py b/scripts/FileGenerator.py
index e2750ebe0..11d6d70ba 100644
--- a/scripts/FileGenerator.py
+++ b/scripts/FileGenerator.py
@@ -7,8 +7,8 @@
 # Requires Python 2.5 or later
 # The files are copied to a string apart from sections between a
 # ++Autogenerated comment and a --Autogenerated comment which is
-# generated by the CopyWithInsertion function. After the whole string is 
-# instantiated, it is compared with the target file and if different the file 
+# generated by the CopyWithInsertion function. After the whole string is
+# instantiated, it is compared with the target file and if different the file
 # is rewritten.
 
 from __future__ import with_statement
diff --git a/scripts/GenerateCaseConvert.py b/scripts/GenerateCaseConvert.py
index 37506b7b9..068a068cd 100644
--- a/scripts/GenerateCaseConvert.py
+++ b/scripts/GenerateCaseConvert.py
@@ -3,15 +3,15 @@
 # Requires Python 3.3 or later
 # Should not be run with old versions of Python.
 
-# Current best approach divides case conversions into two cases: 
+# Current best approach divides case conversions into two cases:
 # simple symmetric and complex.
 # Simple symmetric is where a lower and upper case pair convert to each
-# other and the folded form is the same as the lower case. 
+# other and the folded form is the same as the lower case.
 # There are 1006 symmetric pairs.
 # These are further divided into ranges (stored as lower, upper, range length,
-# range pitch and singletons (stored as lower, upper). 
+# range pitch and singletons (stored as lower, upper).
 # Complex is for cases that don't fit the above: where there are multiple
-# characters in one of the forms or fold is different to lower or 
+# characters in one of the forms or fold is different to lower or
 # lower(upper(x)) or upper(lower(x)) are not x. These are represented as UTF-8
 # strings with original, folded, upper, and lower separated by '|'.
 # There are 126 complex cases.
@@ -33,7 +33,7 @@ def contiguousRanges(l, diff):
 def flatten(listOfLists):
     "Flatten one level of nesting"
     return itertools.chain.from_iterable(listOfLists)
-    
+
 def conversionSets():
     # For all Unicode characters, see whether they have case conversions
     # Return 2 sets: one of simple symmetric conversion cases and another
@@ -89,7 +89,7 @@ def groupRanges(symmetrics):
 
     contiguousGroups = flatten([contiguousRanges(g, 1) for g in groups])
     longGroups = [(x[0][0], x[0][1], len(x), 1) for x in contiguousGroups if len(x) > 4]
-    
+
     oneDiffs = [s for s in symmetrics if s[2] == 1]
     contiguousOnes = flatten([contiguousRanges(g, 2) for g in [oneDiffs]])
     longOneGroups = [(x[0][0], x[0][1], len(x), 2) for x in contiguousOnes if len(x) > 4]
@@ -97,7 +97,7 @@ def groupRanges(symmetrics):
     rangeGroups = sorted(longGroups+longOneGroups, key=lambda s: s[0])
 
     rangeCoverage = list(flatten([range(r[0], r[0]+r[2]*r[3], r[3]) for r in rangeGroups]))
-    
+
     nonRanges = [(l, u) for l, u, d in symmetrics if l not in rangeCoverage]
 
     return rangeGroups, nonRanges
@@ -107,7 +107,7 @@ def escape(s):
 
 def updateCaseConvert():
     symmetrics, complexes = conversionSets()
-    
+
     rangeGroups, nonRanges = groupRanges(symmetrics)
 
     print(len(rangeGroups), "ranges")
@@ -115,9 +115,9 @@ def updateCaseConvert():
 
     print(len(nonRanges), "non ranges")
     nonRangeLines = ["%d,%d, " % x for x in nonRanges]
-    
+
     print(len(symmetrics), "symmetric")
-    
+
     complexLines = ['"%s|%s|%s|%s|"' % tuple(escape(t) for t in x) for x in complexes]
     print(len(complexLines), "complex")
 
diff --git a/scripts/LexGen.py b/scripts/LexGen.py
index 934968c27..ba179eee0 100644
--- a/scripts/LexGen.py
+++ b/scripts/LexGen.py
@@ -44,14 +44,14 @@ def UpdateVersionNumbers(sci, root):
         "CFBundleShortVersionString", sci.versionDotted)
 
 def RegenerateAll(root):
-    
+
     sci = ScintillaData.ScintillaData(root)
 
     Regenerate(root + "src/Catalogue.cxx", "//", sci.lexerModules)
     Regenerate(root + "win32/scintilla.mak", "#", sci.lexFiles)
 
     UpdateVersionNumbers(sci, root)
-    
+
     HFacer.RegenerateAll(root, False)
 
 if __name__=="__main__":
diff --git a/scripts/ScintillaData.py b/scripts/ScintillaData.py
index a5f269573..7aeee4f62 100644
--- a/scripts/ScintillaData.py
+++ b/scripts/ScintillaData.py
@@ -7,14 +7,14 @@
 #     version
 #     versionDotted
 #     versionCommad
-#     
+#
 # Date last modified
 #     dateModified
 #     yearModified
 #     mdyModified
 #     dmyModified
 #     myModified
-#     
+#
 # Information about lexers and properties defined in lexers
 #     lexFiles
 #         sorted list of lexer files
diff --git a/src/Document.cxx b/src/Document.cxx
index 65c63c138..122ce0f59 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -271,7 +271,7 @@ void Document::TentativeUndo() {
 			bool endSavePoint = cb.IsSavePoint();
 			if (startSavePoint != endSavePoint)
 				NotifySavePoint(endSavePoint);
-				
+
 			cb.TentativeCommit();
 		}
 		enteredModification--;
@@ -1277,7 +1277,7 @@ int Document::SetLineIndentation(int line, int indent) {
 		int indentPos = GetLineIndentPosition(line);
 		UndoGroup ug(this);
 		DeleteChars(thisLineStart, indentPos - thisLineStart);
-		return thisLineStart + InsertString(thisLineStart, linebuf.c_str(), 
+		return thisLineStart + InsertString(thisLineStart, linebuf.c_str(),
 			static_cast<int>(linebuf.length()));
 	} else {
 		return GetLineIndentPosition(line);
@@ -2554,10 +2554,10 @@ public:
 		return doc != other.doc || position != other.position;
 	}
 	int Pos() const {
-		return position; 
+		return position;
 	}
 	int PosRoundUp() const {
-		return position; 
+		return position;
 	}
 };
 
@@ -2654,7 +2654,7 @@ long Cxx11RegexFindText(Document *doc, int minPos, int maxPos, const char *s,
 			std::wregex regexp;
 #if defined(__APPLE__)
 			// Using a UTF-8 locale doesn't change to Unicode over a byte buffer so '.'
-			// is one byte not one character. 
+			// is one byte not one character.
 			// However, on OS X this makes wregex act as Unicode
 			std::locale localeU("en_US.UTF-8");
 			regexp.imbue(localeU);
diff --git a/src/Document.h b/src/Document.h
index 71a45879e..21713d3a2 100644
--- a/src/Document.h
+++ b/src/Document.h
@@ -376,7 +376,7 @@ public:
 	struct CharacterExtracted {
 		unsigned int character;
 		unsigned int widthBytes;
-		CharacterExtracted(unsigned int character_, unsigned int widthBytes_) : 
+		CharacterExtracted(unsigned int character_, unsigned int widthBytes_) :
 			character(character_), widthBytes(widthBytes_) {
 		}
 	};
@@ -427,7 +427,7 @@ public:
 	void AnnotationSetStyles(int line, const unsigned char *styles);
 	int AnnotationLines(int line) const;
 	void AnnotationClearAll();
-	
+
 	bool AddWatcher(DocWatcher *watcher, void *userData);
 	bool RemoveWatcher(DocWatcher *watcher, void *userData);
 
diff --git a/src/EditModel.h b/src/EditModel.h
index 33c1ac0df..021bf6770 100644
--- a/src/EditModel.h
+++ b/src/EditModel.h
@@ -42,7 +42,7 @@ public:
 	Selection sel;
 	bool primarySelection;
 
-	enum IMEInteraction { imeWindowed, imeInline } imeInteraction; 
+	enum IMEInteraction { imeWindowed, imeInline } imeInteraction;
 
 	int foldFlags;
 	ContractionState cs;
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 04b94a815..692740b7c 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -394,7 +394,7 @@ void EditView::LayoutLine(const EditModel &model, int line, Surface *surface, co
 					allSame = allSame &&
 					(ll->chars[numCharsInLine] == static_cast<char>(toupper(chDoc)));
 				else	{ // Style::caseCamel
-					if ((model.pdoc->WordCharClass(ll->chars[numCharsInLine]) == CharClassify::ccWord) && 
+					if ((model.pdoc->WordCharClass(ll->chars[numCharsInLine]) == CharClassify::ccWord) &&
 					  ((numCharsInLine == 0) || (model.pdoc->WordCharClass(ll->chars[numCharsInLine - 1]) != CharClassify::ccWord))) {
 						allSame = allSame && (ll->chars[numCharsInLine] == static_cast<char>(toupper(chDoc)));
 					} else {
@@ -444,13 +444,13 @@ void EditView::LayoutLine(const EditModel &model, int line, Surface *surface, co
 				else if (vstyle.styles[ll->styles[charInLine]].caseForce == Style::caseLower)
 					ll->chars[charInLine] = static_cast<char>(tolower(chDoc));
 				else if (vstyle.styles[ll->styles[charInLine]].caseForce == Style::caseCamel) {
-					if ((model.pdoc->WordCharClass(ll->chars[charInLine]) == CharClassify::ccWord) && 
+					if ((model.pdoc->WordCharClass(ll->chars[charInLine]) == CharClassify::ccWord) &&
 					  ((charInLine == 0) || (model.pdoc->WordCharClass(ll->chars[charInLine - 1]) != CharClassify::ccWord))) {
 						ll->chars[charInLine] = static_cast<char>(toupper(chDoc));
 					} else {
 						ll->chars[charInLine] = static_cast<char>(tolower(chDoc));
 					}
-				}				
+				}
 			}
 		}
 		ll->xHighlightGuide = 0;
@@ -1476,7 +1476,7 @@ void EditView::DrawForeground(Surface *surface, const EditModel &model, const Vi
 					if (indicatorValue) {
 						const Indicator &indicator = vsDraw.indicators[deco->indicator];
 						const bool hover = indicator.IsDynamic() &&
-							((model.hoverIndicatorPos >= ts.start + posLineStart) && 
+							((model.hoverIndicatorPos >= ts.start + posLineStart) &&
 							(model.hoverIndicatorPos <= ts.end() + posLineStart));
 						if (hover) {
 							if (indicator.sacHover.style == INDIC_TEXTFORE) {
diff --git a/src/Editor.cxx b/src/Editor.cxx
index d7cbe11ee..4f53d1e99 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -3111,7 +3111,7 @@ void Editor::CursorUpOrDown(int direction, Selection::selTypes selt) {
 			const SelectionPosition spCaretNow = sel.Range(r).caret;
 			const SelectionPosition posNew = MovePositionSoVisible(
 				PositionUpOrDown(spCaretNow, direction, lastX), direction);
-			sel.Range(r) = selt == Selection::selStream ? 
+			sel.Range(r) = selt == Selection::selStream ?
 				SelectionRange(posNew, sel.Range(r).anchor) : SelectionRange(posNew);
 		}
 		sel.RemoveDuplicates();
@@ -3477,7 +3477,7 @@ int Editor::DelWordOrLine(unsigned int iMessage) {
 	// which means 2 actions so wrap in an undo group.
 
 	// Rightwards and leftwards deletions differ in treatment of virtual space.
-	// Clear virtual space for leftwards, realise for rightwards. 
+	// Clear virtual space for leftwards, realise for rightwards.
 	const bool leftwards = (iMessage == SCI_DELWORDLEFT) || (iMessage == SCI_DELLINELEFT);
 
 	if (!additionalSelectionTyping) {
@@ -3496,7 +3496,7 @@ int Editor::DelWordOrLine(unsigned int iMessage) {
 			sel.Range(r) = SelectionRange(
 				InsertSpace(sel.Range(r).caret.Position(), sel.Range(r).caret.VirtualSpace()));
 		}
-		
+
 		Range rangeDelete;
 		switch (iMessage) {
 		case SCI_DELWORDLEFT:
@@ -6463,7 +6463,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 
 	case SCI_ISRANGEWORD:
 		return pdoc->IsWordAt(static_cast<int>(wParam), static_cast<int>(lParam));
-	
+
 	case SCI_SETIDLESTYLING:
 		idleStyling = static_cast<int>(wParam);
 		break;
@@ -6669,7 +6669,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 
 	case SCI_GETIMEINTERACTION:
 		return imeInteraction;
-		
+
 #ifdef INCLUDE_DEPRECATED_FEATURES
 	case SCI_SETUSEPALETTE:
 		InvalidateStyleRedraw();
diff --git a/src/Editor.h b/src/Editor.h
index 0d788b5a8..67aad42d7 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -36,7 +36,7 @@ public:
 
 /**
  * When platform has a way to generate an event before painting,
- * accumulate needed styling range and other work items in 
+ * accumulate needed styling range and other work items in
  * WorkNeeded to avoid unnecessary work inside paint handler
  */
 class WorkNeeded {
diff --git a/src/Indicator.cxx b/src/Indicator.cxx
index 7380d52d2..4bc25a815 100644
--- a/src/Indicator.cxx
+++ b/src/Indicator.cxx
@@ -128,7 +128,7 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r
 			rcBox.top = rcLine.top + 1;
 		rcBox.left = rc.left;
 		rcBox.right = rc.right;
-		surface->AlphaRectangle(rcBox, (sacDraw.style == INDIC_ROUNDBOX) ? 1 : 0, 
+		surface->AlphaRectangle(rcBox, (sacDraw.style == INDIC_ROUNDBOX) ? 1 : 0,
 			sacDraw.fore, fillAlpha, sacDraw.fore, outlineAlpha, 0);
 	} else if (sacDraw.style == INDIC_DOTBOX) {
 		PRectangle rcBox = PixelGridAlign(rc);
diff --git a/test/ScintillaCallable.py b/test/ScintillaCallable.py
index 8dbcfcdee..6a27def22 100644
--- a/test/ScintillaCallable.py
+++ b/test/ScintillaCallable.py
@@ -151,7 +151,7 @@ class ScintillaCallable:
 
 	def Contents(self):
 		return self.ByteRange(0, self.Length)
-		
+
 	def SetContents(self, s):
 		self.TargetStart = 0
 		self.TargetEnd = self.Length
diff --git a/test/XiteQt.py b/test/XiteQt.py
index 48c39e402..1b3a8dfa0 100644
--- a/test/XiteQt.py
+++ b/test/XiteQt.py
@@ -40,7 +40,7 @@ class XiteWin():
 
 		self.ed = ScintillaCallable.ScintillaCallable(self.face, scifn, sciptr)
 		self.form.show()
-		
+
 	def DoStuff(self):
 		print(self.test)
 		self.CmdTest()
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index bf4f0503b..673f914fa 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -2462,7 +2462,7 @@ POINT ListBoxX::MinTrackSize() const {
 
 POINT ListBoxX::MaxTrackSize() const {
 	PRectangle rc = PRectangle::FromInts(0, 0,
-		Platform::Maximum(MinClientWidth(), 
+		Platform::Maximum(MinClientWidth(),
 		maxCharWidth * maxItemCharacters + static_cast<int>(TextInset.x) * 2 +
 		 TextOffset() + ::GetSystemMetrics(SM_CXVSCROLL)),
 		ItemHeight() * lti.Count());
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 92df2aad6..a5733d39b 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -987,7 +987,7 @@ void ScintillaWin::EscapeHanja() {
 }
 
 void ScintillaWin::ToggleHanja() {
-	// If selection, convert every hanja to hangul within the main range. 
+	// If selection, convert every hanja to hangul within the main range.
 	// If no selection, commit to IME.
 	if (sel.Count() > 1) {
 		return; // Do not allow multi carets.
@@ -1557,7 +1557,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam
 			return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
 
 		case WM_IME_COMPOSITION:
-			if (KoreanIME() || imeInteraction == imeInline) { 
+			if (KoreanIME() || imeInteraction == imeInline) {
 				return HandleCompositionInline(wParam, lParam);
 			} else {
 				return HandleCompositionWindowed(wParam, lParam);
@@ -1704,7 +1704,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam
 #endif
 
 		case SCI_SETTECHNOLOGY:
-			if ((wParam == SC_TECHNOLOGY_DEFAULT) || 
+			if ((wParam == SC_TECHNOLOGY_DEFAULT) ||
 				(wParam == SC_TECHNOLOGY_DIRECTWRITERETAIN) ||
 				(wParam == SC_TECHNOLOGY_DIRECTWRITEDC) ||
 				(wParam == SC_TECHNOLOGY_DIRECTWRITE)) {
@@ -2203,7 +2203,7 @@ void ScintillaWin::Paste() {
 	if (!::OpenClipboard(MainHWND()))
 		return;
 	UndoGroup ug(pdoc);
-	const bool isLine = SelectionEmpty() && 
+	const bool isLine = SelectionEmpty() &&
 		(::IsClipboardFormatAvailable(cfLineSelect) || ::IsClipboardFormatAvailable(cfVSLineTag));
 	ClearSelection(multiPasteMode == SC_MULTIPASTE_EACH);
 	bool isRectangular = (::IsClipboardFormatAvailable(cfColumnSelect) != 0);
@@ -2702,7 +2702,7 @@ LRESULT ScintillaWin::ImeOnReconvert(LPARAM lParam) {
 	rc->dwCompStrLen = (DWORD)static_cast<int>(rcCompWstring.length());
 	rc->dwCompStrOffset = (DWORD)static_cast<int>(rcCompWstart.length()) * sizeof(wchar_t);
 	rc->dwTargetStrLen = rc->dwCompStrLen;
-	rc->dwTargetStrOffset =rc->dwCompStrOffset; 
+	rc->dwTargetStrOffset =rc->dwCompStrOffset;
 
 	IMContext imc(MainHWND());
 	if (!imc.hIMC)
@@ -2718,7 +2718,7 @@ LRESULT ScintillaWin::ImeOnReconvert(LPARAM lParam) {
 	std::string tgCompStart = StringEncode(rcFeed.substr(0, tgWstart), codePage);
 	std::string tgComp = StringEncode(rcFeed.substr(tgWstart, tgWlen), codePage);
 
-	// No selection needs to adjust reconvert start position for IME set. 
+	// No selection needs to adjust reconvert start position for IME set.
 	int adjust = static_cast<int>(tgCompStart.length() - rcCompStart.length());
 	int docCompLen = static_cast<int>(tgComp.length());
 
diff --git a/win32/makefile b/win32/makefile
index 7d7d02789..668812553 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -117,7 +117,7 @@ $(LEXCOMPONENT): $(LOBJS) Scintilla.def
 
 $(LEXLIB): $(LEXOBJS)
 	$(AR) rc $@ $^
-	$(RANLIB) $@	
+	$(RANLIB) $@
 
 # Automatically generate dependencies for most files with "make deps"
 include deps.mak