Set version to 2.5.5

Signed-off-by: Simon Rozman <simon@rozman.si>

MSI/ZRCola/Makefile

@@ -1,21 +1,5 @@
-#
+#    SPDX-License-Identifier: GPL-3.0-or-later
 #    Copyright © 1991-2021 Amebis
-#
-#    This file is part of ZRCola.
-#
-#    ZRCola is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    ZRCola is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
-#
 
 !INCLUDE "..\..\include\MSIBuildCfg.mak"
 !INCLUDE "..\MSIBuild\Makefile"

README.md

@@ -33,15 +33,15 @@ ZRCola is using wxWidgets static libraries. You have to compile static libraries
 4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64 BUILD=release`
 
 #### Specifying wxWidgets path
-ZRCola compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets`).
+ZRCola compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (e.g. `C:\SDK\wxWidgets`).
 
 ### Digital Signing of Build Outputs
 In order to have the build process digitally sign output files, one should provide the following:
 
 1. A signing certificate installed in the current user's certificate store.
 2. The following variables in the environment:
-  - `ManifestCertificateThumbprint` - set the value to certificate's SHA1 thumbprint (hexadecimal, without spaces, i.e. `bc0d8da45f9eeefcbe4e334e1fc262804df88d7e`).
-  - `ManifestTimestampUrl`          - set the value to URL used to perform timestamp signature (i.e. `http://timestamp.verisign.com/scripts/timstamp.dll`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.
+  - `ManifestCertificateThumbprint` - set the value to certificate's SHA1 thumbprint (hexadecimal, without spaces, e.g. `f61b973226c502a732d24f41aa85e192b009e7c0`).
+  - `ManifestTimestampRFC3161Url`   - set the value to URL used to perform RFC3161 timestamp signature (e.g. `http://time.certum.pl`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.
 
 Please note that only Release builds are configured for timestamp signing. Debug configurations do not attempt to timestamp sign the resulting DLL and EXE files in order to speed up the building process and enable offline building.
 
@@ -54,7 +54,7 @@ Use Microsoft NMAKE to build the project. The resulting files can be found in ou
 - `nmake Register`	Build a debug version of project, install fonts (reboot required), and Start Menu shortcuts. For development purposes only!
 - `nmake Unregister`	Remove Start Menu shortcuts, and fonts. For development purposes only!
 
-The `/ls` flag can be appended to the commands above to reduce NMAKE's verbosity. You can combine multiple targets (i.e. nmake Unregister Clean). Please, see NMAKE reference for further reading.
+The `/ls` flag can be appended to the commands above to reduce NMAKE's verbosity. You can combine multiple targets (e.g. nmake Unregister Clean). Please, see NMAKE reference for further reading.
 
 ## Translating ZRCola
 Instructions how to translate ZRCola to your language can be found [here](LOCALIZATION.md).

ZRCola.sln

@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRCola", "ZRCola\ZRCola.vcx
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-16.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CFEBC17E-C840-4507-BDE6-1EF5B52DDCC5}"
 	ProjectSection(SolutionItems) = preProject
@@ -18,11 +18,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-16.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updater", "Updater\Updater\build\Updater.vcxproj", "{990D8CF9-4457-4DC0-AA18-4968EF434741}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-16.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

ZRCola/ZRCola.props

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\Updater\Updater\include;..\lib\stdex\include;..\lib\WinStd\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Manifest>
-      <EnableDpiAwareness>true</EnableDpiAwareness>
-    </Manifest>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\Updater\Updater\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

ZRCola/ZRCola.vcxproj

@@ -29,98 +29,47 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CD9E4170-92DD-440E-980C-D15F62032249}</ProjectGuid>
     <RootNamespace>ZRCola</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
     <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
     <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\include\$(Platform).props" />
     <Import Project="..\include\$(Configuration).props" />
-    <Import Project="ZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="ZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="ZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="ZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="ZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="ZRCola.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\Updater\Updater\include;..\lib\stdex\include;..\lib\WinStd\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Manifest>
+      <EnableDpiAwareness>true</EnableDpiAwareness>
+    </Manifest>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\Updater\Updater\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
+      <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="zrcolaabout.cpp" />
     <ClCompile Include="zrcolaapp.cpp" />
@@ -159,10 +108,10 @@
     <ProjectReference Include="..\lib\libZRCola\build\libZRCola.vcxproj">
       <Project>{3c61929e-7289-4101-8d0a-da22d6e1aea8}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-16.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib-16.0.vcxproj">
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib.vcxproj">
       <Project>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</Project>
     </ProjectReference>
     <ProjectReference Include="..\Updater\Updater\build\Updater.vcxproj">

ZRCola/pch.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"

ZRCola/pch.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once

ZRCola/res/ZRCola.fbp

@@ -247,30 +247,66 @@
                         <property name="name">separator4</property>
                         <property name="permission">none</property>
                     </object>
+                    <object class="submenu" expanded="0">
+                        <property name="bitmap"></property>
+                        <property name="label">(De)&amp;composition</property>
+                        <property name="name">m_menuComposition</property>
+                        <property name="permission">none</property>
+                        <object class="wxMenuItem" expanded="0">
+                            <property name="bitmap"></property>
+                            <property name="checked">0</property>
+                            <property name="enabled">1</property>
+                            <property name="help">No character (De)composition</property>
+                            <property name="id">wxID_COMPOSITION_NONE</property>
+                            <property name="kind">wxITEM_RADIO</property>
+                            <property name="label">&amp;None</property>
+                            <property name="name">m_menuItemCompositionNone</property>
+                            <property name="permission">protected</property>
+                            <property name="shortcut"></property>
+                            <property name="unchecked_bitmap"></property>
+                        </object>
+                        <object class="wxMenuItem" expanded="0">
+                            <property name="bitmap"></property>
+                            <property name="checked">0</property>
+                            <property name="enabled">1</property>
+                            <property name="help">ZRCola character (De)composition</property>
+                            <property name="id">wxID_COMPOSITION_ZRCOLA</property>
+                            <property name="kind">wxITEM_RADIO</property>
+                            <property name="label">&amp;ZRCola</property>
+                            <property name="name">m_menuItemCompositionZRCola</property>
+                            <property name="permission">protected</property>
+                            <property name="shortcut"></property>
+                            <property name="unchecked_bitmap"></property>
+                        </object>
+                        <object class="wxMenuItem" expanded="0">
+                            <property name="bitmap"></property>
+                            <property name="checked">0</property>
+                            <property name="enabled">1</property>
+                            <property name="help">Unicode character (De)composition</property>
+                            <property name="id">wxID_COMPOSITION_UNICODE</property>
+                            <property name="kind">wxITEM_RADIO</property>
+                            <property name="label">&amp;Unicode</property>
+                            <property name="name">m_menuItemCompositionUnicode</property>
+                            <property name="permission">protected</property>
+                            <property name="shortcut"></property>
+                            <property name="unchecked_bitmap"></property>
+                        </object>
+                    </object>
                     <object class="submenu" expanded="0">
                         <property name="bitmap"></property>
                         <property name="label">Tra&amp;nslation</property>
                         <property name="name">m_menuTranslationSeq</property>
                         <property name="permission">protected</property>
                     </object>
-                    <object class="wxMenuItem" expanded="0">
-                        <property name="bitmap"></property>
-                        <property name="checked">0</property>
-                        <property name="enabled">1</property>
-                        <property name="help">Toggle ZRCola character (De)composition</property>
-                        <property name="id">wxID_COMPOSITION</property>
-                        <property name="kind">wxITEM_CHECK</property>
-                        <property name="label">&amp;ZRCola (De)composition</property>
-                        <property name="name">m_menuItemComposition</property>
-                        <property name="permission">protected</property>
-                        <property name="shortcut"></property>
-                        <property name="unchecked_bitmap"></property>
+                    <object class="separator" expanded="0">
+                        <property name="name">separator5</property>
+                        <property name="permission">none</property>
                     </object>
                     <object class="wxMenuItem" expanded="0">
                         <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help">Toggle PUA warning</property>
+                        <property name="help">Highlight Private Use Area Characters</property>
                         <property name="id">wxID_WARN_PUA</property>
                         <property name="kind">wxITEM_CHECK</property>
                         <property name="label">&amp;PUA Warning</property>
@@ -280,7 +316,7 @@
                         <property name="unchecked_bitmap"></property>
                     </object>
                     <object class="separator" expanded="0">
-                        <property name="name">separator5</property>
+                        <property name="name">separator6</property>
                         <property name="permission">none</property>
                     </object>
                     <object class="wxMenuItem" expanded="0">
@@ -612,6 +648,66 @@
                 <object class="toolSeparator" expanded="0">
                     <property name="permission">protected</property>
                 </object>
+                <object class="wxChoice" expanded="0">
+                    <property name="BottomDockable">1</property>
+                    <property name="LeftDockable">1</property>
+                    <property name="RightDockable">1</property>
+                    <property name="TopDockable">1</property>
+                    <property name="aui_layer"></property>
+                    <property name="aui_name"></property>
+                    <property name="aui_position"></property>
+                    <property name="aui_row"></property>
+                    <property name="best_size"></property>
+                    <property name="bg"></property>
+                    <property name="caption"></property>
+                    <property name="caption_visible">1</property>
+                    <property name="center_pane">0</property>
+                    <property name="choices">&quot;None&quot; &quot;ZRCola&quot; &quot;Unicode&quot;</property>
+                    <property name="close_button">1</property>
+                    <property name="context_help"></property>
+                    <property name="context_menu">1</property>
+                    <property name="default_pane">0</property>
+                    <property name="dock">Dock</property>
+                    <property name="dock_fixed">0</property>
+                    <property name="docking">Left</property>
+                    <property name="enabled">1</property>
+                    <property name="fg"></property>
+                    <property name="floatable">1</property>
+                    <property name="font"></property>
+                    <property name="gripper">0</property>
+                    <property name="hidden">0</property>
+                    <property name="id">wxID_ANY</property>
+                    <property name="max_size"></property>
+                    <property name="maximize_button">0</property>
+                    <property name="maximum_size"></property>
+                    <property name="min_size"></property>
+                    <property name="minimize_button">0</property>
+                    <property name="minimum_size">-1,-1</property>
+                    <property name="moveable">1</property>
+                    <property name="name">m_toolComposition</property>
+                    <property name="pane_border">1</property>
+                    <property name="pane_position"></property>
+                    <property name="pane_size"></property>
+                    <property name="permission">protected</property>
+                    <property name="pin_button">1</property>
+                    <property name="pos"></property>
+                    <property name="resize">Resizable</property>
+                    <property name="selection">0</property>
+                    <property name="show">1</property>
+                    <property name="size">120,-1</property>
+                    <property name="style"></property>
+                    <property name="subclass"></property>
+                    <property name="toolbar_pane">0</property>
+                    <property name="tooltip"></property>
+                    <property name="validator_data_type"></property>
+                    <property name="validator_style">wxFILTER_NONE</property>
+                    <property name="validator_type">wxDefaultValidator</property>
+                    <property name="validator_variable"></property>
+                    <property name="window_extra_style"></property>
+                    <property name="window_name"></property>
+                    <property name="window_style"></property>
+                    <event name="OnChoice">OnCompositionChoice</event>
+                </object>
                 <object class="wxChoice" expanded="0">
                     <property name="BottomDockable">1</property>
                     <property name="LeftDockable">1</property>
@@ -658,7 +754,7 @@
                     <property name="resize">Resizable</property>
                     <property name="selection">0</property>
                     <property name="show">1</property>
-                    <property name="size">240,-1</property>
+                    <property name="size">180,-1</property>
                     <property name="style"></property>
                     <property name="subclass"></property>
                     <property name="toolbar_pane">0</property>
@@ -672,16 +768,8 @@
                     <property name="window_style"></property>
                     <event name="OnChoice">OnTranslationSeqChoice</event>
                 </object>
-                <object class="tool" expanded="0">
-                    <property name="bitmap">Load From Icon Resource; composition.ico; [24; 24]</property>
-                    <property name="context_menu">0</property>
-                    <property name="id">wxID_COMPOSITION</property>
-                    <property name="kind">wxITEM_CHECK</property>
-                    <property name="label">ZRCola (De)composition</property>
-                    <property name="name">m_toolComposition</property>
+                <object class="toolSeparator" expanded="0">
                     <property name="permission">protected</property>
-                    <property name="statusbar">Toggle ZRCola character (De)composition</property>
-                    <property name="tooltip">ZRCola (De)composition</property>
                 </object>
                 <object class="tool" expanded="0">
                     <property name="bitmap">Load From Icon Resource; warn_pua.ico; [24; 24]</property>
@@ -691,8 +779,8 @@
                     <property name="label">PUA Warning</property>
                     <property name="name">m_toolWarnPUA</property>
                     <property name="permission">protected</property>
-                    <property name="statusbar">Toggle PUA warning</property>
-                    <property name="tooltip">Highlight PUA Characters</property>
+                    <property name="statusbar">Highlight Private Use Area Characters</property>
+                    <property name="tooltip">Highlight Private Use Area Characters</property>
                 </object>
             </object>
             <object class="CustomControl" expanded="0">
@@ -5623,7 +5711,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">&gt;</property>
+                                                <property name="label">→</property>
                                                 <property name="margins"></property>
                                                 <property name="markup">0</property>
                                                 <property name="max_size"></property>
@@ -5696,7 +5784,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">&lt;</property>
+                                                <property name="label">←</property>
                                                 <property name="margins"></property>
                                                 <property name="markup">0</property>
                                                 <property name="max_size"></property>
@@ -5919,7 +6007,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Up</property>
+                                        <property name="label">↑</property>
                                         <property name="margins"></property>
                                         <property name="markup">0</property>
                                         <property name="max_size"></property>
@@ -5940,7 +6028,7 @@
                                         <property name="pressed"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size">70,-1</property>
+                                        <property name="size">32,32</property>
                                         <property name="style"></property>
                                         <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
@@ -5992,7 +6080,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Down</property>
+                                        <property name="label">↓</property>
                                         <property name="margins"></property>
                                         <property name="markup">0</property>
                                         <property name="max_size"></property>
@@ -6013,7 +6101,7 @@
                                         <property name="pressed"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size">70,-1</property>
+                                        <property name="size">32,32</property>
                                         <property name="style"></property>
                                         <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>

ZRCola/res/zrcolagui.cpp

@@ -133,14 +133,27 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 
 	m_menuEdit->AppendSeparator();
 
+	wxMenu* m_menuComposition;
+	m_menuComposition = new wxMenu();
+	wxMenuItem* m_menuCompositionItem = new wxMenuItem( m_menuEdit, wxID_ANY, _("(De)&composition"), wxEmptyString, wxITEM_NORMAL, m_menuComposition );
+	m_menuItemCompositionNone = new wxMenuItem( m_menuComposition, wxID_COMPOSITION_NONE, wxString( _("&None") ) , _("No character (De)composition"), wxITEM_RADIO );
+	m_menuComposition->Append( m_menuItemCompositionNone );
+
+	m_menuItemCompositionZRCola = new wxMenuItem( m_menuComposition, wxID_COMPOSITION_ZRCOLA, wxString( _("&ZRCola") ) , _("ZRCola character (De)composition"), wxITEM_RADIO );
+	m_menuComposition->Append( m_menuItemCompositionZRCola );
+
+	m_menuItemCompositionUnicode = new wxMenuItem( m_menuComposition, wxID_COMPOSITION_UNICODE, wxString( _("&Unicode") ) , _("Unicode character (De)composition"), wxITEM_RADIO );
+	m_menuComposition->Append( m_menuItemCompositionUnicode );
+
+	m_menuEdit->Append( m_menuCompositionItem );
+
 	m_menuTranslationSeq = new wxMenu();
 	wxMenuItem* m_menuTranslationSeqItem = new wxMenuItem( m_menuEdit, wxID_ANY, _("Tra&nslation"), wxEmptyString, wxITEM_NORMAL, m_menuTranslationSeq );
 	m_menuEdit->Append( m_menuTranslationSeqItem );
 
-	m_menuItemComposition = new wxMenuItem( m_menuEdit, wxID_COMPOSITION, wxString( _("&ZRCola (De)composition") ) , _("Toggle ZRCola character (De)composition"), wxITEM_CHECK );
-	m_menuEdit->Append( m_menuItemComposition );
+	m_menuEdit->AppendSeparator();
 
-	m_menuItemWarnPUA = new wxMenuItem( m_menuEdit, wxID_WARN_PUA, wxString( _("&PUA Warning") ) , _("Toggle PUA warning"), wxITEM_CHECK );
+	m_menuItemWarnPUA = new wxMenuItem( m_menuEdit, wxID_WARN_PUA, wxString( _("&PUA Warning") ) , _("Highlight Private Use Area Characters"), wxITEM_CHECK );
 	m_menuEdit->Append( m_menuItemWarnPUA );
 
 	m_menuEdit->AppendSeparator();
@@ -216,13 +229,18 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 
 	m_toolbarTranslate->AddSeparator();
 
+	wxString m_toolCompositionChoices[] = { _("No (De)composition"), _("ZRCola"), _("Unicode") };
+	int m_toolCompositionNChoices = sizeof( m_toolCompositionChoices ) / sizeof( wxString );
+	m_toolComposition = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, wxSize( 120,-1 ), m_toolCompositionNChoices, m_toolCompositionChoices, 0 );
+	m_toolComposition->SetSelection( 0 );
+	m_toolbarTranslate->AddControl( m_toolComposition );
 	wxArrayString m_toolTranslationSeqChoices;
-	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, wxSize( 240,-1 ), m_toolTranslationSeqChoices, 0 );
+	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), m_toolTranslationSeqChoices, 0 );
 	m_toolTranslationSeq->SetSelection( 0 );
 	m_toolbarTranslate->AddControl( m_toolTranslationSeq );
-	m_toolComposition = m_toolbarTranslate->AddTool( wxID_COMPOSITION, _("ZRCola (De)composition"), wxIcon( wxT("composition.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("ZRCola (De)composition"), _("Toggle ZRCola character (De)composition"), NULL );
+	m_toolbarTranslate->AddSeparator();
 
-	m_toolWarnPUA = m_toolbarTranslate->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("Highlight PUA Characters"), _("Toggle PUA warning"), NULL );
+	m_toolWarnPUA = m_toolbarTranslate->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
 
 	m_toolbarTranslate->Realize();
 	m_mgr.AddPane( m_toolbarTranslate, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
@@ -244,6 +262,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxZRColaFrameBase::OnClose ) );
 	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
+	m_toolComposition->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnCompositionChoice ), NULL, this );
 	m_toolTranslationSeq->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
 }
 
@@ -253,6 +272,7 @@ wxZRColaFrameBase::~wxZRColaFrameBase()
 	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxZRColaFrameBase::OnClose ) );
 	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
+	m_toolComposition->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnCompositionChoice ), NULL, this );
 	m_toolTranslationSeq->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
 
 	m_mgr.UnInit();
@@ -1159,10 +1179,10 @@ wxZRColaTranslationSeqBase::wxZRColaTranslationSeqBase( wxWindow* parent, wxWind
 	wxBoxSizer* bSizerTransSelect;
 	bSizerTransSelect = new wxBoxSizer( wxVERTICAL );
 
-	m_add = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _(">"), wxDefaultPosition, wxSize( 32,32 ), 0 );
+	m_add = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("→"), wxDefaultPosition, wxSize( 32,32 ), 0 );
 	bSizerTransSelect->Add( m_add, 0, wxALL, 5 );
 
-	m_remove = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("<"), wxDefaultPosition, wxSize( 32,32 ), 0 );
+	m_remove = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("←"), wxDefaultPosition, wxSize( 32,32 ), 0 );
 	bSizerTransSelect->Add( m_remove, 0, wxALL, 5 );
 
 
@@ -1189,10 +1209,10 @@ wxZRColaTranslationSeqBase::wxZRColaTranslationSeqBase( wxWindow* parent, wxWind
 	wxBoxSizer* bSizerTransActiveReorder;
 	bSizerTransActiveReorder = new wxBoxSizer( wxHORIZONTAL );
 
-	m_selectedUp = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("Up"), wxDefaultPosition, wxSize( 70,-1 ), 0 );
+	m_selectedUp = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("↑"), wxDefaultPosition, wxSize( 32,32 ), 0 );
 	bSizerTransActiveReorder->Add( m_selectedUp, 0, wxALL, 5 );
 
-	m_selectedDown = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("Down"), wxDefaultPosition, wxSize( 70,-1 ), 0 );
+	m_selectedDown = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("↓"), wxDefaultPosition, wxSize( 32,32 ), 0 );
 	bSizerTransActiveReorder->Add( m_selectedDown, 0, wxALL, 5 );
 
 

ZRCola/res/zrcolagui.h

@@ -67,7 +67,9 @@ class wxZRColaFrameBase : public wxFrame
 			wxID_SEND_SOURCE,
 			wxID_COPY_SOURCE_AND_RETURN,
 			wxID_SEND_ABORT,
-			wxID_COMPOSITION,
+			wxID_COMPOSITION_NONE,
+			wxID_COMPOSITION_ZRCOLA,
+			wxID_COMPOSITION_UNICODE,
 			wxID_WARN_PUA,
 			wxID_SETTINGS,
 			wxID_TOOLBAR_EDIT,
@@ -82,8 +84,10 @@ class wxZRColaFrameBase : public wxFrame
 		wxMenuBar* m_menubar;
 		wxMenu* m_menuProgram;
 		wxMenu* m_menuEdit;
+		wxMenuItem* m_menuItemCompositionNone;
+		wxMenuItem* m_menuItemCompositionZRCola;
+		wxMenuItem* m_menuItemCompositionUnicode;
 		wxMenu* m_menuTranslationSeq;
-		wxMenuItem* m_menuItemComposition;
 		wxMenuItem* m_menuItemWarnPUA;
 		wxMenu* m_menuView;
 		wxMenu* m_menuHelp;
@@ -95,8 +99,8 @@ class wxZRColaFrameBase : public wxFrame
 		wxAuiToolBarItem* m_toolCharSelect;
 		wxAuiToolBarItem* m_toolSendDestination;
 		wxAuiToolBarItem* m_toolSendSource;
+		wxChoice* m_toolComposition;
 		wxChoice* m_toolTranslationSeq;
-		wxAuiToolBarItem* m_toolComposition;
 		wxAuiToolBarItem* m_toolWarnPUA;
 		wxZRColaCharacterCatalogPanel* m_panelChrCat;
 		wxStatusBar* m_statusBar;
@@ -105,6 +109,7 @@ class wxZRColaFrameBase : public wxFrame
 		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
 		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
 		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
+		virtual void OnCompositionChoice( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); }
 
 

ZRCola/zrcolaabout.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"

ZRCola/zrcolaabout.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///

ZRCola/zrcolaapp.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
@@ -158,6 +144,12 @@ bool ZRColaApp::OnInit()
                             wxFAIL_MSG(wxT("Error reading tag name data from ZRCola.zrcdb."));
                             m_tn_db.clear();
                         }
+                    } else if (id == ZRCola::highlight_rec::id) {
+                        dat >> ZRCola::highlight_rec(m_h_db);
+                        if (!dat.good()) {
+                            wxFAIL_MSG(wxT("Error reading highlight data from ZRCola.zrcdb."));
+                            m_h_db.clear();
+                        }
                     } else
                         stdex::idrec::ignore<ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dat);
                 }
@@ -174,6 +166,7 @@ bool ZRColaApp::OnInit()
     wxSocketBase::Initialize();
 
     m_mainWnd = new wxZRColaFrame();
+    m_mainWnd->m_panel->RestoreFromStateFile();
     m_mainWnd->Show();
 
     return true;

ZRCola/zrcolaapp.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///
@@ -35,6 +21,7 @@ class ZRColaApp;
 #include <wx/intl.h>
 #pragma warning(pop)
 #include <zrcola/character.h>
+#include <zrcola/highlight.h>
 #include <zrcola/language.h>
 #include <zrcola/translate.h>
 #include <zrcola/tag.h>
@@ -86,6 +73,7 @@ public:
     ZRCola::chrcat_db m_cc_db;      ///< Characted category database
     ZRCola::chrtag_db m_ct_db;      ///< Character tag database
     ZRCola::tagname_db m_tn_db;     ///< Tag name database
+    ZRCola::highlight_db m_h_db;    ///< Highlight database
 
     wxZRColaFrame *m_mainWnd;       ///< Main window
 

ZRCola/zrcolachrcatpnl.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"

ZRCola/zrcolachrcatpnl.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///

ZRCola/zrcolachrgrid.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"

ZRCola/zrcolachrgrid.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///

ZRCola/zrcolachrreq.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"

ZRCola/zrcolachrreq.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///

ZRCola/zrcolachrslct.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
@@ -237,8 +223,10 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :
 
 wxZRColaCharSelect::~wxZRColaCharSelect()
 {
-    if (m_searchThread)
+    if (m_searchThread) {
+        #pragma warning(suppress: 26812) // wxThreadError is unscoped.
         m_searchThread->Delete();
+    }
 
     Disconnect(wxID_ANY, wxEVT_SEARCH_COMPLETE, wxThreadEventHandler(wxZRColaCharSelect::OnSearchComplete), NULL, this);
 }

ZRCola/zrcolachrslct.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///

ZRCola/zrcolacomppnl.cpp

@@ -1,29 +1,10 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
 
-static inline bool is_pua(_In_ wchar_t c)
-{
-    return L'\ue000' <= c && c <= L'\uf8ff';
-}
-
 
 //////////////////////////////////////////////////////////////////////////
 // wxZRColaComposerPanel
@@ -36,6 +17,7 @@ wxZRColaComposerPanel::wxZRColaComposerPanel(wxWindow* parent) :
     m_destinationRestyled(false),
     m_styleNormal(*wxBLACK, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
     m_stylePUA(*wxBLUE, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
+    m_styleZRColaUnicodeComposedIssues(*wxRED, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
     m_selSource(0, 0),
     m_selDestination(0, 0),
     wxZRColaComposerPanelBase(parent)
@@ -45,7 +27,22 @@ wxZRColaComposerPanel::wxZRColaComposerPanel(wxWindow* parent) :
     m_destination->SetMargins(FromDIP(wxPoint(5, 2)));
 
     m_source->PushEventHandler(&m_keyhandler);
+}
 
+
+wxZRColaComposerPanel::~wxZRColaComposerPanel()
+{
+    m_source->PopEventHandler();
+
+    // This is a controlled exit. Purge saved state.
+    wxString fileName(GetStateFileName());
+    if (wxFileExists(fileName))
+        wxRemoveFile(fileName);
+}
+
+
+void wxZRColaComposerPanel::RestoreFromStateFile()
+{
     // Restore the previously saved state (if exists).
     wxString fileName(GetStateFileName());
     if (wxFileExists(fileName)) {
@@ -83,17 +80,6 @@ wxZRColaComposerPanel::wxZRColaComposerPanel(wxWindow* parent) :
 }
 
 
-wxZRColaComposerPanel::~wxZRColaComposerPanel()
-{
-    m_source->PopEventHandler();
-
-    // This is a controlled exit. Purge saved state.
-    wxString fileName(GetStateFileName());
-    if (wxFileExists(fileName))
-        wxRemoveFile(fileName);
-}
-
-
 void wxZRColaComposerPanel::SynchronizePanels()
 {
     if (m_sourceChanged) {
@@ -108,6 +94,15 @@ void wxZRColaComposerPanel::SynchronizePanels()
 
         m_mapping.clear();
 
+        if (app->m_mainWnd->m_composition) {
+            // ZRCola decompose first, then re-compose.
+            app->m_t_db.TranslateInv(app->m_mainWnd->m_composition_id, dst.data(), dst.size(), dst2, &map);
+            m_mapping.push_back(std::move(map));
+
+            app->m_t_db.Translate(app->m_mainWnd->m_composition_id, dst2.data(), dst2.size(), dst, &map);
+            m_mapping.push_back(std::move(map));
+        }
+
         // Other translations
         const ZRCola::transetid_t *sets_begin, *sets_end;
         GetTranslationSeq(sets_begin, sets_end);
@@ -117,15 +112,6 @@ void wxZRColaComposerPanel::SynchronizePanels()
             dst = std::move(dst2);
         }
 
-        if (app->m_mainWnd->m_composition) {
-            // ZRCola decompose first, then re-compose.
-            app->m_t_db.TranslateInv(ZRCOLA_TRANSEQID_DEFAULT, dst.data(), dst.size(), dst2, &map);
-            m_mapping.push_back(std::move(map));
-
-            app->m_t_db.Translate(ZRCOLA_TRANSEQID_DEFAULT, dst2.data(), dst2.size(), dst, &map);
-            m_mapping.push_back(std::move(map));
-        }
-
         m_source->GetSelection(&m_selSource.first, &m_selSource.second);
 
         // Update source HEX dump.
@@ -152,20 +138,20 @@ void wxZRColaComposerPanel::SynchronizePanels()
 
         m_mapping.clear();
 
-        if (app->m_mainWnd->m_composition) {
-            // ZRCola decompose.
-            app->m_t_db.TranslateInv(ZRCOLA_TRANSEQID_DEFAULT, dst.data(), dst.size(), &app->m_lc_db, app->m_mainWnd->m_settings->m_lang, dst2, &map);
+        // Other translations
+        const ZRCola::transetid_t *sets_begin, *sets_end;
+        GetTranslationSeq(sets_begin, sets_end);
+        for (auto s = sets_end; (s--) != sets_begin;) {
+            app->m_t_db.TranslateInv(*s, dst.data(), dst.size(), dst2, &map);
             dst = std::move(dst2);
 
             map.invert();
             m_mapping.push_back(std::move(map));
         }
 
-        // Other translations
-        const ZRCola::transetid_t *sets_begin, *sets_end;
-        GetTranslationSeq(sets_begin, sets_end);
-        for (auto s = sets_end; (s--) != sets_begin;) {
-            app->m_t_db.TranslateInv(*s, dst.data(), dst.size(), dst2, &map);
+        if (app->m_mainWnd->m_composition) {
+            // ZRCola decompose.
+            app->m_t_db.TranslateInv(app->m_mainWnd->m_composition_id, dst.data(), dst.size(), &app->m_lc_db, app->m_mainWnd->m_settings->m_lang, dst2, &map);
             dst = std::move(dst2);
 
             map.invert();
@@ -193,7 +179,6 @@ void wxZRColaComposerPanel::SynchronizePanels()
 }
 
 
-
 void wxZRColaComposerPanel::OnSourcePaint(wxPaintEvent& event)
 {
     event.Skip();
@@ -336,17 +321,25 @@ void wxZRColaComposerPanel::OnDestinationText(wxCommandEvent& event)
 
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     m_destinationRestyled = true;
-    if (app->m_mainWnd->m_warnPUA) {
-        wxString src = m_destination->GetValue();
-        size_t len = src.Length();
-        for (size_t i = 0, j; i < len;) {
-            bool pua_i = is_pua(src[i]);
-            for (j = i + 1; j < len && pua_i == is_pua(src[j]); j++);
-            m_destination->SetStyle((long)i, (long)j, pua_i ? m_stylePUA : m_styleNormal);
-            i = j;
+    wxString src = m_destination->GetValue();
+    app->m_h_db.Highlight(src, src.Length(), [this, app, src](ZRCola::hlghtsetid_t set, size_t start, size_t end) {
+        switch (set) {
+        case ZRCOLA_HLGHTSETID_ZRCOLA_UNICODE_COMPOSED_ISSUES:
+            m_destination->SetStyle((long)start, (long)end, m_styleZRColaUnicodeComposedIssues);
+            break;
+
+        default:
+            if (app->m_mainWnd->m_warnPUA) {
+                for (size_t i = start, j; i < end;) {
+                    bool pua_i = ZRCola::ispua(src[i]);
+                    for (j = i + 1; j < end && pua_i == ZRCola::ispua(src[j]); j++);
+                    m_destination->SetStyle((long)i, (long)j, pua_i ? m_stylePUA : m_styleNormal);
+                    i = j;
+                }
+            } else
+                m_destination->SetStyle((long)start, (long)end, m_styleNormal);
         }
-    } else
-        m_destination->SetStyle(0, GetWindowTextLength(m_destination->GetHWND()), m_styleNormal);
+    });
     m_destinationRestyled = false;
 }
 

ZRCola/zrcolacomppnl.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///
@@ -49,6 +35,7 @@ public:
     wxZRColaComposerPanel(wxWindow* parent);
     virtual ~wxZRColaComposerPanel();
 
+    void RestoreFromStateFile();
     void SynchronizePanels();
 
     friend class wxPersistentZRColaComposerPanel;   // Allow saving/restoring window state.
@@ -76,7 +63,8 @@ protected:
         m_destinationRestyled;                      ///< Boolean flag to mark destination text is being restyled
     wxTextAttr
         m_styleNormal,                              ///< Normal text style
-        m_stylePUA;                                 ///< PUA character text style
+        m_stylePUA,                                 ///< PUA character text style
+        m_styleZRColaUnicodeComposedIssues;         ///< ZRCola Unicode Composed issues character text style
     std::vector<ZRCola::mapping_vector> m_mapping;  ///< Character index mapping vector between source and normalized text
     std::pair<long, long>
         m_selSource,                                ///< Character index of selected text in source text control

ZRCola/zrcolafrm.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
@@ -42,7 +28,9 @@ wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
     EVT_MENU           (wxID_SEND_SOURCE                                      , wxZRColaFrame::OnSendSource                 )
     EVT_MENU           (wxID_SEND_ABORT                                       , wxZRColaFrame::OnSendAbort                  )
 
-    EVT_MENU           (wxID_COMPOSITION                                      , wxZRColaFrame::OnComposition                )
+    EVT_MENU           (wxID_COMPOSITION_NONE                                 , wxZRColaFrame::OnCompositionNone            )
+    EVT_MENU           (wxID_COMPOSITION_ZRCOLA                               , wxZRColaFrame::OnCompositionZRCola          )
+    EVT_MENU           (wxID_COMPOSITION_UNICODE                              , wxZRColaFrame::OnCompositionUnicode         )
     EVT_MENU           (wxID_WARN_PUA                                         , wxZRColaFrame::OnWarnPUA                    )
     EVT_MENU_RANGE     (wxID_TRANSLATION_SEQ_DEFAULT, wxID_TRANSLATION_SEQ_END, wxZRColaFrame::OnTranslationSeqMenu         )
 
@@ -75,6 +63,7 @@ wxZRColaFrame::wxZRColaFrame() :
     m_settings(NULL),
     m_chrReq(NULL),
     m_composition(true),
+    m_composition_id(ZRCOLA_TRANSETID_DEFAULT),
     m_warnPUA(false),
     m_transeq_id(ZRCOLA_TRANSEQID_DEFAULT),
     m_transeq(NULL),
@@ -188,12 +177,15 @@ wxZRColaFrame::wxZRColaFrame() :
     persist_mgr.RegisterAndRestore(this, new wxPersistentZRColaFrame(this));
 
     // Update (de)composition selection.
-    if (m_composition) {
-        m_menuItemComposition->Check(true);
-        m_toolComposition->SetState(m_toolComposition->GetState() | wxAUI_BUTTON_STATE_CHECKED);
+    if (m_composition && m_composition_id == ZRCOLA_TRANSETID_DEFAULT) {
+        m_menuItemCompositionZRCola->Check(true);
+        m_toolComposition->Select(1);
+    } else if (m_composition && m_composition_id == ZRCOLA_TRANSETID_UNICODE) {
+        m_menuItemCompositionUnicode->Check(true);
+        m_toolComposition->Select(2);
     } else {
-        m_menuItemComposition->Check(false);
-        m_toolComposition->SetState(m_toolComposition->GetState() & ~wxAUI_BUTTON_STATE_CHECKED);
+        m_menuItemCompositionNone->Check(true);
+        m_toolComposition->Select(0);
     }
 
     if (m_warnPUA) {
@@ -352,21 +344,43 @@ void wxZRColaFrame::OnSendAbort(wxCommandEvent& event)
 }
 
 
-void wxZRColaFrame::OnComposition(wxCommandEvent& event)
+void wxZRColaFrame::OnCompositionNone(wxCommandEvent& event)
 {
-    m_composition = !m_composition;
-    m_menuItemComposition->Check(m_composition);
-    m_toolComposition->SetState((m_toolComposition->GetState() & ~wxAUI_BUTTON_STATE_CHECKED) | (m_composition ? wxAUI_BUTTON_STATE_CHECKED : 0));
+    DoSetComposition(false, ZRCOLA_TRANSETID_DEFAULT);
     m_toolbarTranslate->Refresh();
 
-    // Notify source text something changed and should re-translate.
-    wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
-    m_panel->m_source->ProcessWindowEvent(event2);
+    event.Skip();
+}
+
+
+void wxZRColaFrame::OnCompositionZRCola(wxCommandEvent& event)
+{
+    DoSetComposition(true, ZRCOLA_TRANSETID_DEFAULT);
+    m_toolbarTranslate->Refresh();
 
     event.Skip();
 }
 
 
+void wxZRColaFrame::OnCompositionUnicode(wxCommandEvent& event)
+{
+    DoSetComposition(true, ZRCOLA_TRANSETID_UNICODE);
+    m_toolbarTranslate->Refresh();
+
+    event.Skip();
+}
+
+
+void wxZRColaFrame::OnCompositionChoice(wxCommandEvent& event)
+{
+    switch (event.GetSelection()) {
+    case 0: DoSetComposition(false, ZRCOLA_TRANSETID_DEFAULT); break;
+    case 1: DoSetComposition(true, ZRCOLA_TRANSETID_DEFAULT); break;
+    case 2: DoSetComposition(true, ZRCOLA_TRANSETID_UNICODE); break;
+    }
+}
+
+
 void wxZRColaFrame::OnWarnPUA(wxCommandEvent& event)
 {
     m_warnPUA = !m_warnPUA;
@@ -658,6 +672,30 @@ void wxZRColaFrame::DoCopyAndReturn(const wxString& str)
 }
 
 
+void wxZRColaFrame::DoSetComposition(bool enable, ZRCola::transetid_t transet_id)
+{
+    if (enable && transet_id == ZRCOLA_TRANSETID_DEFAULT) {
+        m_composition = true;
+        m_composition_id = ZRCOLA_TRANSETID_DEFAULT;
+        m_menuItemCompositionZRCola->Check(true);
+        m_toolComposition->Select(1);
+    } else if (enable && transet_id == ZRCOLA_TRANSETID_UNICODE) {
+        m_composition = true;
+        m_composition_id = ZRCOLA_TRANSETID_UNICODE;
+        m_menuItemCompositionUnicode->Check(true);
+        m_toolComposition->Select(2);
+    } else {
+        m_composition = false;
+        m_menuItemCompositionNone->Check(true);
+        m_toolComposition->Select(0);
+    }
+
+    // Notify source text something changed and should re-translate.
+    wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
+    m_panel->m_source->ProcessWindowEvent(event2);
+}
+
+
 void wxZRColaFrame::DoSetTranslationSeq(int idx, ZRCola::transeqid_t transeq_id)
 {
     if (transeq_id == ZRCOLA_TRANSEQID_CUSTOM) {
@@ -758,6 +796,7 @@ void wxPersistentZRColaFrame::Save() const
     auto wnd = static_cast<const wxZRColaFrame*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
     SaveValue(wxT("composition"), wnd->m_composition);
+    SaveValue(wxT("compositionId"), static_cast<int>(wnd->m_composition_id));
     SaveValue(wxT("warnPUA"), wnd->m_warnPUA);
     SaveValue(wxT("transeqId"), static_cast<int>(wnd->m_transeq_id));
 
@@ -782,6 +821,8 @@ bool wxPersistentZRColaFrame::Restore()
         wnd->m_composition = b;
     else
         wnd->m_composition = wnd->m_transeq_id == ZRCOLA_TRANSEQID_DEFAULT;
+    if (RestoreValue(wxT("compositionId"), &num))
+        wnd->m_composition_id = (ZRCola::transetid_t)num;
     if (RestoreValue(wxT("warnPUA"), &b))
         wnd->m_warnPUA = b;
     else

ZRCola/zrcolafrm.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///
@@ -90,7 +76,10 @@ protected:
     void OnSendSource(wxCommandEvent& event);
     void OnCopySourceAndReturn(wxCommandEvent& event);
     void OnSendAbort(wxCommandEvent& event);
-    void OnComposition(wxCommandEvent& event);
+    void OnCompositionNone(wxCommandEvent& event);
+    void OnCompositionZRCola(wxCommandEvent& event);
+    void OnCompositionUnicode(wxCommandEvent& event);
+    virtual void OnCompositionChoice(wxCommandEvent& event);
     void OnWarnPUA(wxCommandEvent& event);
     void OnSettings(wxCommandEvent& event);
     virtual void OnIdle(wxIdleEvent& event);
@@ -131,6 +120,7 @@ protected:
 private:
     void DoSend(const wxString& str);
     void DoCopyAndReturn(const wxString& str);
+    void DoSetComposition(bool enable, ZRCola::transetid_t transet_id);
     void DoSetTranslationSeq(int idx, ZRCola::transeqid_t transeq_id);
 
 protected:
@@ -142,16 +132,17 @@ protected:
     static const int s_guiLevel;        ///< Persisted placements/sizing are considered incompatible between different GUI levels
 
 protected:
-    WXHWND m_hWndSource;                ///< Handle of the active window, when the ZRCola hotkey was pressed
-    bool m_wasIconised;                 ///< Was the ZRCola window iconized, when the ZRCola hotkey was pressed
-    wxTaskBarIcon *m_taskBarIcon;       ///< Taskbar icon
-    wxZRColaCharSelect *m_chrSelect;    ///< Character selection dialog
-    wxZRColaCharRequest *m_chrReq;      ///< Request a New Character dialog
-    wxZRColaSettings *m_settings;       ///< Configuration dialog
-    bool m_composition;                 ///< Is (de)composition enabled?
-    bool m_warnPUA;                     ///< Mark Private-Use-Area characters in destination text
-    ZRCola::transeqid_t m_transeq_id;   ///< Translation sequence ID
-    wxZRColaTranslationSeq *m_transeq;  ///< Custom translation sequence dialog
+    WXHWND m_hWndSource;                    ///< Handle of the active window, when the ZRCola hotkey was pressed
+    bool m_wasIconised;                     ///< Was the ZRCola window iconized, when the ZRCola hotkey was pressed
+    wxTaskBarIcon *m_taskBarIcon;           ///< Taskbar icon
+    wxZRColaCharSelect *m_chrSelect;        ///< Character selection dialog
+    wxZRColaCharRequest *m_chrReq;          ///< Request a New Character dialog
+    wxZRColaSettings *m_settings;           ///< Configuration dialog
+    bool m_composition;                     ///< Is (de)composition enabled?
+    ZRCola::transetid_t m_composition_id;   ///< Which (de)composition is enabled
+    bool m_warnPUA;                         ///< Mark Private-Use-Area characters in destination text
+    ZRCola::transeqid_t m_transeq_id;       ///< Translation sequence ID
+    wxZRColaTranslationSeq *m_transeq;      ///< Custom translation sequence dialog
 };
 
 

ZRCola/zrcolagui.cpp

@@ -133,14 +133,27 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 
 	m_menuEdit->AppendSeparator();
 
+	wxMenu* m_menuComposition;
+	m_menuComposition = new wxMenu();
+	wxMenuItem* m_menuCompositionItem = new wxMenuItem( m_menuEdit, wxID_ANY, _("(De)&composition"), wxEmptyString, wxITEM_NORMAL, m_menuComposition );
+	m_menuItemCompositionNone = new wxMenuItem( m_menuComposition, wxID_COMPOSITION_NONE, wxString( _("&None") ) , _("No character (De)composition"), wxITEM_RADIO );
+	m_menuComposition->Append( m_menuItemCompositionNone );
+
+	m_menuItemCompositionZRCola = new wxMenuItem( m_menuComposition, wxID_COMPOSITION_ZRCOLA, wxString( _("&ZRCola") ) , _("ZRCola character (De)composition"), wxITEM_RADIO );
+	m_menuComposition->Append( m_menuItemCompositionZRCola );
+
+	m_menuItemCompositionUnicode = new wxMenuItem( m_menuComposition, wxID_COMPOSITION_UNICODE, wxString( _("&Unicode") ) , _("Unicode character (De)composition"), wxITEM_RADIO );
+	m_menuComposition->Append( m_menuItemCompositionUnicode );
+
+	m_menuEdit->Append( m_menuCompositionItem );
+
 	m_menuTranslationSeq = new wxMenu();
 	wxMenuItem* m_menuTranslationSeqItem = new wxMenuItem( m_menuEdit, wxID_ANY, _("Tra&nslation"), wxEmptyString, wxITEM_NORMAL, m_menuTranslationSeq );
 	m_menuEdit->Append( m_menuTranslationSeqItem );
 
-	m_menuItemComposition = new wxMenuItem( m_menuEdit, wxID_COMPOSITION, wxString( _("&ZRCola (De)composition") ) , _("Toggle ZRCola character (De)composition"), wxITEM_CHECK );
-	m_menuEdit->Append( m_menuItemComposition );
+	m_menuEdit->AppendSeparator();
 
-	m_menuItemWarnPUA = new wxMenuItem( m_menuEdit, wxID_WARN_PUA, wxString( _("&PUA Warning") ) , _("Toggle PUA warning"), wxITEM_CHECK );
+	m_menuItemWarnPUA = new wxMenuItem( m_menuEdit, wxID_WARN_PUA, wxString( _("&PUA Warning") ) , _("Highlight Private Use Area Characters"), wxITEM_CHECK );
 	m_menuEdit->Append( m_menuItemWarnPUA );
 
 	m_menuEdit->AppendSeparator();
@@ -216,13 +229,18 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 
 	m_toolbarTranslate->AddSeparator();
 
+	wxString m_toolCompositionChoices[] = { _("No (De)composition"), _("ZRCola"), _("Unicode") };
+	int m_toolCompositionNChoices = sizeof( m_toolCompositionChoices ) / sizeof( wxString );
+	m_toolComposition = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 120,-1 )), m_toolCompositionNChoices, m_toolCompositionChoices, 0 );
+	m_toolComposition->SetSelection( 0 );
+	m_toolbarTranslate->AddControl( m_toolComposition );
 	wxArrayString m_toolTranslationSeqChoices;
-	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 240,-1 )), m_toolTranslationSeqChoices, 0 );
+	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 180,-1 )), m_toolTranslationSeqChoices, 0 );
 	m_toolTranslationSeq->SetSelection( 0 );
 	m_toolbarTranslate->AddControl( m_toolTranslationSeq );
-	m_toolComposition = m_toolbarTranslate->AddTool( wxID_COMPOSITION, _("ZRCola (De)composition"), wxIcon( wxT("composition.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("ZRCola (De)composition"), _("Toggle ZRCola character (De)composition"), NULL );
+	m_toolbarTranslate->AddSeparator();
 
-	m_toolWarnPUA = m_toolbarTranslate->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("Highlight PUA Characters"), _("Toggle PUA warning"), NULL );
+	m_toolWarnPUA = m_toolbarTranslate->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
 
 	m_toolbarTranslate->Realize();
 	m_mgr.AddPane( m_toolbarTranslate, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
@@ -244,6 +262,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxZRColaFrameBase::OnClose ) );
 	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
+	m_toolComposition->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnCompositionChoice ), NULL, this );
 	m_toolTranslationSeq->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
 }
 
@@ -253,6 +272,7 @@ wxZRColaFrameBase::~wxZRColaFrameBase()
 	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxZRColaFrameBase::OnClose ) );
 	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
+	m_toolComposition->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnCompositionChoice ), NULL, this );
 	m_toolTranslationSeq->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
 
 	m_mgr.UnInit();
@@ -1162,10 +1182,10 @@ wxZRColaTranslationSeqBase::wxZRColaTranslationSeqBase( wxWindow* parent, wxWind
 	wxBoxSizer* bSizerTransSelect;
 	bSizerTransSelect = new wxBoxSizer( wxVERTICAL );
 
-	m_add = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _(">"), wxDefaultPosition, FromDIP(wxSize( 32,32 )), 0 );
+	m_add = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("→"), wxDefaultPosition, FromDIP(wxSize( 32,32 )), 0 );
 	bSizerTransSelect->Add( m_add, 0, wxALL, FromDIP(5) );
 
-	m_remove = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("<"), wxDefaultPosition, FromDIP(wxSize( 32,32 )), 0 );
+	m_remove = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("←"), wxDefaultPosition, FromDIP(wxSize( 32,32 )), 0 );
 	bSizerTransSelect->Add( m_remove, 0, wxALL, FromDIP(5) );
 
 
@@ -1192,10 +1212,10 @@ wxZRColaTranslationSeqBase::wxZRColaTranslationSeqBase( wxWindow* parent, wxWind
 	wxBoxSizer* bSizerTransActiveReorder;
 	bSizerTransActiveReorder = new wxBoxSizer( wxHORIZONTAL );
 
-	m_selectedUp = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("Up"), wxDefaultPosition, FromDIP(wxSize( 70,-1 )), 0 );
+	m_selectedUp = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("↑"), wxDefaultPosition, FromDIP(wxSize( 32,32 )), 0 );
 	bSizerTransActiveReorder->Add( m_selectedUp, 0, wxALL, FromDIP(5) );
 
-	m_selectedDown = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("Down"), wxDefaultPosition, FromDIP(wxSize( 70,-1 )), 0 );
+	m_selectedDown = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("↓"), wxDefaultPosition, FromDIP(wxSize( 32,32 )), 0 );
 	bSizerTransActiveReorder->Add( m_selectedDown, 0, wxALL, FromDIP(5) );
 
 

ZRCola/zrcolagui.h

@@ -67,7 +67,9 @@ class wxZRColaFrameBase : public wxFrame
 			wxID_SEND_SOURCE,
 			wxID_COPY_SOURCE_AND_RETURN,
 			wxID_SEND_ABORT,
-			wxID_COMPOSITION,
+			wxID_COMPOSITION_NONE,
+			wxID_COMPOSITION_ZRCOLA,
+			wxID_COMPOSITION_UNICODE,
 			wxID_WARN_PUA,
 			wxID_SETTINGS,
 			wxID_TOOLBAR_EDIT,
@@ -82,8 +84,10 @@ class wxZRColaFrameBase : public wxFrame
 		wxMenuBar* m_menubar;
 		wxMenu* m_menuProgram;
 		wxMenu* m_menuEdit;
+		wxMenuItem* m_menuItemCompositionNone;
+		wxMenuItem* m_menuItemCompositionZRCola;
+		wxMenuItem* m_menuItemCompositionUnicode;
 		wxMenu* m_menuTranslationSeq;
-		wxMenuItem* m_menuItemComposition;
 		wxMenuItem* m_menuItemWarnPUA;
 		wxMenu* m_menuView;
 		wxMenu* m_menuHelp;
@@ -95,8 +99,8 @@ class wxZRColaFrameBase : public wxFrame
 		wxAuiToolBarItem* m_toolCharSelect;
 		wxAuiToolBarItem* m_toolSendDestination;
 		wxAuiToolBarItem* m_toolSendSource;
+		wxChoice* m_toolComposition;
 		wxChoice* m_toolTranslationSeq;
-		wxAuiToolBarItem* m_toolComposition;
 		wxAuiToolBarItem* m_toolWarnPUA;
 		wxZRColaCharacterCatalogPanel* m_panelChrCat;
 		wxStatusBar* m_statusBar;
@@ -105,6 +109,7 @@ class wxZRColaFrameBase : public wxFrame
 		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
 		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
 		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
+		virtual void OnCompositionChoice( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); }
 
 

ZRCola/zrcolakeyhndlr.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"

ZRCola/zrcolakeyhndlr.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///

ZRCola/zrcolasettings.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"

ZRCola/zrcolasettings.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///

ZRCola/zrcolatranseq.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"

ZRCola/zrcolatranseq.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///

ZRCola/zrcolaupdater.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
@@ -41,6 +27,7 @@ wxZRColaUpdater::wxZRColaUpdater(wxWindow* parent) :
 
     // Prepare Updater.
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    #pragma warning(suppress: 26812) // wxLanguage is unscoped.
     m_updater = new wxUpdCheckThread(app->m_lang_ui == wxLANGUAGE_DEFAULT ? wxT("en_US") : wxLocale::GetLanguageCanonicalName(app->m_lang_ui), this);
     //if (m_updater->Run() != wxTHREAD_NO_ERROR) {
     //    wxFAIL_MSG(wxT("Can't create the thread!"));

ZRCola/zrcolaupdater.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///

ZRColaCompile/ZRColaCompile.props

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\lib\WinStd\include;..\lib\stdex\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

ZRColaCompile/ZRColaCompile.vcxproj

@@ -13,45 +13,45 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}</ProjectGuid>
     <RootNamespace>ZRColaCompile</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\include\$(Platform).props" />
     <Import Project="..\include\$(Configuration).props" />
-    <Import Project="ZRColaCompile.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-    <Import Project="ZRColaCompile.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\lib\WinStd\include;..\lib\stdex\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="dbsource.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="parse.cpp" />
     <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -66,10 +66,10 @@
     <ProjectReference Include="..\lib\libZRCola\build\libZRCola.vcxproj">
       <Project>{3c61929e-7289-4101-8d0a-da22d6e1aea8}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-16.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib-16.0.vcxproj">
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendLib.vcxproj">
       <Project>{D3E29951-D9F5-486D-A167-20AE8E90B1FA}</Project>
     </ProjectReference>
   </ItemGroup>

ZRColaCompile/dbsource.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
@@ -256,6 +242,8 @@ ZRCola::DBSource::~DBSource()
     m_comTranslation.free();
     m_pCharacterGroup1.free();
     m_comCharacterGroup.free();
+    m_pHighlight1.free();
+    m_comHighlight.free();
 
     if (m_db)
         m_db->Close();
@@ -319,7 +307,7 @@ bool ZRCola::DBSource::Open(LPCTSTR filename)
                 com_obj<ADOParameters> params;
                 wxVERIFY(SUCCEEDED(m_comTranslation->get_Parameters(&params)));
                 wxASSERT_MSG(!m_pTranslation1, wxT("ADO command parameter already created"));
-                wxVERIFY(SUCCEEDED(m_comTranslation->CreateParameter(bstr(L"@Script"), adInteger, adParamInput, 0, variant(DISP_E_PARAMNOTFOUND, VT_ERROR), &m_pTranslation1)));
+                wxVERIFY(SUCCEEDED(m_comTranslation->CreateParameter(bstr(L"@Script"), adSmallInt, adParamInput, 0, variant(DISP_E_PARAMNOTFOUND, VT_ERROR), &m_pTranslation1)));
                 wxVERIFY(SUCCEEDED(params->Append(m_pTranslation1)));
             }
 
@@ -336,10 +324,27 @@ bool ZRCola::DBSource::Open(LPCTSTR filename)
                 com_obj<ADOParameters> params;
                 wxVERIFY(SUCCEEDED(m_comTranslationSets->get_Parameters(&params)));
                 wxASSERT_MSG(!m_pTranslationSets1, wxT("ADO command parameter already created"));
-                wxVERIFY(SUCCEEDED(m_comTranslationSets->CreateParameter(bstr(L"@ID"), adInteger, adParamInput, 0, variant(DISP_E_PARAMNOTFOUND, VT_ERROR), &m_pTranslationSets1)));
+                wxVERIFY(SUCCEEDED(m_comTranslationSets->CreateParameter(bstr(L"@ID"), adSmallInt, adParamInput, 0, variant(DISP_E_PARAMNOTFOUND, VT_ERROR), &m_pTranslationSets1)));
                 wxVERIFY(SUCCEEDED(params->Append(m_pTranslationSets1)));
             }
 
+            wxASSERT_MSG(!m_comHighlight, wxT("ADO command already created"));
+            wxVERIFY(SUCCEEDED(::CoCreateInstance(CLSID_CADOCommand, NULL, CLSCTX_ALL, IID_IADOCommand, (LPVOID*)&m_comHighlight)));
+            wxVERIFY(SUCCEEDED(m_comHighlight->put_ActiveConnection(variant(m_db))));
+            wxVERIFY(SUCCEEDED(m_comHighlight->put_CommandType(adCmdText)));
+            wxVERIFY(SUCCEEDED(m_comHighlight->put_CommandText(bstr(L"SELECT [komb] "
+                L"FROM [VRS_HighlightChars2] "
+                L"WHERE [group]=? "
+                L"ORDER BY [komb]"))));
+            {
+                // Create and add command parameters.
+                com_obj<ADOParameters> params;
+                wxVERIFY(SUCCEEDED(m_comHighlight->get_Parameters(&params)));
+                wxASSERT_MSG(!m_pHighlight1, wxT("ADO command parameter already created"));
+                wxVERIFY(SUCCEEDED(m_comHighlight->CreateParameter(bstr(L"@group"), adSmallInt, adParamInput, 0, variant(DISP_E_PARAMNOTFOUND, VT_ERROR), &m_pHighlight1)));
+                wxVERIFY(SUCCEEDED(params->Append(m_pHighlight1)));
+            }
+
             return true;
         } else {
             _ftprintf(stderr, wxT("%s: error ZCC0011: Could not open database (0x%x).\n"), (LPCTSTR)filename, hr);
@@ -400,15 +405,15 @@ bool ZRCola::DBSource::GetValue(const com_obj<ADOField>& f, bool& val) const
 }
 
 
-bool ZRCola::DBSource::GetValue(const com_obj<ADOField>& f, int& val) const
+bool ZRCola::DBSource::GetValue(const com_obj<ADOField>& f, short& val) const
 {
     wxASSERT_MSG(f, wxT("field is empty"));
 
     variant v;
     wxVERIFY(SUCCEEDED(f->get_Value(&v)));
-    wxCHECK(SUCCEEDED(v.change_type(VT_I4)), false);
+    wxCHECK(SUCCEEDED(v.change_type(VT_I2)), false);
 
-    val = V_I4(&v);
+    val = V_I2(&v);
 
     return true;
 }
@@ -729,27 +734,6 @@ bool ZRCola::DBSource::GetNormPerm(const winstd::com_obj<ADORecordset>& rs, std:
 }
 
 
-bool ZRCola::DBSource::SelectAllTranslations(com_obj<ADORecordset> &rs) const
-{
-    // Create a new recordset.
-    rs.free();
-    wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
-
-    // Open it.
-    if (FAILED(rs->Open(variant(
-        L"SELECT [komb], [rang_komb], [Kano], [Kanoniziraj], [znak], [rang_znak] "
-        L"FROM [VRS_ReplChar] "
-        L"ORDER BY [rang_komb], LEN([komb]) DESC"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
-    {
-        _ftprintf(stderr, wxT("%s: error ZCC0040: Error loading translations from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
-        LogErrors();
-        return false;
-    }
-
-    return true;
-}
-
-
 bool ZRCola::DBSource::SelectTranslations(com_obj<ADORecordset> &rs) const
 {
     // Create a new recordset.
@@ -772,7 +756,7 @@ bool ZRCola::DBSource::SelectTranslations(com_obj<ADORecordset> &rs) const
 }
 
 
-bool ZRCola::DBSource::SelectTranslations(int set, winstd::com_obj<ADORecordset>& rs) const
+bool ZRCola::DBSource::SelectTranslations(short set, winstd::com_obj<ADORecordset>& rs) const
 {
     // Create a new recordset.
     rs.free();
@@ -958,7 +942,7 @@ bool ZRCola::DBSource::GetTranslationSeq(const com_obj<ADORecordset>& rs, ZRCola
         wxVERIFY(SUCCEEDED(flds2->get_Item(variant(L"Script"), &f_set)));
         size_t n = 0;
         for (VARIANT_BOOL eof = VARIANT_TRUE; SUCCEEDED(rs_chars->get_EOF(&eof)) && !eof; rs_chars->MoveNext(), n++) {
-            int set;
+            short set;
             wxCHECK(GetValue(f_set, set), false);
             ts.sets.push_back(set);
         }
@@ -1002,21 +986,21 @@ bool ZRCola::DBSource::GetKeySequence(const com_obj<ADORecordset>& rs, ZRCola::D
         wxCHECK(GetUnicodeString(f, ks.chr), false);
     }
 
-    int modifiers;
+    short modifiers;
     {
         com_obj<ADOField> f;
         wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Modifiers"), &f)));
         wxCHECK(GetValue(f, modifiers), false);
     }
 
-    int keycode1;
+    short keycode1;
     {
         com_obj<ADOField> f;
         wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"KeyCodePre"), &f)));
         wxCHECK(GetValue(f, keycode1), false);
     }
 
-    int keycode;
+    short keycode;
     {
         com_obj<ADOField> f;
         wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"KeyCode"), &f)));
@@ -1034,18 +1018,18 @@ bool ZRCola::DBSource::GetKeySequence(const com_obj<ADORecordset>& rs, ZRCola::D
     if (keycode1) {
         // First key in the sequence is complete.
         keyseq::keycode kc1 = {
-            keyseq::keycode::translate_slen(static_cast<wchar_t>(keycode1 & 0xffff)),
+            keyseq::keycode::translate_slen(static_cast<wchar_t>(keycode1)),
             (modifiers & 0x100) != 0,
             (modifiers & 0x200) != 0,
             (modifiers & 0x400) != 0 };
         ks.seq.push_back(kc1);
 
-        keyseq::keycode kc2 = { keyseq::keycode::translate_slen(static_cast<wchar_t>(keycode & 0xffff)), shift };
+        keyseq::keycode kc2 = { keyseq::keycode::translate_slen(static_cast<wchar_t>(keycode)), shift };
         ks.seq.push_back(kc2);
     } else {
         // First key in the sequence is only modifier(s).
         keyseq::keycode kc1 = {
-            keyseq::keycode::translate_slen(static_cast<wchar_t>(keycode & 0xffff)),
+            keyseq::keycode::translate_slen(static_cast<wchar_t>(keycode)),
             shift || (modifiers & 0x100) != 0,
                      (modifiers & 0x200) != 0,
                      (modifiers & 0x400) != 0 };
@@ -1260,30 +1244,6 @@ bool ZRCola::DBSource::SelectCharacters(com_obj<ADORecordset>& rs) const
 }
 
 
-bool ZRCola::DBSource::SelectPUACharacters(com_obj<ADORecordset>& rs) const
-{
-    // Create a new recordset.
-    rs.free();
-    wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
-
-    // Open it.
-    if (FAILED(rs->Open(variant(
-        L"SELECT [znak], [opis_en], [kat], [znak_v], [znak_m] "
-        L"FROM [VRS_CharList] "
-        L"WHERE "
-        L"[znak]>='E000' AND [znak]<='F8FF' AND " // Private-Use-Area
-        L"[aktiven]=1 "                           // Active characters only
-        L"ORDER BY [znak]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
-    {
-        _ftprintf(stderr, wxT("%s: error ZCC0120: Error loading characters from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
-        LogErrors();
-        return false;
-    }
-
-    return true;
-}
-
-
 bool ZRCola::DBSource::GetCharacter(const com_obj<ADORecordset>& rs, character& chr) const
 {
     wxASSERT_MSG(rs, wxT("recordset is empty"));
@@ -1498,3 +1458,41 @@ bool ZRCola::DBSource::GetTagName(const winstd::com_obj<ADORecordset>& rs, tagna
 
     return true;
 }
+
+
+bool ZRCola::DBSource::SelectHighlights(short set, winstd::com_obj<ADORecordset>& rs) const
+{
+    // Create a new recordset.
+    rs.free();
+    wxVERIFY(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)));
+    wxVERIFY(SUCCEEDED(rs->put_CursorLocation(adUseClient)));
+    wxVERIFY(SUCCEEDED(rs->put_CursorType(adOpenForwardOnly)));
+    wxVERIFY(SUCCEEDED(rs->put_LockType(adLockReadOnly)));
+
+    // Open it.
+    wxVERIFY(SUCCEEDED(m_pHighlight1->put_Value(variant(set))));
+    if (FAILED(rs->Open(variant(m_comHighlight), variant(DISP_E_PARAMNOTFOUND, VT_ERROR)))) {
+        _ftprintf(stderr, wxT("%s: error ZCC0101: Error loading highlights from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
+        LogErrors();
+        return false;
+    }
+
+    return true;
+}
+
+
+bool ZRCola::DBSource::GetHighlight(const com_obj<ADORecordset>& rs, ZRCola::DBSource::highlight& h) const
+{
+    wxASSERT_MSG(rs, wxT("recordset is empty"));
+
+    com_obj<ADOFields> flds;
+    wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"komb"), &f)));
+        wxCHECK(GetUnicodeString(f, h.chr), false);
+    }
+
+    return true;
+}

ZRColaCompile/dbsource.h

@@ -1,26 +1,12 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
 
 #include <zrcola/character.h>
-#include <zrcola/common.h>
+#include <zrcola/highlight.h>
 #include <zrcola/language.h>
 #include <zrcola/tag.h>
 #include <zrcola/translate.h>
@@ -61,7 +47,7 @@ namespace ZRCola {
         ///
         class charseq {
         public:
-            int rank;         ///< Sequence rank
+            short rank;       ///< Sequence rank
             std::wstring str; ///< Sequence string
 
             inline charseq() :
@@ -69,19 +55,19 @@ namespace ZRCola {
             {
             }
 
-            inline charseq(_In_ int _rank, _In_z_ const wchar_t *_str) :
+            inline charseq(_In_ short _rank, _In_z_ const wchar_t *_str) :
                 rank(_rank),
                 str (_str)
             {
             }
 
-            inline charseq(_In_ int _rank, _In_ const std::wstring &_str) :
+            inline charseq(_In_ short _rank, _In_ const std::wstring &_str) :
                 rank(_rank),
                 str (_str)
             {
             }
 
-            inline charseq(_In_ int _rank, _Inout_ std::wstring &&_str) :
+            inline charseq(_In_ short _rank, _Inout_ std::wstring &&_str) :
                 rank(_rank),
                 str (std::move(_str))
             {
@@ -127,16 +113,12 @@ namespace ZRCola {
         ///
         class translation {
         public:
-            int set;            ///< Translation set ID
+            short set;          ///< Translation set ID
             charseq src;        ///< Source sequence
             std::string norm;   ///< Normalization footprint
             charseq dst;        ///< Destination sequence
-            double score;       ///< Score
 
-            inline translation() :
-                set((int)ZRCOLA_TRANSEQID_DEFAULT),
-                score(0)
-            {}
+            inline translation() : set((short)ZRCOLA_TRANSETID_DEFAULT) {}
         };
 
 
@@ -145,11 +127,11 @@ namespace ZRCola {
         ///
         class transet {
         public:
-            int set;            ///< ID
+            short set;          ///< ID
             std::wstring src;   ///< Source name
             std::wstring dst;   ///< Destination name
 
-            inline transet() : set((int)ZRCOLA_TRANSEQID_DEFAULT) {}
+            inline transet() : set((short)ZRCOLA_TRANSETID_DEFAULT) {}
         };
 
 
@@ -158,10 +140,10 @@ namespace ZRCola {
         ///
         class transeq {
         public:
-            int seq;                ///< ID
-            int rank;               ///< Rank
-            std::wstring name;      ///< Name
-            std::vector<int> sets;  ///< Sets
+            short seq;                  ///< ID
+            short rank;                 ///< Rank
+            std::wstring name;          ///< Name
+            std::vector<short> sets;    ///< Sets
 
             inline transeq() :
                 seq(0),
@@ -240,8 +222,8 @@ namespace ZRCola {
         ///
         class chrgrp {
         public:
-            int grp;                            ///< Character group ID
-            int rank;                           ///< Rank
+            short grp;                          ///< Character group ID
+            short rank;                         ///< Rank
             std::wstring name;                  ///< Name
             std::vector<wchar_t> chars;         ///< Characters (zero-delimited)
             std::vector<unsigned __int16> show; ///< Bit vector if particular character from \c chars is displayed initially
@@ -391,7 +373,7 @@ namespace ZRCola {
         class chrcat {
         public:
             ZRCola::chrcatid_t cat;     ///> Category ID
-            int rank;                   ///< Rank
+            short rank;                 ///< Rank
             std::wstring name;          ///< Name
 
             inline chrcat() : cat(ZRCola::chrcatid_t::blank), rank(0) {}
@@ -404,7 +386,7 @@ namespace ZRCola {
         class chrtag {
         public:
             std::wstring chr;           ///> Character
-            int tag;                    ///< Tag ID
+            short tag;                  ///< Tag ID
 
             inline chrtag() : tag(0) {}
         };
@@ -415,13 +397,25 @@ namespace ZRCola {
         ///
         class tagname {
         public:
-            int tag;                    ///< Tag ID
+            short tag;                  ///< Tag ID
             std::map<LCID, std::list<std::wstring> > names; ///< Names
 
             inline tagname() : tag(0) {}
         };
 
 
+        ///
+        /// Highlight
+        ///
+        class highlight {
+        public:
+            short set;          ///< Highlight set ID
+            std::wstring chr;   ///< Character sequence
+
+            inline highlight() : set((short)ZRCOLA_HLGHTSETID_DEFAULT) {}
+        };
+
+
     public:
         DBSource();
         virtual ~DBSource();
@@ -470,18 +464,6 @@ namespace ZRCola {
             return SUCCEEDED(rs->get_RecordCount(&count)) ? count : (size_t)-1;
         }
 
-        ///
-        /// Splits string to individual keywords
-        ///
-        /// \param[in ] str       String
-        /// \param[out] keywords  Array of keywords
-        ///
-        /// \returns
-        /// - true when successful
-        /// - false otherwise
-        ///
-        static bool GetKeywords(const wchar_t *str, std::vector< std::wstring > &keywords);
-
         ///
         /// Gets boolean from ZRCola.zrc database
         ///
@@ -504,7 +486,7 @@ namespace ZRCola {
         /// - true when successful
         /// - false otherwise
         ///
-        bool GetValue(const winstd::com_obj<ADOField>& f, int& val) const;
+        bool GetValue(const winstd::com_obj<ADOField>& f, short& val) const;
 
         ///
         /// Gets string from ZRCola.zrc database
@@ -625,17 +607,6 @@ namespace ZRCola {
         ///
         bool GetNormPerm(const winstd::com_obj<ADORecordset>& rs, std::string& norm, normperm& np) const;
 
-        ///
-        /// Returns all character translations
-        ///
-        /// \param[out] rs  Recordset with results
-        ///
-        /// \returns
-        /// - true when query succeeds
-        /// - false otherwise
-        ///
-        bool SelectAllTranslations(winstd::com_obj<ADORecordset>& rs) const;
-
         ///
         /// Returns character translations
         ///
@@ -657,7 +628,7 @@ namespace ZRCola {
         /// - true when query succeeds
         /// - false otherwise
         ///
-        bool SelectTranslations(int set, winstd::com_obj<ADORecordset>& rs) const;
+        bool SelectTranslations(short set, winstd::com_obj<ADORecordset>& rs) const;
 
         ///
         /// Returns translation data
@@ -820,17 +791,6 @@ namespace ZRCola {
         ///
         bool SelectCharacters(winstd::com_obj<ADORecordset>& rs) const;
 
-        ///
-        /// Returns Private-Use-Area characters
-        ///
-        /// \param[out] rs  Recordset with results
-        ///
-        /// \returns
-        /// - true when query succeeds
-        /// - false otherwise
-        ///
-        bool SelectPUACharacters(winstd::com_obj<ADORecordset>& rs) const;
-
         ///
         /// Returns character data
         ///
@@ -912,6 +872,30 @@ namespace ZRCola {
         ///
         bool GetTagName(const winstd::com_obj<ADORecordset>& rs, tagname& tn) const;
 
+        ///
+        /// Returns character highlights by set
+        ///
+        /// \param[in ] set  Highlight set ID
+        /// \param[out] rs   Recordset with results
+        ///
+        /// \returns
+        /// - true when query succeeds
+        /// - false otherwise
+        ///
+        bool SelectHighlights(short set, winstd::com_obj<ADORecordset>& rs) const;
+
+        ///
+        /// Returns highlight data
+        ///
+        /// \param[in]  rs  Recordset with results
+        /// \param[out] h   Highlight
+        ///
+        /// \returns
+        /// - true when succeeded
+        /// - false otherwise
+        ///
+        bool GetHighlight(const winstd::com_obj<ADORecordset>& rs, highlight& h) const;
+
     protected:
         std::basic_string<TCHAR> m_filename;    ///< Database filename
         winstd::com_obj<ADOConnection> m_db;    ///< Database
@@ -926,6 +910,9 @@ namespace ZRCola {
         winstd::com_obj<ADOCommand> m_comTranslationSets;   ///< ADO Command for GetTranslationSeq subquery
         winstd::com_obj<ADOParameter> m_pTranslationSets1;  ///< \c m_comTranslationSets parameter
 
+        winstd::com_obj<ADOCommand> m_comHighlight;         ///< ADO Command for SelectHighlights subquery
+        winstd::com_obj<ADOParameter> m_pHighlight1;        ///< \c m_comHighlights parameter
+
         std::set<std::wstring> m_terms_ignore;  ///< Terms to ignore when comparing characters
     };
 };
@@ -934,11 +921,8 @@ namespace ZRCola {
 inline ZRCola::translation_db& operator<<(_Inout_ ZRCola::translation_db &db, _In_ const ZRCola::DBSource::translation &rec)
 {
     unsigned __int32 idx = db.data.size();
-    wxASSERT_MSG((int)0xffff0000 <= rec.set && rec.set <= (int)0x0000ffff, wxT("translation set id out of bounds"));
     db.data.push_back((unsigned __int16)rec.set);
-    wxASSERT_MSG((int)0xffff8000 <= rec.dst.rank && rec.dst.rank <= (int)0x00007fff, wxT("destination character rank out of bounds"));
     db.data.push_back((unsigned __int16)rec.dst.rank);
-    wxASSERT_MSG((int)0xffff8000 <= rec.src.rank && rec.src.rank <= (int)0x00007fff, wxT("source character rank out of bounds"));
     db.data.push_back((unsigned __int16)rec.src.rank);
     std::wstring::size_type n = rec.dst.str.length();
     wxASSERT_MSG(n <= 0xffff, wxT("destination overflow"));
@@ -958,7 +942,6 @@ inline ZRCola::translation_db& operator<<(_Inout_ ZRCola::translation_db &db, _I
 inline ZRCola::transet_db& operator<<(_Inout_ ZRCola::transet_db &db, _In_ const ZRCola::DBSource::transet &rec)
 {
     unsigned __int32 idx = db.data.size();
-    wxASSERT_MSG((int)0xffff0000 <= rec.set && rec.set <= (int)0x0000ffff, wxT("translation set id out of bounds"));
     db.data.push_back((unsigned __int16)rec.set);
     std::wstring::size_type n = rec.src.length();
     wxASSERT_MSG(n <= 0xffff, wxT("translation set source name overflow"));
@@ -977,9 +960,7 @@ inline ZRCola::transet_db& operator<<(_Inout_ ZRCola::transet_db &db, _In_ const
 inline ZRCola::transeq_db& operator<<(_Inout_ ZRCola::transeq_db &db, _In_ const ZRCola::DBSource::transeq &rec)
 {
     unsigned __int32 idx = db.data.size();
-    wxASSERT_MSG((int)0xffff8000 <= rec.seq && rec.seq <= (int)0x00007fff, wxT("translation sequence id out of bounds"));
     db.data.push_back((unsigned __int16)rec.seq);
-    wxASSERT_MSG((int)0xffff8000 <= rec.rank && rec.rank <= (int)0x00007fff, wxT("translation rank id out of bounds"));
     db.data.push_back((unsigned __int16)rec.rank);
     std::wstring::size_type n = rec.name.length();
     wxASSERT_MSG(n <= 0xffff, wxT("translation sequence name overflow"));
@@ -988,11 +969,8 @@ inline ZRCola::transeq_db& operator<<(_Inout_ ZRCola::transeq_db &db, _In_ const
     wxASSERT_MSG(n <= 0xffff, wxT("translation sequence sets overflow"));
     db.data.push_back((unsigned __int16)n);
     db.data.insert(db.data.end(), rec.name.cbegin(), rec.name.cend());
-    for (auto s = rec.sets.cbegin(), s_end = rec.sets.cend(); s != s_end; ++s) {
-        int val = *s;
-        wxASSERT_MSG(val <= 0xffff, wxT("translation sequence ID overflow"));
-        db.data.push_back((unsigned __int16)val);
-    }
+    for (auto s = rec.sets.cbegin(), s_end = rec.sets.cend(); s != s_end; ++s)
+        db.data.push_back((unsigned __int16)*s);
     db.idxTranSeq.push_back(idx);
     db.idxRank   .push_back(idx);
 
@@ -1058,9 +1036,7 @@ inline ZRCola::langchar_db& operator<<(_Inout_ ZRCola::langchar_db &db, _In_ con
 inline ZRCola::chrgrp_db& operator<<(_Inout_ ZRCola::chrgrp_db &db, _In_ const ZRCola::DBSource::chrgrp &rec)
 {
     unsigned __int32 idx = db.data.size();
-    wxASSERT_MSG((int)0xffff8000 <= rec.grp && rec.grp <= (int)0x00007fff, wxT("character group ID out of bounds"));
     db.data.push_back((unsigned __int16)rec.grp);
-    wxASSERT_MSG((int)0xffff8000 <= rec.rank && rec.rank <= (int)0x00007fff, wxT("character group rank out of bounds"));
     db.data.push_back((unsigned __int16)rec.rank);
     std::wstring::size_type n = rec.name.length();
     wxASSERT_MSG(n <= 0xffff, wxT("character group name overflow"));
@@ -1103,7 +1079,6 @@ inline ZRCola::chrcat_db& operator<<(_Inout_ ZRCola::chrcat_db &db, _In_ const Z
 {
     unsigned __int32 idx = db.data.size();
     db.data.insert(db.data.end(), reinterpret_cast<const unsigned __int16*>(&rec.cat), reinterpret_cast<const unsigned __int16*>(&rec.cat + 1));
-    wxASSERT_MSG((int)0xffff8000 <= rec.rank && rec.rank <= (int)0x00007fff, wxT("character category rank out of bounds"));
     db.data.push_back((unsigned __int16)rec.rank);
     std::wstring::size_type n = rec.name.length();
     wxASSERT_MSG(n <= 0xffff, wxT("character category name overflow"));
@@ -1119,7 +1094,6 @@ inline ZRCola::chrcat_db& operator<<(_Inout_ ZRCola::chrcat_db &db, _In_ const Z
 inline ZRCola::chrtag_db& operator<<(_Inout_ ZRCola::chrtag_db &db, _In_ const ZRCola::DBSource::chrtag &rec)
 {
     unsigned __int32 idx = db.data.size();
-    wxASSERT_MSG((int)0xffff8000 <= rec.tag && rec.tag <= (int)0x00007fff, wxT("tag out of bounds"));
     db.data.push_back((unsigned __int16)rec.tag);
     std::wstring::size_type n = rec.chr.length();
     wxASSERT_MSG(n <= 0xffff, wxT("character overflow"));
@@ -1137,7 +1111,6 @@ inline ZRCola::tagname_db& operator<<(_Inout_ ZRCola::tagname_db &db, _In_ const
     for (auto ln = rec.names.cbegin(), ln_end = rec.names.cend(); ln != ln_end; ++ln) {
         for (auto nm = ln->second.cbegin(), nm_end = ln->second.cend(); nm != nm_end; ++nm) {
             unsigned __int32 idx = db.data.size();
-            wxASSERT_MSG((int)0xffff8000 <= rec.tag && rec.tag <= (int)0x00007fff, wxT("tag out of bounds"));
             db.data.push_back((unsigned __int16)rec.tag);
             db.data.push_back(LOWORD(ln->first));
             db.data.push_back(HIWORD(ln->first));
@@ -1152,3 +1125,17 @@ inline ZRCola::tagname_db& operator<<(_Inout_ ZRCola::tagname_db &db, _In_ const
 
     return db;
 }
+
+
+inline ZRCola::highlight_db& operator<<(_Inout_ ZRCola::highlight_db &db, _In_ const ZRCola::DBSource::highlight &rec)
+{
+    unsigned __int32 idx = db.data.size();
+    db.data.push_back((unsigned __int16)rec.set);
+    std::wstring::size_type n = rec.chr.length();
+    wxASSERT_MSG(n <= 0xffff, wxT("character overflow"));
+    db.data.push_back((unsigned __int16)n);
+    db.data.insert(db.data.end(), rec.chr.cbegin(), rec.chr.cend());
+    db.idxChr.push_back(idx);
+
+    return db;
+}

ZRColaCompile/main.cpp

@@ -1,28 +1,10 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
 
-#define FONT_MATCH_WIDTH        512 // must be a multiple of 8
-#define FONT_MATCH_HEIGHT       512
-#define FONT_MATCH_THRESHOLD    8e-2
-
 using namespace std;
 using namespace stdex;
 using namespace winstd;
@@ -34,8 +16,8 @@ using namespace winstd;
 class com_translation
 {
 public:
-    int rank_src;                   ///< Source sequence rank
-    int rank_dst;                   ///< Destination character rank
+    short rank_src;                 ///< Source sequence rank
+    short rank_dst;                 ///< Destination character rank
     string norm;                    ///< Normalization footprint
 
     inline com_translation() :
@@ -44,20 +26,20 @@ public:
     {
     }
 
-    inline com_translation(int _rank_src, int _rank_dst) :
+    inline com_translation(short _rank_src, short _rank_dst) :
         rank_src(_rank_src),
         rank_dst(_rank_dst)
     {
     }
 
-    inline com_translation(int _rank_src, int _rank_dst, const char *_norm) :
+    inline com_translation(short _rank_src, short _rank_dst, const char *_norm) :
         rank_src(_rank_src),
         rank_dst(_rank_dst),
         norm    (_norm    )
     {
     }
 
-    inline com_translation(int _rank_src, int _rank_dst, string &&_norm) :
+    inline com_translation(short _rank_src, short _rank_dst, string &&_norm) :
         rank_src(          _rank_src ),
         rank_dst(          _rank_dst ),
         norm    (std::move(_norm    ))
@@ -228,56 +210,6 @@ static inline set<ZRCola::DBSource::charseq> permutate_and_translate_inv(_In_ co
 }
 
 
-static bool contains_pua(_In_ const wstring &str)
-{
-    for (auto p = str.c_str(), p_end = str.c_str() + str.size(); p < p_end; p++)
-        if (L'\ue000' <= *p && *p <= L'\uf8ff')
-            return true;
-    return false;
-}
-
-
-static void replace_all(_Inout_ wstring &str, _In_ const wstring &from, _In_ const wstring &to)
-{
-    size_t start_pos = 0;
-    while ((start_pos = str.find(from, start_pos)) != wstring::npos) {
-        str.replace(start_pos, from.length(), to);
-        start_pos += to.length();
-    }
-}
-
-
-static double compare_bitmaps(
-    _In_count_c_(FONT_MATCH_WIDTH * FONT_MATCH_HEIGHT / 8) const unsigned char *bits_orig,
-    _In_count_c_(FONT_MATCH_WIDTH * FONT_MATCH_HEIGHT / 8) const unsigned char *bits)
-{
-#define B2(n) n, n + 1, n + 1, n + 2
-#define B4(n) B2(n), B2(n + 1), B2(n + 1), B2(n + 2)
-#define B6(n) B4(n), B4(n + 1), B4(n + 1), B4(n + 2)
-    static const unsigned char number_of_bits[256] = { B6(0), B6(1), B6(1), B6(2) };
-#undef B2
-#undef B4
-#undef B6
-    // Set divisors to 1 to prevent divide-by-zero.
-    size_t b_orig = 1, b = 1, x = 0;
-    for (size_t i = 0; i < FONT_MATCH_WIDTH * FONT_MATCH_HEIGHT / 8; ++i) {
-        b_orig += number_of_bits[bits_orig[i]];
-        b      += number_of_bits[bits     [i]];
-        x      += number_of_bits[bits_orig[i] ^ bits[i]];
-    }
-    return (double)x/b_orig * (double)x/b;
-}
-
-
-static string make_unicode(_In_ const wstring &str)
-{
-    string out;
-    for (size_t i = 0, n = str.length(); i < n; i++)
-        out += string_printf(i ? "+%04X" : "%04X", str[i]);
-    return out;
-}
-
-
 ///
 /// Main function
 ///
@@ -304,10 +236,10 @@ int _tmain(int argc, _TCHAR *argv[])
     // Parse command line.
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {
-        { wxCMD_LINE_SWITCH, "h"  , "help", _("Show this help message"), wxCMD_LINE_VAL_NONE  , wxCMD_LINE_OPTION_HELP      },
-        { wxCMD_LINE_PARAM ,  NULL, NULL  , _("<input file>"          ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
-        { wxCMD_LINE_PARAM ,  NULL, NULL  , _("<output file>"         ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
-        { wxCMD_LINE_PARAM ,  NULL, NULL  , _("<output POT catalog>"  ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION           },
+        { wxCMD_LINE_SWITCH, "h" , "help"   , _("Show this help message"), wxCMD_LINE_VAL_NONE  , wxCMD_LINE_OPTION_HELP      },
+        { wxCMD_LINE_PARAM , NULL, NULL     , _("<Input file>"          ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
+        { wxCMD_LINE_PARAM , NULL, NULL     , _("<Output file>"         ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_OPTION_MANDATORY },
+        { wxCMD_LINE_OPTION, NULL, "pot-cat", _("Output POT catalog"    ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL   },
 
         { wxCMD_LINE_NONE }
     };
@@ -350,12 +282,10 @@ int _tmain(int argc, _TCHAR *argv[])
     bool has_errors = false;
 
     // Set of strings to translate.
-    bool build_pot = parser.GetParamCount() > 2;
+    wxString filenamePot;
+    bool build_pot = parser.Found("pot-cat", &filenamePot);
     set<wstring> pot;
 
-    bool build_csv = parser.GetParamCount() > 3;
-    vector<ZRCola::DBSource::translation> csv;
-
     // Open file ID.
     streamoff dst_start = idrec::open<ZRCola::recordid_t, ZRCola::recordsize_t>(dst, ZRCOLA_DB_ID);
 
@@ -392,19 +322,6 @@ int _tmain(int argc, _TCHAR *argv[])
     }
 
     {
-        // Build ZRCola Decomposed to ZRCola Composed translation set.
-        ZRCola::DBSource::transet ts;
-        ts.set = (int)ZRCOLA_TRANSEQID_DEFAULT;
-        ts.src = L"ZRCola Decomposed";
-        ts.dst = L"ZRCola Composed";
-        if (build_pot) {
-            pot.insert(ts.src);
-            pot.insert(ts.dst);
-        }
-
-        // Add translation set to index and data.
-        db_transset << ts;
-
         // Get translations.
         com_obj<ADORecordset> rs;
         if (src.SelectTranslations(rs)) {
@@ -448,8 +365,8 @@ int _tmain(int argc, _TCHAR *argv[])
                             translation_db::mapped_type::mapped_type ct(d1->second.rank_src + r->rank, d1->second.rank_dst);
                             auto hit = t2->second.find(r->str);
                             if (hit != t2->second.end()) {
-                                hit->second.rank_src = std::min<int>(hit->second.rank_src, ct.rank_src);
-                                hit->second.rank_dst = std::max<int>(hit->second.rank_dst, ct.rank_dst);
+                                hit->second.rank_src = std::min<short>(hit->second.rank_src, ct.rank_src);
+                                hit->second.rank_dst = std::max<short>(hit->second.rank_dst, ct.rank_dst);
                             } else
                                 t2->second.insert(pair<translation_db::mapped_type::key_type, translation_db::mapped_type::mapped_type>(r->str, std::move(ct)));
                         }
@@ -457,21 +374,34 @@ int _tmain(int argc, _TCHAR *argv[])
                 }
 
                 // Preallocate memory.
-                db_trans.idxSrc.reserve(count);
-                db_trans.idxDst.reserve(count);
-                db_trans.data  .reserve(count*5);
+                db_trans.idxSrc.reserve(count*2);
+                db_trans.idxDst.reserve(count*2);
+                db_trans.data  .reserve(count*2*8);
 
                 // Parse translations and build index and data.
                 ZRCola::DBSource::translation trans;
-                trans.set = 0;
                 for (auto t = db_temp2.cbegin(), t_end = db_temp2.cend(); t != t_end; ++t) {
                     // Add translation to index and data.
                     trans.dst.str = t->first;
                     for (auto d = t->second.cbegin(), d_end = t->second.cend(); d != d_end; ++d) {
+                        trans.set = (short)ZRCOLA_TRANSETID_DEFAULT;
                         trans.dst.rank = d->second.rank_dst;
                         trans.src.rank = d->second.rank_src;
                         trans.src.str  = d->first;
                         db_trans << trans;
+
+                        // If destination contains no PUA characters, add it to the ZRCola » Unicode transliteration too.
+                        bool has_pua = false;
+                        for (auto ch = trans.dst.str.cbegin(), ch_end = trans.dst.str.cend(); ch != ch_end; ++ch)
+                            if (ZRCola::ispua(*ch)) {
+                                has_pua = true;
+                                break;
+                            }
+                        if (!has_pua) {
+                            trans.set = (short)ZRCOLA_TRANSETID_UNICODE;
+                            trans.dst.rank += 50;
+                            db_trans << trans;
+                        }
                     }
                 }
             } else {
@@ -485,211 +415,32 @@ int _tmain(int argc, _TCHAR *argv[])
     }
 
     {
-        // Build ZRCola to Unicode translation set.
-        ZRCola::DBSource::transet ts;
-        ts.set = (int)ZRCOLA_TRANSEQID_UNICODE;
-        ts.src = L"ZRCola Composed";
-        ts.dst = L"Unicode";
-        if (build_pot) {
-            pot.insert(ts.src);
-            pot.insert(ts.dst);
-        }
+        com_obj<ADORecordset> rs_tran;
+        if (src.SelectTranslations(static_cast<short>(ZRCOLA_TRANSETID_UNICODE), rs_tran)) {
+            size_t count = src.GetRecordsetCount(rs_tran);
+            if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                // Preallocate memory.
+                db_trans.idxSrc.reserve(db_trans.idxSrc.size() + count);
+                db_trans.idxDst.reserve(db_trans.idxDst.size() + count);
+                db_trans.data  .reserve(db_trans.data.size()   + count*8);
 
-        // Add translation set to index and data.
-        db_transset << ts;
-
-        // Get all translations.
-        com_obj<ADORecordset> rs;
-        if (src.SelectAllTranslations(rs)) {
-            // Parse translations and build temporary database.
-            vector<ZRCola::DBSource::translation> db_all, db_combining;
-            for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
-                // Read translation from the database.
+                // Parse translations and build temporary database.
                 ZRCola::DBSource::translation trans;
-                if (src.GetTranslation(rs, trans)) {
-                    // Add translation to temporary databases.
-                    db_all.push_back(trans);
-                    if (!trans.src.str.empty() && trans.src.str[0] == L'\u203f') {
-                        trans.src.str.erase(0, 1);
-                        db_combining.push_back(trans);
-                    }
-                } else
-                    has_errors = true;
-            }
-
-            com_obj<ADORecordset> rs2;
-            if (src.SelectPUACharacters(rs2)) {
-                // Parse characters and build translations.
-                static const LOGFONT lf_zrcola = {
-                    -FONT_MATCH_HEIGHT/2, 0,
-                    0, 0,
-                    FW_NORMAL,
-                    FALSE, FALSE, FALSE,
-                    ANSI_CHARSET,
-                    OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
-                    DEFAULT_PITCH | FF_DONTCARE,
-                    TEXT("ZRCola")
-                };
-                gdi_handle<HFONT> fnt_zrcola(::CreateFontIndirect(&lf_zrcola));
-                gdi_handle<HBRUSH> brush_bg(::CreateSolidBrush(RGB(0x00, 0x00, 0x00)));
-                gdi_handle<HBITMAP>
-                    bmp_orig(::CreateBitmap(FONT_MATCH_WIDTH, FONT_MATCH_HEIGHT, 1, 1, NULL)),
-                    bmp_comb(::CreateBitmap(FONT_MATCH_WIDTH, FONT_MATCH_HEIGHT, 1, 1, NULL)),
-                    bmp_pre (::CreateBitmap(FONT_MATCH_WIDTH, FONT_MATCH_HEIGHT, 1, 1, NULL));
-                dc
-                    dc_orig(::CreateCompatibleDC(NULL)),
-                    dc_comb(::CreateCompatibleDC(NULL)),
-                    dc_pre (::CreateCompatibleDC(NULL));
-                SetBkColor(dc_orig, RGB(0x00, 0x00, 0x00));
-                SetBkColor(dc_comb, RGB(0x00, 0x00, 0x00));
-                SetBkColor(dc_pre , RGB(0x00, 0x00, 0x00));
-                SetBkMode (dc_orig, TRANSPARENT);
-                SetBkMode (dc_comb, TRANSPARENT);
-                SetBkMode (dc_pre , TRANSPARENT);
-                SetTextColor(dc_orig, RGB(0xff, 0xff, 0xff));
-                SetTextColor(dc_comb, RGB(0xff, 0xff, 0xff));
-                SetTextColor(dc_pre , RGB(0xff, 0xff, 0xff));
-                SetTextAlign(dc_orig, TA_BASELINE | TA_CENTER | TA_NOUPDATECP);
-                SetTextAlign(dc_comb, TA_BASELINE | TA_CENTER | TA_NOUPDATECP);
-                SetTextAlign(dc_pre , TA_BASELINE | TA_CENTER | TA_NOUPDATECP);
-                dc_selector
-                    selector_font_orig(dc_orig, fnt_zrcola),
-                    selector_font_comb(dc_comb, fnt_zrcola),
-                    selector_font_pre (dc_pre , fnt_zrcola);
-                struct {
-                    BITMAPINFOHEADER bmiHeader;
-                    RGBQUAD          bmiColors[2];
-                } bmi =
-                {
-                    {
-                        sizeof(BITMAPINFOHEADER),
-                        FONT_MATCH_WIDTH,
-                        FONT_MATCH_HEIGHT,
-                        1,
-                        1,
-                        BI_RGB,
-                        0,
-                        3780, 3780,
-                        2, 0
-                    },
-                    {
-                        { 0x00, 0x00, 0x00 },
-                        { 0xff, 0xff, 0xff },
-                    }
-                };
-                vector<unsigned char>
-                    bits_orig(FONT_MATCH_WIDTH * FONT_MATCH_HEIGHT / 8),
-                    bits_comb(FONT_MATCH_WIDTH * FONT_MATCH_HEIGHT / 8),
-                    bits_pre (FONT_MATCH_WIDTH * FONT_MATCH_HEIGHT / 8);
-                map<wstring, map<wstring, pair<double, int>>> trans;
-                for (; !ZRCola::DBSource::IsEOF(rs2); rs2->MoveNext()) {
-                    // Read character from the database.
-                    ZRCola::DBSource::character chr;
-                    if (src.GetCharacter(rs2, chr)) {
-                        for (auto t = db_all.cbegin(), t_end = db_all.cend(); t != t_end; ++t) {
-                            if (t->dst.str != chr.first)
-                                continue;
-                            // Replace ZRCola decomposition with Unicode combining characters wherever possible.
-                            const auto &comp_orig = chr.first;
-                            const auto &decomp_orig = t->src.str;
-                            wstring decomp = decomp_orig;
-                            for (auto i = db_combining.cbegin(), i_end = db_combining.cend(); i != i_end; ++i)
-                                replace_all(decomp, i->src.str, i->dst.str);
-                            wstring comp = decomp;
-                            for (auto i = db_all.cbegin(), i_end = db_all.cend(); i != i_end; ++i)
-                                replace_all(comp, i->src.str, i->dst.str);
-                            // Check if we got anything useful.
-                            if (comp_orig == comp ||
-                                contains_pua(comp))
-                                continue;
-                            // Do the Unicode C and D normalizations to get two variants:
-                            // - Use precomposed characters as much as possible
-                            // - Use combining characters only
-                            wstring comp_comb, comp_pre;
-                            NormalizeString(NormalizationC, comp    , comp_pre );
-                            NormalizeString(NormalizationD, comp_pre, comp_comb);
-                            {
-                                // Paint original character and Unicode precomposed/combining one.
-                                dc_selector
-                                    selector_bmp_orig(dc_orig, bmp_orig),
-                                    selector_bmp_comb(dc_comb, bmp_comb),
-                                    selector_bmp_pre (dc_pre , bmp_pre );
-                                static const RECT bounds = { 0, 0, FONT_MATCH_WIDTH, FONT_MATCH_HEIGHT };
-                                FillRect(dc_orig, &bounds, brush_bg);
-                                FillRect(dc_comb, &bounds, brush_bg);
-                                FillRect(dc_pre , &bounds, brush_bg);
-                                TextOutW(dc_orig, FONT_MATCH_WIDTH/2, FONT_MATCH_HEIGHT*5/8, comp_orig.c_str(), comp_orig.length());
-                                TextOutW(dc_comb, FONT_MATCH_WIDTH/2, FONT_MATCH_HEIGHT*5/8, comp_comb.c_str(), comp_comb.length());
-                                TextOutW(dc_pre , FONT_MATCH_WIDTH/2, FONT_MATCH_HEIGHT*5/8, comp_pre .c_str(), comp_pre .length());
-                            }
-                            // Compare bitmaps.
-                            if (!GetDIBits(dc_orig, bmp_orig, 0, FONT_MATCH_HEIGHT, bits_orig.data(), (BITMAPINFO*)&bmi, DIB_PAL_COLORS) ||
-                                !GetDIBits(dc_comb, bmp_comb, 0, FONT_MATCH_HEIGHT, bits_comb.data(), (BITMAPINFO*)&bmi, DIB_PAL_COLORS) ||
-                                !GetDIBits(dc_pre , bmp_pre , 0, FONT_MATCH_HEIGHT, bits_pre .data(), (BITMAPINFO*)&bmi, DIB_PAL_COLORS))
-                                continue;
-                            double
-                                score_comb = compare_bitmaps(bits_orig.data(), bits_comb.data()),
-                                score_pre  = compare_bitmaps(bits_orig.data(), bits_pre .data());
-                            // Add results to a temporary database.
-                            auto hit = trans.find(comp_orig);
-                            if (hit != trans.end()) {
-                                if (build_csv || score_pre <= FONT_MATCH_THRESHOLD) {
-                                    if (hit->second.find(comp_pre) == hit->second.end())
-                                        hit->second.insert(make_pair(comp_pre, make_pair(score_pre, 1)));
-                                } if ((build_csv || score_comb <= FONT_MATCH_THRESHOLD) && comp_pre != comp_comb) {
-                                    if (hit->second.find(comp_comb) == hit->second.end())
-                                        hit->second.insert(make_pair(comp_comb, make_pair(score_comb, 100)));
-                                }
-                            } else {
-                                map<wstring, pair<double, int>> v;
-                                if (build_csv || score_pre <= FONT_MATCH_THRESHOLD)
-                                    v.insert(make_pair(comp_pre, make_pair(score_pre, 1)));
-                                if ((build_csv || score_comb <= FONT_MATCH_THRESHOLD) && comp_pre != comp_comb)
-                                    v.insert(make_pair(comp_comb, make_pair(score_comb, 100)));
-                                if (!v.empty())
-                                    trans.insert(make_pair(comp_orig, std::move(v)));
-                            }
-                        }
+                trans.set = (short)ZRCOLA_TRANSETID_UNICODE;
+                for (; !ZRCola::DBSource::IsEOF(rs_tran); rs_tran->MoveNext()) {
+                    // Read translation from the database.
+                    if (src.GetTranslation(rs_tran, trans)) {
+                        // Add translation to index and data.
+                        db_trans << trans;
                     } else
                         has_errors = true;
                 }
-
-                // Preallocate memory.
-                size_t reserve = db_trans.idxSrc.size() + trans.size()*2;
-                db_trans.idxSrc.reserve(reserve);
-                db_trans.idxDst.reserve(reserve);
-                db_trans.data  .reserve(reserve*5);
-                if (build_csv)
-                    csv.reserve(trans.size()*2);
-
-                ZRCola::DBSource::translation t;
-                t.set = (int)ZRCOLA_TRANSEQID_UNICODE;
-                t.dst.rank = 1;
-                vector<pair<double, pair<wstring, int>>> results;
-                for (auto i = trans.cbegin(), i_end = trans.cend(); i != i_end; ++i) {
-                    // Sort results by score.
-                    results.clear();
-                    results.reserve(i->second.size());
-                    for (auto j = i->second.cbegin(), j_end = i->second.cend(); j != j_end; ++j)
-                        results.push_back(make_pair(j->second.first, make_pair(j->first, j->second.second)));
-                    sort(results.begin(), results.end(), [] (pair<double, pair<wstring, int>> const& a, pair<double, pair<wstring, int>> const& b) { return a.first < b.first; });
-                    int rank_comb = 0, rank_pre = 0;
-                    for (auto j = results.cbegin(), j_end = results.cend(); j != j_end; ++j) {
-                        t.src.str  = i->first;
-                        t.src.rank = j->second.second + (j->second.second >= 100 ? rank_comb++ : rank_pre++);
-                        t.dst.str  = j->second.first;
-                        t.score    = j->first;
-                        db_trans << t;
-                        if (build_csv)
-                            csv.push_back(t);
-                    }
-                }
             } else {
-                _ftprintf(stderr, wxT("%s: error ZCC0016: Error getting characters from database. Please make sure the file is ZRCola.zrc compatible.\n"), (LPCTSTR)filenameIn.c_str());
+                _ftprintf(stderr, wxT("%s: error ZCC0004: Error getting Unicode translation count from database or too many translations.\n"), (LPCTSTR)filenameIn.c_str());
                 has_errors = true;
             }
         } else {
-            _ftprintf(stderr, wxT("%s: error ZCC0003: Error getting translations from database. Please make sure the file is ZRCola.zrc compatible.\n"), (LPCTSTR)filenameIn.c_str());
+            _ftprintf(stderr, wxT("%s: error ZCC0003: Error getting Unicode translations from database. Please make sure the file is ZRCola.zrc compatible.\n"), (LPCTSTR)filenameIn.c_str());
             has_errors = true;
         }
     }
@@ -701,19 +452,16 @@ int _tmain(int argc, _TCHAR *argv[])
             size_t count = src.GetRecordsetCount(rs);
             if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
                 // Preallocate memory.
-                db_transset.idxTranSet.reserve((count+2));
-                db_transset.data      .reserve((count+2)*4);
+                db_transset.idxTranSet.reserve((count+1));
+                db_transset.data      .reserve((count+1)*4);
 
                 // Parse translation sets and build index and data.
                 for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
                     // Read translation set from the database.
                     ZRCola::DBSource::transet ts;
                     if (src.GetTranslationSet(rs, ts)) {
-                        if (ts.set <= (int)ZRCOLA_TRANSEQID_DEFAULT) {
-                            _ftprintf(stderr, wxT("%s: error ZCC0008: Translation set is using reserved ID %i.\n"), (LPCTSTR)filenameIn.c_str(), ts.set);
-                            has_errors = true;
+                        if (ts.set <= (short)ZRCOLA_TRANSETID_DEFAULT || (short)ZRCOLA_TRANSETID_UNICODE <= ts.set)
                             continue;
-                        }
 
                         if (build_pot) {
                             pot.insert(ts.src);
@@ -726,7 +474,13 @@ int _tmain(int argc, _TCHAR *argv[])
                         // Get translations.
                         com_obj<ADORecordset> rs_tran;
                         if (src.SelectTranslations(ts.set, rs_tran)) {
-                            if (src.GetRecordsetCount(rs_tran) < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                            count = src.GetRecordsetCount(rs_tran);
+                            if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                                // Preallocate memory.
+                                db_trans.idxSrc.reserve(db_trans.idxSrc.size() + count);
+                                db_trans.idxDst.reserve(db_trans.idxDst.size() + count);
+                                db_trans.data  .reserve(db_trans.data.size()   + count*8);
+
                                 // Parse translations and build temporary database.
                                 ZRCola::DBSource::translation trans;
                                 trans.set = ts.set;
@@ -759,17 +513,13 @@ int _tmain(int argc, _TCHAR *argv[])
         }
     }
 
-    // Sort indices.
-    db_transset.idxTranSet.sort();
-
     // Write translation sets to file.
+    db_transset.idxTranSet.sort();
     dst << ZRCola::transet_rec(db_transset);
 
-    // Sort indices.
+    // Write translations to file.
     db_trans.idxSrc.sort();
     db_trans.idxDst.sort();
-
-    // Write translations to file.
     dst << ZRCola::translation_rec(db_trans);
 
     {
@@ -799,11 +549,9 @@ int _tmain(int argc, _TCHAR *argv[])
                         has_errors = true;
                 }
 
-                // Sort indices.
+                // Write translation sequences to file.
                 db.idxTranSeq.sort();
                 db.idxRank   .sort();
-
-                // Write translation sequences to file.
                 dst << ZRCola::transeq_rec(db);
             } else {
                 _ftprintf(stderr, wxT("%s: error ZCC0025: Error getting translation sequence count from database or too many translation sequences.\n"), (LPCTSTR)filenameIn.c_str());
@@ -898,10 +646,8 @@ int _tmain(int argc, _TCHAR *argv[])
                         has_errors = true;
                 }
 
-                // Sort indices.
-                db.idxLang.sort();
-
                 // Write languages to file.
+                db.idxLang.sort();
                 dst << ZRCola::language_rec(db);
             } else {
                 _ftprintf(stderr, wxT("%s: error ZCC0009: Error getting language count from database or too many languages.\n"), (LPCTSTR)filenameIn.c_str());
@@ -939,13 +685,11 @@ int _tmain(int argc, _TCHAR *argv[])
                         has_errors = true;
                 }
 
-                // Sort indices.
+                // Write language characters to file.
                 db.idxChr .sort();
 #ifdef ZRCOLA_LANGCHAR_LANG_IDX
                 db.idxLang.sort();
 #endif
-
-                // Write language characters to file.
                 dst << ZRCola::langchar_rec(db);
             } else {
                 _ftprintf(stderr, wxT("%s: error ZCC0011: Error getting language characters count from database or too many langchars.\n"), (LPCTSTR)filenameIn.c_str());
@@ -988,10 +732,8 @@ int _tmain(int argc, _TCHAR *argv[])
                         has_errors = true;
                 }
 
-                // Sort indices.
-                db.idxRank.sort();
-
                 // Write character groups to file.
+                db.idxRank.sort();
                 dst << ZRCola::chrgrp_rec(db);
             } else {
                 _ftprintf(stderr, wxT("%s: error ZCC0015: Error getting character group count from database or too many character groups.\n"), (LPCTSTR)filenameIn.c_str());
@@ -1012,7 +754,6 @@ int _tmain(int argc, _TCHAR *argv[])
             size_t count = src.GetRecordsetCount(rs);
             if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
                 ZRCola::DBSource::character_desc_idx idxChrDsc, idxChrDscSub;
-
                 ZRCola::DBSource::character_bank chrs;
 
                 // Phase 1: Parse characters and build indexes.
@@ -1047,14 +788,10 @@ int _tmain(int argc, _TCHAR *argv[])
                     categories_used.insert(chr->second.cat);
                 }
 
-                // Sort indices.
+                // Write characters to file.
                 db.idxChr.sort();
-
-                // Save text indices.
                 idxChrDsc   .save(db.idxDsc   );
                 idxChrDscSub.save(db.idxDscSub);
-
-                // Write characters to file.
                 dst << ZRCola::character_rec(db);
             } else {
                 _ftprintf(stderr, wxT("%s: error ZCC0017: Error getting character count from database or too many characters.\n"), (LPCTSTR)filenameIn.c_str());
@@ -1098,11 +835,9 @@ int _tmain(int argc, _TCHAR *argv[])
                         has_errors = true;
                 }
 
-                // Sort indices.
+                // Write character categories to file.
                 db.idxChrCat.sort();
                 db.idxRank  .sort();
-
-                // Write character categories to file.
                 dst << ZRCola::chrcat_rec(db);
             } else {
                 _ftprintf(stderr, wxT("%s: error ZCC0019: Error getting character category count from database or too many character categories.\n"), (LPCTSTR)filenameIn.c_str());
@@ -1138,11 +873,9 @@ int _tmain(int argc, _TCHAR *argv[])
                         has_errors = true;
                 }
 
-                // Sort indices.
+                // Write characters tags to file.
                 db.idxChr.sort();
                 db.idxTag.sort();
-
-                // Write characters tags to file.
                 dst << ZRCola::chrtag_rec(db);
             } else {
                 _ftprintf(stderr, wxT("%s: error ZCC0021: Error getting characters tags count from database or too many character tags.\n"), (LPCTSTR)filenameIn.c_str());
@@ -1178,11 +911,9 @@ int _tmain(int argc, _TCHAR *argv[])
                         has_errors = true;
                 }
 
-                // Sort indices.
+                // Write tags to file.
                 db.idxName.sort();
                 db.idxTag .sort();
-
-                // Write tags to file.
                 dst << ZRCola::tagname_rec(db);
             } else {
                 _ftprintf(stderr, wxT("%s: error ZCC0023: Error getting tag name count from database or too many tags.\n"), (LPCTSTR)filenameIn.c_str());
@@ -1194,6 +925,43 @@ int _tmain(int argc, _TCHAR *argv[])
         }
     }
 
+    {
+        // Get highlights.
+        com_obj<ADORecordset> rs;
+        if (src.SelectHighlights((short)ZRCOLA_HLGHTSETID_ZRCOLA_UNICODE_COMPOSED_ISSUES, rs)) {
+            size_t count = src.GetRecordsetCount(rs);
+            if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                ZRCola::DBSource::highlight h;
+                ZRCola::highlight_db db;
+
+                // Preallocate memory.
+                db.idxChr.reserve(count);
+                db.data  .reserve(count*5);
+
+                // Parse highlights and build index and data.
+                h.set = (short)ZRCOLA_HLGHTSETID_ZRCOLA_UNICODE_COMPOSED_ISSUES;
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
+                    // Read tag name from the database.
+                    if (src.GetHighlight(rs, h)) {
+                        // Add highlight to index and data.
+                        db << h;
+                    } else
+                        has_errors = true;
+                }
+
+                // Write highlights to file.
+                db.idxChr.sort();
+                dst << ZRCola::highlight_rec(db);
+            } else {
+                _ftprintf(stderr, wxT("%s: error ZCC0027: Error getting highlight count from database or too many tags.\n"), (LPCTSTR)filenameIn.c_str());
+                has_errors = true;
+            }
+        } else {
+            _ftprintf(stderr, wxT("%s: error ZCC0026: Error getting highlights from database. Please make sure the file is ZRCola.zrc compatible.\n"), (LPCTSTR)filenameIn.c_str());
+            has_errors = true;
+        }
+    }
+
     idrec::close<ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dst, dst_start);
 
     if (dst.fail()) {
@@ -1202,7 +970,6 @@ int _tmain(int argc, _TCHAR *argv[])
     }
 
     if (!has_errors && build_pot) {
-        const wxString& filenamePot = parser.GetParam(2);
         fstream dst_pot((LPCTSTR)filenamePot, ios_base::out | ios_base::trunc);
         if (dst_pot.good()) {
             dst_pot << "msgid \"\"" << endl
@@ -1245,43 +1012,6 @@ int _tmain(int argc, _TCHAR *argv[])
         }
     }
 
-    if (!has_errors && build_csv) {
-        const wxString& filenameCsv = parser.GetParam(3);
-        fstream dst_csv((LPCTSTR)filenameCsv, ios_base::out | ios_base::trunc);
-        if (dst_csv.good()) {
-            dst_csv
-                << "\xef\xbb\xbf" // UTF-8 BOM
-                << "\"znak\";"
-                << "\"znakZRCola\";"
-                << "\"znakRank\";"
-                << "\"komb\";"
-                << "\"kombZRCola\";"
-                << "\"kombRank\";"
-                << "\"razlika\"" << endl;
-            wstring_convert<codecvt_utf8<wchar_t>> conv;
-            for (auto i = csv.cbegin(), i_end = csv.cend(); i != i_end; ++i) {
-                dst_csv
-                    << "\"" << make_unicode(i->src.str) << "\";"
-                    << "\"" << conv.to_bytes(i->src.str) << "\";"
-                    << i->src.rank << ";"
-                    << "\"" << make_unicode(i->dst.str) << "\";"
-                    << "\"" << conv.to_bytes(i->dst.str) << "\";"
-                    << i->dst.rank << ";"
-                    << i->score << endl;
-            }
-
-            if (dst_csv.fail()) {
-                _ftprintf(stderr, wxT("%s: error ZCC0013: Writing to CSV report failed.\n"), (LPCTSTR)filenameOut.c_str());
-                has_errors = true;
-            }
-
-            dst_csv.close();
-        } else {
-            _ftprintf(stderr, wxT("%s: error ZCC0012: Error opening CSV report.\n"), filenameOut.fn_str());
-            has_errors = true;
-        }
-    }
-
     if (has_errors) {
         dst.close();
         wxRemoveFile(filenameOut);

ZRColaCompile/parse.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2018-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"

ZRColaCompile/parse.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2018-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once

ZRColaCompile/pch.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"

ZRColaCompile/pch.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
@@ -37,7 +23,6 @@
 #include <stdex/idrec.h>
 
 #include <WinStd/Common.h>
-#include <WinStd/GDI.h>
 
 #include <initguid.h> // GUID helper to prevent LNK2001 errors (unresolved external symbol IID_IADO...)
 #pragma warning(push)
@@ -46,7 +31,6 @@
 #include <adoid.h>
 #pragma warning(pop)
 
-#include <memory.h>
 #include <process.h>
 #include <tchar.h>
 
@@ -58,5 +42,4 @@
 #include <fstream>
 #include <memory>
 #include <set>
-#include <utility>
 #include <vector>

ZRColaInstall/ZRColaInstall.props

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\include\$(Platform).props" />
-    <Import Project="..\include\$(Configuration).props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ZRColaInstall.rc" />
-  </ItemGroup>
-</Project>

ZRColaInstall/ZRColaInstall.vcxproj

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <Language Condition="'$(Language)'==''">En</Language>
+  </PropertyGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5BD95B95-38B0-4C7D-9471-F99CA1203DF4}</ProjectGuid>
+    <RootNamespace>ZRColaInstall$(Language)</RootNamespace>
+    <ProjectName>ZRColaInstall$(Language)</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\include\$(Platform).props" />
+    <Import Project="..\include\$(Configuration).props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <IntDir>temp\$(ProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</IntDir>
+    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>ZRCOLA_INSTALL_LANG="$(Language)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ZRColaInstall.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
+</Project>

ZRColaInstall/ZRColaInstallDe.vcxproj

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{620D6AC0-C8FF-4185-B820-DB1503ACB95C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ZRColaInstallDe</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="ZRColaInstall.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="ZRColaInstall.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>ZRCOLA_INSTALL_LANG="De";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>ZRCOLA_INSTALL_LANG="De";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

ZRColaInstall/ZRColaInstallEn.vcxproj

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5BD95B95-38B0-4C7D-9471-F99CA1203DF4}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ZRColaInstallEn</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="ZRColaInstall.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="ZRColaInstall.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>ZRCOLA_INSTALL_LANG="En";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>ZRCOLA_INSTALL_LANG="En";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

ZRColaInstall/ZRColaInstallEn.vcxproj.filters

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ZRColaInstall.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>

ZRColaInstall/ZRColaInstallRu.vcxproj

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2551B561-5E5B-497E-AE01-11519F91EF19}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ZRColaInstallRu</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="ZRColaInstall.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="ZRColaInstall.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>ZRCOLA_INSTALL_LANG="Ru";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>ZRCOLA_INSTALL_LANG="Ru";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

ZRColaInstall/ZRColaInstallRu.vcxproj.filters

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ZRColaInstall.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>

ZRColaInstall/ZRColaInstallSl.vcxproj

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ZRColaInstallSl</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="ZRColaInstall.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="ZRColaInstall.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>ZRCOLA_INSTALL_LANG="Sl";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>ZRCOLA_INSTALL_LANG="Sl";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

ZRColaInstall/ZRColaInstallSl.vcxproj.filters

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ZRColaInstall.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>

ZRColaInstall/main.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"

ZRColaInstall/pch.cpp

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"

ZRColaInstall/pch.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once

ZRColaUtils.sln

@@ -14,23 +14,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaCompile", "ZRColaCompile\ZRColaCompile.vcxproj", "{87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-16.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-16.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ZRColaInstall", "ZRColaInstall", "{7F5D45A3-B3D2-4B1D-B258-9B83395786E6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstall", "ZRColaInstall\ZRColaInstall.vcxproj", "{5BD95B95-38B0-4C7D-9471-F99CA1203DF4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallSl", "ZRColaInstall\ZRColaInstallSl.vcxproj", "{0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallDe", "ZRColaInstall\ZRColaInstallDe.vcxproj", "{620D6AC0-C8FF-4185-B820-DB1503ACB95C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallEn", "ZRColaInstall\ZRColaInstallEn.vcxproj", "{5BD95B95-38B0-4C7D-9471-F99CA1203DF4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallRu", "ZRColaInstall\ZRColaInstallRu.vcxproj", "{2551B561-5E5B-497E-AE01-11519F91EF19}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-16.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -58,20 +50,10 @@ Global
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.Build.0 = Debug|Win32
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.ActiveCfg = Release|Win32
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.Build.0 = Release|Win32
-		{0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Debug|Win32.Build.0 = Debug|Win32
-		{0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Release|Win32.ActiveCfg = Release|Win32
-		{0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Release|Win32.Build.0 = Release|Win32
-		{620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Release|Win32.ActiveCfg = Release|Win32
 		{5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Debug|Win32.Build.0 = Debug|Win32
 		{5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Release|Win32.ActiveCfg = Release|Win32
 		{5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Release|Win32.Build.0 = Release|Win32
-		{2551B561-5E5B-497E-AE01-11519F91EF19}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2551B561-5E5B-497E-AE01-11519F91EF19}.Debug|Win32.Build.0 = Debug|Win32
-		{2551B561-5E5B-497E-AE01-11519F91EF19}.Release|Win32.ActiveCfg = Release|Win32
-		{2551B561-5E5B-497E-AE01-11519F91EF19}.Release|Win32.Build.0 = Release|Win32
 		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32
 		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32
 		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32
@@ -85,10 +67,6 @@ Global
 		{D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
 		{518777CC-0A59-4415-A12A-82751ED75343} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
-		{0C2C89C2-C96B-41B6-AA99-7E7741E20F3A} = {7F5D45A3-B3D2-4B1D-B258-9B83395786E6}
-		{620D6AC0-C8FF-4185-B820-DB1503ACB95C} = {7F5D45A3-B3D2-4B1D-B258-9B83395786E6}
-		{5BD95B95-38B0-4C7D-9471-F99CA1203DF4} = {7F5D45A3-B3D2-4B1D-B258-9B83395786E6}
-		{2551B561-5E5B-497E-AE01-11519F91EF19} = {7F5D45A3-B3D2-4B1D-B258-9B83395786E6}
 		{47399D91-7EB9-41DE-B521-514BA5DB0C43} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

bin/CanoPerm.wsf

@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2017-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <package>
 	<job id="CanoPerm">
 		<runtime>
-			<description>Generates character index permutations - Amebis, Copyright © 2017</description>
+			<description>Generates character index permutations - Amebis, Copyright © 2017-2021</description>
 			<unnamed name="&lt;Pattern&gt;" required="true" helpstring="Cannonical form (X=unmoveable character; 0-9=moveable character, characters of the same number must preserve global order of appearance; maximum 10 characters)"/>
 			<example>
 Example:

bin/InstFont.wsf

@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of InstFont.
-
-    InstFont is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    InstFont is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with InstFont. If not, see <http://www.gnu.org/licenses/>.
 -->
 <package>
 	<job id="InstFont">
 		<runtime>
-			<description>Installs font - Amebis, Copyright © 2016-2017</description>
+			<description>Installs font - Amebis, Copyright © 2016-2021</description>
 			<unnamed name="&lt;Shortcut.lnk&gt;" required="true"  helpstring="Shortcut file to create"/>
 			<example>
 Example:

bin/MkLnk.wsf

@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright © 1991-2015-2021 Amebis
-
-    This file is part of MkLink.
-
-    MkLink is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MkLink is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MkLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 1991-2021 Amebis
 -->
 <package>
 	<job id="MkLnk">
 		<runtime>
-			<description>Creates shortcut to a program - Amebis, Copyright © 2015</description>
+			<description>Creates shortcut to a program - Amebis, Copyright © 1991-2021</description>
 			<unnamed name="&lt;Shortcut.lnk&gt;" required="true"  helpstring="Shortcut file to create"/>
 			<unnamed name="&lt;Target&gt;"       required="true"  helpstring="Target file the shortcut invokes"/>
 			<named name="A" type="string"        required="false" helpstring="Command line arguments"/>

bin/ZRCUpdate.wsf

@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <package>
 	<job id="CharImport">

include/ARM64.props

@@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
     <Import Project="common.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_PropertySheetDisplayName>ZRCola ARM64</_PropertySheetDisplayName>
     <LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_arm64_lib;$(LibraryPath)</LibraryPath>
@@ -39,5 +24,4 @@
       <AdditionalDependencies>advapi32.lib;ole32.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup />
 </Project>

include/Debug.props

@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_PropertySheetDisplayName>ZRCola Debug</_PropertySheetDisplayName>
   </PropertyGroup>
@@ -37,16 +22,9 @@
       <EnableCOMDATFolding>false</EnableCOMDATFolding>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup />
   <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
     <Message Text="Signing output file..." />
-    <!--
-        To make Windows XP and Vista compliant signatures, the binaries have to be signed using SHA1.
-        <SignFile> switches to SHA256 if the signing certificate is SHA256.
-        Reverted to signtool.exe until we can drop Windows XP and Vista support.
-    -->
-    <!--<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />-->
-    <Exec Command="signtool.exe sign /du &quot;https://www.amebis.si&quot; /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha1 /q &quot;$(TargetPath)&quot;" />
+    <Exec Command="signtool.exe sign /du &quot;https://www.amebis.si&quot; /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha256 /q &quot;$(TargetPath)&quot;" />
     <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
   </Target>
 </Project>

include/Release.props

@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_PropertySheetDisplayName>ZRCola Release</_PropertySheetDisplayName>
   </PropertyGroup>
@@ -39,16 +24,9 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
-  <ItemGroup />
   <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
     <Message Text="Signing output file..." />
-    <!--
-        To make Windows XP and Vista compliant signatures, the binaries have to be signed using SHA1.
-        <SignFile> switches to SHA256 if the signing certificate is SHA256.
-        Reverted to signtool.exe until we can drop Windows XP and Vista support.
-    -->
-    <!--<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" TimestampUrl="$(ManifestTimestampUrl)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />-->
-    <Exec Command="signtool.exe sign /du &quot;https://www.amebis.si&quot; /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha1 /t &quot;%ManifestTimestampUrl%&quot; /q &quot;$(TargetPath)&quot;" />
+    <Exec Command="signtool.exe sign /sha1 &quot;%ManifestCertificateThumbprint%&quot; /fd sha256 /tr &quot;%ManifestTimestampRFC3161Url%&quot; /td sha256 /q &quot;$(TargetPath)&quot;" />
     <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
   </Target>
 </Project>

include/UpdaterCfg.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "version.h"

include/Win32.props

@@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
     <Import Project="common.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_PropertySheetDisplayName>ZRCola Win32</_PropertySheetDisplayName>
     <LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_lib;$(LibraryPath)</LibraryPath>
@@ -35,5 +20,4 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup />
 </Project>

include/common.props

@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="ExtensionSettings">
@@ -59,5 +45,4 @@
       <OutputFile>$(OutDir)..\locale\%(Filename)\$(ProjectName).mo</OutputFile>
     </POCompile>
   </ItemDefinitionGroup>
-  <ItemGroup />
 </Project>

include/version.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
@@ -23,7 +9,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x02050100
+#define PRODUCT_VERSION          0x02050500
 
 //
 // Product version by components
@@ -33,26 +19,26 @@
 //
 #define PRODUCT_VERSION_MAJ      2
 #define PRODUCT_VERSION_MIN      5
-#define PRODUCT_VERSION_REV      1
+#define PRODUCT_VERSION_REV      5
 #define PRODUCT_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "2.5.1"
+#define PRODUCT_VERSION_STR      "2.5.5"
 #define PRODUCT_BUILD_YEAR_STR   "2021"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "2.5.1"
+#define PRODUCT_VERSION_INST     "2.5.5"
 
 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{A0B4DD52-8EDF-48D1-BC01-5055353E7DF8}"
+#define PRODUCT_VERSION_GUID     "{109805EF-6EB5-4F43-A05A-82B3862E16B5}"
 
 //
 // The product vendor and application name for configuration keeping.

include/x64.props

@@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
     <Import Project="common.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_PropertySheetDisplayName>ZRCola x64</_PropertySheetDisplayName>
     <LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_x64_lib;$(LibraryPath)</LibraryPath>
@@ -35,5 +20,4 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup />
 </Project>

include/xgettext.props

@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(POCompileBeforeTargets)' == '' and '$(POCompileAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">

include/xgettext.targets

@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>

include/xgettext.xml

@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">
   <Rule Name="POCompile" PageTemplate="tool" DisplayName="PO Compiler" SwitchPrefix="--" Order="200">

lib/libZRCola/build/libZRCola.props

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-    <libZRColaVersion>10</libZRColaVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OutDir>..\..\..\output\$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\stdex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="libZRColaVersion">
-      <Value>$(libZRColaVersion)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>

lib/libZRCola/build/libZRCola.vcxproj

@@ -26,18 +26,49 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}</ProjectGuid>
+    <RootNamespace>libZRCola</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Release'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Platform)'=='ARM64'">
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\include\$(Platform).props" />
+    <Import Project="..\..\..\include\$(Configuration).props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\..\..\output\$(Platform).$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\stdex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\character.cpp" />
     <ClCompile Include="..\src\common.cpp" />
+    <ClCompile Include="..\src\highlight.cpp" />
     <ClCompile Include="..\src\language.cpp" />
     <ClCompile Include="..\src\mapping.cpp" />
     <ClCompile Include="..\src\pch.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
+      <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="..\src\tag.cpp" />
     <ClCompile Include="..\src\translate.cpp" />
@@ -45,105 +76,12 @@
   <ItemGroup>
     <ClInclude Include="..\include\zrcola\character.h" />
     <ClInclude Include="..\include\zrcola\common.h" />
+    <ClInclude Include="..\include\zrcola\highlight.h" />
     <ClInclude Include="..\include\zrcola\language.h" />
     <ClInclude Include="..\include\zrcola\tag.h" />
     <ClInclude Include="..\include\zrcola\translate.h" />
     <ClInclude Include="..\src\pch.h" />
   </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}</ProjectGuid>
-    <RootNamespace>libZRCola</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
-    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="libZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="libZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="libZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="libZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="libZRCola.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\$(Platform).props" />
-    <Import Project="..\..\..\include\$(Configuration).props" />
-    <Import Project="libZRCola.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>

lib/libZRCola/build/libZRCola.vcxproj.filters

@@ -32,6 +32,9 @@
     <ClCompile Include="..\src\tag.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\highlight.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\pch.h">
@@ -52,5 +55,8 @@
     <ClInclude Include="..\include\zrcola\tag.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\zrcola\highlight.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

lib/libZRCola/include/zrcola/character.h

@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
@@ -43,6 +29,11 @@ namespace ZRCola {
     ///
     typedef double charrank_t;
 
+    inline bool ispua(_In_ wchar_t c)
+    {
+        return L'\ue000' <= c && c <= L'\uf8ff';
+    }
+
 #pragma pack(push)
 #pragma pack(2)
     ///

lib/libZRCola/include/zrcola/common.h

@@ -1,32 +1,19 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
 
+#ifdef _WIN32
+#define _WINSOCKAPI_    // Prevent inclusion of winsock.h in windows.h.
+#include <Windows.h>
+#endif
 #include <sal.h>
 #include <istream>
 #include <ostream>
 #include <utility>
 #include <vector>
-#ifdef _WIN32
-#include <Windows.h>
-#endif
 
 
 #pragma warning(push)

lib/libZRCola/include/zrcola/highlight.h

@@ -0,0 +1,240 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2021 Amebis
+*/
+
+#pragma once
+
+#include "common.h"
+
+#include <stdex/idrec.h>
+
+#include <functional>
+
+#pragma warning(push)
+#pragma warning(disable: 4200)
+
+///
+/// Default highlight
+///
+#define ZRCOLA_HLGHTSETID_DEFAULT                           ((ZRCola::hlghtsetid_t)0x0000)
+
+
+///
+/// ZRCola Unicode Composed Issues
+///
+#define ZRCOLA_HLGHTSETID_ZRCOLA_UNICODE_COMPOSED_ISSUES    ((ZRCola::hlghtsetid_t)0x0001)
+
+namespace ZRCola {
+    ///
+    /// Highlight set ID
+    ///
+    typedef unsigned __int16 hlghtsetid_t;
+
+    ///
+    /// Highlight database
+    ///
+    class highlight_db {
+    public:
+#pragma pack(push)
+#pragma pack(2)
+        ///
+        /// Highlight data
+        ///
+        struct highlight {
+        public:
+            hlghtsetid_t set;           ///< Highlight set ID
+
+        protected:
+            unsigned __int16 chr_to;    ///< Character end in \c data
+            wchar_t data[];             ///< Character
+
+        private:
+            inline highlight(_In_ const highlight &other);
+            inline highlight& operator=(_In_ const highlight &other);
+
+        public:
+            ///
+            /// Constructs the highlight
+            ///
+            /// \param[in] set      Highlight set ID
+            /// \param[in] chr      Character
+            /// \param[in] chr_len  Number of UTF-16 characters in \p chr
+            ///
+            inline highlight(
+                _In_opt_                        hlghtsetid_t  set     = 0,
+                _In_opt_z_count_(chr_len) const wchar_t      *chr     = NULL,
+                _In_opt_                        size_t        chr_len = 0)
+            {
+                this->set    = set;
+                this->chr_to = static_cast<unsigned __int16>(chr_len);
+                if (chr && chr_len) memcpy(this->data, chr, sizeof(wchar_t)*chr_len);
+            }
+
+            inline const wchar_t*         chr    () const { return data;          };
+            inline       wchar_t*         chr    ()       { return data;          };
+            inline const wchar_t*         chr_end() const { return data + chr_to; };
+            inline       wchar_t*         chr_end()       { return data + chr_to; };
+            inline       unsigned __int16 chr_len() const { return chr_to;        };
+
+            inline wchar_t chr_at(_In_ size_t i) const
+            {
+                return i < chr_to ? data[i] : 0;
+            }
+        };
+#pragma pack(pop)
+
+        ///
+        /// Highlight index
+        ///
+        class indexChr : public index<unsigned __int16, unsigned __int32, highlight>
+        {
+        public:
+            ///
+            /// Constructs the index
+            ///
+            /// \param[in] h  Reference to vector holding the data
+            ///
+            indexChr(_In_ std::vector<unsigned __int16> &h) : index<unsigned __int16, unsigned __int32, highlight>(h) {}
+
+            ///
+            /// Compares two highlights by string (for searching)
+            ///
+            /// \param[in] a  Pointer to first element
+            /// \param[in] b  Pointer to second element
+            ///
+            /// \returns
+            /// - <0 when a <  b
+            /// - =0 when a == b
+            /// - >0 when a >  b
+            ///
+            virtual int compare(_In_ const highlight &a, _In_ const highlight &b) const
+            {
+                int r = ZRCola::CompareString(a.chr(), a.chr_len(), b.chr(), b.chr_len());
+                if (r != 0) return r;
+
+                     if (a.set < b.set) return -1;
+                else if (a.set > b.set) return +1;
+
+                return 0;
+            }
+
+            ///
+            /// Compares two highlights by string (for sorting)
+            ///
+            /// \param[in] a  Pointer to first element
+            /// \param[in] b  Pointer to second element
+            ///
+            /// \returns
+            /// - <0 when a <  b
+            /// - =0 when a == b
+            /// - >0 when a >  b
+            ///
+            virtual int compare_sort(_In_ const highlight &a, _In_ const highlight &b) const
+            {
+                // Revert to `compare()` by default.
+                return compare(a, b);
+            }
+        } idxChr;   ///< Highlight index
+
+
+        std::vector<unsigned __int16> data;         ///< Highlight data
+
+    public:
+        ///
+        /// Constructs the database
+        ///
+        inline highlight_db() : idxChr(data) {}
+
+        ///
+        /// Clears the database
+        ///
+        inline void clear()
+        {
+            idxChr.clear();
+            data  .clear();
+        }
+
+        ///
+        /// Highlights string
+        ///
+        /// \param[in] input     Input string (UTF-16)
+        /// \param[in] inputMax  Length of the input string in characters. Can be (size_t)-1 if \p input is zero terminated.
+        /// \param[in] callback  Function to be called on highlight switch
+        ///
+        void Highlight(_In_z_count_(inputMax) const wchar_t* input, _In_ size_t inputMax, _In_ std::function<void (hlghtsetid_t set, size_t start, size_t end)> callback) const;
+    };
+
+
+    typedef stdex::idrec::record<highlight_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> highlight_rec;
+};
+
+
+const ZRCola::recordid_t ZRCola::highlight_rec::id = *(ZRCola::recordid_t*)"HGH";
+
+
+///
+/// Writes highlight database to a stream
+///
+/// \param[in] stream  Output stream
+/// \param[in] db      Highlight database
+///
+/// \returns The stream \p stream
+///
+inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::highlight_db &db)
+{
+    // Write highlight index.
+    if (stream.fail()) return stream;
+    stream << db.idxChr;
+
+    // Write data count.
+    auto data_count = db.data.size();
+#if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
+    // 4G check
+    if (data_count > 0xffffffff) {
+        stream.setstate(std::ios_base::failbit);
+        return stream;
+    }
+#endif
+    if (stream.fail()) return stream;
+    unsigned __int32 count = (unsigned __int32)data_count;
+    stream.write((const char*)&count, sizeof(count));
+
+    // Write data.
+    if (stream.fail()) return stream;
+    stream.write((const char*)db.data.data(), sizeof(unsigned __int16)*static_cast<std::streamsize>(count));
+
+    return stream;
+}
+
+
+///
+/// Reads highlight database from a stream
+///
+/// \param[in ] stream  Input stream
+/// \param[out] db      Highlight database
+///
+/// \returns The stream \p stream
+///
+inline std::istream& operator >>(_In_ std::istream& stream, _Out_ ZRCola::highlight_db &db)
+{
+    // Read highlight index.
+    stream >> db.idxChr;
+    if (!stream.good()) return stream;
+
+    // Read data count.
+    unsigned __int32 count;
+    stream.read((char*)&count, sizeof(count));
+    if (!stream.good()) return stream;
+
+    if (count) {
+        // Read data.
+        db.data.resize(count);
+        stream.read((char*)db.data.data(), sizeof(unsigned __int16)*static_cast<std::streamsize>(count));
+    } else
+        db.data.clear();
+
+    return stream;
+}
+
+#pragma warning(pop)