From 67a6fd18e4e4092d94d040ef099afbb4344ed2e4 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 25 May 2016 13:57:33 +0200
Subject: [PATCH] Empty character categories removed from database

---
 ZRColaCompile/main.cpp              |  38 +++++++++++++++++-----------
 output/data/ZRCola.zrcdb            | Bin 1890516 -> 1890312 bytes
 output/locale/ZRCola-zrcdb.pot      |  17 +++----------
 output/locale/de_DE/ZRCola-zrcdb.po |  20 +++------------
 output/locale/ru_RU/ZRCola-zrcdb.po |  15 +++--------
 output/locale/sl_SI/ZRCola-zrcdb.mo | Bin 6678 -> 6487 bytes
 output/locale/sl_SI/ZRCola-zrcdb.po |  28 ++++++++++----------
 7 files changed, 48 insertions(+), 70 deletions(-)

diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp
index c695099..c0a3387 100644
--- a/ZRColaCompile/main.cpp
+++ b/ZRColaCompile/main.cpp
@@ -385,6 +385,8 @@ int _tmain(int argc, _TCHAR *argv[])
         }
     }
 
+    set<ZRCola::chrcatid_t> categories_used;
+
     {
         // Get characters.
         ATL::CComPtr<ADORecordset> rs;
@@ -425,6 +427,9 @@ int _tmain(int argc, _TCHAR *argv[])
                         idxChrDsc   .add_keywords(chr.keywords.c_str(), chr.chr, 0);
                         idxChrDscSub.add_keywords(chr.desc    .c_str(), chr.chr, 3);
                         idxChrDscSub.add_keywords(chr.keywords.c_str(), chr.chr, 3);
+
+                        // Mark category used.
+                        categories_used.insert(chr.cat);
                     } else
                         has_errors = true;
 
@@ -468,21 +473,24 @@ int _tmain(int argc, _TCHAR *argv[])
                 while (!ZRCola::DBSource::IsEOF(rs)) {
                     // Read character category from the database.
                     if (src.GetCharacterCategory(rs, cc)) {
-                        // Add character category to index and data.
-                        unsigned __int32 idx = db.data.size();
-                        for (wstring::size_type i = 0; i < sizeof(ZRCola::chrcatid_t)/sizeof(unsigned __int16); i++)
-                            db.data.push_back(((const unsigned __int16*)cc.id.data)[i]);
-                        wxASSERT_MSG((int)0xffff8000 <= cc.rank && cc.rank <= (int)0x00007fff, wxT("character category rank out of bounds"));
-                        db.data.push_back((unsigned __int16)cc.rank);
-                        wstring::size_type n_name = cc.name.length();
-                        wxASSERT_MSG(n_name <= 0xffff, wxT("character category name too long"));
-                        db.data.push_back((unsigned __int16)n_name);
-                        for (wstring::size_type i = 0; i < n_name; i++)
-                            db.data.push_back(cc.name[i]);
-                        db.idxChrCat.push_back(idx);
-                        db.idxRnk   .push_back(idx);
-                        if (build_pot)
-                            pot.insert(cc.name);
+                        if (categories_used.find(cc.id) != categories_used.end()) {
+                            // Add character category to index and data.
+                            unsigned __int32 idx = db.data.size();
+                            for (wstring::size_type i = 0; i < sizeof(ZRCola::chrcatid_t)/sizeof(unsigned __int16); i++)
+                                db.data.push_back(((const unsigned __int16*)cc.id.data)[i]);
+                            wxASSERT_MSG((int)0xffff8000 <= cc.rank && cc.rank <= (int)0x00007fff, wxT("character category rank out of bounds"));
+                            db.data.push_back((unsigned __int16)cc.rank);
+                            wstring::size_type n_name = cc.name.length();
+                            wxASSERT_MSG(n_name <= 0xffff, wxT("character category name too long"));
+                            db.data.push_back((unsigned __int16)n_name);
+                            for (wstring::size_type i = 0; i < n_name; i++)
+                                db.data.push_back(cc.name[i]);
+                            db.idxChrCat.push_back(idx);
+                            db.idxRnk   .push_back(idx);
+                            if (build_pot)
+                                pot.insert(cc.name);
+                        } else
+                            _ftprintf(stderr, wxT("%s: warning ZCC0019: Ommiting empty category %ls.\n"), (LPCTSTR)filenameIn.c_str(), (LPCWSTR)cc.name.c_str());
                     } else
                         has_errors = true;
 
diff --git a/output/data/ZRCola.zrcdb b/output/data/ZRCola.zrcdb
index 8bd1567f0ece94416df5afd952d5f40a70d17aba..c4e500d5723dc969cab70978ffd2aeedefeb0d8e 100644
GIT binary patch
delta 211
zcmWm4yAA<C0EOWhcHGw8+I5+TL?WI*rJ|Kc6bdT6Zl6F!rJV<ms1y{kQ7YA@*eB5K
zJNTXCJIy)v9v*L@S}$ip?A1d_mB{VEO(arC!+}BuS>%vM0WOLtp^OTusG*JqJT&1W
zKnrbjA~)%tzrB?sL?DECN{URdzzCi&_M@lj!WNi;)f@MJdt<(n=4Evwx>`L>8$Z@V
IbBcBU2c9WKXaE2J

delta 410
zcmZwCyH3JT90u_3fX7=w&>|Om5-$UBkd?{Ft`IM5bwbjB5v6JI0i1MjKeI7$)`2j%
z_yBA);R)2KZ{Xn98aA8!lJjrA|99Gl*C2cgq;qCtawkVp$Vd$CjYv?6(zHO57HNr=
zX@yqFpbTYcjdGNyb=n}43baW@Dp8p#v^6#&>-np?Cjkq<j{q_$9{3#6G3`@<UWA@Z
z)lqiJ%qM-2rOi;CTk&!JdS0>3nnqvfr%;*W$57SNwPvS?5}Ihk#}y8+gBCna9bDoD
zUCuTJxW+|1>-U+eojUz8a*Vl2&}Vqah@UJsk~J5OSK$Z#pE*e`YqLDw_0ZGbGqqc_
Y1BE>QZipVM|LR(}<;iD#H@U{eFUcxuPXGV_

diff --git a/output/locale/ZRCola-zrcdb.pot b/output/locale/ZRCola-zrcdb.pot
index 5458ff9..6aabf28 100644
--- a/output/locale/ZRCola-zrcdb.pot
+++ b/output/locale/ZRCola-zrcdb.pot
@@ -5,7 +5,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: ZRColaCompile 2.0-beta\n"
+"X-Generator: ZRColaCompile 2.0-beta1\n"
 
 msgid "Albanian"
 msgstr ""
@@ -160,6 +160,9 @@ msgstr ""
 msgid "Letter Z"
 msgstr ""
 
+msgid "Letter a"
+msgstr ""
+
 msgid "Letter e"
 msgstr ""
 
@@ -205,9 +208,6 @@ msgstr ""
 msgid "Mark, Non-Spacing"
 msgstr ""
 
-msgid "Mark, Spacing Combining"
-msgstr ""
-
 msgid "Metric"
 msgstr ""
 
@@ -271,9 +271,6 @@ msgstr ""
 msgid "Other, Format"
 msgstr ""
 
-msgid "Other, Surrogate"
-msgstr ""
-
 msgid "Parentheses"
 msgstr ""
 
@@ -313,12 +310,6 @@ msgstr ""
 msgid "Russian"
 msgstr ""
 
-msgid "Separator, Line"
-msgstr ""
-
-msgid "Separator, Paragraph"
-msgstr ""
-
 msgid "Separator, Space"
 msgstr ""
 
diff --git a/output/locale/de_DE/ZRCola-zrcdb.po b/output/locale/de_DE/ZRCola-zrcdb.po
index 199e0da..5329830 100644
--- a/output/locale/de_DE/ZRCola-zrcdb.po
+++ b/output/locale/de_DE/ZRCola-zrcdb.po
@@ -167,6 +167,10 @@ msgstr ""
 msgid "Letter Z"
 msgstr ""
 
+#, fuzzy
+msgid "Letter a"
+msgstr "Letter Extra 9 1/2 x 12 Zoll"
+
 msgid "Letter e"
 msgstr ""
 
@@ -212,9 +216,6 @@ msgstr ""
 msgid "Mark, Non-Spacing"
 msgstr ""
 
-msgid "Mark, Spacing Combining"
-msgstr ""
-
 msgid "Metric"
 msgstr ""
 
@@ -279,9 +280,6 @@ msgstr ""
 msgid "Other, Format"
 msgstr ""
 
-msgid "Other, Surrogate"
-msgstr ""
-
 msgid "Parentheses"
 msgstr ""
 
@@ -321,12 +319,6 @@ msgstr ""
 msgid "Russian"
 msgstr ""
 
-msgid "Separator, Line"
-msgstr ""
-
-msgid "Separator, Paragraph"
-msgstr ""
-
 msgid "Separator, Space"
 msgstr ""
 
@@ -429,7 +421,3 @@ msgstr "Windows Türkisch (CP 1254)"
 
 msgid "Ukrainian"
 msgstr ""
-
-#, fuzzy
-#~ msgid "Letter a"
-#~ msgstr "Letter Extra 9 1/2 x 12 Zoll"
diff --git a/output/locale/ru_RU/ZRCola-zrcdb.po b/output/locale/ru_RU/ZRCola-zrcdb.po
index 80483a4..5c03352 100644
--- a/output/locale/ru_RU/ZRCola-zrcdb.po
+++ b/output/locale/ru_RU/ZRCola-zrcdb.po
@@ -167,6 +167,9 @@ msgstr ""
 msgid "Letter Z"
 msgstr ""
 
+msgid "Letter a"
+msgstr ""
+
 msgid "Letter e"
 msgstr ""
 
@@ -212,9 +215,6 @@ msgstr ""
 msgid "Mark, Non-Spacing"
 msgstr ""
 
-msgid "Mark, Spacing Combining"
-msgstr ""
-
 msgid "Metric"
 msgstr ""
 
@@ -278,9 +278,6 @@ msgstr ""
 msgid "Other, Format"
 msgstr ""
 
-msgid "Other, Surrogate"
-msgstr ""
-
 msgid "Parentheses"
 msgstr ""
 
@@ -320,12 +317,6 @@ msgstr ""
 msgid "Russian"
 msgstr ""
 
-msgid "Separator, Line"
-msgstr ""
-
-msgid "Separator, Paragraph"
-msgstr ""
-
 msgid "Separator, Space"
 msgstr ""
 
diff --git a/output/locale/sl_SI/ZRCola-zrcdb.mo b/output/locale/sl_SI/ZRCola-zrcdb.mo
index c514694e56b50d193c5326dcd258d35575eba1c3..2e124347f304a1a67a4852d3c93f8fb9b8495353 100644
GIT binary patch
literal 6487
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

literal 6678
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

diff --git a/output/locale/sl_SI/ZRCola-zrcdb.po b/output/locale/sl_SI/ZRCola-zrcdb.po
index 8a7b5e2..cc8794f 100644
--- a/output/locale/sl_SI/ZRCola-zrcdb.po
+++ b/output/locale/sl_SI/ZRCola-zrcdb.po
@@ -167,6 +167,9 @@ msgstr "Črka Y"
 msgid "Letter Z"
 msgstr "Črka Z"
 
+msgid "Letter a"
+msgstr "Črka a"
+
 msgid "Letter e"
 msgstr "Črka e"
 
@@ -212,9 +215,6 @@ msgstr "Ločevalo, obdajajoča"
 msgid "Mark, Non-Spacing"
 msgstr "Ločevalo, neločljivo"
 
-msgid "Mark, Spacing Combining"
-msgstr "Ločevalo, ločljivo"
-
 msgid "Metric"
 msgstr "Metrično"
 
@@ -278,9 +278,6 @@ msgstr "Druga spreminjevala"
 msgid "Other, Format"
 msgstr "Drugo, oblikovni"
 
-msgid "Other, Surrogate"
-msgstr "Drugo, nadomestni"
-
 msgid "Parentheses"
 msgstr "Oklepaji"
 
@@ -320,12 +317,6 @@ msgstr "romunščina"
 msgid "Russian"
 msgstr "ruščina"
 
-msgid "Separator, Line"
-msgstr "Ločilo, vrstic"
-
-msgid "Separator, Paragraph"
-msgstr "Ločilo, odstavkov"
-
 msgid "Separator, Space"
 msgstr "Ločilo, presledek"
 
@@ -416,8 +407,17 @@ msgstr "turščina"
 msgid "Ukrainian"
 msgstr "ukrajinščina"
 
-#~ msgid "Letter a"
-#~ msgstr "Črka a"
+#~ msgid "Mark, Spacing Combining"
+#~ msgstr "Ločevalo, ločljivo"
+
+#~ msgid "Other, Surrogate"
+#~ msgstr "Drugo, nadomestni"
+
+#~ msgid "Separator, Line"
+#~ msgstr "Ločilo, vrstic"
+
+#~ msgid "Separator, Paragraph"
+#~ msgstr "Ločilo, odstavkov"
 
 #~ msgid "Letter b"
 #~ msgstr "Črka b"