Set version to 2.5.2

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

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).

ZRColaCompile/main.cpp

@@ -304,10 +304,11 @@ 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_OPTION, NULL, "csv-rep", _("Output CSV report"     ), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL   },
 
         { wxCMD_LINE_NONE }
     };
@@ -350,10 +351,12 @@ 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;
+    wxString filenameCsv;
+    bool build_csv = parser.Found("csv-rep", &filenameCsv);
     vector<ZRCola::DBSource::translation> csv;
 
     // Open file ID.
@@ -520,17 +523,30 @@ int _tmain(int argc, _TCHAR *argv[])
             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));
+                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")
+                    },
+                    lf_times = {
+                        -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("Times New Roman")
+                    };
+                gdi_handle<HFONT>
+                    fnt_zrcola(::CreateFontIndirect(&lf_zrcola)),
+                    fnt_times (::CreateFontIndirect(&lf_times ));
                 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)),
@@ -554,8 +570,8 @@ int _tmain(int argc, _TCHAR *argv[])
                 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);
+                    selector_font_comb(dc_comb, fnt_times ),
+                    selector_font_pre (dc_pre , fnt_times );
                 struct {
                     BITMAPINFOHEADER bmiHeader;
                     RGBQUAD          bmiColors[2];
@@ -582,6 +598,69 @@ int _tmain(int argc, _TCHAR *argv[])
                     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;
+
+                auto process_permutation = [&] (const wstring &comp_orig, const wstring &decomp_orig) {
+                    // Replace ZRCola decomposition with Unicode combining characters wherever possible.
+                    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))
+                        return;
+                    // Do the Unicode normalization.
+                    wstring comp_pre;
+                    if (comp.length() > 2) {
+                        NormalizeString(NormalizationC, comp.c_str(), 2, comp_pre);
+                        comp_pre += comp.c_str() + 2;
+                    } else
+                        NormalizeString(NormalizationC, comp, comp_pre);
+                    {
+                        // 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     .c_str(), comp     .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))
+                        return;
+                    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) {
+                            if (hit->second.find(comp) == hit->second.end())
+                                hit->second.insert(make_pair(comp, 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)
+                            v.insert(make_pair(comp, make_pair(score_comb, 100)));
+                        if (!v.empty())
+                            trans.insert(make_pair(comp_orig, std::move(v)));
+                    }
+                };
+
                 for (; !ZRCola::DBSource::IsEOF(rs2); rs2->MoveNext()) {
                     // Read character from the database.
                     ZRCola::DBSource::character chr;
@@ -589,65 +668,22 @@ int _tmain(int argc, _TCHAR *argv[])
                         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)));
+
+                            // Process primary permutation.
+                            process_permutation(chr.first, t->src.str);
+
+                            // Secondary permutation(s).
+                            auto const hit_np = db_np.find(t->norm);
+                            if (hit_np != db_np.end()) {
+                                for (auto perm = hit_np->second.cbegin(), perm_end = hit_np->second.cend(); perm != perm_end; ++perm) {
+                                    // Prepare permutated string.
+                                    translation_db::mapped_type::key_type str_perm;
+                                    for (auto idx = perm->cbegin(), idx_end = perm->cend(); idx != idx_end; ++idx)
+                                        str_perm += t->src.str[*idx];
+
+                                    // Process secondary permutation.
+                                    process_permutation(chr.first, str_perm);
                                 }
-                            } 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)));
                             }
                         }
                     } else
@@ -1202,7 +1238,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
@@ -1246,7 +1281,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

include/Debug.props

@@ -40,13 +40,7 @@
   <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

@@ -42,13 +42,7 @@
   <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/version.h

@@ -23,7 +23,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x02050100
+#define PRODUCT_VERSION          0x02050200
 
 //
 // Product version by components
@@ -33,26 +33,26 @@
 //
 #define PRODUCT_VERSION_MAJ      2
 #define PRODUCT_VERSION_MIN      5
-#define PRODUCT_VERSION_REV      1
+#define PRODUCT_VERSION_REV      2
 #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.2"
 #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.2"
 
 //
 // 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     "{40E9D33D-F781-4969-96B2-D4EED1C79FD6}"
 
 //
 // The product vendor and application name for configuration keeping.