Fast fix

    - Estonian language is "et", not "es"
    - More western languages in configuration

6 files changed, 129 insertions, 7 deletions

diff --git a/VERSION b/VERSION
index abd4105..3a4036f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.4
+0.2.5
diff --git a/engines/libguess.c b/engines/libguess.c
index 7f13b50..4bf1dee 100644
--- a/engines/libguess.c
+++ b/engines/libguess.c
@@ -49,7 +49,7 @@ struct rcc_guess_engine_t guessJPEngine = {
  &guess_jp
 };
 
-struct rcc_guess_engine_t guessCNEngine = {
+struct rcc_guess_engine_t guessZHEngine = {
  {
     "LibGUESS",
     NULL,		/* Constructor */
@@ -60,6 +60,30 @@ struct rcc_guess_engine_t guessCNEngine = {
  NULL
 };
 
+/*
+struct rcc_guess_engine_t guessCNEngine = {
+ {
+    "LibGUESS",
+    NULL,
+    NULL,
+    &guessDetect,
+    {"UTF-8", "UTF-16", "ISO-2022-CN", "GB2312", "GB18030", NULL}
+ },
+ &guess_cn
+};
+
+struct rcc_guess_engine_t guessTWEngine = {
+ {
+    "LibGUESS",
+    NULL,
+    NULL,
+    &guessDetect,
+    {"UTF-8", "UTF-16", "ISO-2022-TW", "BIG5", NULL}
+ },
+ &guess_tw
+};
+*/
+
 struct rcc_guess_engine_t guessKREngine = {
  {
     "LibGUESS",
@@ -73,7 +97,7 @@ struct rcc_guess_engine_t guessKREngine = {
         
     
 rcc_engine *rccGetInfo(const char *lang) {
-    if (!strcmp(lang, "zh")) return (rcc_engine*)&guessCNEngine;
+    if (!strcmp(lang, "zh")) return (rcc_engine*)&guessZHEngine;
     if (!strcmp(lang, "ja")) return (rcc_engine*)&guessJPEngine;
     if (!strcmp(lang, "ko")) return (rcc_engine*)&guessKREngine;
     return NULL;
diff --git a/examples/rcc.xml b/examples/rcc.xml
index eda97f1..51198da 100644
--- a/examples/rcc.xml
+++ b/examples/rcc.xml
@@ -21,6 +21,7 @@
 	    <Charsets>
 		<Charset>ISO8859-1</Charset>
 		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
 	    </Charsets>
 	    <Engines>
 		<Engine>western</Engine>
@@ -48,7 +49,7 @@
 		<Charset>CSKOI8R</Charset>
 	    </Charsets>
 	</Language>
-	<Language name="es">
+	<Language name="et">
 	    <FullName locale="ru">Эстонский</FullName>
 	    <Charsets>
 		<Charset>CP1257</Charset>
@@ -187,6 +188,7 @@
 	    <Charsets>
 		<Charset>ISO8859-1</Charset>
 		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
 	    </Charsets>
 	    <Engines>
 		<Engine>western</Engine>
@@ -198,6 +200,31 @@
 	    <Charsets>
 		<Charset>ISO8859-1</Charset>
 		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
+	    </Charsets>
+	    <Engines>
+		<Engine>western</Engine>
+	    </Engines>
+	</Language>
+	<Language name="es">
+	    <FullName>Spanish</FullName>
+	    <FullName locale="ru">Испанский</FullName>
+	    <Charsets>
+		<Charset>ISO8859-1</Charset>
+		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
+	    </Charsets>
+	    <Engines>
+		<Engine>western</Engine>
+	    </Engines>
+	</Language>
+	<Language name="it">
+	    <FullName>Italian</FullName>
+	    <FullName locale="ru">Итальянский</FullName>
+	    <Charsets>
+		<Charset>ISO8859-1</Charset>
+		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
 	    </Charsets>
 	    <Engines>
 		<Engine>western</Engine>
@@ -280,9 +307,12 @@
 	<Engine name="off">
 	    <FullName locale="ru">Отключить</FullName>
 	</Engine>
-	<Engine name="Russian">
+	<Engine name="LibRCD">
 	    <FullName locale="ru">Библиотека LibRCD</FullName>
 	</Engine>
+	<Engine name="western">
+	    <FullName locale="ru">Детектор ISO8859-1/Unicode</FullName>
+	</Engine>
 	<Engine name="Enca Library">
 	    <FullName locale="ru">Библиотека Enca</FullName>
 	</Engine>
diff --git a/examples/rcc.xml.eastern b/examples/rcc.xml.eastern
index 52fbfcb..acc8f13 100644
--- a/examples/rcc.xml.eastern
+++ b/examples/rcc.xml.eastern
@@ -21,7 +21,7 @@
 		<Charset>CSKOI8R</Charset>
 	    </Charsets>
 	</Language>
-	<Language name="es">
+	<Language name="et">
 	    <Charsets>
 		<Charset>CP1257</Charset>
 		<Charset>UTF-8</Charset>
diff --git a/examples/rcc.xml.western b/examples/rcc.xml.western
index 12f667b..26bee86 100644
--- a/examples/rcc.xml.western
+++ b/examples/rcc.xml.western
@@ -6,6 +6,7 @@
 	    <Charsets>
 		<Charset>ISO8859-1</Charset>
 		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
 	    </Charsets>
 	    <Engines>
 		<Engine>western</Engine>
@@ -16,6 +17,73 @@
 	    <Charsets>
 		<Charset>ISO8859-1</Charset>
 		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
+	    </Charsets>
+	    <Engines>
+		<Engine>western</Engine>
+	    </Engines>
+	</Language>
+	<Language name="nl">
+	    <FullName>Dutch</FullName>
+	    <Charsets>
+		<Charset>ISO8859-1</Charset>
+		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
+	    </Charsets>
+	    <Engines>
+		<Engine>western</Engine>
+	    </Engines>
+	</Language>
+	<Language name="it">
+	    <FullName>Italian</FullName>
+	    <Charsets>
+		<Charset>ISO8859-1</Charset>
+		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
+	    </Charsets>
+	    <Engines>
+		<Engine>western</Engine>
+	    </Engines>
+	</Language>
+	<Language name="es">
+	    <FullName>Spanish</FullName>
+	    <Charsets>
+		<Charset>ISO8859-1</Charset>
+		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
+	    </Charsets>
+	    <Engines>
+		<Engine>western</Engine>
+	    </Engines>
+	</Language>
+	<Language name="pt">
+	    <FullName>Portugese</FullName>
+	    <Charsets>
+		<Charset>ISO8859-1</Charset>
+		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
+	    </Charsets>
+	    <Engines>
+		<Engine>western</Engine>
+	    </Engines>
+	</Language>
+	<Language name="sv">
+	    <FullName>Swedish</FullName>
+	    <Charsets>
+		<Charset>ISO8859-1</Charset>
+		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
+	    </Charsets>
+	    <Engines>
+		<Engine>western</Engine>
+	    </Engines>
+	</Language>
+	<Language name="no">
+	    <FullName>Norwegian</FullName>
+	    <Charsets>
+		<Charset>ISO8859-1</Charset>
+		<Charset>UTF-8</Charset>
+		<Charset>CP1252</Charset>
 	    </Charsets>
 	    <Engines>
 		<Engine>western</Engine>
diff --git a/src/rccconfig.c b/src/rccconfig.c
index d5546c7..d9e8cba 100644
--- a/src/rccconfig.c
+++ b/src/rccconfig.c
@@ -100,7 +100,7 @@ rcc_language rcc_default_languages_embeded[RCC_MAX_LANGUAGES + 1] = {
     &rcc_default_engine,
     NULL
 }},
-{"es", {rcc_default_charset, rcc_utf8_charset, "ISO-8859-4", "CP1257", "IBM775", "ISO-8859-13", "macce", "baltic", NULL},{
+{"et", {rcc_default_charset, rcc_utf8_charset, "ISO-8859-4", "CP1257", "IBM775", "ISO-8859-13", "macce", "baltic", NULL},{
     &rcc_default_engine,
     NULL
 }},