[sword-svn] r2244 - in trunk: include src/modules/filters

[chrislit at crosswire.org]

Author: chrislit
Date: 2009-02-09 17:12:46 -0700 (Mon, 09 Feb 2009)
New Revision: 2244

Modified:
   trunk/include/utf8transliterator.h
   trunk/src/modules/filters/utf8transliterator.cpp
Log:
re-enable some ancient scripts
name changes to transform variants to conform to CLDR forms


Modified: trunk/include/utf8transliterator.h
===================================================================
--- trunk/include/utf8transliterator.h	2009-02-09 05:19:22 UTC (rev 2243)
+++ trunk/include/utf8transliterator.h	2009-02-10 00:12:46 UTC (rev 2244)
@@ -23,7 +23,7 @@
 
 enum scriptEnum {SE_OFF, SE_LATIN, 
 /*one-way (to) transliterators*/ 
-SE_IPA, SE_BASICLATIN, SE_SBL, SE_TC, SE_BETA, SE_BGREEK, SE_SERA, SE_HUGOYE, SE_UNGEGN, SE_ISO, SE_ALALC, SE_BGNPCGN, 
+SE_IPA, SE_BASICLATIN, SE_SBL, SE_TC, SE_BETA, SE_BGREEK, SE_SERA, SE_HUGOYE, SE_UNGEGN, SE_ISO, SE_ALALC, SE_BGN, 
 /*two-way transliterators*/ 
 SE_GREEK, SE_HEBREW, SE_CYRILLIC, SE_ARABIC, SE_SYRIAC, SE_KATAKANA, SE_HIRAGANA, SE_HANGUL, SE_DEVANAGARI, SE_TAMIL, SE_BENGALI, SE_GURMUKHI, SE_GUJARATI, SE_ORIYA, SE_TELUGU, SE_KANNADA, SE_MALAYALAM, SE_THAI, SE_GEORGIAN, SE_ARMENIAN, SE_ETHIOPIC, SE_GOTHIC, SE_UGARITIC, SE_COPTIC, SE_MEROITIC, SE_LINEARB, SE_CYPRIOT, SE_RUNIC, SE_OGHAM, SE_THAANA, SE_GLAGOLITIC, 
 /*SE_TENGWAR, SE_CIRTH,*/

Modified: trunk/src/modules/filters/utf8transliterator.cpp
===================================================================
--- trunk/src/modules/filters/utf8transliterator.cpp	2009-02-09 05:19:22 UTC (rev 2243)
+++ trunk/src/modules/filters/utf8transliterator.cpp	2009-02-10 00:12:46 UTC (rev 2244)
@@ -52,7 +52,7 @@
 	//        "UNGEGN",
 	//        "ISO",
 	//        "ALA-LC",
-	//        "BGN-PCGN",
+	//        "BGN",
 	//        "Greek",
 	//        "Hebrew",
 	//        "Cyrillic",
@@ -394,13 +394,13 @@
                         case UBLOCK_ETHIOPIC: scripts[SE_ETHIOPIC] = true; break;
                         case UBLOCK_GOTHIC: scripts[SE_GOTHIC] = true; break;
                         case UBLOCK_UGARITIC: scripts[SE_UGARITIC] = true; break;
-//                        case UBLOCK_MEROITIC: scripts[SE_MEROITIC] = true; break;
-//                        case UBLOCK_LINEARB: scripts[SE_LINEARB] = true; break;
-//                        case UBLOCK_CYPRIOT: scripts[SE_CYPRIOT] = true; break;
+                        case UBLOCK_MEROITIC: scripts[SE_MEROITIC] = true; break;
+                        case UBLOCK_LINEARB: scripts[SE_LINEARB] = true; break;
+                        case UBLOCK_CYPRIOT: scripts[SE_CYPRIOT] = true; break;
                         case UBLOCK_RUNIC: scripts[SE_RUNIC] = true; break;
                         case UBLOCK_OGHAM: scripts[SE_OGHAM] = true; break;
                         case UBLOCK_THAANA: scripts[SE_THAANA] = true; break;
-//                        case UBLOCK_GLAGOLITIC: scripts[SE_GLAGOLITIC] = true; break;
+                        case UBLOCK_GLAGOLITIC: scripts[SE_GLAGOLITIC] = true; break;
 //                        case UBLOCK_TENGWAR: scripts[SE_TENGWAR] = true; break;
 //                        case UBLOCK_CIRTH: scripts[SE_CIRTH] = true; break;
 			case UBLOCK_CJK_RADICALS_SUPPLEMENT:
@@ -461,8 +461,8 @@
         	                	addTrans("Greek-Latin/ISO", &ID);
                                 else if (option == SE_ALALC)
         	                	addTrans("Greek-Latin/ALALC", &ID);
-                                else if (option == SE_BGNPCGN)
-        	                	addTrans("Greek-Latin/BGNPCGN", &ID);
+                                else if (option == SE_BGN)
+        	                	addTrans("Greek-Latin/BGN", &ID);
                                 else if (option == SE_IPA)
         	                	addTrans("Greek-IPA/Ancient", &ID);
                                 else {
@@ -538,8 +538,8 @@
         			addTrans("Georgian-Latin/ISO", &ID);
                         else if (option == SE_ALALC)
         			addTrans("Georgian-Latin/ALALC", &ID);
-                        else if (option == SE_BGNPCGN)
-        			addTrans("Georgian-Latin/BGNPCGN", &ID);
+                        else if (option == SE_BGN)
+        			addTrans("Georgian-Latin/BGN", &ID);
                         else if (option == SE_IPA)
         			addTrans("Georgian-IPA", &ID);
                         else {
@@ -552,8 +552,8 @@
         			addTrans("Armenian-Latin/ISO", &ID);
                         else if (option == SE_ALALC)
         			addTrans("Armenian-Latin/ALALC", &ID);
-                        else if (option == SE_BGNPCGN)
-        			addTrans("Armenian-Latin/BGNPCGN", &ID);
+                        else if (option == SE_BGN)
+        			addTrans("Armenian-Latin/BGN", &ID);
                         else if (option == SE_IPA)
         			addTrans("Armenian-IPA", &ID);
                         else {
@@ -616,8 +616,8 @@
 		if (scripts[SE_THAANA]) {
 			if (option == SE_ALALC)
                         	addTrans("Thaana-Latin/ALALC", &ID);
-			else if (option == SE_BGNPCGN)
-                        	addTrans("Thaana-Latin/BGNPCGN", &ID);
+			else if (option == SE_BGN)
+                        	addTrans("Thaana-Latin/BGN", &ID);
 			else {
 				addTrans("Thaana-Latin", &ID);
 				scripts[SE_LATIN] = true;