]> git.saurik.com Git - apple/icu.git/blobdiff - icuSources/test/intltest/transrt.cpp
ICU-6.2.4.tar.gz
[apple/icu.git] / icuSources / test / intltest / transrt.cpp
index b29dc7dfc18d013a4f1136b3a5bb196733c9334a..f8803212dd552c421b40e90f13c55e8cbdd819a5 100644 (file)
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2000-2003, International Business Machines
+*   Copyright (C) 2000-2004, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
@@ -14,6 +14,7 @@
 
 #include "unicode/translit.h"
 #include "rbt.h"
+#include "unicode/calendar.h"
 #include "unicode/uniset.h"
 #include "unicode/uchar.h"
 #include "unicode/normlzr.h"
 #include "unicode/usetiter.h"
 #include "unicode/putil.h"
 #include "unicode/uversion.h"
+#include "unicode/locid.h"
+#include "unicode/ulocdata.h"
+#include "unicode/utf8.h"
+#include "putilimp.h"
 #include "cmemory.h"
 #include "transrt.h"
 #include "testutil.h"
 #include <string.h>
+#include <stdio.h>
 
 #define CASE(id,test) case id:                          \
                           name = #test;                 \
                           if (exec) {                   \
                               logln(#test "---");       \
                               logln((UnicodeString)""); \
-                              int32_t t = uprv_getUTCtime(); \
+                              UDate t = uprv_getUTCtime(); \
                               test();                   \
                               t = uprv_getUTCtime() - t; \
-                              logln((UnicodeString)#test " took " + t + " seconds"); \
+                              logln((UnicodeString)#test " took " + t/U_MILLIS_PER_DAY + " seconds"); \
                           }                             \
                           break
 
@@ -66,6 +72,9 @@ TransliteratorRoundTripTest::runIndexedTest(int32_t index, UBool exec,
         CASE(7,Testel);
         CASE(8,TestDevanagariLatin);
         CASE(9,TestInterIndic);
+        CASE(10, TestHebrew);
+        CASE(11, TestArabic);
+        CASE(12, TestHan);
         default: name = ""; break;
     }
 }
@@ -74,7 +83,7 @@ TransliteratorRoundTripTest::runIndexedTest(int32_t index, UBool exec,
 // Time bomb - allows temporary behavior that expires at a given
 //             release
 //--------------------------------------------------------------------
-
+/*
 static const UVersionInfo ICU_30 = {3,0,0,0};
 
 static UBool isICUVersionAtLeast(const UVersionInfo x) {
@@ -82,6 +91,7 @@ static UBool isICUVersionAtLeast(const UVersionInfo x) {
     u_getVersion(v);
     return (uprv_memcmp(v, x, U_MAX_VERSION_LENGTH) >= 0);
 }
+*/
 
 //--------------------------------------------------------------------
 // TransliteratorPointer
@@ -564,7 +574,7 @@ void RTTest::test2(UBool quickRt, int32_t density) {
     TransliteratorPointer sourceToTarget(
         Transliterator::createInstance(transliteratorID, UTRANS_FORWARD, parseError,
                                        status));
-    if (sourceToTarget == NULL) {
+    if ((Transliterator *)sourceToTarget == NULL) {
         parent->errln("FAIL: createInstance(" + transliteratorID +
                    ") returned NULL. Error: " + u_errorName(status)
                    + "\n\tpreContext : " + prettify(parseError.preContext) 
@@ -573,7 +583,7 @@ void RTTest::test2(UBool quickRt, int32_t density) {
                 return;
     }
     TransliteratorPointer targetToSource(sourceToTarget->createInverse(status));
-    if (targetToSource == NULL) {
+    if ((Transliterator *)targetToSource == NULL) {
         parent->errln("FAIL: " + transliteratorID +
                    ".createInverse() returned NULL. Error:" + u_errorName(status)          
                    + "\n\tpreContext : " + prettify(parseError.preContext) 
@@ -771,12 +781,16 @@ void RTTest::test2(UBool quickRt, int32_t density) {
                 parent->errln("FAIL: Internal error during decomposition%s\n", u_errorName(status));
                 return;
             }
-            if (toSource.containsAll(targD) == FALSE || 
-                badCharacters.containsSome(targD) == TRUE) {
+            if (toSource.containsAll(targD) == FALSE) {
                 logWrongScript("Target-Source", srcStr, targ);
                 failTargSource.add(c);
                 continue;
             }
+            if (badCharacters.containsSome(targD) == TRUE) {
+                logWrongScript("Target-Source*", srcStr, targ);
+                failTargSource.add(c);
+                continue;
+            }
         }
         if (isSame(srcStr, reverse) == FALSE && 
             roundtripExclusionsSet.contains(c) == FALSE
@@ -970,7 +984,7 @@ void TransliteratorRoundTripTest::TestKana() {
     strcat(temp, HALFWIDTH_KATAKANA);
     strcat(temp, LENGTH);
     strcat(temp, "]");
-       test.test(KATAKANA, UnicodeString("[") + HIRAGANA + LENGTH + UnicodeString("]"), 
+    test.test(KATAKANA, UnicodeString("[") + HIRAGANA + LENGTH + UnicodeString("]"), 
               temp, 
               this, quick, legal);
     delete legal;
@@ -1020,7 +1034,113 @@ void TransliteratorRoundTripTest::TestHangul() {
     delete legal;
 }
 
+
+#define ASSERT_SUCCESS(status) {if (U_FAILURE(status)) { \
+     errln("error at file %s, line %d, status = %s", __FILE__, __LINE__, \
+         u_errorName(status)); \
+         return;}}
+    
+
+static void writeStringInU8(FILE *out, const UnicodeString &s) {
+    int i;
+    for (i=0; i<s.length(); i=s.moveIndex32(i, 1)) {
+        UChar32  c = s.char32At(i);
+        uint8_t  bufForOneChar[10];
+        UBool    isError = FALSE;
+        int32_t  destIdx = 0;
+        U8_APPEND(bufForOneChar, destIdx, sizeof(bufForOneChar), c, isError);
+        fwrite(bufForOneChar, 1, destIdx, out);
+    }
+}
+        
+
+
+
+void TransliteratorRoundTripTest::TestHan() {
+    UErrorCode  status = U_ZERO_ERROR;
+
+    // TODO:  getExemplars() exists only as a C API, taking a USet.
+    //        The set API we need to use exists only on UnicodeSet, not on USet.
+    //        Do a hacky cast, knowing that a USet is really a UnicodeSet in
+    //        the implementation.  Once USet gets the missing API, switch back
+    //        to using that.
+    USet       *USetExemplars = NULL;
+    USetExemplars = uset_open(0, 0);
+    USetExemplars = ulocdata_getExemplarSet(USetExemplars, "zh", 0, &status);
+    ASSERT_SUCCESS(status);
+    UnicodeSet *exemplars = (UnicodeSet *)USetExemplars;
+
+    UnicodeString source;
+    UChar32       c;
+    int           i;
+    for (i=0; ;i++) {
+        // Add all of the Chinese exemplar chars to the string "source".
+        c = exemplars->charAt(i);
+        if (c == (UChar32)-1) {
+            break;
+        }
+        source.append(c);
+    }
+
+    // transform with Han translit
+    Transliterator *hanTL = Transliterator::createInstance("Han-Latin", UTRANS_FORWARD, status);
+    ASSERT_SUCCESS(status);
+    UnicodeString target=source;
+    hanTL->transliterate(target);
+    // now verify that there are no Han characters left
+    UnicodeSet allHan("[:han:]", status);
+    ASSERT_SUCCESS(status);
+    if (allHan.containsSome(target)) {
+        errln("file %s, line %d, No Han must be left after Han-Latin transliteration",
+            __FILE__, __LINE__);
+    }
+
+    // check the pinyin translit
+    Transliterator *pn = Transliterator::createInstance("Latin-NumericPinyin", UTRANS_FORWARD, status);
+    ASSERT_SUCCESS(status);
+    UnicodeString target2 = target;
+    pn->transliterate(target2);
+
+    // verify that there are no marks
+    Transliterator *nfc = Transliterator::createInstance("nfc", UTRANS_FORWARD, status);
+    ASSERT_SUCCESS(status);
+
+    UnicodeString nfced = target2;
+    nfc->transliterate(nfced);
+    UnicodeSet allMarks("[:mark:]", status);
+    ASSERT_SUCCESS(status);
+    assertFalse("NumericPinyin must contain no marks", allMarks.containsSome(nfced));
+
+    // verify roundtrip
+    Transliterator *np = pn->createInverse(status);
+    ASSERT_SUCCESS(status);
+    UnicodeString target3 = target;
+    np->transliterate(target3);
+    UBool roundtripOK = (target3.compare(target) == 0);
+    assertTrue("NumericPinyin must roundtrip", roundtripOK);
+    if (!roundtripOK) {
+        const char *filename = "numeric-pinyin.log.txt";
+        FILE *out = fopen(filename, "w");
+        errln("Creating log file %s\n", filename);
+        fprintf(out, "Pinyin:                ");
+        writeStringInU8(out, target);
+        fprintf(out, "\nPinyin-Numeric-Pinyin: ");
+        writeStringInU8(out, target2);
+        fprintf(out, "\n");
+        fclose(out);
+    }
+
+    delete hanTL;
+    delete pn;
+    delete nfc;
+    delete np;
+    uset_close(USetExemplars);
+}
+
+
 void TransliteratorRoundTripTest::TestGreek() {
+    // weiv removed the test and the fiter
+    /*
     if (isICUVersionAtLeast(ICU_30)) {
         // We temporarily filter against Unicode 3.2, but we only do this
         // before version 3.0.
@@ -1029,13 +1149,21 @@ void TransliteratorRoundTripTest::TestGreek() {
     } else {
         logln("Warning: TestGreek needs to be updated to remove Unicode 3.2 filter");
     }
+    */
     RTTest test("Latin-Greek");
     LegalGreek *legal = new LegalGreek(TRUE);
 
     test.test(UnicodeString("[a-zA-Z]", ""), 
-              UnicodeString("[[\\u003B\\u00B7[:Greek:]-[\\u03D7-\\u03EF]]&[:Age=3.2:]]", 
+        UnicodeString("[\\u003B\\u00B7[[:Greek:]&[:Letter:]]-["
+            "\\u1D26-\\u1D2A" // L&   [5] GREEK LETTER SMALL CAPITAL GAMMA..GREEK LETTER SMALL CAPITAL PSI
+            "\\u1D5D-\\u1D61" // Lm   [5] MODIFIER LETTER SMALL BETA..MODIFIER LETTER SMALL CHI
+            "\\u1D66-\\u1D6A" // L&   [5] GREEK SUBSCRIPT SMALL LETTER BETA..GREEK SUBSCRIPT SMALL LETTER CHI
+            "\\u03D7-\\u03EF" // \N{GREEK KAI SYMBOL}..\N{COPTIC SMALL LETTER DEI}
+            "]]",
+
+              //UnicodeString("[[\\u003B\\u00B7[:Greek:]-[\\u0374\\u0385\\u1fcd\\u1fce\\u1fdd\\u1fde\\u1fed-\\u1fef\\u1ffd\\u03D7-\\u03EF]]&[:Age=3.2:]]", 
                             ""),
-              "[\\u00B5\\u037A\\u03D0-\\u03F5]", /* exclusions */
+              "[\\u00B5\\u037A\\u03D0-\\u03F5\\u03f9]", /* exclusions */
               this, quick, legal, 50);
 
 
@@ -1044,6 +1172,8 @@ void TransliteratorRoundTripTest::TestGreek() {
 
 
 void TransliteratorRoundTripTest::TestGreekUNGEGN() {
+    // weiv removed the test and the fiter
+    /*
     if (isICUVersionAtLeast(ICU_30)) {
         // We temporarily filter against Unicode 3.2, but we only do this
         // before version 3.0.
@@ -1052,19 +1182,28 @@ void TransliteratorRoundTripTest::TestGreekUNGEGN() {
     } else {
         logln("Warning: TestGreekUNGEGN needs to be updated to remove Unicode 3.2 filter");
     }
+    */
     RTTest test("Latin-Greek/UNGEGN");
     LegalGreek *legal = new LegalGreek(FALSE);
 
     test.test(UnicodeString("[a-zA-Z]", ""), 
-              UnicodeString("[[\\u003B\\u00B7[:Greek:]-[\\u03D7-\\u03EF]]&[:Age=3.2:]]", 
+        UnicodeString("[\\u003B\\u00B7[[:Greek:]&[:Letter:]]-["
+            "\\u1D26-\\u1D2A" // L&   [5] GREEK LETTER SMALL CAPITAL GAMMA..GREEK LETTER SMALL CAPITAL PSI
+            "\\u1D5D-\\u1D61" // Lm   [5] MODIFIER LETTER SMALL BETA..MODIFIER LETTER SMALL CHI
+            "\\u1D66-\\u1D6A" // L&   [5] GREEK SUBSCRIPT SMALL LETTER BETA..GREEK SUBSCRIPT SMALL LETTER CHI
+            "\\u03D7-\\u03EF" // \N{GREEK KAI SYMBOL}..\N{COPTIC SMALL LETTER DEI}
+            "]]",
+              //UnicodeString("[[\\u003B\\u00B7[:Greek:]-[\\u0374\\u0385\\u1fce\\u1fde\\u03D7-\\u03EF]]&[:Age=3.2:]]", 
                             ""), 
-              "[\\u00B5\\u037A\\u03D0-\\uFFFF {\\u039C\\u03C0}]", /* roundtrip exclusions */
+              "[\\u0385\\u00B5\\u037A\\u03D0-\\uFFFF {\\u039C\\u03C0}]", /* roundtrip exclusions */
               this, quick, legal);
 
     delete legal;
 }
 
 void TransliteratorRoundTripTest::Testel() {
+    // weiv removed the test and the fiter
+    /*
     if (isICUVersionAtLeast(ICU_30)) {
         // We temporarily filter against Unicode 3.2, but we only do this
         // before version 3.0.
@@ -1073,11 +1212,18 @@ void TransliteratorRoundTripTest::Testel() {
     } else {
         logln("Warning: Testel needs to be updated to remove Unicode 3.2 filter");
     }
+    */
     RTTest test("Latin-el");
     LegalGreek *legal = new LegalGreek(FALSE);
 
     test.test(UnicodeString("[a-zA-Z]", ""), 
-              UnicodeString("[[\\u003B\\u00B7[:Greek:]-[\\u03D7-\\u03EF]]&[:Age=3.2:]]", 
+        UnicodeString("[\\u003B\\u00B7[[:Greek:]&[:Letter:]]-["
+            "\\u1D26-\\u1D2A" // L&   [5] GREEK LETTER SMALL CAPITAL GAMMA..GREEK LETTER SMALL CAPITAL PSI
+            "\\u1D5D-\\u1D61" // Lm   [5] MODIFIER LETTER SMALL BETA..MODIFIER LETTER SMALL CHI
+            "\\u1D66-\\u1D6A" // L&   [5] GREEK SUBSCRIPT SMALL LETTER BETA..GREEK SUBSCRIPT SMALL LETTER CHI
+            "\\u03D7-\\u03EF" // \N{GREEK KAI SYMBOL}..\N{COPTIC SMALL LETTER DEI}
+            "]]",
+              //UnicodeString("[[\\u003B\\u00B7[:Greek:]-[\\u0374\\u0385\\u1fce\\u1fde\\u03D7-\\u03EF]]&[:Age=3.2:]]", 
                             ""), 
               "[\\u00B5\\u037A\\u03D0-\\uFFFF {\\u039C\\u03C0}]", /* exclusions */
               this, quick, legal);
@@ -1086,6 +1232,58 @@ void TransliteratorRoundTripTest::Testel() {
     delete legal;
 }
 
+
+void TransliteratorRoundTripTest::TestArabic() {
+    UnicodeString ARABIC("[\\u060C\\u061B\\u061F\\u0621\\u0627-\\u063A\\u0641-\\u0655\\u0660-\\u066C\\u067E\\u0686\\u0698\\u06A4\\u06AD\\u06AF\\u06CB-\\u06CC\\u06F0-\\u06F9]");
+    Legal *legal = new Legal();
+    RTTest test("Latin-Arabic");
+        test.test("[a-zA-Z\\u02BE\\u02BF\\u207F]", ARABIC, "[a-zA-Z\\u02BE\\u02BF\\u207F]",this, quick, legal); //
+   delete legal;
+}
+class LegalHebrew : public Legal {
+private:
+    UnicodeSet FINAL;
+    UnicodeSet NON_FINAL;
+    UnicodeSet LETTER;
+public:
+    LegalHebrew(UErrorCode& error);
+    virtual ~LegalHebrew() {}
+    virtual UBool is(const UnicodeString& sourceString) const;
+};
+
+LegalHebrew::LegalHebrew(UErrorCode& error){
+    FINAL.applyPattern("[\\u05DA\\u05DD\\u05DF\\u05E3\\u05E5]", error);
+    NON_FINAL.applyPattern("[\\u05DB\\u05DE\\u05E0\\u05E4\\u05E6]", error);
+    LETTER.applyPattern("[:letter:]", error);
+}
+UBool LegalHebrew::is(const UnicodeString& sourceString)const{
+    if (sourceString.length() == 0) return TRUE;
+    // don't worry about surrogates.
+    for (int i = 0; i < sourceString.length(); ++i) {
+        UChar ch = sourceString.charAt(i);
+        UChar next = i+1 == sourceString.length() ? 0x0000 : sourceString.charAt(i);
+        if (FINAL.contains(ch)) {
+            if (LETTER.contains(next)) return FALSE;
+        } else if (NON_FINAL.contains(ch)) {
+            if (!LETTER.contains(next)) return FALSE;
+        }
+    }
+    return TRUE;
+}
+void TransliteratorRoundTripTest::TestHebrew() {
+    //long start = System.currentTimeMillis();
+    UErrorCode error = U_ZERO_ERROR;
+    LegalHebrew* legal = new LegalHebrew(error);
+    if(U_FAILURE(error)){
+        errln("Could not construct LegalHebrew object. Error: %s", u_errorName(error));
+        return;
+    }
+    RTTest test("Latin-Hebrew");
+        test.test("[a-zA-Z\\u02BC\\u02BB]", "[[:hebrew:]-[\\u05BD\\uFB00-\\uFBFF]]", "[\\u05F0\\u05F1\\u05F2]", this, quick, legal);
+    //showElapsed(start, "TestHebrew");
+    delete legal;
+}
 void TransliteratorRoundTripTest::TestCyrillic() {
     RTTest test("Latin-Cyrillic");
     Legal *legal = new Legal();
@@ -1110,7 +1308,7 @@ class LegalIndic :public Legal{
 public:        
     LegalIndic(){
         UErrorCode status = U_ZERO_ERROR;
-        vowelSignSet.addAll( UnicodeSet("[\\u0902\\u0903\\u093e-\\u094c\\u0962\\u0963]",status));/* Devanagari */
+        vowelSignSet.addAll( UnicodeSet("[\\u0902\\u0903\\u0904\\u093e-\\u094c\\u0962\\u0963]",status));/* Devanagari */
         vowelSignSet.addAll( UnicodeSet("[\\u0982\\u0983\\u09be-\\u09cc\\u09e2\\u09e3\\u09D7]",status));/* Bengali */
         vowelSignSet.addAll( UnicodeSet("[\\u0a02\\u0a03\\u0a3e-\\u0a4c\\u0a62\\u0a63\\u0a70\\u0a71]",status));/* Gurmukhi */
         vowelSignSet.addAll( UnicodeSet("[\\u0a82\\u0a83\\u0abe-\\u0acc\\u0ae2\\u0ae3]",status));/* Gujarati */
@@ -1120,8 +1318,8 @@ public:
         vowelSignSet.addAll( UnicodeSet("[\\u0c82\\u0c83\\u0cbe-\\u0ccc\\u0ce2\\u0ce3\\u0cd5\\u0cd6]",status));/* Kannada */
         vowelSignSet.addAll( UnicodeSet("[\\u0d02\\u0d03\\u0d3e-\\u0d4c\\u0d62\\u0d63\\u0d57]",status));/* Malayalam */
 
-        avagraha.addAll(UnicodeSet("[\\u093d\\u0abd\\u0b3d]",status));
-        nukta.addAll(UnicodeSet("[\\u093c\\u09bc\\u0a3c\\u0abc\\u0b3c]",status));
+        avagraha.addAll(UnicodeSet("[\\u093d\\u09bd\\u0abd\\u0b3d\\u0cbd]",status));
+        nukta.addAll(UnicodeSet("[\\u093c\\u09bc\\u0a3c\\u0abc\\u0b3c\\u0cbc]",status));
         virama.addAll(UnicodeSet("[\\u094d\\u09cd\\u0a4d\\u0acd\\u0b4d\\u0bcd\\u0c4d\\u0ccd\\u0d4d]",status));
         sanskritStressSigns.addAll(UnicodeSet("[\\u0951\\u0952\\u0953\\u0954]",status));
         chandrabindu.addAll(UnicodeSet("[\\u0901\\u0981\\u0A81\\u0b01\\u0c01]",status));
@@ -1173,26 +1371,25 @@ static const char latinForIndic[] = "[['.0-9A-Za-z~\\u00C0-\\u00C5\\u00C7-\\u00C
 void TransliteratorRoundTripTest::TestDevanagariLatin() {
     {
         UErrorCode status = U_ZERO_ERROR;
-        TransliteratorPointer t1(Transliterator::createInstance("[\\u0000-\\u00FE \\u0982\\u0983 [:Bengali:][:nonspacing mark:]];NFD;Bengali-InterIndic;InterIndic-Gujarati;NFC;( [ \\u0000-\\u00FE [:Gujarati:][[:nonspacing mark:]])",UTRANS_FORWARD, status));
-        if(t1){
+        UParseError parseError;
+        TransliteratorPointer t1(Transliterator::createInstance("[\\u0964-\\u0965\\u0981-\\u0983\\u0985-\\u098C\\u098F-\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BC\\u09BE-\\u09C4\\u09C7-\\u09C8\\u09CB-\\u09CD\\u09D7\\u09DC-\\u09DD\\u09DF-\\u09E3\\u09E6-\\u09FA];NFD;Bengali-InterIndic;InterIndic-Gujarati;NFC;",UTRANS_FORWARD, parseError, status));
+        if((Transliterator *)t1 != NULL){
             TransliteratorPointer t2(t1->createInverse(status));
             if(U_FAILURE(status)){
                 errln("FAIL: could not create the Inverse:-( \n");
             }
+        }else {
+            errln("FAIL: could not create the transliterator. Error: %s\n", u_errorName(status));
         }
+
     }
     RTTest test("Latin-Devanagari");
     Legal *legal = new LegalIndic();
 
-#if (U_ICU_VERSION_MAJOR_NUM==2 && U_ICU_VERSION_MINOR_NUM==6)
-    test.test(UnicodeString(latinForIndic, ""), 
-              UnicodeString("[[:Devanagari:]&[:Age=3.2:]]", ""), NULL, this, quick, 
-              legal, 50);
-#else
     test.test(UnicodeString(latinForIndic, ""), 
-              UnicodeString("[:Devanagari:]", ""), NULL, this, quick, 
-              legal, 50);
-#endif
+            UnicodeString("[[:Devanagari:][\\u094d][\\u0964\\u0965]]", ""), "[\\u0965\\u0904]", this, quick, 
+            legal, 50);
+
     delete legal;
 }
 
@@ -1200,16 +1397,16 @@ void TransliteratorRoundTripTest::TestDevanagariLatin() {
 static const int32_t INTER_INDIC_ARRAY_WIDTH = 4;
 static const char * const interIndicArray[] = {
     "BENGALI-DEVANAGARI", "[:BENGALI:]", "[:Devanagari:]", 
-    "[\\u0951-\\u0954\\u0943-\\u0949\\u094a\\u0962\\u0963\\u090D\\u090e\\u0911\\u0912\\u0929\\u0933\\u0934\\u0935\\u093d\\u0950\\u0958\\u0959\\u095a\\u095b\\u095e\\u09f0\\u09f1]", /*roundtrip exclusions*/
+    "[\\u0904\\u0951-\\u0954\\u0943-\\u0949\\u094a\\u0962\\u0963\\u090D\\u090e\\u0911\\u0912\\u0929\\u0933\\u0934\\u0935\\u093d\\u0950\\u0958\\u0959\\u095a\\u095b\\u095e\\u09f0\\u09f1\\u09f2-\\u09fa]", /*roundtrip exclusions*/
 
     "DEVANAGARI-BENGALI", "[:Devanagari:]", "[:BENGALI:]",
-    "[\\u0951-\\u0954\\u09D7\\u090D\\u090e\\u0911\\u0912\\u0929\\u0933\\u0934\\u0935\\u093d\\u0950\\u0958\\u0959\\u095a\\u095b\\u095e\\u09f0\\u09f1]", /*roundtrip exclusions*/
+    "[\\u0951-\\u0954\\u0951-\\u0954\\u09D7\\u090D\\u090e\\u0911\\u0912\\u0929\\u0933\\u0934\\u0935\\u093d\\u0950\\u0958\\u0959\\u095a\\u095b\\u095e\\u09f0\\u09f1\\u09f2-\\u09fa]", /*roundtrip exclusions*/
 
     "GURMUKHI-DEVANAGARI", "[:GURMUKHI:]", "[:Devanagari:]", 
-    "[\\u0901\\u0902\\u0936\\u0933\\u0951-\\u0954\\u0902\\u0903\\u0943-\\u0949\\u094a\\u0962\\u0963\\u090B\\u090C\\u090D\\u090e\\u0911\\u0912\\u0934\\u0937\\u093D\\u0950\\u0960\\u0961\\u0a72\\u0a73\\u0a74]", /*roundtrip exclusions*/
+    "[\\u0904\\u0901\\u0902\\u0936\\u0933\\u0951-\\u0954\\u0902\\u0903\\u0943-\\u0949\\u094a\\u0962\\u0963\\u090B\\u090C\\u090D\\u090e\\u0911\\u0912\\u0934\\u0937\\u093D\\u0950\\u0960\\u0961\\u0a72\\u0a73\\u0a74]", /*roundtrip exclusions*/
 
     "DEVANAGARI-GURMUKHI", "[:Devanagari:]", "[:GURMUKHI:]",
-    "[\\u0A02\\u0946\\u0A5C\\u0951-\\u0954\\u0A70\\u0A71\\u090B\\u090C\\u090D\\u090e\\u0911\\u0912\\u0934\\u0937\\u093D\\u0950\\u0960\\u0961\\u0a72\\u0a73\\u0a74]", /*roundtrip exclusions*/
+    "[\\u0904\\u0A02\\u0946\\u0A5C\\u0951-\\u0954\\u0A70\\u0A71\\u090B\\u090C\\u090D\\u090e\\u0911\\u0912\\u0934\\u0937\\u093D\\u0950\\u0960\\u0961\\u0a72\\u0a73\\u0a74]", /*roundtrip exclusions*/
 
     "GUJARATI-DEVANAGARI", "[:GUJARATI:]", "[:Devanagari:]", 
     "[\\u0946\\u094A\\u0962\\u0963\\u0951-\\u0954\\u0961\\u090c\\u090e\\u0912]", /*roundtrip exclusions*/
@@ -1218,73 +1415,73 @@ static const char * const interIndicArray[] = {
     "[\\u0951-\\u0954\\u0961\\u090c\\u090e\\u0912]", /*roundtrip exclusions*/
 
     "ORIYA-DEVANAGARI", "[:ORIYA:]", "[:Devanagari:]", 
-    "[\\u0943-\\u094a\\u0962\\u0963\\u0951-\\u0954\\u0950\\u090D\\u090e\\u0912\\u0911\\u0931\\u0935]", /*roundtrip exclusions*/
+    "[\\u0904\\u0943-\\u094a\\u0962\\u0963\\u0951-\\u0954\\u0950\\u090D\\u090e\\u0912\\u0911\\u0931\\u0935]", /*roundtrip exclusions*/
 
     "DEVANAGARI-ORIYA", "[:Devanagari:]", "[:ORIYA:]",
-    "[\\u0b5f\\u0b56\\u0b57\\u0950\\u090D\\u090e\\u0912\\u0911\\u0931\\u0935]", /*roundtrip exclusions*/
+    "[\\u0b5f\\u0b56\\u0b57\\u0b70\\u0b71\\u0950\\u090D\\u090e\\u0912\\u0911\\u0931]", /*roundtrip exclusions*/
 
     "Tamil-DEVANAGARI", "[:tamil:]", "[:Devanagari:]", 
-    "[\\u0901\\u093c\\u0943-\\u094a\\u0951-\\u0954\\u0962\\u0963\\u090B\\u090C\\u090D\\u0911\\u0916\\u0917\\u0918\\u091B\\u091D\\u0920\\u0921\\u0922\\u0925\\u0926\\u0927\\u092B\\u092C\\u092D\\u0936\\u093d\\u0950[\\u0958-\\u0961]]", /*roundtrip exclusions*/
+    "[\\u0901\\u0904\\u093c\\u0943-\\u094a\\u0951-\\u0954\\u0962\\u0963\\u090B\\u090C\\u090D\\u0911\\u0916\\u0917\\u0918\\u091B\\u091D\\u0920\\u0921\\u0922\\u0925\\u0926\\u0927\\u092B\\u092C\\u092D\\u0936\\u093d\\u0950[\\u0958-\\u0961]]", /*roundtrip exclusions*/
 
     "DEVANAGARI-Tamil", "[:Devanagari:]", "[:tamil:]", 
     "[\\u0bd7]", /*roundtrip exclusions*/
 
     "Telugu-DEVANAGARI", "[:telugu:]", "[:Devanagari:]", 
-    "[\\u093c\\u0950\\u0945\\u0949\\u0951-\\u0954\\u0962\\u0963\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/
+    "[\\u0904\\u093c\\u0950\\u0945\\u0949\\u0951-\\u0954\\u0962\\u0963\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/
 
     "DEVANAGARI-TELUGU", "[:Devanagari:]", "[:TELUGU:]",
     "[\\u0c55\\u0c56\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/
 
     "KANNADA-DEVANAGARI", "[:KANNADA:]", "[:Devanagari:]", 
-    "[\\u0901\\u0946\\u093c\\u0950\\u0945\\u0949\\u0951-\\u0954\\u0962\\u0963\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/
+    "[\\u0901\\u0904\\u0946\\u093c\\u0950\\u0945\\u0949\\u0951-\\u0954\\u0962\\u0963\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/
 
     "DEVANAGARI-KANNADA", "[:Devanagari:]", "[:KANNADA:]",
-    "[\\u0cde\\u0cd5\\u0cd6\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/ 
+    "[{\\u0cb0\\u0cbc}{\\u0cb3\\u0cbc}\\u0cde\\u0cd5\\u0cd6\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/ 
 
     "MALAYALAM-DEVANAGARI", "[:MALAYALAM:]", "[:Devanagari:]", 
-    "[\\u0901\\u094a\\u094b\\u094c\\u093c\\u0950\\u0944\\u0945\\u0949\\u0951-\\u0954\\u0962\\u0963\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/
+    "[\\u0901\\u0904\\u094a\\u094b\\u094c\\u093c\\u0950\\u0944\\u0945\\u0949\\u0951-\\u0954\\u0962\\u0963\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/
 
     "DEVANAGARI-MALAYALAM", "[:Devanagari:]", "[:MALAYALAM:]",
     "[\\u0d4c\\u0d57\\u0950\\u090D\\u0911\\u093d\\u0929\\u0934[\\u0958-\\u095f]]", /*roundtrip exclusions*/
 
     "GURMUKHI-BENGALI", "[:GURMUKHI:]", "[:BENGALI:]",  
-    "[\\u0981\\u0982\\u09b6\\u09e2\\u09e3\\u09c3\\u09c4\\u09d7\\u098B\\u098C\\u09B7\\u09E0\\u09E1\\u09F0\\u09F1]", /*roundtrip exclusions*/
+    "[\\u0981\\u0982\\u09b6\\u09e2\\u09e3\\u09c3\\u09c4\\u09d7\\u098B\\u098C\\u09B7\\u09E0\\u09E1\\u09F0\\u09F1\\u09f2-\\u09fa]", /*roundtrip exclusions*/
 
     "BENGALI-GURMUKHI", "[:BENGALI:]", "[:GURMUKHI:]",
     "[\\u0A02\\u0a5c\\u0a47\\u0a70\\u0a71\\u0A33\\u0A35\\u0A59\\u0A5A\\u0A5B\\u0A5E\\u0A72\\u0A73\\u0A74]", /*roundtrip exclusions*/
 
     "GUJARATI-BENGALI", "[:GUJARATI:]", "[:BENGALI:]", 
-    "[\\u09d7\\u09e2\\u09e3\\u098c\\u09e1\\u09f0\\u09f1]", /*roundtrip exclusions*/
+    "[\\u09d7\\u09e2\\u09e3\\u098c\\u09e1\\u09f0\\u09f1\\u09f2-\\u09fa]", /*roundtrip exclusions*/
 
     "BENGALI-GUJARATI", "[:BENGALI:]", "[:GUJARATI:]",
     "[\\u0A82\\u0a83\\u0Ac9\\u0Ac5\\u0ac7\\u0A8D\\u0A91\\u0AB3\\u0AB5\\u0ABD\\u0AD0]", /*roundtrip exclusions*/
 
     "ORIYA-BENGALI", "[:ORIYA:]", "[:BENGALI:]", 
-    "[\\u09c4\\u09e2\\u09e3\\u09f0\\u09f1]", /*roundtrip exclusions*/
+    "[\\u09c4\\u09e2\\u09e3\\u09f0\\u09f1\\u09f2-\\u09fa]", /*roundtrip exclusions*/
 
     "BENGALI-ORIYA", "[:BENGALI:]", "[:ORIYA:]",
-    "[\\u0b5f\\u0b56\\u0b33\\u0b3d]", /*roundtrip exclusions*/
+    "[\\u0b35\\u0b71\\u0b5f\\u0b56\\u0b33\\u0b3d]", /*roundtrip exclusions*/
 
     "Tamil-BENGALI", "[:tamil:]", "[:BENGALI:]", 
-    "[\\u0981\\u09bc\\u09c3\\u09c4\\u09e2\\u09e3\\u09f0\\u09f1\\u098B\\u098C\\u0996\\u0997\\u0998\\u099B\\u099D\\u09A0\\u09A1\\u09A2\\u09A5\\u09A6\\u09A7\\u09AB\\u09AC\\u09AD\\u09B6\\u09DC\\u09DD\\u09DF\\u09E0\\u09E1]", /*roundtrip exclusions*/
+    "[\\u0981\\u09bc\\u09c3\\u09c4\\u09e2\\u09e3\\u09f0\\u09f1\\u098B\\u098C\\u0996\\u0997\\u0998\\u099B\\u099D\\u09A0\\u09A1\\u09A2\\u09A5\\u09A6\\u09A7\\u09AB\\u09AC\\u09AD\\u09B6\\u09DC\\u09DD\\u09DF\\u09E0\\u09E1\\u09f2-\\u09fa]", /*roundtrip exclusions*/
 
     "BENGALI-Tamil", "[:BENGALI:]", "[:tamil:]",
     "[\\u0bc6\\u0bc7\\u0bca\\u0B8E\\u0B92\\u0BA9\\u0BB1\\u0BB3\\u0BB4\\u0BB5]", /*roundtrip exclusions*/
 
     "Telugu-BENGALI", "[:telugu:]", "[:BENGALI:]", 
-    "[\\u09e2\\u09e3\\u09bc\\u09d7\\u09f0\\u09f1\\u09dc\\u09dd\\u09df]", /*roundtrip exclusions*/
+    "[\\u09e2\\u09e3\\u09bc\\u09d7\\u09f0\\u09f1\\u09dc\\u09dd\\u09df\\u09f2-\\u09fa]", /*roundtrip exclusions*/
 
     "BENGALI-TELUGU", "[:BENGALI:]", "[:TELUGU:]",
     "[\\u0c55\\u0c56\\u0c47\\u0c46\\u0c4a\\u0C0E\\u0C12\\u0C31\\u0C33\\u0C35]", /*roundtrip exclusions*/
 
     "KANNADA-BENGALI", "[:KANNADA:]", "[:BENGALI:]", 
-    "[\\u0981\\u09e2\\u09e3\\u09bc\\u09d7\\u09f0\\u09f1\\u09dc\\u09dd\\u09df]", /*roundtrip exclusions*/
+    "[\\u0981\\u09e2\\u09e3\\u09bc\\u09d7\\u09dc\\u09dd\\u09df\\u09f0\\u09f1\\u09f2-\\u09fa]", /*roundtrip exclusions*/
 
     "BENGALI-KANNADA", "[:BENGALI:]", "[:KANNADA:]",
-    "[\\u0cc6\\u0cca\\u0cd5\\u0cd6\\u0cc7\\u0C8E\\u0C92\\u0CB1\\u0cb3\\u0cb5\\u0cde]", /*roundtrip exclusions*/ 
+    "[{\\u0cb0\\u0cbc}{\\u0cb3\\u0cbc}\\u0cc6\\u0cca\\u0cd5\\u0cd6\\u0cc7\\u0C8E\\u0C92\\u0CB1\\u0cb3\\u0cb5\\u0cde]", /*roundtrip exclusions*/ 
 
     "MALAYALAM-BENGALI", "[:MALAYALAM:]", "[:BENGALI:]", 
-    "[\\u0981\\u09e2\\u09e3\\u09bc\\u09c4\\u09f0\\u09f1\\u09dc\\u09dd\\u09df]", /*roundtrip exclusions*/
+    "[\\u0981\\u09e2\\u09e3\\u09bc\\u09c4\\u09f0\\u09f1\\u09dc\\u09dd\\u09df\\u09dc\\u09dd\\u09df\\u09f2-\\u09fa]", /*roundtrip exclusions*/
 
     "BENGALI-MALAYALAM", "[:BENGALI:]", "[:MALAYALAM:]",
     "[\\u0d46\\u0d4a\\u0d47\\u0d31-\\u0d35\\u0d0e\\u0d12]", /*roundtrip exclusions*/
@@ -1293,16 +1490,16 @@ static const char * const interIndicArray[] = {
     "[\\u0A02\\u0ab3\\u0ab6\\u0A70\\u0a71\\u0a82\\u0a83\\u0ac3\\u0ac4\\u0ac5\\u0ac9\\u0a5c\\u0a72\\u0a73\\u0a74\\u0a8b\\u0a8d\\u0a91\\u0abd]", /*roundtrip exclusions*/
 
     "GURMUKHI-GUJARATI", "[:GURMUKHI:]", "[:GUJARATI:]",
-    "[\\u0A81\\u0A82\\u0ab3\\u0ab6\\u0A70\\u0a71\\u0a82\\u0a83\\u0ac3\\u0ac4\\u0ac5\\u0ac9\\u0a5c\\u0a72\\u0a73\\u0a74\\u0a8b\\u0a8d\\u0a91\\u0ab7\\u0abd\\u0ad0\\u0ae0]", /*roundtrip exclusions*/
+    "[\\u0a5c\\u0A70\\u0a71\\u0a72\\u0a73\\u0a74\\u0a82\\u0a83\\u0a8b\\u0a8c\\u0a8d\\u0a91\\u0ab3\\u0ab6\\u0ab7\\u0abd\\u0ac3\\u0ac4\\u0ac5\\u0ac9\\u0ad0\\u0ae0\\u0ae1]", /*roundtrip exclusions*/
 
     "ORIYA-GURMUKHI", "[:ORIYA:]", "[:GURMUKHI:]", 
     "[\\u0A01\\u0A02\\u0a5c\\u0a21\\u0a47\\u0a71\\u0b02\\u0b03\\u0b33\\u0b36\\u0b43\\u0b56\\u0b57\\u0B0B\\u0B0C\\u0B37\\u0B3D\\u0B5F\\u0B60\\u0B61\\u0a35\\u0a72\\u0a73\\u0a74]", /*roundtrip exclusions*/
 
     "GURMUKHI-ORIYA", "[:GURMUKHI:]", "[:ORIYA:]",
-    "[\\u0b01\\u0b02\\u0b03\\u0b33\\u0b36\\u0b43\\u0b56\\u0b57\\u0B0B\\u0B0C\\u0B37\\u0B3D\\u0B5F\\u0B60\\u0B61]", /*roundtrip exclusions*/
+    "[\\u0b01\\u0b02\\u0b03\\u0b33\\u0b36\\u0b43\\u0b56\\u0b57\\u0B0B\\u0B0C\\u0B37\\u0B3D\\u0B5F\\u0B60\\u0B61\\u0b70\\u0b71]", /*roundtrip exclusions*/
 
     "TAMIL-GURMUKHI", "[:TAMIL:]", "[:GURMUKHI:]", 
-    "[\\u0A02\\u0a33\\u0a36\\u0a3c\\u0a70\\u0a71\\u0a47\\u0A16\\u0A17\\u0A18\\u0A1B\\u0A1D\\u0A20\\u0A21\\u0A22\\u0A25\\u0A26\\u0A27\\u0A2B\\u0A2C\\u0A2D\\u0A59\\u0A5A\\u0A5B\\u0A5C\\u0A5E\\u0A72\\u0A73\\u0A74]", /*roundtrip exclusions*/
+    "[\\u0A01\\u0A02\\u0a33\\u0a36\\u0a3c\\u0a70\\u0a71\\u0a47\\u0A16\\u0A17\\u0A18\\u0A1B\\u0A1D\\u0A20\\u0A21\\u0A22\\u0A25\\u0A26\\u0A27\\u0A2B\\u0A2C\\u0A2D\\u0A59\\u0A5A\\u0A5B\\u0A5C\\u0A5E\\u0A72\\u0A73\\u0A74]", /*roundtrip exclusions*/
 
     "GURMUKHI-TAMIL", "[:GURMUKHI:]", "[:TAMIL:]",
     "[\\u0b82\\u0bc6\\u0bca\\u0bd7\\u0bb7\\u0bb3\\u0b83\\u0B8E\\u0B92\\u0BA9\\u0BB1\\u0BB4]", /*roundtrip exclusions*/
@@ -1314,25 +1511,25 @@ static const char * const interIndicArray[] = {
     "[\\u0c01\\u0c02\\u0c03\\u0c33\\u0c36\\u0c44\\u0c43\\u0c46\\u0c4a\\u0c56\\u0c55\\u0C0B\\u0C0C\\u0C0E\\u0C12\\u0C31\\u0C37\\u0C60\\u0C61]", /*roundtrip exclusions*/
 
     "KANNADA-GURMUKHI", "[:KANNADA:]", "[:GURMUKHI:]", 
-    "[\\u0A02\\u0a33\\u0a36\\u0a3c\\u0a70\\u0a71\\u0A59\\u0A5A\\u0A5B\\u0A5C\\u0A5E\\u0A72\\u0A73\\u0A74]", /*roundtrip exclusions*/
+    "[\\u0A01\\u0A02\\u0a33\\u0a36\\u0a3c\\u0a70\\u0a71\\u0A59\\u0A5A\\u0A5B\\u0A5C\\u0A5E\\u0A72\\u0A73\\u0A74]", /*roundtrip exclusions*/
 
     "GURMUKHI-KANNADA", "[:GURMUKHI:]", "[:KANNADA:]",
-    "[\\u0c82\\u0c83\\u0cb3\\u0cb6\\u0cc4\\u0cc3\\u0cc6\\u0cca\\u0cd5\\u0cd6\\u0C8B\\u0C8C\\u0C8E\\u0C92\\u0CB1\\u0CB7\\u0CE0\\u0CE1]", /*roundtrip exclusions*/
+    "[{\\u0cb0\\u0cbc}{\\u0cb3\\u0cbc}\\u0c82\\u0c83\\u0cb3\\u0cb6\\u0cc4\\u0cc3\\u0cc6\\u0cca\\u0cd5\\u0cd6\\u0C8B\\u0C8C\\u0C8E\\u0C92\\u0CB1\\u0CB7\\u0cbd\\u0CE0\\u0CE1\\u0cde]", /*roundtrip exclusions*/
 
     "MALAYALAM-GURMUKHI", "[:MALAYALAM:]", "[:GURMUKHI:]", 
-    "[\\u0A02\\u0a4b\\u0a4c\\u0a33\\u0a36\\u0a3c\\u0a70\\u0a71\\u0A59\\u0A5A\\u0A5B\\u0A5C\\u0A5E\\u0A72\\u0A73\\u0A74]", /*roundtrip exclusions*/
+    "[\\u0A01\\u0A02\\u0a4b\\u0a4c\\u0a33\\u0a36\\u0a3c\\u0a70\\u0a71\\u0A59\\u0A5A\\u0A5B\\u0A5C\\u0A5E\\u0A72\\u0A73\\u0A74]", /*roundtrip exclusions*/
 
     "GURMUKHI-MALAYALAM", "[:GURMUKHI:]", "[:MALAYALAM:]",
     "[\\u0d02\\u0d03\\u0d33\\u0d36\\u0d43\\u0d46\\u0d4a\\u0d4c\\u0d57\\u0D0B\\u0D0C\\u0D0E\\u0D12\\u0D31\\u0D34\\u0D37\\u0D60\\u0D61]", /*roundtrip exclusions*/
 
     "GUJARATI-ORIYA", "[:GUJARATI:]", "[:ORIYA:]", 
-    "[\\u0b56\\u0b57\\u0B0C\\u0B5F\\u0B61]", /*roundtrip exclusions*/
+    "[\\u0b56\\u0b57\\u0B0C\\u0B5F\\u0B61\\u0b70\\u0b71]", /*roundtrip exclusions*/
 
     "ORIYA-GUJARATI", "[:ORIYA:]", "[:GUJARATI:]",
     "[\\u0Ac4\\u0Ac5\\u0Ac9\\u0Ac7\\u0A8D\\u0A91\\u0AB5\\u0Ad0]", /*roundtrip exclusions*/
 
     "TAMIL-GUJARATI", "[:TAMIL:]", "[:GUJARATI:]", 
-    "[\\u0A81\\u0abc\\u0ac3\\u0Ac4\\u0Ac5\\u0Ac9\\u0Ac7\\u0A8B\\u0A8D\\u0A91\\u0A96\\u0A97\\u0A98\\u0A9B\\u0A9D\\u0AA0\\u0AA1\\u0AA2\\u0AA5\\u0AA6\\u0AA7\\u0AAB\\u0AAC\\u0AAD\\u0AB6\\u0ABD\\u0AD0\\u0AE0]", /*roundtrip exclusions*/
+    "[\\u0A81\\u0a8c\\u0abc\\u0ac3\\u0Ac4\\u0Ac5\\u0Ac9\\u0Ac7\\u0A8B\\u0A8D\\u0A91\\u0A96\\u0A97\\u0A98\\u0A9B\\u0A9D\\u0AA0\\u0AA1\\u0AA2\\u0AA5\\u0AA6\\u0AA7\\u0AAB\\u0AAC\\u0AAD\\u0AB6\\u0ABD\\u0AD0\\u0AE0\\u0AE1]", /*roundtrip exclusions*/
 
     "GUJARATI-TAMIL", "[:GUJARATI:]", "[:TAMIL:]",
     "[\\u0Bc6\\u0Bca\\u0Bd7\\u0B8E\\u0B92\\u0BA9\\u0BB1\\u0BB4]", /*roundtrip exclusions*/
@@ -1347,7 +1544,7 @@ static const char * const interIndicArray[] = {
     "[\\u0A81\\u0abc\\u0Ac5\\u0Ac9\\u0A8D\\u0A91\\u0ABD\\u0Ad0]", /*roundtrip exclusions*/
 
     "GUJARATI-KANNADA", "[:GUJARATI:]", "[:KANNADA:]",
-    "[\\u0cc6\\u0cca\\u0cd5\\u0cd6\\u0C8C\\u0C8E\\u0C92\\u0CB1\\u0CDE\\u0CE1]", /*roundtrip exclusions*/
+    "[{\\u0cb0\\u0cbc}{\\u0cb3\\u0cbc}\\u0cc6\\u0cca\\u0cd5\\u0cd6\\u0C8C\\u0C8E\\u0C92\\u0CB1\\u0CDE\\u0CE1]", /*roundtrip exclusions*/
 
     "MALAYALAM-GUJARATI", "[:MALAYALAM:]", "[:GUJARATI:]", 
     "[\\u0A81\\u0ac4\\u0acb\\u0acc\\u0abc\\u0Ac5\\u0Ac9\\u0A8D\\u0A91\\u0ABD\\u0Ad0]", /*roundtrip exclusions*/
@@ -1356,25 +1553,25 @@ static const char * const interIndicArray[] = {
     "[\\u0d46\\u0d4a\\u0d4c\\u0d55\\u0d57\\u0D0C\\u0D0E\\u0D12\\u0D31\\u0D34\\u0D61]", /*roundtrip exclusions*/
 
     "TAMIL-ORIYA", "[:TAMIL:]", "[:ORIYA:]", 
-    "[\\u0B01\\u0b3c\\u0b43\\u0b56\\u0B0B\\u0B0C\\u0B16\\u0B17\\u0B18\\u0B1B\\u0B1D\\u0B20\\u0B21\\u0B22\\u0B25\\u0B26\\u0B27\\u0B2B\\u0B2C\\u0B2D\\u0B36\\u0B3D\\u0B5C\\u0B5D\\u0B5F\\u0B60\\u0B61]", /*roundtrip exclusions*/
+    "[\\u0B01\\u0b3c\\u0b43\\u0b56\\u0B0B\\u0B0C\\u0B16\\u0B17\\u0B18\\u0B1B\\u0B1D\\u0B20\\u0B21\\u0B22\\u0B25\\u0B26\\u0B27\\u0B2B\\u0B2C\\u0B2D\\u0B36\\u0B3D\\u0B5C\\u0B5D\\u0B5F\\u0B60\\u0B61\\u0b70\\u0b71]", /*roundtrip exclusions*/
 
     "ORIYA-TAMIL", "[:ORIYA:]", "[:TAMIL:]",
     "[\\u0bc6\\u0bca\\u0bc7\\u0B8E\\u0B92\\u0BA9\\u0BB1\\u0BB4\\u0BB5]", /*roundtrip exclusions*/
 
     "TELUGU-ORIYA", "[:TELUGU:]", "[:ORIYA:]", 
-    "[\\u0b3c\\u0b57\\u0b56\\u0B3D\\u0B5C\\u0B5D\\u0B5F]", /*roundtrip exclusions*/
+    "[\\u0b3c\\u0b57\\u0b56\\u0B3D\\u0B5C\\u0B5D\\u0B5F\\u0b70\\u0b71]", /*roundtrip exclusions*/
 
     "ORIYA-TELUGU", "[:ORIYA:]", "[:TELUGU:]",
     "[\\u0c44\\u0c46\\u0c4a\\u0c55\\u0c47\\u0C0E\\u0C12\\u0C31\\u0C35]", /*roundtrip exclusions*/
 
     "KANNADA-ORIYA", "[:KANNADA:]", "[:ORIYA:]", 
-    "[\\u0B01\\u0b3c\\u0b57\\u0B3D\\u0B5C\\u0B5D\\u0B5F]", /*roundtrip exclusions*/
+    "[\\u0B01\\u0b3c\\u0b57\\u0B3D\\u0B5C\\u0B5D\\u0B5F\\u0b70\\u0b71]", /*roundtrip exclusions*/
 
     "ORIYA-KANNADA", "[:ORIYA:]", "[:KANNADA:]",
-    "[\\u0cc4\\u0cc6\\u0cca\\u0cd5\\u0cc7\\u0C8E\\u0C92\\u0CB1\\u0CB5\\u0CDE]", /*roundtrip exclusions*/
+    "[{\\u0cb0\\u0cbc}{\\u0cb3\\u0cbc}\\u0cc4\\u0cc6\\u0cca\\u0cd5\\u0cc7\\u0C8E\\u0C92\\u0CB1\\u0CB5\\u0CDE]", /*roundtrip exclusions*/
 
     "MALAYALAM-ORIYA", "[:MALAYALAM:]", "[:ORIYA:]", 
-    "[\\u0B01\\u0b3c\\u0b56\\u0B3D\\u0B5C\\u0B5D\\u0B5F]", /*roundtrip exclusions*/
+    "[\\u0B01\\u0b3c\\u0b56\\u0B3D\\u0B5C\\u0B5D\\u0B5F\\u0b70\\u0b71]", /*roundtrip exclusions*/
 
     "ORIYA-MALAYALAM", "[:ORIYA:]", "[:MALAYALAM:]",
     "[\\u0D47\\u0D46\\u0D4a\\u0D0E\\u0D12\\u0D31\\u0D34\\u0D35]", /*roundtrip exclusions*/
@@ -1389,7 +1586,7 @@ static const char * const interIndicArray[] = {
     "[\\u0bd7\\u0bc6\\u0ba9\\u0bb4]", /*roundtrip exclusions*/
 
     "TAMIL-KANNADA", "[:TAMIL:]", "[:KANNADA:]",
-    "[\\u0cc3\\u0cc4\\u0cc6\\u0cc7\\u0cd5\\u0cd6\\u0C8B\\u0C8C\\u0C96\\u0C97\\u0C98\\u0C9B\\u0C9D\\u0CA0\\u0CA1\\u0CA2\\u0CA5\\u0CA6\\u0CA7\\u0CAB\\u0CAC\\u0CAD\\u0CB6\\u0CDE\\u0CE0\\u0CE1]", /*roundtrip exclusions*/
+    "[\\u0cc3\\u0cc4\\u0cc6\\u0cc7\\u0cd5\\u0cd6\\u0C8B\\u0C8C\\u0C96\\u0C97\\u0C98\\u0C9B\\u0C9D\\u0CA0\\u0CA1\\u0CA2\\u0CA5\\u0CA6\\u0CA7\\u0CAB\\u0CAC\\u0CAD\\u0CB6\\u0cbc\\u0cbd\\u0CDE\\u0CE0\\u0CE1]", /*roundtrip exclusions*/
 
     "MALAYALAM-TAMIL", "[:MALAYALAM:]", "[:TAMIL:]", 
     "[\\u0ba9]", /*roundtrip exclusions*/
@@ -1401,7 +1598,7 @@ static const char * const interIndicArray[] = {
     "[\\u0C01\\u0c3f\\u0c46\\u0c48\\u0c4a]", /*roundtrip exclusions*/
 
     "TELUGU-KANNADA", "[:TELUGU:]", "[:KANNADA:]",
-    "[\\u0cc8\\u0cd5\\u0cd6\\u0CDE]", /*roundtrip exclusions*/
+    "[\\u0cc8\\u0cd5\\u0cd6\\u0cbc\\u0cbd\\u0CDE]", /*roundtrip exclusions*/
 
     "MALAYALAM-TELUGU", "[:MALAYALAM:]", "[:TELUGU:]", 
     "[\\u0C01\\u0c44\\u0c4a\\u0c4c\\u0c4b\\u0c55\\u0c56]", /*roundtrip exclusions*/
@@ -1410,22 +1607,22 @@ static const char * const interIndicArray[] = {
     "[\\u0d4c\\u0d57\\u0D34]", /*roundtrip exclusions*/
 
     "MALAYALAM-KANNADA", "[:MALAYALAM:]", "[:KANNADA:]", 
-    "[\\u0cc4\\u0cc6\\u0cca\\u0ccc\\u0ccb\\u0cd5\\u0cd6\\u0cDe]", /*roundtrip exclusions*/
+    "[\\u0cbc\\u0cbd\\u0cc4\\u0cc6\\u0cca\\u0ccc\\u0ccb\\u0cd5\\u0cd6\\u0cDe]", /*roundtrip exclusions*/
 
     "KANNADA-MALAYALAM", "[:KANNADA:]", "[:MALAYALAM:]",
     "[\\u0d4c\\u0d57\\u0d46\\u0D34]", /*roundtrip exclusions*/
     
     "Latin-Bengali",latinForIndic, "[[:Bengali:][\\u0964\\u0965]]", 
-    "[\\u0965\\u09f0\\u09f1]" /*roundtrip exclusions*/ ,
+    "[\\u0965\\u09f0-\\u09fa]" /*roundtrip exclusions*/ ,
     
     "Latin-Gurmukhi", latinForIndic, "[[:Gurmukhi:][\\u0964\\u0965]]", 
-    "[\\u0965\\u0a02\\u0a72\\u0a73\\u0a74]" /*roundtrip exclusions*/,
+    "[\\u0a01\\u0965\\u0a02\\u0a72\\u0a73\\u0a74]" /*roundtrip exclusions*/,
     
     "Latin-Gujarati",latinForIndic, "[[:Gujarati:][\\u0964\\u0965]]", 
     "[\\u0965]" /*roundtrip exclusions*/,
     
     "Latin-Oriya",latinForIndic, "[[:Oriya:][\\u0964\\u0965]]", 
-    "[\\u0965]" /*roundtrip exclusions*/,
+    "[\\u0965\\u0b70]" /*roundtrip exclusions*/,
     
     "Latin-Tamil",latinForIndic, "[:Tamil:]", 
     NULL /*roundtrip exclusions*/,
@@ -1459,22 +1656,13 @@ void TransliteratorRoundTripTest::TestInterIndic() {
     for(int i = 0; i < num;i++){
         RTTest test(interIndicArray[i*INTER_INDIC_ARRAY_WIDTH + 0]);
         Legal *legal = new LegalIndic();
-#if (U_ICU_VERSION_MAJOR_NUM==2 && U_ICU_VERSION_MINOR_NUM==6)
-        UnicodeString temp1 = "[";
-        temp1.append(interIndicArray[i*INTER_INDIC_ARRAY_WIDTH + 1]);
-        temp1.append("& [:Age=3.2:]]");
-        UnicodeString temp2 = "[";
-        temp2.append(interIndicArray[i*INTER_INDIC_ARRAY_WIDTH + 2]);
-        temp2.append("& [:Age=3.2:]]");
-#else
-        UnicodeString temp1 = interIndicArray[i*INTER_INDIC_ARRAY_WIDTH + 1];
-        UnicodeString temp2 = interIndicArray[i*INTER_INDIC_ARRAY_WIDTH + 2];
-#endif
-        test.test(temp1, 
-                  temp2, 
-                  interIndicArray[i*INTER_INDIC_ARRAY_WIDTH + 3], // roundtrip exclusions 
-                  this, quick, legal, 50);
-       delete legal;
+
+        test.test(  interIndicArray[i*INTER_INDIC_ARRAY_WIDTH + 1], 
+                    interIndicArray[i*INTER_INDIC_ARRAY_WIDTH + 2], 
+                    interIndicArray[i*INTER_INDIC_ARRAY_WIDTH + 3], // roundtrip exclusions 
+                    this, quick, legal, 50);
+
+        delete legal;
     }
     
 }