* locales/i18n: Move Indic Matra characters to punct.

	* locales/as_IN: Add support for internationalized digits.
	* locales/bn_BD: Likewise.
	* locales/bn_IN: Likewise.
	* locales/gu_IN: Likewise.
	* locales/hi_IN: Likewise.
	* locales/kn_IN: Likewise.
	* locales/ml_IN: Likewise.
	* locales/mr_IN: Likewise.
	* locales/or_IN: Likewise.
	* locales/pa_IN: Likewise.
	* locales/ta_IN: Likewise.
	* locales/te_IN: Likewise.

12 files changed, 206 insertions, 44 deletions

diff --git a/localedata/locales/as_IN b/localedata/locales/as_IN
index 41917f06dc..3e1c4cb8ab 100644
--- a/localedata/locales/as_IN
+++ b/localedata/locales/as_IN
@@ -32,7 +32,7 @@ END LC_IDENTIFICATION
 
 %%%%%%%%%%%%%
 LC_CTYPE
-copy "i18n"
+copy "bn_IN"
 
 translit_start
 include "translit_combining";""
diff --git a/localedata/locales/bn_IN b/localedata/locales/bn_IN
index 1a792acd8a..43a682549e 100644
--- a/localedata/locales/bn_IN
+++ b/localedata/locales/bn_IN
@@ -34,7 +34,28 @@ END LC_IDENTIFICATION
 
 
 LC_CTYPE
-copy "bn_BD"
+copy "i18n"
+
+% Bengali uses the alternate digits U+09E6..U+09EF
+outdigit <U09E6>..<U09EF>
+
+% This is used in the scanf family of functions to read Bengali numbers
+% using "%Id" and such.
+map to_inpunct; /
+  (<U0030>,<U09E6>); /
+  (<U0031>,<U09E7>); /
+  (<U0032>,<U09E8>); /
+  (<U0033>,<U09E9>); /
+  (<U0034>,<U09EA>); /
+  (<U0035>,<U09EB>); /
+  (<U0036>,<U09EC>); /
+  (<U0037>,<U09ED>); /
+  (<U0038>,<U09EE>); /
+  (<U0039>,<U09EF>); 
+
+translit_start
+include "translit_combining";""
+translit_end
 END LC_CTYPE
 
 
diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN
index 6e60a2367e..0d7ffc98a8 100644
--- a/localedata/locales/gu_IN
+++ b/localedata/locales/gu_IN
@@ -35,6 +35,23 @@ END LC_IDENTIFICATION
 LC_CTYPE
 copy "i18n"
 
+% Gujarati uses the alternate digits U+0AE6..U+0AEF
+outdigit <U0AE6>..<U0AEF>
+
+% This is used in the scanf family of functions to read Gujarati numbers
+% using "%Id" and such.
+map to_inpunct; /
+  (<U0030>,<U0AE6>); /
+  (<U0031>,<U0AE7>); /
+  (<U0032>,<U0AE8>); /
+  (<U0033>,<U0AE9>); /
+  (<U0034>,<U0AEA>); /
+  (<U0035>,<U0AEB>); /
+  (<U0036>,<U0AEC>); /
+  (<U0037>,<U0AED>); /
+  (<U0038>,<U0AEE>); /
+  (<U0039>,<U0AEF>); 
+
 translit_start
 include "translit_combining";""
 translit_end
diff --git a/localedata/locales/hi_IN b/localedata/locales/hi_IN
index 44644bc323..c8a5051089 100644
--- a/localedata/locales/hi_IN
+++ b/localedata/locales/hi_IN
@@ -32,7 +32,7 @@ category  "hi_IN:2000";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
-copy "i18n"
+copy "mr_IN"
 
 translit_start
 include "translit_combining";""
diff --git a/localedata/locales/i18n b/localedata/locales/i18n
index 7287424417..8afbb717fa 100644
--- a/localedata/locales/i18n
+++ b/localedata/locales/i18n
@@ -231,41 +231,55 @@ alpha /
    <U0780>..<U07A5>;<U07B1>;/
 % NKO/
    <U07C0>..<U07EA>;<U07F4>..<U07F5>;<U07FA>;/
+% - All Matras of Indic and Sinhala are moved from punct to alpha class/
+% - Added Unicode 5.1 charctares of Indic scripts/
 % DEVANAGARI/
-   <U0904>..<U0939>;<U093D>;<U0950>;<U0958>..<U0961>;/
-   <U097B>..<U097F>;/
+   <U0901>..<U0939>;<U093C>..<U094D>;/
+   <U0950>..<U0954>;<U0958>..<U0961>;/
+   <U0962>;<U0963>;<U0972>;<U097B>..<U097F>;/
 % TABLE 18 BENGALI/
-   <U0985>..<U098C>;<U098F>;<U0990>;<U0993>..<U09A8>;<U09AA>..<U09B0>;/
-   <U09B2>;<U09B6>..<U09B9>;<U09BD>;<U09CE>;<U09DC>;<U09DD>;<U09DF>..<U09E1>;/
-   <U09F0>..<U09F1>;/
+   <U0981>..<U0983>;<U0985>..<U098C>;<U098F>;<U0990>;<U0993>..<U09A8>;/
+   <U09AA>..<U09B0>;<U09B2>;<U09B6>..<U09B9>;<U09BC>..<U09C4>;/
+   <U09C7>;<U09C8>;<U09CB>..<U09CE>;<U09D7>;/
+   <U09DC>;<U09DD>;<U09DF>..<U09E3>;<U09F0>..<U09FA>;/
 % GURMUKHI/
-   <U0A05>..<U0A0A>;<U0A0F>;<U0A10>;<U0A13>..<U0A28>;<U0A2A>..<U0A30>;/
-   <U0A32>;<U0A33>;<U0A35>;<U0A36>;<U0A38>;<U0A39>;<U0A59>..<U0A5C>;/
-   <U0A5E>;<U0A72>..<U0A74>;/
+   <U0A01>..<U0A03>;<U0A05>..<U0A0A>;<U0A0F>;<U0A10>;<U0A13>..<U0A28>;/
+   <U0A2A>..<U0A30>;<U0A32>;<U0A33>;<U0A35>;<U0A36>;<U0A38>;<U0A39>;/
+   <U0A3C>;<U0A3E>..<U0A42>;<U0A47>;<U0A48>;<U0A4B>..<U0A4D>;<U0A51>;/
+   <U0A59>..<U0A5C>;<U0A5E>;<U0A70>..<U0A75>;/
 % GUJARATI/
+   <U0A81>..<U0A83>;/
    <U0A85>..<U0A8D>;<U0A8F>..<U0A91>;<U0A93>..<U0AA8>;/
-   <U0AAA>..<U0AB0>;<U0AB2>;<U0AB3>;<U0AB5>..<U0AB9>;<U0ABD>;<U0AD0>;/
-   <U0AE0>;<U0AE1>;/
+   <U0AAA>..<U0AB0>;<U0AB2>;<U0AB3>;<U0AB5>..<U0AB9>;<U0ABC>..<U0AC5>;/
+   <U0AC7>..<U0AC9>;<U0ACB>..<U0ACD>;/
+   <U0AD0>;<U0AE0>..<U0AE3>;<U0AF1>;/
 % ORIYA/
-   <U0B05>..<U0B0C>;<U0B0F>;<U0B10>;<U0B13>..<U0B28>;<U0B2A>..<U0B30>;/
-   <U0B32>;<U0B33>;<U0B35>..<U0B39>;<U0B3D>;<U0B5C>;<U0B5D>;/
-   <U0B5F>..<U0B63>;<U0B71>;/
+   <U0B01>..<U0B03>;<U0B05>..<U0B0C>;<U0B0F>;<U0B10>;<U0B13>..<U0B28>;/
+   <U0B2A>..<U0B30>;<U0B32>;<U0B33>;<U0B35>..<U0B39>;<U0B3C>..<U0B44>;/
+   <U0B47>..<U0B48>;<U0B4B>..<U0B4D>;<U0B56>..<U0B57>;<U0B5C>;<U0B5D>;/
+   <U0B5F>..<U0B63>;<U0B70>;<U0B71>;/
 % TAMIL/
-   <U0B83>;<U0B85>..<U0B8A>;<U0B8E>..<U0B90>;<U0B92>..<U0B95>;<U0B99>;/
+   <U0B82>;<U0B83>;<U0B85>..<U0B8A>;<U0B8E>..<U0B90>;<U0B92>..<U0B95>;<U0B99>;/
    <U0B9A>;<U0B9C>;<U0B9E>;<U0B9F>;<U0BA3>;<U0BA4>;<U0BA8>..<U0BAA>;/
-   <U0BAE>..<U0BB9>;/
+   <U0BAE>..<U0BB9>;<U0BBE>..<U0BC2>;<U0BC6>..<U0BC8>;<U0BCA>..<U0BCD>;/
+  <U0BD0>;<U0BD7>;<U0BF0>..<U0BFA>;/
 % TELUGU/
-   <U0C05>..<U0C0C>;<U0C0E>..<U0C10>;<U0C12>..<U0C28>;<U0C2A>..<U0C33>;/
-   <U0C35>..<U0C39>;<U0C3D>;<U0C58>..<U0C59>;<U0C60>..<U0C63>;/
+   <U0C01>..<U0C03>;<U0C05>..<U0C0C>;<U0C0E>..<U0C10>;<U0C12>..<U0C28>;/
+   <U0C2A>..<U0C33>;<U0C35>..<U0C39>;<U0C3D>..<U0C44>;<U0C46>..<U0C48>;/
+   <U0C4A>..<U0C4D>;<U0C55>..<U0C56>;<U0C58>..<U0C59>;<U0C60>..<U0C63>;/
 % KANNADA/
-   <U0C85>..<U0C8C>;<U0C8E>..<U0C90>;<U0C92>..<U0CA8>;<U0CAA>..<U0CB3>;/
-   <U0CB5>..<U0CB9>;<U0CDE>;<U0CE0>..<U0CE1>;/
+   <U0C82>..<U0C83>;<U0C85>..<U0C8C>;<U0C8E>..<U0C90>;<U0C92>..<U0CA8>;/
+   <U0CAA>..<U0CB3>;<U0CB5>..<U0CB9>;<U0CBC>..<U0CC4>;<U0CC6>..<U0CC8>;<U0CCA>..<U0CCD>;/
+   <U0CD5>..<U0CD6>;<U0CDE>;<U0CE0>..<U0CE3>;<U0CF1>;<U0CF2>;/
 % MALAYALAM/
-   <U0D05>..<U0D0C>;<U0D0E>..<U0D10>;<U0D12>..<U0D28>;<U0D2A>..<U0D39>;/
-   <U0D3D>;<U0D60>..<U0D63>;/
+   <U0D02>..<U0D03>;<U0D05>..<U0D0C>;<U0D0E>..<U0D10>;<U0D12>..<U0D28>;/
+   <U0D2A>..<U0D39>;<U0D3D>..<U0D44>;/
+   <U0D46>..<U0D48>;<U0D4A>..<U0D4D>;<U0D57>;/
+   <U0D60>..<U0D63>;<U0D79>..<U0D7F>;/
 % SINHALA/
-   <U0D85>..<U0D96>;<U0D9A>..<U0DB1>;<U0DB3>..<U0DBB>;<U0DBD>;/
-   <U0DC0>..<U0DC6>;/
+   <U0D82>..<U0D83>;<U0D85>..<U0D96>;<U0D9A>..<U0DB1>;<U0DB3>..<U0DBB>;<U0DBD>;/
+   <U0DC0>..<U0DC6>;<U0DCA>;/
+   <U0DCF>..<U0DD4>;<U0DD6>;<U0DD8>..<U0DDF>;<U0DF2>..<U0DF4>;/
 % THAI/
    <U0E01>..<U0E2E>;<U0E30>..<U0E3A>;<U0E40>..<U0E45>;<U0E47>..<U0E4E>;/
 % LAO/
@@ -496,7 +510,7 @@ alpha /
 % KANNADA/
    <U0CE6>..<U0CEF>;/
 % MALAYALAM/
-   <U0D66>..<U0D75>;<U0D79>..<U0D7F>;/
+   <U0D66>..<U0D75>;<U0D70>..<U0D75>;/
 % THAI/
    <U0E50>..<U0E59>;/
 % LAO/
@@ -566,22 +580,8 @@ punct /
    <U064B>..<U065E>;<U066A>..<U066D>;<U0670>;<U06D4>;<U06D6>..<U06E4>;/
    <U06E7>..<U06ED>;<U06FD>..<U06FE>;<U0700>..<U070D>;<U070F>;<U0711>;/
    <U0730>..<U074A>;<U07A6>..<U07B0>;<U07EB>..<U07F3>;<U07F6>..<U07F9>;/
-   <U0901>..<U0903>;<U093C>;<U093E>..<U094D>;<U0951>..<U0954>;/
-   <U0962>..<U0965>;<U0972>;<U0981>..<U0983>;<U09BC>;<U09BE>..<U09C4>;/
-   <U09C7>..<U09C8>;<U09CB>..<U09CD>;<U09D7>;<U09E2>..<U09E3>;/
-   <U09F2>..<U09FA>;<U0A01>..<U0A03>;<U0A3C>;<U0A3E>..<U0A42>;/
-   <U0A47>..<U0A48>;<U0A4B>..<U0A4D>;<U0A51>;<U0A70>..<U0A71>;/
-   <U0A75>;<U0A81>..<U0A83>;/
-   <U0ABC>;<U0ABE>..<U0AC5>;<U0AC7>..<U0AC9>;<U0ACB>..<U0ACD>;/
-   <U0AE2>..<U0AE3>;<U0AF1>;<U0B01>..<U0B03>;<U0B3C>;<U0B3E>..<U0B44>;/
-   <U0B47>..<U0B48>;<U0B4B>..<U0B4D>;<U0B56>..<U0B57>;<U0B70>;<U0B82>;/
-   <U0BBE>..<U0BC2>;<U0BC6>..<U0BC8>;<U0BCA>..<U0BCD>;<U0BD0>;<U0BD7>;/
-   <U0BF0>..<U0BFA>;<U0C01>..<U0C03>;<U0C3E>..<U0C44>;<U0C46>..<U0C48>;/
-   <U0C4A>..<U0C4D>;<U0C55>..<U0C56>;<U0C82>..<U0C83>;<U0CBC>;/
-   <U0CBE>..<U0CC4>;<U0CC6>..<U0CC8>;<U0CCA>..<U0CCD>;<U0CD5>..<U0CD6>;/
-   <U0CE2>..<U0CE3>;<U0CF1>..<U0CF2>;<U0D02>..<U0D03>;<U0D3E>..<U0D44>;/
-   <U0D46>..<U0D48>;<U0D4A>..<U0D4D>;<U0D57>;<U0D82>..<U0D83>;<U0DCA>;/
-   <U0DCF>..<U0DD4>;<U0DD6>;<U0DD8>..<U0DDF>;<U0DF2>..<U0DF4>;<U0E2F>;/
+   <U0964>;<U0965>;/
+   <U0E2F>;/
    <U0E3F>;<U0E46>;<U0E4F>;<U0E5A>..<U0E5B>;<U0EB1>;<U0EB4>..<U0EB9>;/
    <U0EBB>..<U0EBC>;<U0EC8>..<U0ECD>;<U0F01>..<U0F1F>;<U0F2A>..<U0F3F>;/
    <U0F71>..<U0F87>;<U0F90>..<U0F97>;<U0F99>..<U0FBC>;<U0FBE>..<U0FCC>;/
diff --git a/localedata/locales/kn_IN b/localedata/locales/kn_IN
index 53c5fcac71..4a0a2e3409 100644
--- a/localedata/locales/kn_IN
+++ b/localedata/locales/kn_IN
@@ -36,6 +36,23 @@ END LC_IDENTIFICATION
 LC_CTYPE
 copy "i18n"
 
+% Kannada uses the alternate digits U+0CE6..U+0CEF
+outdigit <U0CE6>..<U0CEF>
+
+% This is used in the scanf family of functions to read Kannada numbers
+% using "%Id" and such.
+map to_inpunct; /
+  (<U0030>,<U0CE6>); /
+  (<U0031>,<U0CE7>); /
+  (<U0032>,<U0CE8>); /
+  (<U0033>,<U0CE9>); /
+  (<U0034>,<U0CEA>); /
+  (<U0035>,<U0CEB>); /
+  (<U0036>,<U0CEC>); /
+  (<U0037>,<U0CED>); /
+  (<U0038>,<U0CEE>); /
+  (<U0039>,<U0CEF>); 
+
 translit_start
 include  "translit_combining";""
 translit_end
diff --git a/localedata/locales/ml_IN b/localedata/locales/ml_IN
index 1f57845813..18196bb5de 100644
--- a/localedata/locales/ml_IN
+++ b/localedata/locales/ml_IN
@@ -32,6 +32,24 @@ category     "ml_IN:2000";LC_MEASUREMENT
 END LC_IDENTIFICATION
 LC_CTYPE
 copy	"i18n"
+
+% Malayalam uses the alternate digits U+0D66..U+0D6F
+outdigit <U0D66>..<U0D6F>
+
+% This is used in the scanf family of functions to read Malayalam numbers
+% using "%Id" and such.
+map to_inpunct; /
+  (<U0030>,<U0D66>); /
+  (<U0031>,<U0D67>); /
+  (<U0032>,<U0D68>); /
+  (<U0033>,<U0D69>); /
+  (<U0034>,<U0D6A>); /
+  (<U0035>,<U0D6B>); /
+  (<U0036>,<U0D6C>); /
+  (<U0037>,<U0D6D>); /
+  (<U0038>,<U0D6E>); /
+  (<U0039>,<U0D6F>); 
+
 translit_start
 include     "translit_combining";""
 translit_end
diff --git a/localedata/locales/mr_IN b/localedata/locales/mr_IN
index ba3b3d6148..7c9d439fcb 100644
--- a/localedata/locales/mr_IN
+++ b/localedata/locales/mr_IN
@@ -34,6 +34,23 @@ END LC_IDENTIFICATION
 LC_CTYPE
 copy "i18n"
 
+% Devanagari uses the alternate digits U+0966..U+096F
+outdigit <U0966>..<U096F>
+
+% This is used in the scanf family of functions to read devanagari numbers
+% using "%Id" and such.
+map to_inpunct; /
+  (<U0030>,<U0966>); /
+  (<U0031>,<U0967>); /
+  (<U0032>,<U0968>); /
+  (<U0033>,<U0969>); /
+  (<U0034>,<U096A>); /
+  (<U0035>,<U096B>); /
+  (<U0036>,<U096C>); /
+  (<U0037>,<U096D>); /
+  (<U0038>,<U096E>); /
+  (<U0039>,<U096F>); 
+
 translit_start
 include  "translit_combining";""
 translit_end
diff --git a/localedata/locales/or_IN b/localedata/locales/or_IN
index 86754b2e2f..22ee03108a 100644
--- a/localedata/locales/or_IN
+++ b/localedata/locales/or_IN
@@ -35,6 +35,23 @@ END LC_IDENTIFICATION
 LC_CTYPE
 copy "i18n"
 
+% Oriya uses the alternate digits U+0B66..U+0B6F
+outdigit <U0B66>..<U0B6F>
+
+% This is used in the scanf family of functions to read Oriya numbers
+% using "%Id" and such.
+map to_inpunct; /
+  (<U0030>,<U0B66>); /
+  (<U0031>,<U0B67>); /
+  (<U0032>,<U0B68>); /
+  (<U0033>,<U0B69>); /
+  (<U0034>,<U0B6A>); /
+  (<U0035>,<U0B6B>); /
+  (<U0036>,<U0B6C>); /
+  (<U0037>,<U0B6D>); /
+  (<U0038>,<U0B6E>); /
+  (<U0039>,<U0B6F>); 
+
 translit_start
 include  "translit_combining";""
 translit_end
diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN
index b269472d4e..c4c4732349 100644
--- a/localedata/locales/pa_IN
+++ b/localedata/locales/pa_IN
@@ -31,7 +31,28 @@ category  "pa_IN:2000";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_CTYPE
-copy "pa_PK"
+copy	"i18n"
+
+% Punjabi uses the alternate digits U+0A66..U+0A6F
+outdigit <U0A66>..<U0A6F>
+
+% This is used in the scanf family of functions to read Punjabi numbers
+% using "%Id" and such.
+map to_inpunct; /
+  (<U0030>,<U0A66>); /
+  (<U0031>,<U0A67>); /
+  (<U0032>,<U0A68>); /
+  (<U0033>,<U0A69>); /
+  (<U0034>,<U0A6A>); /
+  (<U0035>,<U0A6B>); /
+  (<U0036>,<U0A6C>); /
+  (<U0037>,<U0A6D>); /
+  (<U0038>,<U0A6E>); /
+  (<U0039>,<U0A6F>); 
+
+translit_start
+include     "translit_combining";""
+translit_end
 END LC_CTYPE
 
 
diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN
index df68390261..51a4fff35f 100644
--- a/localedata/locales/ta_IN
+++ b/localedata/locales/ta_IN
@@ -37,6 +37,23 @@ END LC_IDENTIFICATION
 LC_CTYPE
 copy "i18n"
 
+% Tamil uses the alternate digits U+0BE6..U+0BEF
+outdigit <U0BE6>..<U0BEF>
+
+% This is used in the scanf family of functions to read Tamil numbers
+% using "%Id" and such.
+map to_inpunct; /
+  (<U0030>,<U0BE6>); /
+  (<U0031>,<U0BE7>); /
+  (<U0032>,<U0BE8>); /
+  (<U0033>,<U0BE9>); /
+  (<U0034>,<U0BEA>); /
+  (<U0035>,<U0BEB>); /
+  (<U0036>,<U0BEC>); /
+  (<U0037>,<U0BED>); /
+  (<U0038>,<U0BEE>); /
+  (<U0039>,<U0BEF>); 
+
 translit_start
 include  "translit_combining";""
 translit_end
diff --git a/localedata/locales/te_IN b/localedata/locales/te_IN
index f833651a82..d3456244b0 100644
--- a/localedata/locales/te_IN
+++ b/localedata/locales/te_IN
@@ -36,6 +36,23 @@ END LC_IDENTIFICATION
 LC_CTYPE
 copy "i18n"
 
+% Telugu uses the alternate digits U+0C66..U+0C6F
+outdigit <U0C66>..<U0C6F>
+
+% This is used in the scanf family of functions to read Telugu numbers
+% using "%Id" and such.
+map to_inpunct; /
+  (<U0030>,<U0C66>); /
+  (<U0031>,<U0C67>); /
+  (<U0032>,<U0C68>); /
+  (<U0033>,<U0C69>); /
+  (<U0034>,<U0C6A>); /
+  (<U0035>,<U0C6B>); /
+  (<U0036>,<U0C6C>); /
+  (<U0037>,<U0C6D>); /
+  (<U0038>,<U0C6E>); /
+  (<U0039>,<U0C6F>); 
+
 translit_start
 include  "translit_combining";""
 translit_end