summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Notepad2.c5
-rw-r--r--src/Notepad2.vcxproj116
-rw-r--r--src/Notepad2.vcxproj.filters220
-rw-r--r--src/Notepad2_icl12.vcxproj168
-rw-r--r--src/Notepad2_icl12.vcxproj.filters437
-rw-r--r--src/Styles.c11
6 files changed, 522 insertions, 435 deletions
diff --git a/src/Notepad2.c b/src/Notepad2.c
index ba844f9..9ae6c3b 100644
--- a/src/Notepad2.c
+++ b/src/Notepad2.c
@@ -1499,11 +1499,6 @@ LRESULT MsgCreate(HWND hwnd,WPARAM wParam,LPARAM lParam)
SciCall_SetMarginMask(MARGIN_FOLD_INDEX, SC_MASK_FOLDERS);
SciCall_SetMarginWidth(MARGIN_FOLD_INDEX, (bShowCodeFolding) ? 11 : 0);
SciCall_SetMarginSensitive(MARGIN_FOLD_INDEX, TRUE);
- SciCall_SetProperty("fold", "1");
- SciCall_SetProperty("fold.compact", "0");
- SciCall_SetProperty("fold.comment", "1");
- SciCall_SetProperty("fold.html", "1");
- SciCall_SetProperty("fold.preprocessor", "1");
SciCall_MarkerDefine(SC_MARKNUM_FOLDEROPEN, SC_MARK_BOXMINUS);
SciCall_MarkerDefine(SC_MARKNUM_FOLDER, SC_MARK_BOXPLUS);
SciCall_MarkerDefine(SC_MARKNUM_FOLDERSUB, SC_MARK_VLINE);
diff --git a/src/Notepad2.vcxproj b/src/Notepad2.vcxproj
index 322dd67..3408861 100644
--- a/src/Notepad2.vcxproj
+++ b/src/Notepad2.vcxproj
@@ -91,7 +91,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexers;..\scintilla\lexlib;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;STATIC_BUILD;SCI_LEXER;UNICODE;_UNICODE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -120,7 +120,7 @@ update_version.bat</Command>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexers;..\scintilla\lexlib;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;STATIC_BUILD;SCI_LEXER;UNICODE;_UNICODE;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -150,7 +150,7 @@ update_version.bat</Command>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexers;..\scintilla\lexlib;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;STATIC_BUILD;SCI_LEXER;NDEBUG;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -192,7 +192,7 @@ update_version.bat</Command>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<OmitFramePointers>true</OmitFramePointers>
- <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexers;..\scintilla\lexlib;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;STATIC_BUILD;SCI_LEXER;NDEBUG;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -230,92 +230,94 @@ update_version.bat</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\scintilla\src\LexAHK.cxx" />
- <ClCompile Include="..\scintilla\src\LexAU3.cxx" />
- <ClCompile Include="..\scintilla\src\LexBash.cxx" />
- <ClCompile Include="..\scintilla\src\LexInno.cxx" />
- <ClCompile Include="..\scintilla\src\LexLua.cxx" />
- <ClCompile Include="..\scintilla\src\LexNsis.cxx" />
- <ClCompile Include="..\scintilla\src\LexRuby.cxx" />
- <ClCompile Include="..\scintilla\src\LexTCL.cxx" />
- <ClCompile Include="Dialogs.c" />
- <ClCompile Include="Dlapi.c" />
- <ClCompile Include="Edit.c" />
- <ClCompile Include="Helpers.c" />
- <ClCompile Include="Notepad2.c" />
- <ClCompile Include="Print.cpp" />
- <ClCompile Include="Styles.c" />
+ <ClCompile Include="..\scintilla\lexers\LexAHK.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexAsm.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexAU3.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexBash.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexConf.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexCPP.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexCSS.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexHTML.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexInno.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexLua.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexNsis.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexOthers.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexPascal.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexPerl.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexPowerShell.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexPython.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexRuby.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexSQL.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexTCL.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexVB.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\Accessor.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\CharacterSet.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\LexerBase.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\LexerModule.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\LexerSimple.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\PropSetSimple.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\StyleContext.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\WordList.cxx" />
<ClCompile Include="..\scintilla\src\AutoComplete.cxx" />
<ClCompile Include="..\scintilla\src\CallTip.cxx" />
+ <ClCompile Include="..\scintilla\src\Catalogue.cxx" />
<ClCompile Include="..\scintilla\src\CellBuffer.cxx" />
<ClCompile Include="..\scintilla\src\CharClassify.cxx" />
<ClCompile Include="..\scintilla\src\ContractionState.cxx" />
<ClCompile Include="..\scintilla\src\Decoration.cxx" />
<ClCompile Include="..\scintilla\src\Document.cxx" />
- <ClCompile Include="..\scintilla\src\DocumentAccessor.cxx" />
<ClCompile Include="..\scintilla\src\Editor.cxx" />
<ClCompile Include="..\scintilla\src\ExternalLexer.cxx" />
<ClCompile Include="..\scintilla\src\Indicator.cxx" />
<ClCompile Include="..\scintilla\src\KeyMap.cxx" />
- <ClCompile Include="..\scintilla\src\KeyWords.cxx" />
- <ClCompile Include="..\scintilla\src\LexAsm.cxx" />
- <ClCompile Include="..\scintilla\src\LexCPP.cxx" />
- <ClCompile Include="..\scintilla\src\LexCSS.cxx" />
- <ClCompile Include="..\scintilla\src\LexConf.cxx" />
- <ClCompile Include="..\scintilla\src\LexHTML.cxx" />
- <ClCompile Include="..\scintilla\src\LexOthers.cxx" />
- <ClCompile Include="..\scintilla\src\LexPascal.cxx" />
- <ClCompile Include="..\scintilla\src\LexPerl.cxx" />
- <ClCompile Include="..\scintilla\src\LexPowerShell.cxx" />
- <ClCompile Include="..\scintilla\src\LexPython.cxx" />
- <ClCompile Include="..\scintilla\src\LexSQL.cxx" />
- <ClCompile Include="..\scintilla\src\LexVB.cxx" />
<ClCompile Include="..\scintilla\src\LineMarker.cxx" />
<ClCompile Include="..\scintilla\src\PerLine.cxx" />
<ClCompile Include="..\scintilla\src\PositionCache.cxx" />
- <ClCompile Include="..\scintilla\src\PropSet.cxx" />
<ClCompile Include="..\scintilla\src\RESearch.cxx" />
<ClCompile Include="..\scintilla\src\RunStyles.cxx" />
<ClCompile Include="..\scintilla\src\ScintillaBase.cxx" />
<ClCompile Include="..\scintilla\src\Selection.cxx" />
<ClCompile Include="..\scintilla\src\Style.cxx" />
- <ClCompile Include="..\scintilla\src\StyleContext.cxx" />
<ClCompile Include="..\scintilla\src\UniConversion.cxx" />
<ClCompile Include="..\scintilla\src\ViewStyle.cxx" />
- <ClCompile Include="..\scintilla\src\WindowAccessor.cxx" />
<ClCompile Include="..\scintilla\src\XPM.cxx" />
+ <ClCompile Include="Dialogs.c" />
+ <ClCompile Include="Dlapi.c" />
+ <ClCompile Include="Edit.c" />
+ <ClCompile Include="Helpers.c" />
+ <ClCompile Include="Notepad2.c" />
+ <ClCompile Include="Print.cpp" />
+ <ClCompile Include="Styles.c" />
<ClCompile Include="..\scintilla\win32\PlatWin.cxx" />
<ClCompile Include="..\scintilla\win32\ScintillaWin.cxx" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Dialogs.h" />
- <ClInclude Include="Dlapi.h" />
- <ClInclude Include="Edit.h" />
- <ClInclude Include="Helpers.h" />
- <ClInclude Include="Notepad2.h" />
- <ClInclude Include="SciCall.h" />
- <ClInclude Include="Styles.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="Version.h" />
- <ClInclude Include="..\scintilla\include\Accessor.h" />
- <ClInclude Include="..\scintilla\include\KeyWords.h" />
+ <ClInclude Include="..\scintilla\include\ILexer.h" />
<ClInclude Include="..\scintilla\include\Platform.h" />
- <ClInclude Include="..\scintilla\include\PropSet.h" />
<ClInclude Include="..\scintilla\include\SciLexer.h" />
<ClInclude Include="..\scintilla\include\Scintilla.h" />
<ClInclude Include="..\scintilla\include\ScintillaWidget.h" />
- <ClInclude Include="..\scintilla\include\WindowAccessor.h" />
+ <ClInclude Include="..\scintilla\lexlib\Accessor.h" />
+ <ClInclude Include="..\scintilla\lexlib\CharacterSet.h" />
+ <ClInclude Include="..\scintilla\lexlib\LexAccessor.h" />
+ <ClInclude Include="..\scintilla\lexlib\LexerBase.h" />
+ <ClInclude Include="..\scintilla\lexlib\LexerModule.h" />
+ <ClInclude Include="..\scintilla\lexlib\LexerSimple.h" />
+ <ClInclude Include="..\scintilla\lexlib\OptionSet.h" />
+ <ClInclude Include="..\scintilla\lexlib\PropSetSimple.h" />
+ <ClInclude Include="..\scintilla\lexlib\StyleContext.h" />
+ <ClInclude Include="..\scintilla\lexlib\WordList.h" />
<ClInclude Include="..\scintilla\src\AutoComplete.h" />
<ClInclude Include="..\scintilla\src\CallTip.h" />
+ <ClInclude Include="..\scintilla\src\Catalogue.h" />
<ClInclude Include="..\scintilla\src\CellBuffer.h" />
<ClInclude Include="..\scintilla\src\CharClassify.h" />
- <ClInclude Include="..\scintilla\src\CharacterSet.h" />
<ClInclude Include="..\scintilla\src\ContractionState.h" />
<ClInclude Include="..\scintilla\src\Decoration.h" />
<ClInclude Include="..\scintilla\src\Document.h" />
- <ClInclude Include="..\scintilla\src\DocumentAccessor.h" />
<ClInclude Include="..\scintilla\src\Editor.h" />
<ClInclude Include="..\scintilla\src\ExternalLexer.h" />
+ <ClInclude Include="..\scintilla\src\FontQuality.h" />
<ClInclude Include="..\scintilla\src\Indicator.h" />
<ClInclude Include="..\scintilla\src\KeyMap.h" />
<ClInclude Include="..\scintilla\src\LineMarker.h" />
@@ -324,15 +326,23 @@ update_version.bat</Command>
<ClInclude Include="..\scintilla\src\PositionCache.h" />
<ClInclude Include="..\scintilla\src\RESearch.h" />
<ClInclude Include="..\scintilla\src\RunStyles.h" />
- <ClInclude Include="..\scintilla\src\SVector.h" />
<ClInclude Include="..\scintilla\src\ScintillaBase.h" />
<ClInclude Include="..\scintilla\src\Selection.h" />
<ClInclude Include="..\scintilla\src\SplitVector.h" />
<ClInclude Include="..\scintilla\src\Style.h" />
- <ClInclude Include="..\scintilla\src\StyleContext.h" />
+ <ClInclude Include="..\scintilla\src\SVector.h" />
<ClInclude Include="..\scintilla\src\UniConversion.h" />
<ClInclude Include="..\scintilla\src\ViewStyle.h" />
<ClInclude Include="..\scintilla\src\XPM.h" />
+ <ClInclude Include="Dialogs.h" />
+ <ClInclude Include="Dlapi.h" />
+ <ClInclude Include="Edit.h" />
+ <ClInclude Include="Helpers.h" />
+ <ClInclude Include="Notepad2.h" />
+ <ClInclude Include="SciCall.h" />
+ <ClInclude Include="Styles.h" />
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="Version.h" />
<ClInclude Include="..\scintilla\win32\PlatformRes.h" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Notepad2.vcxproj.filters b/src/Notepad2.vcxproj.filters
index 9f7ba55..c35755e 100644
--- a/src/Notepad2.vcxproj.filters
+++ b/src/Notepad2.vcxproj.filters
@@ -19,6 +19,12 @@
<Filter Include="Scintilla\include">
<UniqueIdentifier>{52a9038d-55b6-4160-9922-006bc5b944e2}</UniqueIdentifier>
</Filter>
+ <Filter Include="Scintilla\lexers">
+ <UniqueIdentifier>{d935131a-8e0b-4edd-8e22-10accb5ffeb0}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Scintilla\lexlib">
+ <UniqueIdentifier>{fe9e2269-192b-4e55-b221-dfc50a195d93}</UniqueIdentifier>
+ </Filter>
<Filter Include="Scintilla\src">
<UniqueIdentifier>{4b9b9748-4a42-47b2-b4e6-6d5e997ae4e0}</UniqueIdentifier>
</Filter>
@@ -48,79 +54,124 @@
<ClCompile Include="Styles.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\AutoComplete.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexAHK.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\CallTip.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexAsm.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\CellBuffer.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexAU3.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\CharClassify.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexBash.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\ContractionState.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexConf.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\Decoration.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexCPP.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\Document.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexCSS.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\DocumentAccessor.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexHTML.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\Editor.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexInno.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\ExternalLexer.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexLua.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\Indicator.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexNsis.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\KeyMap.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexOthers.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\KeyWords.cxx">
- <Filter>Scintilla\src</Filter>
+ <ClCompile Include="..\scintilla\lexers\LexPascal.cxx">
+ <Filter>Scintilla\lexers</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexAsm.cxx">
+ <ClCompile Include="..\scintilla\lexers\LexPerl.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexPowerShell.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexPython.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexRuby.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexSQL.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexTCL.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexVB.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\Accessor.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\CharacterSet.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\LexerBase.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\LexerModule.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\LexerSimple.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\PropSetSimple.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\StyleContext.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\WordList.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\AutoComplete.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexCPP.cxx">
+ <ClCompile Include="..\scintilla\src\CallTip.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexCSS.cxx">
+ <ClCompile Include="..\scintilla\src\Catalogue.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexConf.cxx">
+ <ClCompile Include="..\scintilla\src\CellBuffer.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexHTML.cxx">
+ <ClCompile Include="..\scintilla\src\CharClassify.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexOthers.cxx">
+ <ClCompile Include="..\scintilla\src\ContractionState.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexPascal.cxx">
+ <ClCompile Include="..\scintilla\src\Decoration.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexPerl.cxx">
+ <ClCompile Include="..\scintilla\src\Document.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexPowerShell.cxx">
+ <ClCompile Include="..\scintilla\src\Editor.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexPython.cxx">
+ <ClCompile Include="..\scintilla\src\ExternalLexer.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexSQL.cxx">
+ <ClCompile Include="..\scintilla\src\Indicator.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexVB.cxx">
+ <ClCompile Include="..\scintilla\src\KeyMap.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
<ClCompile Include="..\scintilla\src\LineMarker.cxx">
@@ -132,9 +183,6 @@
<ClCompile Include="..\scintilla\src\PositionCache.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\PropSet.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
<ClCompile Include="..\scintilla\src\RESearch.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
@@ -150,18 +198,12 @@
<ClCompile Include="..\scintilla\src\Style.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\StyleContext.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
<ClCompile Include="..\scintilla\src\UniConversion.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
<ClCompile Include="..\scintilla\src\ViewStyle.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\WindowAccessor.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
<ClCompile Include="..\scintilla\src\XPM.cxx">
<Filter>Scintilla\src</Filter>
</ClCompile>
@@ -171,30 +213,6 @@
<ClCompile Include="..\scintilla\win32\ScintillaWin.cxx">
<Filter>Scintilla\win32</Filter>
</ClCompile>
- <ClCompile Include="..\scintilla\src\LexAU3.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexBash.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexTCL.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexInno.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexNsis.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexLua.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexRuby.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexAHK.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Dialogs.h">
@@ -224,18 +242,15 @@
<ClInclude Include="Version.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\include\Accessor.h">
- <Filter>Scintilla\include</Filter>
+ <ClInclude Include="..\scintilla\win32\PlatformRes.h">
+ <Filter>Scintilla\win32</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\include\KeyWords.h">
+ <ClInclude Include="..\scintilla\include\ILexer.h">
<Filter>Scintilla\include</Filter>
</ClInclude>
<ClInclude Include="..\scintilla\include\Platform.h">
<Filter>Scintilla\include</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\include\PropSet.h">
- <Filter>Scintilla\include</Filter>
- </ClInclude>
<ClInclude Include="..\scintilla\include\SciLexer.h">
<Filter>Scintilla\include</Filter>
</ClInclude>
@@ -245,22 +260,19 @@
<ClInclude Include="..\scintilla\include\ScintillaWidget.h">
<Filter>Scintilla\include</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\include\WindowAccessor.h">
- <Filter>Scintilla\include</Filter>
- </ClInclude>
<ClInclude Include="..\scintilla\src\AutoComplete.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
<ClInclude Include="..\scintilla\src\CallTip.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\src\CellBuffer.h">
+ <ClInclude Include="..\scintilla\src\Catalogue.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\src\CharClassify.h">
+ <ClInclude Include="..\scintilla\src\CellBuffer.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\src\CharacterSet.h">
+ <ClInclude Include="..\scintilla\src\CharClassify.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
<ClInclude Include="..\scintilla\src\ContractionState.h">
@@ -272,15 +284,15 @@
<ClInclude Include="..\scintilla\src\Document.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\src\DocumentAccessor.h">
- <Filter>Scintilla\src</Filter>
- </ClInclude>
<ClInclude Include="..\scintilla\src\Editor.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
<ClInclude Include="..\scintilla\src\ExternalLexer.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
+ <ClInclude Include="..\scintilla\src\FontQuality.h">
+ <Filter>Scintilla\src</Filter>
+ </ClInclude>
<ClInclude Include="..\scintilla\src\Indicator.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
@@ -305,9 +317,6 @@
<ClInclude Include="..\scintilla\src\RunStyles.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\src\SVector.h">
- <Filter>Scintilla\src</Filter>
- </ClInclude>
<ClInclude Include="..\scintilla\src\ScintillaBase.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
@@ -320,7 +329,7 @@
<ClInclude Include="..\scintilla\src\Style.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\src\StyleContext.h">
+ <ClInclude Include="..\scintilla\src\SVector.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
<ClInclude Include="..\scintilla\src\UniConversion.h">
@@ -332,8 +341,35 @@
<ClInclude Include="..\scintilla\src\XPM.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\win32\PlatformRes.h">
- <Filter>Scintilla\win32</Filter>
+ <ClInclude Include="..\scintilla\lexlib\Accessor.h">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\lexlib\CharacterSet.h">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\lexlib\LexAccessor.h">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\lexlib\LexerBase.h">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\lexlib\LexerModule.h">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\lexlib\LexerSimple.h">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\lexlib\OptionSet.h">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\lexlib\PropSetSimple.h">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\lexlib\StyleContext.h">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\lexlib\WordList.h">
+ <Filter>Scintilla\lexlib</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
diff --git a/src/Notepad2_icl12.vcxproj b/src/Notepad2_icl12.vcxproj
index 6c66b95..7efe490 100644
--- a/src/Notepad2_icl12.vcxproj
+++ b/src/Notepad2_icl12.vcxproj
@@ -97,7 +97,7 @@ update_version.bat
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexers;..\scintilla\lexlib;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;STATIC_BUILD;SCI_LEXER;NDEBUG;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -132,7 +132,7 @@ update_version.bat
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexers;..\scintilla\lexlib;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;STATIC_BUILD;SCI_LEXER;NDEBUG;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -171,7 +171,7 @@ update_version.bat
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexers;..\scintilla\lexlib;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;STATIC_BUILD;SCI_LEXER;NDEBUG;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -221,7 +221,7 @@ update_version.bat
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexers;..\scintilla\lexlib;..\scintilla\src;..\scintilla\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;STATIC_BUILD;SCI_LEXER;NDEBUG;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -254,34 +254,94 @@ update_version.bat
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="Dialogs.h" />
- <ClInclude Include="Dlapi.h" />
- <ClInclude Include="Edit.h" />
- <ClInclude Include="Helpers.h" />
- <ClInclude Include="Notepad2.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="SciCall.h" />
- <ClInclude Include="Styles.h" />
- <ClInclude Include="Version.h" />
- <ClInclude Include="..\scintilla\include\Accessor.h" />
- <ClInclude Include="..\scintilla\include\KeyWords.h" />
+ <ClCompile Include="..\scintilla\lexers\LexAHK.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexAsm.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexAU3.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexBash.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexConf.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexCPP.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexCSS.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexHTML.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexInno.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexLua.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexNsis.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexOthers.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexPascal.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexPerl.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexPowerShell.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexPython.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexRuby.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexSQL.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexTCL.cxx" />
+ <ClCompile Include="..\scintilla\lexers\LexVB.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\Accessor.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\CharacterSet.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\LexerBase.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\LexerModule.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\LexerSimple.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\PropSetSimple.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\StyleContext.cxx" />
+ <ClCompile Include="..\scintilla\lexlib\WordList.cxx" />
+ <ClCompile Include="..\scintilla\src\AutoComplete.cxx" />
+ <ClCompile Include="..\scintilla\src\CallTip.cxx" />
+ <ClCompile Include="..\scintilla\src\Catalogue.cxx" />
+ <ClCompile Include="..\scintilla\src\CellBuffer.cxx" />
+ <ClCompile Include="..\scintilla\src\CharClassify.cxx" />
+ <ClCompile Include="..\scintilla\src\ContractionState.cxx" />
+ <ClCompile Include="..\scintilla\src\Decoration.cxx" />
+ <ClCompile Include="..\scintilla\src\Document.cxx" />
+ <ClCompile Include="..\scintilla\src\Editor.cxx" />
+ <ClCompile Include="..\scintilla\src\ExternalLexer.cxx" />
+ <ClCompile Include="..\scintilla\src\Indicator.cxx" />
+ <ClCompile Include="..\scintilla\src\KeyMap.cxx" />
+ <ClCompile Include="..\scintilla\src\LineMarker.cxx" />
+ <ClCompile Include="..\scintilla\src\PerLine.cxx" />
+ <ClCompile Include="..\scintilla\src\PositionCache.cxx" />
+ <ClCompile Include="..\scintilla\src\RESearch.cxx" />
+ <ClCompile Include="..\scintilla\src\RunStyles.cxx" />
+ <ClCompile Include="..\scintilla\src\ScintillaBase.cxx" />
+ <ClCompile Include="..\scintilla\src\Selection.cxx" />
+ <ClCompile Include="..\scintilla\src\Style.cxx" />
+ <ClCompile Include="..\scintilla\src\UniConversion.cxx" />
+ <ClCompile Include="..\scintilla\src\ViewStyle.cxx" />
+ <ClCompile Include="..\scintilla\src\XPM.cxx" />
+ <ClCompile Include="..\scintilla\win32\PlatWin.cxx" />
+ <ClCompile Include="..\scintilla\win32\ScintillaWin.cxx" />
+ <ClCompile Include="Dialogs.c" />
+ <ClCompile Include="Dlapi.c" />
+ <ClCompile Include="Edit.c" />
+ <ClCompile Include="Helpers.c" />
+ <ClCompile Include="Notepad2.c" />
+ <ClCompile Include="Print.cpp" />
+ <ClCompile Include="Styles.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\scintilla\include\ILexer.h" />
<ClInclude Include="..\scintilla\include\Platform.h" />
- <ClInclude Include="..\scintilla\include\PropSet.h" />
<ClInclude Include="..\scintilla\include\SciLexer.h" />
<ClInclude Include="..\scintilla\include\Scintilla.h" />
<ClInclude Include="..\scintilla\include\ScintillaWidget.h" />
- <ClInclude Include="..\scintilla\include\WindowAccessor.h" />
+ <ClInclude Include="..\scintilla\lexlib\Accessor.h" />
+ <ClInclude Include="..\scintilla\lexlib\CharacterSet.h" />
+ <ClInclude Include="..\scintilla\lexlib\LexAccessor.h" />
+ <ClInclude Include="..\scintilla\lexlib\LexerBase.h" />
+ <ClInclude Include="..\scintilla\lexlib\LexerModule.h" />
+ <ClInclude Include="..\scintilla\lexlib\LexerSimple.h" />
+ <ClInclude Include="..\scintilla\lexlib\OptionSet.h" />
+ <ClInclude Include="..\scintilla\lexlib\PropSetSimple.h" />
+ <ClInclude Include="..\scintilla\lexlib\StyleContext.h" />
+ <ClInclude Include="..\scintilla\lexlib\WordList.h" />
<ClInclude Include="..\scintilla\src\AutoComplete.h" />
<ClInclude Include="..\scintilla\src\CallTip.h" />
+ <ClInclude Include="..\scintilla\src\Catalogue.h" />
<ClInclude Include="..\scintilla\src\CellBuffer.h" />
- <ClInclude Include="..\scintilla\src\CharacterSet.h" />
<ClInclude Include="..\scintilla\src\CharClassify.h" />
<ClInclude Include="..\scintilla\src\ContractionState.h" />
<ClInclude Include="..\scintilla\src\Decoration.h" />
<ClInclude Include="..\scintilla\src\Document.h" />
- <ClInclude Include="..\scintilla\src\DocumentAccessor.h" />
<ClInclude Include="..\scintilla\src\Editor.h" />
<ClInclude Include="..\scintilla\src\ExternalLexer.h" />
+ <ClInclude Include="..\scintilla\src\FontQuality.h" />
<ClInclude Include="..\scintilla\src\Indicator.h" />
<ClInclude Include="..\scintilla\src\KeyMap.h" />
<ClInclude Include="..\scintilla\src\LineMarker.h" />
@@ -294,17 +354,24 @@ update_version.bat
<ClInclude Include="..\scintilla\src\Selection.h" />
<ClInclude Include="..\scintilla\src\SplitVector.h" />
<ClInclude Include="..\scintilla\src\Style.h" />
- <ClInclude Include="..\scintilla\src\StyleContext.h" />
<ClInclude Include="..\scintilla\src\SVector.h" />
<ClInclude Include="..\scintilla\src\UniConversion.h" />
<ClInclude Include="..\scintilla\src\ViewStyle.h" />
<ClInclude Include="..\scintilla\src\XPM.h" />
<ClInclude Include="..\scintilla\win32\PlatformRes.h" />
+ <ClInclude Include="Dialogs.h" />
+ <ClInclude Include="Dlapi.h" />
+ <ClInclude Include="Edit.h" />
+ <ClInclude Include="Helpers.h" />
+ <ClInclude Include="Notepad2.h" />
+ <ClInclude Include="SciCall.h" />
+ <ClInclude Include="Styles.h" />
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="Version.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\res\Copy.cur" />
<None Include="..\res\Encoding.bmp" />
- <None Include="..\scintilla\win32\Margin.cur" />
<None Include="..\res\Next.bmp" />
<None Include="..\res\Notepad2.ico" />
<None Include="..\res\Open.bmp" />
@@ -313,6 +380,7 @@ update_version.bat
<None Include="..\res\Run.ico" />
<None Include="..\res\Styles.ico" />
<None Include="..\res\Toolbar.bmp" />
+ <None Include="..\scintilla\win32\Margin.cur" />
</ItemGroup>
<ItemGroup>
<Manifest Include="..\res\Notepad2.exe.manifest" />
@@ -320,64 +388,6 @@ update_version.bat
<ItemGroup>
<ResourceCompile Include="Notepad2.rc" />
</ItemGroup>
- <ItemGroup>
- <ClCompile Include="Dialogs.c" />
- <ClCompile Include="Dlapi.c" />
- <ClCompile Include="Edit.c" />
- <ClCompile Include="Helpers.c" />
- <ClCompile Include="Notepad2.c" />
- <ClCompile Include="Print.cpp" />
- <ClCompile Include="Styles.c" />
- <ClCompile Include="..\scintilla\src\AutoComplete.cxx" />
- <ClCompile Include="..\scintilla\src\CallTip.cxx" />
- <ClCompile Include="..\scintilla\src\CellBuffer.cxx" />
- <ClCompile Include="..\scintilla\src\CharClassify.cxx" />
- <ClCompile Include="..\scintilla\src\ContractionState.cxx" />
- <ClCompile Include="..\scintilla\src\Decoration.cxx" />
- <ClCompile Include="..\scintilla\src\Document.cxx" />
- <ClCompile Include="..\scintilla\src\DocumentAccessor.cxx" />
- <ClCompile Include="..\scintilla\src\Editor.cxx" />
- <ClCompile Include="..\scintilla\src\ExternalLexer.cxx" />
- <ClCompile Include="..\scintilla\src\Indicator.cxx" />
- <ClCompile Include="..\scintilla\src\KeyMap.cxx" />
- <ClCompile Include="..\scintilla\src\KeyWords.cxx" />
- <ClCompile Include="..\scintilla\src\LexAHK.cxx" />
- <ClCompile Include="..\scintilla\src\LexAsm.cxx" />
- <ClCompile Include="..\scintilla\src\LexAU3.cxx" />
- <ClCompile Include="..\scintilla\src\LexBash.cxx" />
- <ClCompile Include="..\scintilla\src\LexConf.cxx" />
- <ClCompile Include="..\scintilla\src\LexCPP.cxx" />
- <ClCompile Include="..\scintilla\src\LexCSS.cxx" />
- <ClCompile Include="..\scintilla\src\LexHTML.cxx" />
- <ClCompile Include="..\scintilla\src\LexInno.cxx" />
- <ClCompile Include="..\scintilla\src\LexLua.cxx" />
- <ClCompile Include="..\scintilla\src\LexNsis.cxx" />
- <ClCompile Include="..\scintilla\src\LexOthers.cxx" />
- <ClCompile Include="..\scintilla\src\LexPascal.cxx" />
- <ClCompile Include="..\scintilla\src\LexPerl.cxx" />
- <ClCompile Include="..\scintilla\src\LexPowerShell.cxx" />
- <ClCompile Include="..\scintilla\src\LexPython.cxx" />
- <ClCompile Include="..\scintilla\src\LexRuby.cxx" />
- <ClCompile Include="..\scintilla\src\LexSQL.cxx" />
- <ClCompile Include="..\scintilla\src\LexTCL.cxx" />
- <ClCompile Include="..\scintilla\src\LexVB.cxx" />
- <ClCompile Include="..\scintilla\src\LineMarker.cxx" />
- <ClCompile Include="..\scintilla\src\PerLine.cxx" />
- <ClCompile Include="..\scintilla\src\PositionCache.cxx" />
- <ClCompile Include="..\scintilla\src\PropSet.cxx" />
- <ClCompile Include="..\scintilla\src\RESearch.cxx" />
- <ClCompile Include="..\scintilla\src\RunStyles.cxx" />
- <ClCompile Include="..\scintilla\src\ScintillaBase.cxx" />
- <ClCompile Include="..\scintilla\src\Selection.cxx" />
- <ClCompile Include="..\scintilla\src\Style.cxx" />
- <ClCompile Include="..\scintilla\src\StyleContext.cxx" />
- <ClCompile Include="..\scintilla\src\UniConversion.cxx" />
- <ClCompile Include="..\scintilla\src\ViewStyle.cxx" />
- <ClCompile Include="..\scintilla\src\WindowAccessor.cxx" />
- <ClCompile Include="..\scintilla\src\XPM.cxx" />
- <ClCompile Include="..\scintilla\win32\PlatWin.cxx" />
- <ClCompile Include="..\scintilla\win32\ScintillaWin.cxx" />
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/src/Notepad2_icl12.vcxproj.filters b/src/Notepad2_icl12.vcxproj.filters
index 9275912..efed7f6 100644
--- a/src/Notepad2_icl12.vcxproj.filters
+++ b/src/Notepad2_icl12.vcxproj.filters
@@ -16,17 +16,205 @@
<Filter Include="Scintilla">
<UniqueIdentifier>{ed9b3c28-9a07-46c0-8a59-7d0909d41240}</UniqueIdentifier>
</Filter>
- <Filter Include="Scintilla\win32">
- <UniqueIdentifier>{a32f9603-4321-4b8e-8ccc-f9b453f4feb9}</UniqueIdentifier>
+ <Filter Include="Scintilla\include">
+ <UniqueIdentifier>{720b705e-03e3-4db1-8272-00413fd63748}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Scintilla\lexers">
+ <UniqueIdentifier>{d935131a-8e0b-4edd-8e22-10accb5ffeb0}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Scintilla\lexlib">
+ <UniqueIdentifier>{fe9e2269-192b-4e55-b221-dfc50a195d93}</UniqueIdentifier>
</Filter>
<Filter Include="Scintilla\src">
<UniqueIdentifier>{fece5d6a-3edf-4aa6-8a57-671022c06e27}</UniqueIdentifier>
</Filter>
- <Filter Include="Scintilla\include">
- <UniqueIdentifier>{720b705e-03e3-4db1-8272-00413fd63748}</UniqueIdentifier>
+ <Filter Include="Scintilla\win32">
+ <UniqueIdentifier>{a32f9603-4321-4b8e-8ccc-f9b453f4feb9}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="Dialogs.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Dlapi.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Edit.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Helpers.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Notepad2.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Print.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="Styles.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexAHK.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexAsm.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexAU3.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexConf.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexCPP.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexCSS.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexHTML.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexInno.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexLua.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexNsis.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexOthers.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexPascal.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexPerl.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexPowerShell.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexPython.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexRuby.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexSQL.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexTCL.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexVB.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexers\LexBash.cxx">
+ <Filter>Scintilla\lexers</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\Accessor.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\CharacterSet.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\LexerBase.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\LexerModule.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\LexerSimple.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\PropSetSimple.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\StyleContext.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\lexlib\WordList.cxx">
+ <Filter>Scintilla\lexlib</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\AutoComplete.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\CallTip.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\Catalogue.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\CellBuffer.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\CharClassify.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\ContractionState.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\Decoration.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\Document.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\Editor.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\ExternalLexer.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\Indicator.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\KeyMap.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\LineMarker.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\PerLine.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\PositionCache.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\RESearch.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\RunStyles.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\ScintillaBase.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\Selection.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\Style.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\UniConversion.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\ViewStyle.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\src\XPM.cxx">
+ <Filter>Scintilla\src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\win32\PlatWin.cxx">
+ <Filter>Scintilla\win32</Filter>
+ </ClCompile>
+ <ClCompile Include="..\scintilla\win32\ScintillaWin.cxx">
+ <Filter>Scintilla\win32</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
<ClInclude Include="Dialogs.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -42,31 +230,46 @@
<ClInclude Include="Notepad2.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="SciCall.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Styles.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="Version.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\scintilla\win32\PlatformRes.h">
<Filter>Scintilla\win32</Filter>
</ClInclude>
+ <ClInclude Include="..\scintilla\include\ILexer.h">
+ <Filter>Scintilla\include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\include\Platform.h">
+ <Filter>Scintilla\include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\include\SciLexer.h">
+ <Filter>Scintilla\include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\include\Scintilla.h">
+ <Filter>Scintilla\include</Filter>
+ </ClInclude>
+ <ClInclude Include="..\scintilla\include\ScintillaWidget.h">
+ <Filter>Scintilla\include</Filter>
+ </ClInclude>
<ClInclude Include="..\scintilla\src\AutoComplete.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
<ClInclude Include="..\scintilla\src\CallTip.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\src\CellBuffer.h">
+ <ClInclude Include="..\scintilla\src\Catalogue.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\src\CharacterSet.h">
+ <ClInclude Include="..\scintilla\src\CellBuffer.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
<ClInclude Include="..\scintilla\src\CharClassify.h">
@@ -81,15 +284,15 @@
<ClInclude Include="..\scintilla\src\Document.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\src\DocumentAccessor.h">
- <Filter>Scintilla\src</Filter>
- </ClInclude>
<ClInclude Include="..\scintilla\src\Editor.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
<ClInclude Include="..\scintilla\src\ExternalLexer.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
+ <ClInclude Include="..\scintilla\src\FontQuality.h">
+ <Filter>Scintilla\src</Filter>
+ </ClInclude>
<ClInclude Include="..\scintilla\src\Indicator.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
@@ -126,9 +329,6 @@
<ClInclude Include="..\scintilla\src\Style.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\src\StyleContext.h">
- <Filter>Scintilla\src</Filter>
- </ClInclude>
<ClInclude Include="..\scintilla\src\SVector.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
@@ -141,29 +341,26 @@
<ClInclude Include="..\scintilla\src\XPM.h">
<Filter>Scintilla\src</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\include\Accessor.h">
- <Filter>Scintilla\include</Filter>
+ <ClInclude Include="..\scintilla\lexlib\Accessor.h">
+ <Filter>Scintilla\lexlib</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\include\KeyWords.h">
- <Filter>Scintilla\include</Filter>
+ <ClInclude Include="..\scintilla\lexlib\CharacterSet.h">
+ <Filter>Scintilla\lexlib</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\include\Platform.h">
- <Filter>Scintilla\include</Filter>
+ <ClInclude Include="..\scintilla\lexlib\LexAccessor.h">
+ <Filter>Scintilla\lexlib</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\include\PropSet.h">
- <Filter>Scintilla\include</Filter>
+ <ClInclude Include="..\scintilla\lexlib\LexerBase.h">
+ <Filter>Scintilla\lexlib</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\include\SciLexer.h">
- <Filter>Scintilla\include</Filter>
+ <ClInclude Include="..\scintilla\lexlib\LexerModule.h">
+ <Filter>Scintilla\lexlib</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\include\Scintilla.h">
- <Filter>Scintilla\include</Filter>
+ <ClInclude Include="..\scintilla\lexlib\LexerSimple.h">
+ <Filter>Scintilla\lexlib</Filter>
</ClInclude>
- <ClInclude Include="..\scintilla\include\ScintillaWidget.h">
- <Filter>Scintilla\include</Filter>
- </ClInclude>
- <ClInclude Include="..\scintilla\include\WindowAccessor.h">
- <Filter>Scintilla\include</Filter>
+ <ClInclude Include="..\scintilla\lexlib\OptionSet.h">
+ <Filter>Scintilla\lexlib</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -173,9 +370,6 @@
<None Include="..\res\Encoding.bmp">
<Filter>Resource Files</Filter>
</None>
- <None Include="..\scintilla\win32\Margin.cur">
- <Filter>Resource Files</Filter>
- </None>
<None Include="..\res\Next.bmp">
<Filter>Resource Files</Filter>
</None>
@@ -200,6 +394,9 @@
<None Include="..\res\Toolbar.bmp">
<Filter>Resource Files</Filter>
</None>
+ <None Include="..\scintilla\win32\Margin.cur">
+ <Filter>Resource Files</Filter>
+ </None>
</ItemGroup>
<ItemGroup>
<Manifest Include="..\res\Notepad2.exe.manifest">
@@ -211,174 +408,4 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
- <ItemGroup>
- <ClCompile Include="Dialogs.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Dlapi.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Edit.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Helpers.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Notepad2.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Print.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Styles.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\AutoComplete.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\CallTip.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\CellBuffer.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\CharClassify.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\ContractionState.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\Decoration.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\Document.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\DocumentAccessor.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\Editor.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\ExternalLexer.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\Indicator.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\KeyMap.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\KeyWords.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexAsm.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexAU3.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexBash.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexConf.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexCPP.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexCSS.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexHTML.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexInno.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexLua.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexNsis.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexOthers.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexPascal.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexPerl.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexPowerShell.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexPython.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexRuby.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexSQL.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexTCL.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexVB.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LineMarker.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\PerLine.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\PositionCache.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\PropSet.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\RESearch.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\RunStyles.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\ScintillaBase.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\Selection.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\Style.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\StyleContext.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\UniConversion.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\ViewStyle.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\WindowAccessor.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\XPM.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\src\LexAHK.cxx">
- <Filter>Scintilla\src</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\win32\PlatWin.cxx">
- <Filter>Scintilla\win32</Filter>
- </ClCompile>
- <ClCompile Include="..\scintilla\win32\ScintillaWin.cxx">
- <Filter>Scintilla\win32</Filter>
- </ClCompile>
- </ItemGroup>
</Project> \ No newline at end of file
diff --git a/src/Styles.c b/src/Styles.c
index 05be76e..d4cc9ed 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -1761,8 +1761,10 @@ void Style_SetLexer(HWND hwnd,PEDITLEXER pLexNew)
else
SendMessage(hwnd,SCI_SETSTYLEBITS,5,0);
- if (pLexNew->iLexer == SCLEX_CPP)
+ if (pLexNew->iLexer == SCLEX_CPP) {
SendMessage(hwnd,SCI_SETPROPERTY,(WPARAM)"styling.within.preprocessor",(LPARAM)"1");
+ SendMessage(hwnd,SCI_SETPROPERTY,(WPARAM)"lexer.cpp.track.preprocessor",(LPARAM)"0");
+ }
else if (pLexNew->iLexer == SCLEX_PASCAL)
SendMessage(hwnd,SCI_SETPROPERTY,(WPARAM)"lexer.pascal.smart.highlighting",(LPARAM)"1");
else if (pLexNew->iLexer == SCLEX_NSIS)
@@ -1772,6 +1774,13 @@ void Style_SetLexer(HWND hwnd,PEDITLEXER pLexNew)
SendMessage(hwnd,SCI_SETPROPERTY,(WPARAM)"lexer.sql.backticks.identifier",(LPARAM)"1");
}
+ // Code folding
+ SciCall_SetProperty("fold", "1");
+ SciCall_SetProperty("fold.compact", "0");
+ SciCall_SetProperty("fold.comment", "1");
+ SciCall_SetProperty("fold.html", "1");
+ SciCall_SetProperty("fold.preprocessor", "1");
+
// Add KeyWord Lists
for (i = 0; i < 9; i++)
SendMessage(hwnd,SCI_SETKEYWORDS,i,(LPARAM)pLexNew->pKeyWords->pszKeyWords[i]);
generated by cgit v1.1 at 2025-05-18 06:05:49 +0000