Merge branch 'scintilla'

XhmikosR · Jul 19, 2013 · 8acf94c · 8acf94c
2 parents a3b8b95 + 4064119
commit 8acf94c
Show file tree

Hide file tree

Showing 50 changed files with 5,025 additions and 858 deletions.
diff --git a/build/makefile.deps.mak b/build/makefile.deps.mak
@@ -68,6 +68,10 @@ $(SCI_LIB_OBJDIR)\Accessor.obj: \
     $(SCI_LIB)\WordList.h \
     $(SCI_LIB)\LexAccessor.h
 
+$(SCI_LIB_OBJDIR)\CharacterCategory.obj: \
+    $(SCI_LIB)\CharacterCategory.cxx \
+    $(SCI_LIB)\CharacterCategory.h
+
 $(SCI_LIB_OBJDIR)\CharacterSet.obj: \
     $(SCI_LIB)\CharacterSet.cxx \
     $(SCI_LIB)\CharacterSet.h
@@ -141,6 +145,18 @@ $(SCI_SRC_OBJDIR)\CallTip.obj: \
     $(SCI_INC)\Scintilla.h \
     $(SCI_SRC)\CallTip.h
 
+$(SCI_SRC_OBJDIR)\CaseConvert.obj: \
+    $(SCI_SRC)\CaseConvert.cxx \
+    $(SCI_SRC)\CaseConvert.h \
+    $(SCI_SRC)\UniConversion.h \
+    $(SCI_SRC)\UnicodeFromUTF8.h
+
+$(SCI_SRC_OBJDIR)\CaseFolder.obj: \
+    $(SCI_SRC)\CaseFolder.cxx \
+    $(SCI_SRC)\CaseConvert.h \
+    $(SCI_SRC)\UniConversion.h \
+    $(SCI_SRC)\CaseFolder.h
+
 $(SCI_SRC_OBJDIR)\Catalogue.obj: \
     $(SCI_SRC)\Catalogue.cxx \
     $(SCI_INC)\ILexer.h \

diff --git a/build/makefile.mak b/build/makefile.mak
@@ -150,6 +150,7 @@ SCI_LEX_OBJ = \
 
 SCI_LIB_OBJ = \
     $(SCI_LIB_OBJDIR)\Accessor.obj \
+    $(SCI_LIB_OBJDIR)\CharacterCategory.obj \
     $(SCI_LIB_OBJDIR)\CharacterSet.obj \
     $(SCI_LIB_OBJDIR)\LexerBase.obj \
     $(SCI_LIB_OBJDIR)\LexerModule.obj \
@@ -161,6 +162,8 @@ SCI_LIB_OBJ = \
 SCI_SRC_OBJ = \
     $(SCI_SRC_OBJDIR)\AutoComplete.obj \
     $(SCI_SRC_OBJDIR)\CallTip.obj \
+    $(SCI_SRC_OBJDIR)\CaseConvert.obj \
+    $(SCI_SRC_OBJDIR)\CaseFolder.obj \
     $(SCI_SRC_OBJDIR)\Catalogue.obj \
     $(SCI_SRC_OBJDIR)\CellBuffer.obj \
     $(SCI_SRC_OBJDIR)\CharClassify.obj \

diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj
@@ -160,6 +160,7 @@
     <ClCompile Include="lexers\LexVB.cxx" />
     <ClCompile Include="lexers\LexYAML.cxx" />
     <ClCompile Include="lexlib\Accessor.cxx" />
+    <ClCompile Include="lexlib\CharacterCategory.cxx" />
     <ClCompile Include="lexlib\CharacterSet.cxx" />
     <ClCompile Include="lexlib\LexerBase.cxx" />
     <ClCompile Include="lexlib\LexerModule.cxx" />
@@ -170,6 +171,8 @@
     <ClCompile Include="lexlib\WordList.cxx" />
     <ClCompile Include="src\AutoComplete.cxx" />
     <ClCompile Include="src\CallTip.cxx" />
+    <ClCompile Include="src\CaseConvert.cxx" />
+    <ClCompile Include="src\CaseFolder.cxx" />
     <ClCompile Include="src\Catalogue.cxx" />
     <ClCompile Include="src\CellBuffer.cxx" />
     <ClCompile Include="src\CharClassify.cxx" />
@@ -200,6 +203,7 @@
     <ClInclude Include="include\SciLexer.h" />
     <ClInclude Include="include\Scintilla.h" />
     <ClInclude Include="lexlib\Accessor.h" />
+    <ClInclude Include="lexlib\CharacterCategory.h" />
     <ClInclude Include="lexlib\CharacterSet.h" />
     <ClInclude Include="lexlib\LexAccessor.h" />
     <ClInclude Include="lexlib\LexerBase.h" />
@@ -214,6 +218,8 @@
     <ClInclude Include="lexlib\WordList.h" />
     <ClInclude Include="src\AutoComplete.h" />
     <ClInclude Include="src\CallTip.h" />
+    <ClInclude Include="src\CaseConvert.h" />
+    <ClInclude Include="src\CaseFolder.h" />
     <ClInclude Include="src\Catalogue.h" />
     <ClInclude Include="src\CellBuffer.h" />
     <ClInclude Include="src\CharClassify.h" />

diff --git a/scintilla/Scintilla.vcxproj.filters b/scintilla/Scintilla.vcxproj.filters
@@ -96,6 +96,9 @@
     <ClCompile Include="lexlib\Accessor.cxx">
       <Filter>lexlib</Filter>
     </ClCompile>
+    <ClCompile Include="lexlib\CharacterCategory.cxx">
+      <Filter>lexlib</Filter>
+    </ClCompile>
     <ClCompile Include="lexlib\CharacterSet.cxx">
       <Filter>lexlib</Filter>
     </ClCompile>
@@ -126,6 +129,12 @@
     <ClCompile Include="src\CallTip.cxx">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="src\CaseConvert.cxx">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\CaseFolder.cxx">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="src\Catalogue.cxx">
       <Filter>src</Filter>
     </ClCompile>
@@ -212,6 +221,9 @@
     <ClInclude Include="lexlib\Accessor.h">
       <Filter>lexlib</Filter>
     </ClInclude>
+    <ClInclude Include="lexlib\CharacterCategory.h">
+      <Filter>lexlib</Filter>
+    </ClInclude>
     <ClInclude Include="lexlib\CharacterSet.h">
       <Filter>lexlib</Filter>
     </ClInclude>
@@ -254,6 +266,12 @@
     <ClInclude Include="src\CallTip.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="src\CaseConvert.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\CaseFolder.h">
+      <Filter>src</Filter>
+    </ClInclude>
     <ClInclude Include="src\Catalogue.h">
       <Filter>src</Filter>
     </ClInclude>

diff --git a/scintilla/Scintilla_VS2010.vcxproj b/scintilla/Scintilla_VS2010.vcxproj
@@ -155,6 +155,7 @@
     <ClCompile Include="lexers\LexVB.cxx" />
     <ClCompile Include="lexers\LexYAML.cxx" />
     <ClCompile Include="lexlib\Accessor.cxx" />
+    <ClCompile Include="lexlib\CharacterCategory.cxx" />
     <ClCompile Include="lexlib\CharacterSet.cxx" />
     <ClCompile Include="lexlib\LexerBase.cxx" />
     <ClCompile Include="lexlib\LexerModule.cxx" />
@@ -165,6 +166,8 @@
     <ClCompile Include="lexlib\WordList.cxx" />
     <ClCompile Include="src\AutoComplete.cxx" />
     <ClCompile Include="src\CallTip.cxx" />
+    <ClCompile Include="src\CaseConvert.cxx" />
+    <ClCompile Include="src\CaseFolder.cxx" />
     <ClCompile Include="src\Catalogue.cxx" />
     <ClCompile Include="src\CellBuffer.cxx" />
     <ClCompile Include="src\CharClassify.cxx" />
@@ -195,6 +198,7 @@
     <ClInclude Include="include\SciLexer.h" />
     <ClInclude Include="include\Scintilla.h" />
     <ClInclude Include="lexlib\Accessor.h" />
+    <ClInclude Include="lexlib\CharacterCategory.h" />
     <ClInclude Include="lexlib\CharacterSet.h" />
     <ClInclude Include="lexlib\LexAccessor.h" />
     <ClInclude Include="lexlib\LexerBase.h" />
@@ -209,6 +213,8 @@
     <ClInclude Include="lexlib\WordList.h" />
     <ClInclude Include="src\AutoComplete.h" />
     <ClInclude Include="src\CallTip.h" />
+    <ClInclude Include="src\CaseConvert.h" />
+    <ClInclude Include="src\CaseFolder.h" />
     <ClInclude Include="src\Catalogue.h" />
     <ClInclude Include="src\CellBuffer.h" />
     <ClInclude Include="src\CharClassify.h" />

diff --git a/scintilla/Scintilla_VS2010.vcxproj.filters b/scintilla/Scintilla_VS2010.vcxproj.filters
@@ -96,6 +96,9 @@
     <ClCompile Include="lexlib\Accessor.cxx">
       <Filter>lexlib</Filter>
     </ClCompile>
+    <ClCompile Include="lexlib\CharacterCategory.cxx">
+      <Filter>lexlib</Filter>
+    </ClCompile>
     <ClCompile Include="lexlib\CharacterSet.cxx">
       <Filter>lexlib</Filter>
     </ClCompile>
@@ -126,6 +129,12 @@
     <ClCompile Include="src\CallTip.cxx">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="src\CaseConvert.cxx">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\CaseFolder.cxx">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="src\Catalogue.cxx">
       <Filter>src</Filter>
     </ClCompile>
@@ -212,6 +221,9 @@
     <ClInclude Include="lexlib\Accessor.h">
       <Filter>lexlib</Filter>
     </ClInclude>
+    <ClInclude Include="lexlib\CharacterCategory.h">
+      <Filter>lexlib</Filter>
+    </ClInclude>
     <ClInclude Include="lexlib\CharacterSet.h">
       <Filter>lexlib</Filter>
     </ClInclude>
@@ -254,6 +266,12 @@
     <ClInclude Include="src\CallTip.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="src\CaseConvert.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\CaseFolder.h">
+      <Filter>src</Filter>
+    </ClInclude>
     <ClInclude Include="src\Catalogue.h">
       <Filter>src</Filter>
     </ClInclude>

diff --git a/scintilla/Scintilla_icl13.vcxproj b/scintilla/Scintilla_icl13.vcxproj
@@ -180,6 +180,7 @@
     <ClCompile Include="lexers\LexVB.cxx" />
     <ClCompile Include="lexers\LexYAML.cxx" />
     <ClCompile Include="lexlib\Accessor.cxx" />
+    <ClCompile Include="lexlib\CharacterCategory.cxx" />
     <ClCompile Include="lexlib\CharacterSet.cxx" />
     <ClCompile Include="lexlib\LexerBase.cxx" />
     <ClCompile Include="lexlib\LexerModule.cxx" />
@@ -190,6 +191,8 @@
     <ClCompile Include="lexlib\WordList.cxx" />
     <ClCompile Include="src\AutoComplete.cxx" />
     <ClCompile Include="src\CallTip.cxx" />
+    <ClCompile Include="src\CaseConvert.cxx" />
+    <ClCompile Include="src\CaseFolder.cxx" />
     <ClCompile Include="src\Catalogue.cxx" />
     <ClCompile Include="src\CellBuffer.cxx" />
     <ClCompile Include="src\CharClassify.cxx" />
@@ -220,6 +223,7 @@
     <ClInclude Include="include\SciLexer.h" />
     <ClInclude Include="include\Scintilla.h" />
     <ClInclude Include="lexlib\Accessor.h" />
+    <ClInclude Include="lexlib\CharacterCategory.h" />
     <ClInclude Include="lexlib\CharacterSet.h" />
     <ClInclude Include="lexlib\LexAccessor.h" />
     <ClInclude Include="lexlib\LexerBase.h" />
@@ -234,6 +238,8 @@
     <ClInclude Include="lexlib\WordList.h" />
     <ClInclude Include="src\AutoComplete.h" />
     <ClInclude Include="src\CallTip.h" />
+    <ClInclude Include="src\CaseConvert.h" />
+    <ClInclude Include="src\CaseFolder.h" />
     <ClInclude Include="src\Catalogue.h" />
     <ClInclude Include="src\CellBuffer.h" />
     <ClInclude Include="src\CharClassify.h" />

diff --git a/scintilla/Scintilla_icl13.vcxproj.filters b/scintilla/Scintilla_icl13.vcxproj.filters
@@ -96,6 +96,9 @@
     <ClCompile Include="lexlib\Accessor.cxx">
       <Filter>lexlib</Filter>
     </ClCompile>
+    <ClCompile Include="lexlib\CharacterCategory.cxx">
+      <Filter>lexlib</Filter>
+    </ClCompile>
     <ClCompile Include="lexlib\CharacterSet.cxx">
       <Filter>lexlib</Filter>
     </ClCompile>
@@ -126,6 +129,12 @@
     <ClCompile Include="src\CallTip.cxx">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="src\CaseConvert.cxx">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\CaseFolder.cxx">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="src\Catalogue.cxx">
       <Filter>src</Filter>
     </ClCompile>
@@ -212,6 +221,9 @@
     <ClInclude Include="lexlib\Accessor.h">
       <Filter>lexlib</Filter>
     </ClInclude>
+    <ClInclude Include="lexlib\CharacterCategory.h">
+      <Filter>lexlib</Filter>
+    </ClInclude>
     <ClInclude Include="lexlib\CharacterSet.h">
       <Filter>lexlib</Filter>
     </ClInclude>
@@ -254,6 +266,12 @@
     <ClInclude Include="src\CallTip.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="src\CaseConvert.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\CaseFolder.h">
+      <Filter>src</Filter>
+    </ClInclude>
     <ClInclude Include="src\Catalogue.h">
       <Filter>src</Filter>
     </ClInclude>

diff --git a/scintilla/cppcheck.suppress b/scintilla/cppcheck.suppress
@@ -7,7 +7,6 @@
 useInitializationList
 
 // Suppress most lexer warnings since the lexers are maintained by others
-variableScope:scintilla/lexers/LexA68k.cxx
 useInitializationList:scintilla/lexers/LexAsm.cxx
 useInitializationList:scintilla/lexers/LexBasic.cxx
 noCopyConstructor:scintilla/lexers/LexBash.cxx
@@ -16,7 +15,6 @@ variableScope:scintilla/lexers/LexCmake.cxx
 variableScope:scintilla/lexers/LexCoffeeScript.cxx
 variableScope:scintilla/lexers/LexCSS.cxx
 useInitializationList:scintilla/lexers/LexD.cxx
-redundantCondition:scintilla/lexers/LexECL.cxx
 variableScope:scintilla/lexers/LexErlang.cxx
 variableScope:scintilla/lexers/LexFortran.cxx
 variableScope:scintilla/lexers/LexGui4Cli.cxx
@@ -31,7 +29,6 @@ variableScope:scintilla/lexers/LexOpal.cxx
 variableScope:scintilla/lexers/LexOthers.cxx
 variableScope:scintilla/lexers/LexPB.cxx
 variableScope:scintilla/lexers/LexPS.cxx
-uninitMemberVar:scintilla/lexers/LexPerl.cxx
 variableScope:scintilla/lexers/LexRuby.cxx
 uninitMemberVar:scintilla/lexers/LexRuby.cxx
 variableScope:scintilla/lexers/LexSpecman.cxx

diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html
@@ -82,7 +82,7 @@
 
     <h1>Scintilla Documentation</h1>
 
-    <p>Last edited 5/May/2013 NH</p>
+    <p>Last edited 29/June/2013 NH</p>
 
     <p>There is <a class="jump" href="Design.html">an overview of the internal design of
     Scintilla</a>.<br />
@@ -115,6 +115,9 @@ <h2>Introduction</h2>
     <p>The GTK+ version also uses messages in a similar way to the Windows version. This is
     different to normal GTK+ practice but made it easier to implement rapidly.</p>
 
+    <p>Scintilla also builds with Cocoa on OS X and with Qt, and follows the conventions of 
+    those platforms.</p>
+
     <p>Scintilla does not properly support right-to-left languages like Arabic and Hebrew.
     While text in these languages may appear correct, it is not possible to interact with this text
     as is normal with other editing components.</p>
@@ -1344,7 +1347,7 @@ <h2 id="SelectionAndInformation">Selection and information</h2>
     <p><b id="SCI_GETLINESELSTARTPOSITION">SCI_GETLINESELSTARTPOSITION(int line)</b><br />
     <b id="SCI_GETLINESELENDPOSITION">SCI_GETLINESELENDPOSITION(int line)</b><br />
     Retrieve the position of the start and end of the selection at the given line with
-    INVALID_POSITION returned if no selection on this line.</p>
+    <code>INVALID_POSITION</code> returned if no selection on this line.</p>
 
     <p><b id="SCI_MOVECARETINSIDEVIEW">SCI_MOVECARETINSIDEVIEW</b><br />
      If the caret is off the top or bottom of the view, it is moved to the nearest line that is
@@ -6321,13 +6324,23 @@ <h4>IDocumentWithLineEnd</h4>
 
 <p>
 To allow lexers to determine the end position of a line and thus more easily support Unicode line ends
-<code>IDocument</code> is extended to <code>IDocumentWithLineEnd</code>.
+<code>IDocument</code> is extended to <code>IDocumentWithLineEnd</code>.</p>
+<p><code>GetRelativePosition</code> navigates the document by whole characters,
+returning <code>INVALID_POSITION</code> for movement beyond the start and end of the document.</p>
+<p><code>GetCharacterAndWidth</code> provides a standard
+conversion from UTF-8 bytes to a UTF-32 character or from DBCS to a 16 bit value.
+Bytes in invalid UTF-8 are reported individually with values 0xDC80+byteValue, which are
+not valid Unicode code points.
+The <code>pWidth</code> argument can be NULL if the caller does not need to know the number of
+bytes in the character.
 </p>
 
 <div class="highlighted">
 <span class="S5">class</span><span class="S0"> </span>IDocumentWithLineEnd<span class="S0"> </span><span class="S10">:</span><span class="S0"> </span><span class="S5">public</span><span class="S0"> </span>IDocument<span class="S0"> </span><span class="S10">{</span><br />
 <span class="S5">public</span><span class="S10">:</span><br />
 <span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>LineEnd<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>line<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>GetRelativePosition<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>positionStart<span class="S10">,</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>characterOffset<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>GetCharacterAndWidth<span class="S10">(</span><span class="S5">int</span><span class="S0"> </span>position<span class="S10">,</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span><span class="S10">*</span>pWidth<span class="S10">)</span><span class="S0"> </span><span class="S5">const</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
 <span class="S10">};</span><br />
 </div>
 
@@ -6602,9 +6615,7 @@ <h2 id="Notifications">Notifications</h2>
 
           <td align="left">Valid for text changes, not for style changes. If we are collecting undo
           information this holds a pointer to the text that is handed to the Undo system, otherwise
-          it is zero. For user performed SC_MOD_BEFOREDELETE the text field is 0 and
-                  for user performed SC_MOD_BEFOREINSERT the text field points to an array of cells,
-                   not bytes and the length is the number of cells.</td>
+          it is zero. For user performed SC_MOD_BEFOREDELETE the text field is 0.</td>
         </tr>
 
         <tr>