(indian-compose-region): Don't call

compose-chars-after, instead call a function registered in
composition-function-table.

1 files changed, 309 insertions, 305 deletions

diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index 97eea6f4d7c..7a95388f81b 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -584,15 +584,19 @@ Returns new end position."
 
 ;;;###autoload
 (defun indian-compose-region (from to)
-  "Compose the region according to `composition-function-table'. "
+  "Compose the region according to `composition-function-table'."
   (interactive "r")
   (save-excursion
     (save-restriction
-      (let ((pos from) chars (max to))
+      (let ((pos from) newpos func (max to))
 	(narrow-to-region from to)
 	(while (< pos max)
-	  (setq chars (compose-chars-after pos))
-	  (if chars (setq pos (+ pos chars)) (setq pos (1+ pos))))))))
+	  (setq func (aref composition-function-table (char-after pos)))
+	  (if (fboundp func)
+	      (setq newpos (funcall func pos nil)
+		    pos (if (and (integerp newpos) (> newpos pos))
+			    newpos (1+ pos)))
+	    (setq pos (1+ pos))))))))
 
 ;;;###autoload
 (defun indian-compose-string (string)
@@ -629,332 +633,332 @@ Returns new end position."
 (defconst indian-2-colum-to-ucs
   '(
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2120   $(5!!!"!#!$!%!&!'!(!)!*!+!,!-!.!/(B
-  ("$(5!!(B" . "$,15A(B")
-  ("$(5!"(B" . "$,15B(B")
-  ("$(5!#(B" . "$,15C(B")
-  ("$(5!$(B" . "$,15E(B")
-  ("$(5!%(B" . "$,15F(B")
-  ("$(5!&(B" . "$,15G(B")
-  ("$(5!'(B" . "$,15H(B")
-  ("$(5!((B" . "$,15I(B")
-  ("$(5!)(B" . "$,15J(B")
-  ("$(5!*(B" . "$,15K(B")
-  ("$(5!*"p(B" . "$,15p6#(B")
-  ("$(5!+(B" . "$,15N(B")
-  ("$(5!,(B" . "$,15O(B")
-  ("$(5!-(B" . "$,15P(B")
-  ("$(5!.(B" . "$,15M(B")
-  ("$(5!/(B" . "$,15R(B")
+  ;;2120   $(6!!!"!#!$!%!&!'!(!)!*!+!,!-!.!/(B
+  ("$(6!!(B" . "$,15A(B")
+  ("$(6!"(B" . "$,15B(B")
+  ("$(6!#(B" . "$,15C(B")
+  ("$(6!$(B" . "$,15E(B")
+  ("$(6!%(B" . "$,15F(B")
+  ("$(6!&(B" . "$,15G(B")
+  ("$(6!'(B" . "$,15H(B")
+  ("$(6!((B" . "$,15I(B")
+  ("$(6!)(B" . "$,15J(B")
+  ("$(6!*(B" . "$,15K(B")
+  ("$(6!*"p(B" . "$,15p6#(B")
+  ("$(6!+(B" . "$,15N(B")
+  ("$(6!,(B" . "$,15O(B")
+  ("$(6!-(B" . "$,15P(B")
+  ("$(6!.(B" . "$,15M(B")
+  ("$(6!/(B" . "$,15R(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2130 $(5!0!1!2!3!4!5!6!7!8!9!:!;!<!=!>!?(B
-  ("$(5!0(B" . "$,15S(B")
-  ("$(5!1(B" . "$,15T(B")
-  ("$(5!2(B" . "$,15Q(B")
-  ("$(5!3(B" . "$,15U(B")
-  ("$(5!4(B" . "$,15V(B")
-  ("$(5!5(B" . "$,15W(B")
-  ("$(5!6(B" . "$,15X(B")
-  ("$(5!7(B" . "$,15Y(B")
-  ("$(5!8(B" . "$,15Z(B")
-  ("$(5!9(B" . "$,15[(B")
-  ("$(5!:(B" . "$,15\(B")
-  ("$(5!;(B" . "$,15](B")
-  ("$(5!<(B" . "$,15^(B")
-  ("$(5!=(B" . "$,15_(B")
-  ("$(5!>(B" . "$,15`(B")
-  ("$(5!?(B" . "$,15a(B")
+  ;;2130 $(6!0!1!2!3!4!5!6!7!8!9!:!;!<!=!>!?(B
+  ("$(6!0(B" . "$,15S(B")
+  ("$(6!1(B" . "$,15T(B")
+  ("$(6!2(B" . "$,15Q(B")
+  ("$(6!3(B" . "$,15U(B")
+  ("$(6!4(B" . "$,15V(B")
+  ("$(6!5(B" . "$,15W(B")
+  ("$(6!6(B" . "$,15X(B")
+  ("$(6!7(B" . "$,15Y(B")
+  ("$(6!8(B" . "$,15Z(B")
+  ("$(6!9(B" . "$,15[(B")
+  ("$(6!:(B" . "$,15\(B")
+  ("$(6!;(B" . "$,15](B")
+  ("$(6!<(B" . "$,15^(B")
+  ("$(6!=(B" . "$,15_(B")
+  ("$(6!>(B" . "$,15`(B")
+  ("$(6!?(B" . "$,15a(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2140 $(5!@!A!B!C!D!E!F!G!H!I!J!K!L!M!N!O(B
-  ("$(5!@(B" . "$,15b(B")
-  ("$(5!A(B" . "$,15c(B")
-  ("$(5!B(B" . "$,15d(B")
-  ("$(5!C(B" . "$,15e(B")
-  ("$(5!D(B" . "$,15f(B")
-  ("$(5!E(B" . "$,15g(B")
-  ("$(5!F(B" . "$,15h(B")
-  ("$(5!G(B" . "$,15i(B")
-  ("$(5!H(B" . "$,15j(B")
-  ("$(5!I(B" . "$,15k(B")
-  ("$(5!J(B" . "$,15l(B")
-  ("$(5!K(B" . "$,15m(B")
-  ("$(5!L(B" . "$,15n(B")
-  ("$(5!M(B" . "$,15o(B")
-  ("$(5!N(B" . "$,16?(B")
-  ("$(5!O(B" . "$,15p(B")
+  ;;2140 $(6!@!A!B!C!D!E!F!G!H!I!J!K!L!M!N!O(B
+  ("$(6!@(B" . "$,15b(B")
+  ("$(6!A(B" . "$,15c(B")
+  ("$(6!B(B" . "$,15d(B")
+  ("$(6!C(B" . "$,15e(B")
+  ("$(6!D(B" . "$,15f(B")
+  ("$(6!E(B" . "$,15g(B")
+  ("$(6!F(B" . "$,15h(B")
+  ("$(6!G(B" . "$,15i(B")
+  ("$(6!H(B" . "$,15j(B")
+  ("$(6!I(B" . "$,15k(B")
+  ("$(6!J(B" . "$,15l(B")
+  ("$(6!K(B" . "$,15m(B")
+  ("$(6!L(B" . "$,15n(B")
+  ("$(6!M(B" . "$,15o(B")
+  ("$(6!N(B" . "$,16?(B")
+  ("$(6!O(B" . "$,15p(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2150 $(5!P!Q!R!S!T!U!V!W!X!Y!Z![!\!]!^!_(B
-  ("$(5!P(B" . "$,15q(B")
-  ("$(5!Q(B" . "$,15r(B")
-  ("$(5!R(B" . "$,15s(B")
-  ("$(5!S(B" . "$,15t(B")
-  ("$(5!T(B" . "$,15u(B")
-  ("$(5!U(B" . "$,15v(B")
-  ("$(5!V(B" . "$,15w(B")
-  ("$(5!W(B" . "$,15x(B")
-  ("$(5!X(B" . "$,15y(B")
-  ("$(5!Z(B" . "$,15~(B")
-  ("$(5![(B" . "$,15(B")
-  ("$(5!\(B" . "$,16 (B")
-  ("$(5!](B" . "$,16!(B")
-  ("$(5!^(B" . "$,16"(B")
-  ("$(5!_(B" . "$,16#(B")
+  ;;2150 $(6!P!Q!R!S!T!U!V!W!X!Y!Z![!\!]!^!_(B
+  ("$(6!P(B" . "$,15q(B")
+  ("$(6!Q(B" . "$,15r(B")
+  ("$(6!R(B" . "$,15s(B")
+  ("$(6!S(B" . "$,15t(B")
+  ("$(6!T(B" . "$,15u(B")
+  ("$(6!U(B" . "$,15v(B")
+  ("$(6!V(B" . "$,15w(B")
+  ("$(6!W(B" . "$,15x(B")
+  ("$(6!X(B" . "$,15y(B")
+  ("$(6!Z(B" . "$,15~(B")
+  ("$(6![(B" . "$,15(B")
+  ("$(6!\(B" . "$,16 (B")
+  ("$(6!](B" . "$,16!(B")
+  ("$(6!^(B" . "$,16"(B")
+  ("$(6!_(B" . "$,16#(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2160 $(5!`!a!b!c!d!e!f!g!h!i!j!k!l!m!n!o(B
-  ("$(5!`(B" . "$,16&(B")
-  ("$(5!a(B" . "$,16'(B")
-  ("$(5!b(B" . "$,16((B")
-  ("$(5!c(B" . "$,16%(B")
-  ("$(5!d(B" . "$,16*(B")
-  ("$(5!e(B" . "$,16+(B")
-  ("$(5!f(B" . "$,16,(B")
-  ("$(5!g(B" . "$,16)(B")
-  ("$(5!h(B" . "$,16-(B")
-  ("$(5!i(B" . "$,15|(B")
-  ("$(5!j(B" . "$,16D(B")
-  ("$(5!j!j(B" . "$,16E(B")
+  ;;2160 $(6!`!a!b!c!d!e!f!g!h!i!j!k!l!m!n!o(B
+  ("$(6!`(B" . "$,16&(B")
+  ("$(6!a(B" . "$,16'(B")
+  ("$(6!b(B" . "$,16((B")
+  ("$(6!c(B" . "$,16%(B")
+  ("$(6!d(B" . "$,16*(B")
+  ("$(6!e(B" . "$,16+(B")
+  ("$(6!f(B" . "$,16,(B")
+  ("$(6!g(B" . "$,16)(B")
+  ("$(6!h(B" . "$,16-(B")
+  ("$(6!i(B" . "$,15|(B")
+  ("$(6!j(B" . "$,16D(B")
+  ("$(6!j!j(B" . "$,16E(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2170 $(5!p!q!r!s!t!u!v!w!x!y!z!{!|!}!~(B
-  ("$(5!q(B" . "$,16F(B")
-  ("$(5!r(B" . "$,16G(B")
-  ("$(5!s(B" . "$,16H(B")
-  ("$(5!t(B" . "$,16I(B")
-  ("$(5!u(B" . "$,16J(B")
-  ("$(5!v(B" . "$,16K(B")
-  ("$(5!w(B" . "$,16L(B")
-  ("$(5!x(B" . "$,16M(B")
-  ("$(5!y(B" . "$,16N(B")
-  ("$(5!z(B" . "$,16O(B")
+  ;;2170 $(6!p!q!r!s!t!u!v!w!x!y!z!{!|!}!~(B
+  ("$(6!q(B" . "$,16F(B")
+  ("$(6!r(B" . "$,16G(B")
+  ("$(6!s(B" . "$,16H(B")
+  ("$(6!t(B" . "$,16I(B")
+  ("$(6!u(B" . "$,16J(B")
+  ("$(6!v(B" . "$,16K(B")
+  ("$(6!w(B" . "$,16L(B")
+  ("$(6!x(B" . "$,16M(B")
+  ("$(6!y(B" . "$,16N(B")
+  ("$(6!z(B" . "$,16O(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2220   $(5"!"""#"$"%"&"'"(")"*"+","-"."/(B
-  ("$(5"!(B" . "$,16;6-5p(B")
-  ("$(5""(B" . "$,16>6-5p(B")
-  ("$(5"#(B" . "$,15U6-5p(B")
-  ("$(5"$(B" . "$,15W6-5p(B")
-  ("$(5"%(B" . "$,15d6-5p(B")
-  ("$(5"&(B" . "$,15j6-5p(B")
-  ("$(5"'(B" . "$,15k6-5p(B")
-  ("$(5")(B" . "$,15v6-5p(B")
-  ("$(5",(B" . "$,15p6!(B")
-  ("$(5"-(B" . "$,15p6"(B")
-  ("$(5".(B" . "$,15q6!(B")
-  ("$(5"/(B" . "$,15q6"(B")
+  ;;2220   $(6"!"""#"$"%"&"'"(")"*"+","-"."/(B
+  ("$(6"!(B" . "$,16;6-5p(B")
+  ("$(6""(B" . "$,16>6-5p(B")
+  ("$(6"#(B" . "$,15U6-5p(B")
+  ("$(6"$(B" . "$,15W6-5p(B")
+  ("$(6"%(B" . "$,15d6-5p(B")
+  ("$(6"&(B" . "$,15j6-5p(B")
+  ("$(6"'(B" . "$,15k6-5p(B")
+  ("$(6")(B" . "$,15v6-5p(B")
+  ("$(6",(B" . "$,15p6!(B")
+  ("$(6"-(B" . "$,15p6"(B")
+  ("$(6".(B" . "$,15q6!(B")
+  ("$(6"/(B" . "$,15q6"(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2230 $(5"0"1"2"3"4"5"6"7"8"9":";"<"=">"?(B
-  ("$(5"3(B" . "$,15U6-(B")
-  ("$(5"4(B" . "$,15V6-(B")
-  ("$(5"5(B" . "$,15W6-(B")
-  ("$(5"6(B" . "$,15X6-(B")
-  ("$(5"8(B" . "$,15Z6-(B")
-  ("$(5"8"q(B" . "$,15Z6-5p6-(B")
-  ("$(5":(B" . "$,15\6-(B")
-  ("$(5";(B" . "$,15]6-(B")
-  ("$(5"<(B" . "$,15^6-(B")
-  ("$(5"<(B" . "$,15^6-(B")
+  ;;2230 $(6"0"1"2"3"4"5"6"7"8"9":";"<"=">"?(B
+  ("$(6"3(B" . "$,15U6-(B")
+  ("$(6"4(B" . "$,15V6-(B")
+  ("$(6"5(B" . "$,15W6-(B")
+  ("$(6"6(B" . "$,15X6-(B")
+  ("$(6"8(B" . "$,15Z6-(B")
+  ("$(6"8"q(B" . "$,15Z6-5p6-(B")
+  ("$(6":(B" . "$,15\6-(B")
+  ("$(6";(B" . "$,15]6-(B")
+  ("$(6"<(B" . "$,15^6-(B")
+  ("$(6"<(B" . "$,15^6-(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2240 $(5"@"A"B"C"D"E"F"G"H"I"J"K"L"M"N"O(B
-  ("$(5"A(B" . "$,15c6-(B")
-  ("$(5"B(B" . "$,15d6-(B")
-  ("$(5"C(B" . "$,15e6-(B")
-  ("$(5"E(B" . "$,15g6-(B")
-  ("$(5"F(B" . "$,15h6-(B")
-  ("$(5"G(B" . "$,15i6-(B")
-  ("$(5"H(B" . "$,15j6-(B")
-  ("$(5"I(B" . "$,15k6-(B")
-  ("$(5"J(B" . "$,15l6-(B")
-  ("$(5"J(B" . "$,15l6-(B")
-  ("$(5"K(B" . "$,15m6-(B")
-  ("$(5"L(B" . "$,15n6-(B")
-  ("$(5"M(B" . "$,15o6-(B")
-  ("$(5"N(B" . "$,16?6-(B")
+  ;;2240 $(6"@"A"B"C"D"E"F"G"H"I"J"K"L"M"N"O(B
+  ("$(6"A(B" . "$,15c6-(B")
+  ("$(6"B(B" . "$,15d6-(B")
+  ("$(6"C(B" . "$,15e6-(B")
+  ("$(6"E(B" . "$,15g6-(B")
+  ("$(6"F(B" . "$,15h6-(B")
+  ("$(6"G(B" . "$,15i6-(B")
+  ("$(6"H(B" . "$,15j6-(B")
+  ("$(6"I(B" . "$,15k6-(B")
+  ("$(6"J(B" . "$,15l6-(B")
+  ("$(6"J(B" . "$,15l6-(B")
+  ("$(6"K(B" . "$,15m6-(B")
+  ("$(6"L(B" . "$,15n6-(B")
+  ("$(6"M(B" . "$,15o6-(B")
+  ("$(6"N(B" . "$,16?6-(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2250 $(5"P"Q"R"S"T"U"V"W"X"Y"Z"["\"]"^"_(B
-  ("$(5"Q(B" . "$,15r6-(B")
-  ("$(5"R(B" . "$,15s6-(B")
-  ("$(5"S(B" . "$,15t6-(B")
-  ("$(5"T(B" . "$,15u6-(B")
-  ("$(5"U(B" . "$,15v6-(B")
-  ("$(5"V(B" . "$,15w6-(B")
-  ("$(5"W(B" . "$,15x6-(B")
-  ("$(5"](B" . "$,16-5o(B")
+  ;;2250 $(6"P"Q"R"S"T"U"V"W"X"Y"Z"["\"]"^"_(B
+  ("$(6"Q(B" . "$,15r6-(B")
+  ("$(6"R(B" . "$,15s6-(B")
+  ("$(6"S(B" . "$,15t6-(B")
+  ("$(6"T(B" . "$,15u6-(B")
+  ("$(6"U(B" . "$,15v6-(B")
+  ("$(6"V(B" . "$,15w6-(B")
+  ("$(6"W(B" . "$,15x6-(B")
+  ("$(6"](B" . "$,16-5o(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2260 $(5"`"a"b"c"d"e"f"g"h"i"j"k"l"m"n"o(B
-  ("$(5"`(B" . "$,15W6-5p6-(B")
-  ("$(5"a(B" . "$,15X6-5h6-(B")
-  ("$(5"c(B" . "$,15d6-5d6-(B")
-  ("$(5"d(B" . "$,15d6-5p6-(B")
-  ("$(5"e(B" . "$,15g6-5h6-(B")
-  ("$(5"f(B" . "$,15g6-5p6-(B")
-  ("$(5"g(B" . "$,15j6-5d6-(B")
-  ("$(5"h(B" . "$,15v6-5Z6-(B")
-  ("$(5"i(B" . "$,15v6-5p6-(B")
-  ("$(5"j(B" . "$,15v6-5u6-(B")
-  ("$(5"k(B" . "$,15h6-5h6-(B")
-  ("$(5"l(B" . "$,15U6-5w6-(B")
-  ("$(5"m(B" . "$,15\6-5^6-(B")
+  ;;2260 $(6"`"a"b"c"d"e"f"g"h"i"j"k"l"m"n"o(B
+  ("$(6"`(B" . "$,15W6-5p6-(B")
+  ("$(6"a(B" . "$,15X6-5h6-(B")
+  ("$(6"c(B" . "$,15d6-5d6-(B")
+  ("$(6"d(B" . "$,15d6-5p6-(B")
+  ("$(6"e(B" . "$,15g6-5h6-(B")
+  ("$(6"f(B" . "$,15g6-5p6-(B")
+  ("$(6"g(B" . "$,15j6-5d6-(B")
+  ("$(6"h(B" . "$,15v6-5Z6-(B")
+  ("$(6"i(B" . "$,15v6-5p6-(B")
+  ("$(6"j(B" . "$,15v6-5u6-(B")
+  ("$(6"k(B" . "$,15h6-5h6-(B")
+  ("$(6"l(B" . "$,15U6-5w6-(B")
+  ("$(6"m(B" . "$,15\6-5^6-(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2270 $(5"p"q"r"s"t"u"v"w"x"y"z"{"|"}"~(B
-  ("$(5"p(B" . "$,15p6-(B")
-  ("$(5"q(B" . "$,16-5p(B")
-  ("$(5"r(B" . "$,16-5p(B")
-  ("$(5"s(B" . "$,1686-(B")
-  ("$(5"t(B" . "$,1696-(B")
-  ("$(5"u(B" . "$,16:6-(B")
-  ("$(5"y(B" . "$,16>6-(B")
-  ("$(5"z(B" . "$,16;6-(B")
+  ;;2270 $(6"p"q"r"s"t"u"v"w"x"y"z"{"|"}"~(B
+  ("$(6"p(B" . "$,15p6-(B")
+  ("$(6"q(B" . "$,16-5p(B")
+  ("$(6"r(B" . "$,16-5p(B")
+  ("$(6"s(B" . "$,1686-(B")
+  ("$(6"t(B" . "$,1696-(B")
+  ("$(6"u(B" . "$,16:6-(B")
+  ("$(6"y(B" . "$,16>6-(B")
+  ("$(6"z(B" . "$,16;6-(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2320   $(5#!#"###$#%#&#'#(#)#*#+#,#-#.#/(B
-  ("$(5#!(B" . "$,160(B")
-  ("$(5#&(B" . "$,15L(B")
-  ("$(5#&"p(B" . "$,15p6$(B")
-  ("$(5#'(B" . "$,16A(B")
-  ("$(5#'"p(B" . "$,15p6C(B")
-  ("$(5#*(B" . "$,16@(B")
-  ("$(5#*"p(B" . "$,15p6B(B")
+  ;;2320   $(6#!#"###$#%#&#'#(#)#*#+#,#-#.#/(B
+  ("$(6#!(B" . "$,160(B")
+  ("$(6#&(B" . "$,15L(B")
+  ("$(6#&"p(B" . "$,15p6$(B")
+  ("$(6#'(B" . "$,16A(B")
+  ("$(6#'"p(B" . "$,15p6C(B")
+  ("$(6#*(B" . "$,16@(B")
+  ("$(6#*"p(B" . "$,15p6B(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2330 $(5#0#1#2#3#4#5#6#7#8#9#:#;#<#=#>#?(B
-  ("$(5#3(B" . "$,168(B")
-  ("$(5#4(B" . "$,169(B")
-  ("$(5#5(B" . "$,16:(B")
-  ("$(5#:(B" . "$,16;(B")
-  ("$(5#?(B" . "$,16<(B")
+  ;;2330 $(6#0#1#2#3#4#5#6#7#8#9#:#;#<#=#>#?(B
+  ("$(6#3(B" . "$,168(B")
+  ("$(6#4(B" . "$,169(B")
+  ("$(6#5(B" . "$,16:(B")
+  ("$(6#:(B" . "$,16;(B")
+  ("$(6#?(B" . "$,16<(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2340 $(5#@#A#B#C#D#E#F#G#H#I#J#K#L#M#N#O(B
-  ("$(5#@(B" . "$,16=(B")
-  ("$(5#I(B" . "$,16>(B")
-  ("$(5#J(B" . "$,15}(B")
-  ("$(5#K(B" . "$,16$(B")
-  ("$(5#L(B" . "$,16B(B")
-  ("$(5#M(B" . "$,16C(B")
+  ;;2340 $(6#@#A#B#C#D#E#F#G#H#I#J#K#L#M#N#O(B
+  ("$(6#@(B" . "$,16=(B")
+  ("$(6#I(B" . "$,16>(B")
+  ("$(6#J(B" . "$,15}(B")
+  ("$(6#K(B" . "$,16$(B")
+  ("$(6#L(B" . "$,16B(B")
+  ("$(6#M(B" . "$,16C(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2350 $(5#P#Q#R#S#T#U#V#W#X#Y#Z#[#\#]#^#_(B
-  ("$(5#P(B" . "$,15n6-5h(B")
-  ("$(5#Q(B" . "$,15n6-5r(B")
-  ("$(5#R(B" . "$,15y6#(B")
+  ;;2350 $(6#P#Q#R#S#T#U#V#W#X#Y#Z#[#\#]#^#_(B
+  ("$(6#P(B" . "$,15n6-5h(B")
+  ("$(6#Q(B" . "$,15n6-5r(B")
+  ("$(6#R(B" . "$,15y6#(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2360 $(5#`#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o(B
-  ("$(5#`(B" . "$,15r6-5r(B")
-  ("$(5#a(B" . "$,15u6-5h(B")
-  ("$(5#b(B" . "$,15u6-5u(B")
-  ("$(5#c(B" . "$,15v6-5Z(B")
-  ("$(5#d(B" . "$,15v6-5h(B")
-  ("$(5#e(B" . "$,15v6-5l(B")
-  ("$(5#f(B" . "$,15v6-5r(B")
-  ("$(5#g(B" . "$,15v6-5u(B")
-  ("$(5#h(B" . "$,15w6-5_6-5p6-5o(B")
-  ("$(5#i(B" . "$,15w6-5_6-5o(B")
-  ("$(5#j(B" . "$,15w6-5_6-5u(B")
-  ("$(5#k(B" . "$,15w6-5_(B")
-  ("$(5#l(B" . "$,15w6-5`(B")
-  ("$(5#m(B" . "$,15x6-5h(B")
-  ("$(5#n(B" . "$,15x6-5p(B")
+  ;;2360 $(6#`#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o(B
+  ("$(6#`(B" . "$,15r6-5r(B")
+  ("$(6#a(B" . "$,15u6-5h(B")
+  ("$(6#b(B" . "$,15u6-5u(B")
+  ("$(6#c(B" . "$,15v6-5Z(B")
+  ("$(6#d(B" . "$,15v6-5h(B")
+  ("$(6#e(B" . "$,15v6-5l(B")
+  ("$(6#f(B" . "$,15v6-5r(B")
+  ("$(6#g(B" . "$,15v6-5u(B")
+  ("$(6#h(B" . "$,15w6-5_6-5p6-5o(B")
+  ("$(6#i(B" . "$,15w6-5_6-5o(B")
+  ("$(6#j(B" . "$,15w6-5_6-5u(B")
+  ("$(6#k(B" . "$,15w6-5_(B")
+  ("$(6#l(B" . "$,15w6-5`(B")
+  ("$(6#m(B" . "$,15x6-5h(B")
+  ("$(6#n(B" . "$,15x6-5p(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2370 $(5#p#q#r#s#t#u#v#w#x#y#z#{#|#}#~(B
-  ("$(5#p(B" . "$,15y6-5c(B")
-  ("$(5#q(B" . "$,15y6-5h(B")
-  ("$(5#r(B" . "$,15y6-5n(B")
-  ("$(5#s(B" . "$,15y6-5o(B")
-  ("$(5#t(B" . "$,15y6-5p(B")
-  ("$(5#u(B" . "$,15y6-5r(B")
-  ("$(5#v(B" . "$,15y6-5u(B")
+  ;;2370 $(6#p#q#r#s#t#u#v#w#x#y#z#{#|#}#~(B
+  ("$(6#p(B" . "$,15y6-5c(B")
+  ("$(6#q(B" . "$,15y6-5h(B")
+  ("$(6#r(B" . "$,15y6-5n(B")
+  ("$(6#s(B" . "$,15y6-5o(B")
+  ("$(6#t(B" . "$,15y6-5p(B")
+  ("$(6#u(B" . "$,15y6-5r(B")
+  ("$(6#v(B" . "$,15y6-5u(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2420   $(5$!$"$#$$$%$&$'$($)$*$+$,$-$.$/(B
-  ("$(5$!(B" . "$,15U6-5d6-5p6-5o(B")
-  ("$(5$"(B" . "$,15U6-5d6-5u(B")
-  ("$(5$#(B" . "$,15U6-5d6-5o(B")
-  ("$(5$$(B" . "$,15U6-5h6-5o(B")
-  ("$(5$%(B" . "$,15U6-5p6-5o(B")
-  ("$(5$&(B" . "$,15U6-5u6-5o(B")
-  ("$(5$'(B" . "$,15U6-5U(B")
-  ("$(5$((B" . "$,15U6-5d(B")
-  ("$(5$)(B" . "$,15U6-5h(B")
-  ("$(5$*(B" . "$,15U6-5n(B")
-  ("$(5$+(B" . "$,15U6-5o(B")
-  ("$(5$,(B" . "$,15U6-5r(B")
-  ("$(5$-(B" . "$,15U6-5u(B")
-  ("$(5$.(B" . "$,15U6-5w(B")
-  ("$(5$/(B" . "$,15X6-5h(B")
+  ;;2420   $(6$!$"$#$$$%$&$'$($)$*$+$,$-$.$/(B
+  ("$(6$!(B" . "$,15U6-5d6-5p6-5o(B")
+  ("$(6$"(B" . "$,15U6-5d6-5u(B")
+  ("$(6$#(B" . "$,15U6-5d6-5o(B")
+  ("$(6$$(B" . "$,15U6-5h6-5o(B")
+  ("$(6$%(B" . "$,15U6-5p6-5o(B")
+  ("$(6$&(B" . "$,15U6-5u6-5o(B")
+  ("$(6$'(B" . "$,15U6-5U(B")
+  ("$(6$((B" . "$,15U6-5d(B")
+  ("$(6$)(B" . "$,15U6-5h(B")
+  ("$(6$*(B" . "$,15U6-5n(B")
+  ("$(6$+(B" . "$,15U6-5o(B")
+  ("$(6$,(B" . "$,15U6-5r(B")
+  ("$(6$-(B" . "$,15U6-5u(B")
+  ("$(6$.(B" . "$,15U6-5w(B")
+  ("$(6$/(B" . "$,15X6-5h(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2430 $(5$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?(B
-  ("$(5$0(B" . "$,15Y6-5U6-5d6-5o(B")
-  ("$(5$1(B" . "$,15Y6-5U6-5w6-5u(B")
-  ("$(5$2(B" . "$,15Y6-5U6-5d(B")
-  ("$(5$3(B" . "$,15Y6-5U6-5w(B")
-  ("$(5$4(B" . "$,15Y6-5X6-5p(B")
-  ("$(5$5(B" . "$,15Y6-5U6-5o(B")
-  ("$(5$6(B" . "$,15Y6-5V6-5o(B")
-  ("$(5$7(B" . "$,15Y6-5W6-5o(B")
-  ("$(5$8(B" . "$,15Y6-5X6-5o(B")
-  ("$(5$9(B" . "$,15Y6-5U(B")
-  ("$(5$:(B" . "$,15Y6-5V(B")
-  ("$(5$;(B" . "$,15Y6-5W(B")
-  ("$(5$<(B" . "$,15Y6-5X(B")
-  ("$(5$=(B" . "$,15Y6-5Y(B")
-  ("$(5$>(B" . "$,15Y6-5h(B")
-  ("$(5$?(B" . "$,15Y6-5n(B")
+  ;;2430 $(6$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?(B
+  ("$(6$0(B" . "$,15Y6-5U6-5d6-5o(B")
+  ("$(6$1(B" . "$,15Y6-5U6-5w6-5u(B")
+  ("$(6$2(B" . "$,15Y6-5U6-5d(B")
+  ("$(6$3(B" . "$,15Y6-5U6-5w(B")
+  ("$(6$4(B" . "$,15Y6-5X6-5p(B")
+  ("$(6$5(B" . "$,15Y6-5U6-5o(B")
+  ("$(6$6(B" . "$,15Y6-5V6-5o(B")
+  ("$(6$7(B" . "$,15Y6-5W6-5o(B")
+  ("$(6$8(B" . "$,15Y6-5X6-5o(B")
+  ("$(6$9(B" . "$,15Y6-5U(B")
+  ("$(6$:(B" . "$,15Y6-5V(B")
+  ("$(6$;(B" . "$,15Y6-5W(B")
+  ("$(6$<(B" . "$,15Y6-5X(B")
+  ("$(6$=(B" . "$,15Y6-5Y(B")
+  ("$(6$>(B" . "$,15Y6-5h(B")
+  ("$(6$?(B" . "$,15Y6-5n(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2440 $(5$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B
-  ("$(5$@(B" . "$,15Y6-5o(B")
-  ("$(5$A(B" . "$,15Z6-5Z(B")
-  ("$(5$B(B" . "$,15Z6-5^(B")
-  ("$(5$C(B" . "$,15[6-5o(B")
-  ("$(5$D(B" . "$,15\6-5p(B")
-  ("$(5$E(B" . "$,15\6-5^(B")
-  ("$(5$F(B" . "$,15^6-5Z(B")
-  ("$(5$G(B" . "$,15^6-5\(B")
-  ("$(5$H(B" . "$,15_6-5U(B")
-  ("$(5$I(B" . "$,15_6-5_(B")
-  ("$(5$J(B" . "$,15_6-5`(B")
-  ("$(5$K(B" . "$,15_6-5o(B")
-  ("$(5$L(B" . "$,15`6-5o(B")
-  ("$(5$M(B" . "$,15a6-5W6-5o(B")
-  ("$(5$N(B" . "$,15a6-5X6-5p(B")
-  ("$(5$O(B" . "$,15a6-5p6-5o(B")
+  ;;2440 $(6$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B
+  ("$(6$@(B" . "$,15Y6-5o(B")
+  ("$(6$A(B" . "$,15Z6-5Z(B")
+  ("$(6$B(B" . "$,15Z6-5^(B")
+  ("$(6$C(B" . "$,15[6-5o(B")
+  ("$(6$D(B" . "$,15\6-5p(B")
+  ("$(6$E(B" . "$,15\6-5^(B")
+  ("$(6$F(B" . "$,15^6-5Z(B")
+  ("$(6$G(B" . "$,15^6-5\(B")
+  ("$(6$H(B" . "$,15_6-5U(B")
+  ("$(6$I(B" . "$,15_6-5_(B")
+  ("$(6$J(B" . "$,15_6-5`(B")
+  ("$(6$K(B" . "$,15_6-5o(B")
+  ("$(6$L(B" . "$,15`6-5o(B")
+  ("$(6$M(B" . "$,15a6-5W6-5o(B")
+  ("$(6$N(B" . "$,15a6-5X6-5p(B")
+  ("$(6$O(B" . "$,15a6-5p6-5o(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2450 $(5$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_(B
-  ("$(5$P(B" . "$,15a6-5W(B")
-  ("$(5$Q(B" . "$,15a6-5X(B")
-  ("$(5$R(B" . "$,15a6-5a(B")
-  ("$(5$S(B" . "$,15a6-5n(B")
-  ("$(5$T(B" . "$,15a6-5o(B")
+  ;;2450 $(6$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_(B
+  ("$(6$P(B" . "$,15a6-5W(B")
+  ("$(6$Q(B" . "$,15a6-5X(B")
+  ("$(6$R(B" . "$,15a6-5a(B")
+  ("$(6$S(B" . "$,15a6-5n(B")
+  ("$(6$T(B" . "$,15a6-5o(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2460 $(5$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o(B
-  ("$(5$`(B" . "$,15b6-5o(B")
-  ("$(5$a(B" . "$,15d6-5d(B")
-  ("$(5$b(B" . "$,15d6-5h(B")
-  ("$(5$c(B" . "$,15f6-5f6-5o(B")
-  ("$(5$d(B" . "$,15f6-5g6-5o(B")
-  ("$(5$e(B" . "$,15f6-5m6-5o(B")
-  ("$(5$f(B" . "$,15f6-5p6-5o(B")
-  ("$(5$g(B" . "$,15f6-5u6-5o(B")
-  ("$(5$h(B" . "$,15f6-5W6-5p(B")
-  ("$(5$i(B" . "$,15f6-5X6-5p(B")
-  ("$(5$j(B" . "$,15f6-5f6-5u(B")
-  ("$(5$k(B" . "$,15f6-5g6-5u(B")
-  ("$(5$l(B" . "$,15f6-5W(B")
-  ("$(5$m(B" . "$,15f6-5X(B")
-  ("$(5$n(B" . "$,15f6-5f(B")
-  ("$(5$o(B" . "$,15f6-5g(B")
+  ;;2460 $(6$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o(B
+  ("$(6$`(B" . "$,15b6-5o(B")
+  ("$(6$a(B" . "$,15d6-5d(B")
+  ("$(6$b(B" . "$,15d6-5h(B")
+  ("$(6$c(B" . "$,15f6-5f6-5o(B")
+  ("$(6$d(B" . "$,15f6-5g6-5o(B")
+  ("$(6$e(B" . "$,15f6-5m6-5o(B")
+  ("$(6$f(B" . "$,15f6-5p6-5o(B")
+  ("$(6$g(B" . "$,15f6-5u6-5o(B")
+  ("$(6$h(B" . "$,15f6-5W6-5p(B")
+  ("$(6$i(B" . "$,15f6-5X6-5p(B")
+  ("$(6$j(B" . "$,15f6-5f6-5u(B")
+  ("$(6$k(B" . "$,15f6-5g6-5u(B")
+  ("$(6$l(B" . "$,15f6-5W(B")
+  ("$(6$m(B" . "$,15f6-5X(B")
+  ("$(6$n(B" . "$,15f6-5f(B")
+  ("$(6$o(B" . "$,15f6-5g(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2470 $(5$p$q$r$s$t$u$v$w$x$y$z${$|$}$~(B
-  ("$(5$p(B" . "$,15f6-5h(B")
-  ("$(5$q(B" . "$,15f6-5l(B")
-  ("$(5$r(B" . "$,15f6-5m(B")
-  ("$(5$s(B" . "$,15f6-5n(B")
-  ("$(5$t(B" . "$,15f6-5o(B")
-  ("$(5$u(B" . "$,15f6-5u(B")
-  ("$(5$v(B" . "$,15g6-5h(B")
-  ("$(5$w(B" . "$,15h6-5h(B")
-  ("$(5$x(B" . "$,15j6-5d(B")
-  ("$(5$y(B" . "$,15j6-5h(B")
-  ("$(5$z(B" . "$,15j6-5r(B")
-  ("$(5${(B" . "$,15l6-5h(B")
-  ("$(5$|(B" . "$,15l6-5l(B")
-  ("$(5$}(B" . "$,15l6-5u(B")
-  ("$(5$~(B" . "$,15m6-5h(B")))
+  ;;2470 $(6$p$q$r$s$t$u$v$w$x$y$z${$|$}$~(B
+  ("$(6$p(B" . "$,15f6-5h(B")
+  ("$(6$q(B" . "$,15f6-5l(B")
+  ("$(6$r(B" . "$,15f6-5m(B")
+  ("$(6$s(B" . "$,15f6-5n(B")
+  ("$(6$t(B" . "$,15f6-5o(B")
+  ("$(6$u(B" . "$,15f6-5u(B")
+  ("$(6$v(B" . "$,15g6-5h(B")
+  ("$(6$w(B" . "$,15h6-5h(B")
+  ("$(6$x(B" . "$,15j6-5d(B")
+  ("$(6$y(B" . "$,15j6-5h(B")
+  ("$(6$z(B" . "$,15j6-5r(B")
+  ("$(6${(B" . "$,15l6-5h(B")
+  ("$(6$|(B" . "$,15l6-5l(B")
+  ("$(6$}(B" . "$,15l6-5u(B")
+  ("$(6$~(B" . "$,15m6-5h(B")))
 
 (defconst indian-2-column-to-ucs-regexp
-  "$(5!j!j(B\\|$(5"8"q(B\\|[$(5#&#'!*#*(B]$(5"p(B\\|[$(5!!(B-$(5$~(B]")
+  "$(6!j!j(B\\|$(6"8"q(B\\|[$(6#&#'!*#*(B]$(6"p(B\\|[$(6!!(B-$(6$~(B]")
 
 (put 'indian-2-column-to-ucs-chartable 'char-table-extra-slots 1)
 (defconst indian-2-column-to-ucs-chartable