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

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

diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index 97eea6f4d7c621e311a5795e08afa275cf7e626d..7a95388f81bf36b0bb69b6d059fb0f8831ff14ee 100644 (file)
--- 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   \e$(5!!!"!#!$!%!&!'!(!)!*!+!,!-!.!/\e(B
-  ("\e$(5!!\e(B" . "\e$,15A\e(B")
-  ("\e$(5!"\e(B" . "\e$,15B\e(B")
-  ("\e$(5!#\e(B" . "\e$,15C\e(B")
-  ("\e$(5!$\e(B" . "\e$,15E\e(B")
-  ("\e$(5!%\e(B" . "\e$,15F\e(B")
-  ("\e$(5!&\e(B" . "\e$,15G\e(B")
-  ("\e$(5!'\e(B" . "\e$,15H\e(B")
-  ("\e$(5!(\e(B" . "\e$,15I\e(B")
-  ("\e$(5!)\e(B" . "\e$,15J\e(B")
-  ("\e$(5!*\e(B" . "\e$,15K\e(B")
-  ("\e$(5!*"p\e(B" . "\e$,15p6#\e(B")
-  ("\e$(5!+\e(B" . "\e$,15N\e(B")
-  ("\e$(5!,\e(B" . "\e$,15O\e(B")
-  ("\e$(5!-\e(B" . "\e$,15P\e(B")
-  ("\e$(5!.\e(B" . "\e$,15M\e(B")
-  ("\e$(5!/\e(B" . "\e$,15R\e(B")
+  ;;2120   \e$(6!!!"!#!$!%!&!'!(!)!*!+!,!-!.!/\e(B
+  ("\e$(6!!\e(B" . "\e$,15A\e(B")
+  ("\e$(6!"\e(B" . "\e$,15B\e(B")
+  ("\e$(6!#\e(B" . "\e$,15C\e(B")
+  ("\e$(6!$\e(B" . "\e$,15E\e(B")
+  ("\e$(6!%\e(B" . "\e$,15F\e(B")
+  ("\e$(6!&\e(B" . "\e$,15G\e(B")
+  ("\e$(6!'\e(B" . "\e$,15H\e(B")
+  ("\e$(6!(\e(B" . "\e$,15I\e(B")
+  ("\e$(6!)\e(B" . "\e$,15J\e(B")
+  ("\e$(6!*\e(B" . "\e$,15K\e(B")
+  ("\e$(6!*"p\e(B" . "\e$,15p6#\e(B")
+  ("\e$(6!+\e(B" . "\e$,15N\e(B")
+  ("\e$(6!,\e(B" . "\e$,15O\e(B")
+  ("\e$(6!-\e(B" . "\e$,15P\e(B")
+  ("\e$(6!.\e(B" . "\e$,15M\e(B")
+  ("\e$(6!/\e(B" . "\e$,15R\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2130 \e$(5!0!1!2!3!4!5!6!7!8!9!:!;!<!=!>!?\e(B
-  ("\e$(5!0\e(B" . "\e$,15S\e(B")
-  ("\e$(5!1\e(B" . "\e$,15T\e(B")
-  ("\e$(5!2\e(B" . "\e$,15Q\e(B")
-  ("\e$(5!3\e(B" . "\e$,15U\e(B")
-  ("\e$(5!4\e(B" . "\e$,15V\e(B")
-  ("\e$(5!5\e(B" . "\e$,15W\e(B")
-  ("\e$(5!6\e(B" . "\e$,15X\e(B")
-  ("\e$(5!7\e(B" . "\e$,15Y\e(B")
-  ("\e$(5!8\e(B" . "\e$,15Z\e(B")
-  ("\e$(5!9\e(B" . "\e$,15[\e(B")
-  ("\e$(5!:\e(B" . "\e$,15\\e(B")
-  ("\e$(5!;\e(B" . "\e$,15]\e(B")
-  ("\e$(5!<\e(B" . "\e$,15^\e(B")
-  ("\e$(5!=\e(B" . "\e$,15_\e(B")
-  ("\e$(5!>\e(B" . "\e$,15`\e(B")
-  ("\e$(5!?\e(B" . "\e$,15a\e(B")
+  ;;2130 \e$(6!0!1!2!3!4!5!6!7!8!9!:!;!<!=!>!?\e(B
+  ("\e$(6!0\e(B" . "\e$,15S\e(B")
+  ("\e$(6!1\e(B" . "\e$,15T\e(B")
+  ("\e$(6!2\e(B" . "\e$,15Q\e(B")
+  ("\e$(6!3\e(B" . "\e$,15U\e(B")
+  ("\e$(6!4\e(B" . "\e$,15V\e(B")
+  ("\e$(6!5\e(B" . "\e$,15W\e(B")
+  ("\e$(6!6\e(B" . "\e$,15X\e(B")
+  ("\e$(6!7\e(B" . "\e$,15Y\e(B")
+  ("\e$(6!8\e(B" . "\e$,15Z\e(B")
+  ("\e$(6!9\e(B" . "\e$,15[\e(B")
+  ("\e$(6!:\e(B" . "\e$,15\\e(B")
+  ("\e$(6!;\e(B" . "\e$,15]\e(B")
+  ("\e$(6!<\e(B" . "\e$,15^\e(B")
+  ("\e$(6!=\e(B" . "\e$,15_\e(B")
+  ("\e$(6!>\e(B" . "\e$,15`\e(B")
+  ("\e$(6!?\e(B" . "\e$,15a\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2140 \e$(5!@!A!B!C!D!E!F!G!H!I!J!K!L!M!N!O\e(B
-  ("\e$(5!@\e(B" . "\e$,15b\e(B")
-  ("\e$(5!A\e(B" . "\e$,15c\e(B")
-  ("\e$(5!B\e(B" . "\e$,15d\e(B")
-  ("\e$(5!C\e(B" . "\e$,15e\e(B")
-  ("\e$(5!D\e(B" . "\e$,15f\e(B")
-  ("\e$(5!E\e(B" . "\e$,15g\e(B")
-  ("\e$(5!F\e(B" . "\e$,15h\e(B")
-  ("\e$(5!G\e(B" . "\e$,15i\e(B")
-  ("\e$(5!H\e(B" . "\e$,15j\e(B")
-  ("\e$(5!I\e(B" . "\e$,15k\e(B")
-  ("\e$(5!J\e(B" . "\e$,15l\e(B")
-  ("\e$(5!K\e(B" . "\e$,15m\e(B")
-  ("\e$(5!L\e(B" . "\e$,15n\e(B")
-  ("\e$(5!M\e(B" . "\e$,15o\e(B")
-  ("\e$(5!N\e(B" . "\e$,16?\e(B")
-  ("\e$(5!O\e(B" . "\e$,15p\e(B")
+  ;;2140 \e$(6!@!A!B!C!D!E!F!G!H!I!J!K!L!M!N!O\e(B
+  ("\e$(6!@\e(B" . "\e$,15b\e(B")
+  ("\e$(6!A\e(B" . "\e$,15c\e(B")
+  ("\e$(6!B\e(B" . "\e$,15d\e(B")
+  ("\e$(6!C\e(B" . "\e$,15e\e(B")
+  ("\e$(6!D\e(B" . "\e$,15f\e(B")
+  ("\e$(6!E\e(B" . "\e$,15g\e(B")
+  ("\e$(6!F\e(B" . "\e$,15h\e(B")
+  ("\e$(6!G\e(B" . "\e$,15i\e(B")
+  ("\e$(6!H\e(B" . "\e$,15j\e(B")
+  ("\e$(6!I\e(B" . "\e$,15k\e(B")
+  ("\e$(6!J\e(B" . "\e$,15l\e(B")
+  ("\e$(6!K\e(B" . "\e$,15m\e(B")
+  ("\e$(6!L\e(B" . "\e$,15n\e(B")
+  ("\e$(6!M\e(B" . "\e$,15o\e(B")
+  ("\e$(6!N\e(B" . "\e$,16?\e(B")
+  ("\e$(6!O\e(B" . "\e$,15p\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2150 \e$(5!P!Q!R!S!T!U!V!W!X!Y!Z![!\!]!^!_\e(B
-  ("\e$(5!P\e(B" . "\e$,15q\e(B")
-  ("\e$(5!Q\e(B" . "\e$,15r\e(B")
-  ("\e$(5!R\e(B" . "\e$,15s\e(B")
-  ("\e$(5!S\e(B" . "\e$,15t\e(B")
-  ("\e$(5!T\e(B" . "\e$,15u\e(B")
-  ("\e$(5!U\e(B" . "\e$,15v\e(B")
-  ("\e$(5!V\e(B" . "\e$,15w\e(B")
-  ("\e$(5!W\e(B" . "\e$,15x\e(B")
-  ("\e$(5!X\e(B" . "\e$,15y\e(B")
-  ("\e$(5!Z\e(B" . "\e$,15~\e(B")
-  ("\e$(5![\e(B" . "\e$,15\7f\e(B")
-  ("\e$(5!\\e(B" . "\e$,16 \e(B")
-  ("\e$(5!]\e(B" . "\e$,16!\e(B")
-  ("\e$(5!^\e(B" . "\e$,16"\e(B")
-  ("\e$(5!_\e(B" . "\e$,16#\e(B")
+  ;;2150 \e$(6!P!Q!R!S!T!U!V!W!X!Y!Z![!\!]!^!_\e(B
+  ("\e$(6!P\e(B" . "\e$,15q\e(B")
+  ("\e$(6!Q\e(B" . "\e$,15r\e(B")
+  ("\e$(6!R\e(B" . "\e$,15s\e(B")
+  ("\e$(6!S\e(B" . "\e$,15t\e(B")
+  ("\e$(6!T\e(B" . "\e$,15u\e(B")
+  ("\e$(6!U\e(B" . "\e$,15v\e(B")
+  ("\e$(6!V\e(B" . "\e$,15w\e(B")
+  ("\e$(6!W\e(B" . "\e$,15x\e(B")
+  ("\e$(6!X\e(B" . "\e$,15y\e(B")
+  ("\e$(6!Z\e(B" . "\e$,15~\e(B")
+  ("\e$(6![\e(B" . "\e$,15\7f\e(B")
+  ("\e$(6!\\e(B" . "\e$,16 \e(B")
+  ("\e$(6!]\e(B" . "\e$,16!\e(B")
+  ("\e$(6!^\e(B" . "\e$,16"\e(B")
+  ("\e$(6!_\e(B" . "\e$,16#\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2160 \e$(5!`!a!b!c!d!e!f!g!h!i!j!k!l!m!n!o\e(B
-  ("\e$(5!`\e(B" . "\e$,16&\e(B")
-  ("\e$(5!a\e(B" . "\e$,16'\e(B")
-  ("\e$(5!b\e(B" . "\e$,16(\e(B")
-  ("\e$(5!c\e(B" . "\e$,16%\e(B")
-  ("\e$(5!d\e(B" . "\e$,16*\e(B")
-  ("\e$(5!e\e(B" . "\e$,16+\e(B")
-  ("\e$(5!f\e(B" . "\e$,16,\e(B")
-  ("\e$(5!g\e(B" . "\e$,16)\e(B")
-  ("\e$(5!h\e(B" . "\e$,16-\e(B")
-  ("\e$(5!i\e(B" . "\e$,15|\e(B")
-  ("\e$(5!j\e(B" . "\e$,16D\e(B")
-  ("\e$(5!j!j\e(B" . "\e$,16E\e(B")
+  ;;2160 \e$(6!`!a!b!c!d!e!f!g!h!i!j!k!l!m!n!o\e(B
+  ("\e$(6!`\e(B" . "\e$,16&\e(B")
+  ("\e$(6!a\e(B" . "\e$,16'\e(B")
+  ("\e$(6!b\e(B" . "\e$,16(\e(B")
+  ("\e$(6!c\e(B" . "\e$,16%\e(B")
+  ("\e$(6!d\e(B" . "\e$,16*\e(B")
+  ("\e$(6!e\e(B" . "\e$,16+\e(B")
+  ("\e$(6!f\e(B" . "\e$,16,\e(B")
+  ("\e$(6!g\e(B" . "\e$,16)\e(B")
+  ("\e$(6!h\e(B" . "\e$,16-\e(B")
+  ("\e$(6!i\e(B" . "\e$,15|\e(B")
+  ("\e$(6!j\e(B" . "\e$,16D\e(B")
+  ("\e$(6!j!j\e(B" . "\e$,16E\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2170 \e$(5!p!q!r!s!t!u!v!w!x!y!z!{!|!}!~\e(B
-  ("\e$(5!q\e(B" . "\e$,16F\e(B")
-  ("\e$(5!r\e(B" . "\e$,16G\e(B")
-  ("\e$(5!s\e(B" . "\e$,16H\e(B")
-  ("\e$(5!t\e(B" . "\e$,16I\e(B")
-  ("\e$(5!u\e(B" . "\e$,16J\e(B")
-  ("\e$(5!v\e(B" . "\e$,16K\e(B")
-  ("\e$(5!w\e(B" . "\e$,16L\e(B")
-  ("\e$(5!x\e(B" . "\e$,16M\e(B")
-  ("\e$(5!y\e(B" . "\e$,16N\e(B")
-  ("\e$(5!z\e(B" . "\e$,16O\e(B")
+  ;;2170 \e$(6!p!q!r!s!t!u!v!w!x!y!z!{!|!}!~\e(B
+  ("\e$(6!q\e(B" . "\e$,16F\e(B")
+  ("\e$(6!r\e(B" . "\e$,16G\e(B")
+  ("\e$(6!s\e(B" . "\e$,16H\e(B")
+  ("\e$(6!t\e(B" . "\e$,16I\e(B")
+  ("\e$(6!u\e(B" . "\e$,16J\e(B")
+  ("\e$(6!v\e(B" . "\e$,16K\e(B")
+  ("\e$(6!w\e(B" . "\e$,16L\e(B")
+  ("\e$(6!x\e(B" . "\e$,16M\e(B")
+  ("\e$(6!y\e(B" . "\e$,16N\e(B")
+  ("\e$(6!z\e(B" . "\e$,16O\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2220   \e$(5"!"""#"$"%"&"'"(")"*"+","-"."/\e(B
-  ("\e$(5"!\e(B" . "\e$,16;6-5p\e(B")
-  ("\e$(5""\e(B" . "\e$,16>6-5p\e(B")
-  ("\e$(5"#\e(B" . "\e$,15U6-5p\e(B")
-  ("\e$(5"$\e(B" . "\e$,15W6-5p\e(B")
-  ("\e$(5"%\e(B" . "\e$,15d6-5p\e(B")
-  ("\e$(5"&\e(B" . "\e$,15j6-5p\e(B")
-  ("\e$(5"'\e(B" . "\e$,15k6-5p\e(B")
-  ("\e$(5")\e(B" . "\e$,15v6-5p\e(B")
-  ("\e$(5",\e(B" . "\e$,15p6!\e(B")
-  ("\e$(5"-\e(B" . "\e$,15p6"\e(B")
-  ("\e$(5".\e(B" . "\e$,15q6!\e(B")
-  ("\e$(5"/\e(B" . "\e$,15q6"\e(B")
+  ;;2220   \e$(6"!"""#"$"%"&"'"(")"*"+","-"."/\e(B
+  ("\e$(6"!\e(B" . "\e$,16;6-5p\e(B")
+  ("\e$(6""\e(B" . "\e$,16>6-5p\e(B")
+  ("\e$(6"#\e(B" . "\e$,15U6-5p\e(B")
+  ("\e$(6"$\e(B" . "\e$,15W6-5p\e(B")
+  ("\e$(6"%\e(B" . "\e$,15d6-5p\e(B")
+  ("\e$(6"&\e(B" . "\e$,15j6-5p\e(B")
+  ("\e$(6"'\e(B" . "\e$,15k6-5p\e(B")
+  ("\e$(6")\e(B" . "\e$,15v6-5p\e(B")
+  ("\e$(6",\e(B" . "\e$,15p6!\e(B")
+  ("\e$(6"-\e(B" . "\e$,15p6"\e(B")
+  ("\e$(6".\e(B" . "\e$,15q6!\e(B")
+  ("\e$(6"/\e(B" . "\e$,15q6"\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2230 \e$(5"0"1"2"3"4"5"6"7"8"9":";"<"=">"?\e(B
-  ("\e$(5"3\e(B" . "\e$,15U6-\e(B")
-  ("\e$(5"4\e(B" . "\e$,15V6-\e(B")
-  ("\e$(5"5\e(B" . "\e$,15W6-\e(B")
-  ("\e$(5"6\e(B" . "\e$,15X6-\e(B")
-  ("\e$(5"8\e(B" . "\e$,15Z6-\e(B")
-  ("\e$(5"8"q\e(B" . "\e$,15Z6-5p6-\e(B")
-  ("\e$(5":\e(B" . "\e$,15\6-\e(B")
-  ("\e$(5";\e(B" . "\e$,15]6-\e(B")
-  ("\e$(5"<\e(B" . "\e$,15^6-\e(B")
-  ("\e$(5"<\e(B" . "\e$,15^6-\e(B")
+  ;;2230 \e$(6"0"1"2"3"4"5"6"7"8"9":";"<"=">"?\e(B
+  ("\e$(6"3\e(B" . "\e$,15U6-\e(B")
+  ("\e$(6"4\e(B" . "\e$,15V6-\e(B")
+  ("\e$(6"5\e(B" . "\e$,15W6-\e(B")
+  ("\e$(6"6\e(B" . "\e$,15X6-\e(B")
+  ("\e$(6"8\e(B" . "\e$,15Z6-\e(B")
+  ("\e$(6"8"q\e(B" . "\e$,15Z6-5p6-\e(B")
+  ("\e$(6":\e(B" . "\e$,15\6-\e(B")
+  ("\e$(6";\e(B" . "\e$,15]6-\e(B")
+  ("\e$(6"<\e(B" . "\e$,15^6-\e(B")
+  ("\e$(6"<\e(B" . "\e$,15^6-\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2240 \e$(5"@"A"B"C"D"E"F"G"H"I"J"K"L"M"N"O\e(B
-  ("\e$(5"A\e(B" . "\e$,15c6-\e(B")
-  ("\e$(5"B\e(B" . "\e$,15d6-\e(B")
-  ("\e$(5"C\e(B" . "\e$,15e6-\e(B")
-  ("\e$(5"E\e(B" . "\e$,15g6-\e(B")
-  ("\e$(5"F\e(B" . "\e$,15h6-\e(B")
-  ("\e$(5"G\e(B" . "\e$,15i6-\e(B")
-  ("\e$(5"H\e(B" . "\e$,15j6-\e(B")
-  ("\e$(5"I\e(B" . "\e$,15k6-\e(B")
-  ("\e$(5"J\e(B" . "\e$,15l6-\e(B")
-  ("\e$(5"J\e(B" . "\e$,15l6-\e(B")
-  ("\e$(5"K\e(B" . "\e$,15m6-\e(B")
-  ("\e$(5"L\e(B" . "\e$,15n6-\e(B")
-  ("\e$(5"M\e(B" . "\e$,15o6-\e(B")
-  ("\e$(5"N\e(B" . "\e$,16?6-\e(B")
+  ;;2240 \e$(6"@"A"B"C"D"E"F"G"H"I"J"K"L"M"N"O\e(B
+  ("\e$(6"A\e(B" . "\e$,15c6-\e(B")
+  ("\e$(6"B\e(B" . "\e$,15d6-\e(B")
+  ("\e$(6"C\e(B" . "\e$,15e6-\e(B")
+  ("\e$(6"E\e(B" . "\e$,15g6-\e(B")
+  ("\e$(6"F\e(B" . "\e$,15h6-\e(B")
+  ("\e$(6"G\e(B" . "\e$,15i6-\e(B")
+  ("\e$(6"H\e(B" . "\e$,15j6-\e(B")
+  ("\e$(6"I\e(B" . "\e$,15k6-\e(B")
+  ("\e$(6"J\e(B" . "\e$,15l6-\e(B")
+  ("\e$(6"J\e(B" . "\e$,15l6-\e(B")
+  ("\e$(6"K\e(B" . "\e$,15m6-\e(B")
+  ("\e$(6"L\e(B" . "\e$,15n6-\e(B")
+  ("\e$(6"M\e(B" . "\e$,15o6-\e(B")
+  ("\e$(6"N\e(B" . "\e$,16?6-\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2250 \e$(5"P"Q"R"S"T"U"V"W"X"Y"Z"["\"]"^"_\e(B
-  ("\e$(5"Q\e(B" . "\e$,15r6-\e(B")
-  ("\e$(5"R\e(B" . "\e$,15s6-\e(B")
-  ("\e$(5"S\e(B" . "\e$,15t6-\e(B")
-  ("\e$(5"T\e(B" . "\e$,15u6-\e(B")
-  ("\e$(5"U\e(B" . "\e$,15v6-\e(B")
-  ("\e$(5"V\e(B" . "\e$,15w6-\e(B")
-  ("\e$(5"W\e(B" . "\e$,15x6-\e(B")
-  ("\e$(5"]\e(B" . "\e$,16-5o\e(B")
+  ;;2250 \e$(6"P"Q"R"S"T"U"V"W"X"Y"Z"["\"]"^"_\e(B
+  ("\e$(6"Q\e(B" . "\e$,15r6-\e(B")
+  ("\e$(6"R\e(B" . "\e$,15s6-\e(B")
+  ("\e$(6"S\e(B" . "\e$,15t6-\e(B")
+  ("\e$(6"T\e(B" . "\e$,15u6-\e(B")
+  ("\e$(6"U\e(B" . "\e$,15v6-\e(B")
+  ("\e$(6"V\e(B" . "\e$,15w6-\e(B")
+  ("\e$(6"W\e(B" . "\e$,15x6-\e(B")
+  ("\e$(6"]\e(B" . "\e$,16-5o\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2260 \e$(5"`"a"b"c"d"e"f"g"h"i"j"k"l"m"n"o\e(B
-  ("\e$(5"`\e(B" . "\e$,15W6-5p6-\e(B")
-  ("\e$(5"a\e(B" . "\e$,15X6-5h6-\e(B")
-  ("\e$(5"c\e(B" . "\e$,15d6-5d6-\e(B")
-  ("\e$(5"d\e(B" . "\e$,15d6-5p6-\e(B")
-  ("\e$(5"e\e(B" . "\e$,15g6-5h6-\e(B")
-  ("\e$(5"f\e(B" . "\e$,15g6-5p6-\e(B")
-  ("\e$(5"g\e(B" . "\e$,15j6-5d6-\e(B")
-  ("\e$(5"h\e(B" . "\e$,15v6-5Z6-\e(B")
-  ("\e$(5"i\e(B" . "\e$,15v6-5p6-\e(B")
-  ("\e$(5"j\e(B" . "\e$,15v6-5u6-\e(B")
-  ("\e$(5"k\e(B" . "\e$,15h6-5h6-\e(B")
-  ("\e$(5"l\e(B" . "\e$,15U6-5w6-\e(B")
-  ("\e$(5"m\e(B" . "\e$,15\6-5^6-\e(B")
+  ;;2260 \e$(6"`"a"b"c"d"e"f"g"h"i"j"k"l"m"n"o\e(B
+  ("\e$(6"`\e(B" . "\e$,15W6-5p6-\e(B")
+  ("\e$(6"a\e(B" . "\e$,15X6-5h6-\e(B")
+  ("\e$(6"c\e(B" . "\e$,15d6-5d6-\e(B")
+  ("\e$(6"d\e(B" . "\e$,15d6-5p6-\e(B")
+  ("\e$(6"e\e(B" . "\e$,15g6-5h6-\e(B")
+  ("\e$(6"f\e(B" . "\e$,15g6-5p6-\e(B")
+  ("\e$(6"g\e(B" . "\e$,15j6-5d6-\e(B")
+  ("\e$(6"h\e(B" . "\e$,15v6-5Z6-\e(B")
+  ("\e$(6"i\e(B" . "\e$,15v6-5p6-\e(B")
+  ("\e$(6"j\e(B" . "\e$,15v6-5u6-\e(B")
+  ("\e$(6"k\e(B" . "\e$,15h6-5h6-\e(B")
+  ("\e$(6"l\e(B" . "\e$,15U6-5w6-\e(B")
+  ("\e$(6"m\e(B" . "\e$,15\6-5^6-\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2270 \e$(5"p"q"r"s"t"u"v"w"x"y"z"{"|"}"~\e(B
-  ("\e$(5"p\e(B" . "\e$,15p6-\e(B")
-  ("\e$(5"q\e(B" . "\e$,16-5p\e(B")
-  ("\e$(5"r\e(B" . "\e$,16-5p\e(B")
-  ("\e$(5"s\e(B" . "\e$,1686-\e(B")
-  ("\e$(5"t\e(B" . "\e$,1696-\e(B")
-  ("\e$(5"u\e(B" . "\e$,16:6-\e(B")
-  ("\e$(5"y\e(B" . "\e$,16>6-\e(B")
-  ("\e$(5"z\e(B" . "\e$,16;6-\e(B")
+  ;;2270 \e$(6"p"q"r"s"t"u"v"w"x"y"z"{"|"}"~\e(B
+  ("\e$(6"p\e(B" . "\e$,15p6-\e(B")
+  ("\e$(6"q\e(B" . "\e$,16-5p\e(B")
+  ("\e$(6"r\e(B" . "\e$,16-5p\e(B")
+  ("\e$(6"s\e(B" . "\e$,1686-\e(B")
+  ("\e$(6"t\e(B" . "\e$,1696-\e(B")
+  ("\e$(6"u\e(B" . "\e$,16:6-\e(B")
+  ("\e$(6"y\e(B" . "\e$,16>6-\e(B")
+  ("\e$(6"z\e(B" . "\e$,16;6-\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2320   \e$(5#!#"###$#%#&#'#(#)#*#+#,#-#.#/\e(B
-  ("\e$(5#!\e(B" . "\e$,160\e(B")
-  ("\e$(5#&\e(B" . "\e$,15L\e(B")
-  ("\e$(5#&"p\e(B" . "\e$,15p6$\e(B")
-  ("\e$(5#'\e(B" . "\e$,16A\e(B")
-  ("\e$(5#'"p\e(B" . "\e$,15p6C\e(B")
-  ("\e$(5#*\e(B" . "\e$,16@\e(B")
-  ("\e$(5#*"p\e(B" . "\e$,15p6B\e(B")
+  ;;2320   \e$(6#!#"###$#%#&#'#(#)#*#+#,#-#.#/\e(B
+  ("\e$(6#!\e(B" . "\e$,160\e(B")
+  ("\e$(6#&\e(B" . "\e$,15L\e(B")
+  ("\e$(6#&"p\e(B" . "\e$,15p6$\e(B")
+  ("\e$(6#'\e(B" . "\e$,16A\e(B")
+  ("\e$(6#'"p\e(B" . "\e$,15p6C\e(B")
+  ("\e$(6#*\e(B" . "\e$,16@\e(B")
+  ("\e$(6#*"p\e(B" . "\e$,15p6B\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2330 \e$(5#0#1#2#3#4#5#6#7#8#9#:#;#<#=#>#?\e(B
-  ("\e$(5#3\e(B" . "\e$,168\e(B")
-  ("\e$(5#4\e(B" . "\e$,169\e(B")
-  ("\e$(5#5\e(B" . "\e$,16:\e(B")
-  ("\e$(5#:\e(B" . "\e$,16;\e(B")
-  ("\e$(5#?\e(B" . "\e$,16<\e(B")
+  ;;2330 \e$(6#0#1#2#3#4#5#6#7#8#9#:#;#<#=#>#?\e(B
+  ("\e$(6#3\e(B" . "\e$,168\e(B")
+  ("\e$(6#4\e(B" . "\e$,169\e(B")
+  ("\e$(6#5\e(B" . "\e$,16:\e(B")
+  ("\e$(6#:\e(B" . "\e$,16;\e(B")
+  ("\e$(6#?\e(B" . "\e$,16<\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2340 \e$(5#@#A#B#C#D#E#F#G#H#I#J#K#L#M#N#O\e(B
-  ("\e$(5#@\e(B" . "\e$,16=\e(B")
-  ("\e$(5#I\e(B" . "\e$,16>\e(B")
-  ("\e$(5#J\e(B" . "\e$,15}\e(B")
-  ("\e$(5#K\e(B" . "\e$,16$\e(B")
-  ("\e$(5#L\e(B" . "\e$,16B\e(B")
-  ("\e$(5#M\e(B" . "\e$,16C\e(B")
+  ;;2340 \e$(6#@#A#B#C#D#E#F#G#H#I#J#K#L#M#N#O\e(B
+  ("\e$(6#@\e(B" . "\e$,16=\e(B")
+  ("\e$(6#I\e(B" . "\e$,16>\e(B")
+  ("\e$(6#J\e(B" . "\e$,15}\e(B")
+  ("\e$(6#K\e(B" . "\e$,16$\e(B")
+  ("\e$(6#L\e(B" . "\e$,16B\e(B")
+  ("\e$(6#M\e(B" . "\e$,16C\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2350 \e$(5#P#Q#R#S#T#U#V#W#X#Y#Z#[#\#]#^#_\e(B
-  ("\e$(5#P\e(B" . "\e$,15n6-5h\e(B")
-  ("\e$(5#Q\e(B" . "\e$,15n6-5r\e(B")
-  ("\e$(5#R\e(B" . "\e$,15y6#\e(B")
+  ;;2350 \e$(6#P#Q#R#S#T#U#V#W#X#Y#Z#[#\#]#^#_\e(B
+  ("\e$(6#P\e(B" . "\e$,15n6-5h\e(B")
+  ("\e$(6#Q\e(B" . "\e$,15n6-5r\e(B")
+  ("\e$(6#R\e(B" . "\e$,15y6#\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2360 \e$(5#`#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o\e(B
-  ("\e$(5#`\e(B" . "\e$,15r6-5r\e(B")
-  ("\e$(5#a\e(B" . "\e$,15u6-5h\e(B")
-  ("\e$(5#b\e(B" . "\e$,15u6-5u\e(B")
-  ("\e$(5#c\e(B" . "\e$,15v6-5Z\e(B")
-  ("\e$(5#d\e(B" . "\e$,15v6-5h\e(B")
-  ("\e$(5#e\e(B" . "\e$,15v6-5l\e(B")
-  ("\e$(5#f\e(B" . "\e$,15v6-5r\e(B")
-  ("\e$(5#g\e(B" . "\e$,15v6-5u\e(B")
-  ("\e$(5#h\e(B" . "\e$,15w6-5_6-5p6-5o\e(B")
-  ("\e$(5#i\e(B" . "\e$,15w6-5_6-5o\e(B")
-  ("\e$(5#j\e(B" . "\e$,15w6-5_6-5u\e(B")
-  ("\e$(5#k\e(B" . "\e$,15w6-5_\e(B")
-  ("\e$(5#l\e(B" . "\e$,15w6-5`\e(B")
-  ("\e$(5#m\e(B" . "\e$,15x6-5h\e(B")
-  ("\e$(5#n\e(B" . "\e$,15x6-5p\e(B")
+  ;;2360 \e$(6#`#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o\e(B
+  ("\e$(6#`\e(B" . "\e$,15r6-5r\e(B")
+  ("\e$(6#a\e(B" . "\e$,15u6-5h\e(B")
+  ("\e$(6#b\e(B" . "\e$,15u6-5u\e(B")
+  ("\e$(6#c\e(B" . "\e$,15v6-5Z\e(B")
+  ("\e$(6#d\e(B" . "\e$,15v6-5h\e(B")
+  ("\e$(6#e\e(B" . "\e$,15v6-5l\e(B")
+  ("\e$(6#f\e(B" . "\e$,15v6-5r\e(B")
+  ("\e$(6#g\e(B" . "\e$,15v6-5u\e(B")
+  ("\e$(6#h\e(B" . "\e$,15w6-5_6-5p6-5o\e(B")
+  ("\e$(6#i\e(B" . "\e$,15w6-5_6-5o\e(B")
+  ("\e$(6#j\e(B" . "\e$,15w6-5_6-5u\e(B")
+  ("\e$(6#k\e(B" . "\e$,15w6-5_\e(B")
+  ("\e$(6#l\e(B" . "\e$,15w6-5`\e(B")
+  ("\e$(6#m\e(B" . "\e$,15x6-5h\e(B")
+  ("\e$(6#n\e(B" . "\e$,15x6-5p\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2370 \e$(5#p#q#r#s#t#u#v#w#x#y#z#{#|#}#~\e(B
-  ("\e$(5#p\e(B" . "\e$,15y6-5c\e(B")
-  ("\e$(5#q\e(B" . "\e$,15y6-5h\e(B")
-  ("\e$(5#r\e(B" . "\e$,15y6-5n\e(B")
-  ("\e$(5#s\e(B" . "\e$,15y6-5o\e(B")
-  ("\e$(5#t\e(B" . "\e$,15y6-5p\e(B")
-  ("\e$(5#u\e(B" . "\e$,15y6-5r\e(B")
-  ("\e$(5#v\e(B" . "\e$,15y6-5u\e(B")
+  ;;2370 \e$(6#p#q#r#s#t#u#v#w#x#y#z#{#|#}#~\e(B
+  ("\e$(6#p\e(B" . "\e$,15y6-5c\e(B")
+  ("\e$(6#q\e(B" . "\e$,15y6-5h\e(B")
+  ("\e$(6#r\e(B" . "\e$,15y6-5n\e(B")
+  ("\e$(6#s\e(B" . "\e$,15y6-5o\e(B")
+  ("\e$(6#t\e(B" . "\e$,15y6-5p\e(B")
+  ("\e$(6#u\e(B" . "\e$,15y6-5r\e(B")
+  ("\e$(6#v\e(B" . "\e$,15y6-5u\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2420   \e$(5$!$"$#$$$%$&$'$($)$*$+$,$-$.$/\e(B
-  ("\e$(5$!\e(B" . "\e$,15U6-5d6-5p6-5o\e(B")
-  ("\e$(5$"\e(B" . "\e$,15U6-5d6-5u\e(B")
-  ("\e$(5$#\e(B" . "\e$,15U6-5d6-5o\e(B")
-  ("\e$(5$$\e(B" . "\e$,15U6-5h6-5o\e(B")
-  ("\e$(5$%\e(B" . "\e$,15U6-5p6-5o\e(B")
-  ("\e$(5$&\e(B" . "\e$,15U6-5u6-5o\e(B")
-  ("\e$(5$'\e(B" . "\e$,15U6-5U\e(B")
-  ("\e$(5$(\e(B" . "\e$,15U6-5d\e(B")
-  ("\e$(5$)\e(B" . "\e$,15U6-5h\e(B")
-  ("\e$(5$*\e(B" . "\e$,15U6-5n\e(B")
-  ("\e$(5$+\e(B" . "\e$,15U6-5o\e(B")
-  ("\e$(5$,\e(B" . "\e$,15U6-5r\e(B")
-  ("\e$(5$-\e(B" . "\e$,15U6-5u\e(B")
-  ("\e$(5$.\e(B" . "\e$,15U6-5w\e(B")
-  ("\e$(5$/\e(B" . "\e$,15X6-5h\e(B")
+  ;;2420   \e$(6$!$"$#$$$%$&$'$($)$*$+$,$-$.$/\e(B
+  ("\e$(6$!\e(B" . "\e$,15U6-5d6-5p6-5o\e(B")
+  ("\e$(6$"\e(B" . "\e$,15U6-5d6-5u\e(B")
+  ("\e$(6$#\e(B" . "\e$,15U6-5d6-5o\e(B")
+  ("\e$(6$$\e(B" . "\e$,15U6-5h6-5o\e(B")
+  ("\e$(6$%\e(B" . "\e$,15U6-5p6-5o\e(B")
+  ("\e$(6$&\e(B" . "\e$,15U6-5u6-5o\e(B")
+  ("\e$(6$'\e(B" . "\e$,15U6-5U\e(B")
+  ("\e$(6$(\e(B" . "\e$,15U6-5d\e(B")
+  ("\e$(6$)\e(B" . "\e$,15U6-5h\e(B")
+  ("\e$(6$*\e(B" . "\e$,15U6-5n\e(B")
+  ("\e$(6$+\e(B" . "\e$,15U6-5o\e(B")
+  ("\e$(6$,\e(B" . "\e$,15U6-5r\e(B")
+  ("\e$(6$-\e(B" . "\e$,15U6-5u\e(B")
+  ("\e$(6$.\e(B" . "\e$,15U6-5w\e(B")
+  ("\e$(6$/\e(B" . "\e$,15X6-5h\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2430 \e$(5$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?\e(B
-  ("\e$(5$0\e(B" . "\e$,15Y6-5U6-5d6-5o\e(B")
-  ("\e$(5$1\e(B" . "\e$,15Y6-5U6-5w6-5u\e(B")
-  ("\e$(5$2\e(B" . "\e$,15Y6-5U6-5d\e(B")
-  ("\e$(5$3\e(B" . "\e$,15Y6-5U6-5w\e(B")
-  ("\e$(5$4\e(B" . "\e$,15Y6-5X6-5p\e(B")
-  ("\e$(5$5\e(B" . "\e$,15Y6-5U6-5o\e(B")
-  ("\e$(5$6\e(B" . "\e$,15Y6-5V6-5o\e(B")
-  ("\e$(5$7\e(B" . "\e$,15Y6-5W6-5o\e(B")
-  ("\e$(5$8\e(B" . "\e$,15Y6-5X6-5o\e(B")
-  ("\e$(5$9\e(B" . "\e$,15Y6-5U\e(B")
-  ("\e$(5$:\e(B" . "\e$,15Y6-5V\e(B")
-  ("\e$(5$;\e(B" . "\e$,15Y6-5W\e(B")
-  ("\e$(5$<\e(B" . "\e$,15Y6-5X\e(B")
-  ("\e$(5$=\e(B" . "\e$,15Y6-5Y\e(B")
-  ("\e$(5$>\e(B" . "\e$,15Y6-5h\e(B")
-  ("\e$(5$?\e(B" . "\e$,15Y6-5n\e(B")
+  ;;2430 \e$(6$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?\e(B
+  ("\e$(6$0\e(B" . "\e$,15Y6-5U6-5d6-5o\e(B")
+  ("\e$(6$1\e(B" . "\e$,15Y6-5U6-5w6-5u\e(B")
+  ("\e$(6$2\e(B" . "\e$,15Y6-5U6-5d\e(B")
+  ("\e$(6$3\e(B" . "\e$,15Y6-5U6-5w\e(B")
+  ("\e$(6$4\e(B" . "\e$,15Y6-5X6-5p\e(B")
+  ("\e$(6$5\e(B" . "\e$,15Y6-5U6-5o\e(B")
+  ("\e$(6$6\e(B" . "\e$,15Y6-5V6-5o\e(B")
+  ("\e$(6$7\e(B" . "\e$,15Y6-5W6-5o\e(B")
+  ("\e$(6$8\e(B" . "\e$,15Y6-5X6-5o\e(B")
+  ("\e$(6$9\e(B" . "\e$,15Y6-5U\e(B")
+  ("\e$(6$:\e(B" . "\e$,15Y6-5V\e(B")
+  ("\e$(6$;\e(B" . "\e$,15Y6-5W\e(B")
+  ("\e$(6$<\e(B" . "\e$,15Y6-5X\e(B")
+  ("\e$(6$=\e(B" . "\e$,15Y6-5Y\e(B")
+  ("\e$(6$>\e(B" . "\e$,15Y6-5h\e(B")
+  ("\e$(6$?\e(B" . "\e$,15Y6-5n\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2440 \e$(5$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O\e(B
-  ("\e$(5$@\e(B" . "\e$,15Y6-5o\e(B")
-  ("\e$(5$A\e(B" . "\e$,15Z6-5Z\e(B")
-  ("\e$(5$B\e(B" . "\e$,15Z6-5^\e(B")
-  ("\e$(5$C\e(B" . "\e$,15[6-5o\e(B")
-  ("\e$(5$D\e(B" . "\e$,15\6-5p\e(B")
-  ("\e$(5$E\e(B" . "\e$,15\6-5^\e(B")
-  ("\e$(5$F\e(B" . "\e$,15^6-5Z\e(B")
-  ("\e$(5$G\e(B" . "\e$,15^6-5\\e(B")
-  ("\e$(5$H\e(B" . "\e$,15_6-5U\e(B")
-  ("\e$(5$I\e(B" . "\e$,15_6-5_\e(B")
-  ("\e$(5$J\e(B" . "\e$,15_6-5`\e(B")
-  ("\e$(5$K\e(B" . "\e$,15_6-5o\e(B")
-  ("\e$(5$L\e(B" . "\e$,15`6-5o\e(B")
-  ("\e$(5$M\e(B" . "\e$,15a6-5W6-5o\e(B")
-  ("\e$(5$N\e(B" . "\e$,15a6-5X6-5p\e(B")
-  ("\e$(5$O\e(B" . "\e$,15a6-5p6-5o\e(B")
+  ;;2440 \e$(6$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O\e(B
+  ("\e$(6$@\e(B" . "\e$,15Y6-5o\e(B")
+  ("\e$(6$A\e(B" . "\e$,15Z6-5Z\e(B")
+  ("\e$(6$B\e(B" . "\e$,15Z6-5^\e(B")
+  ("\e$(6$C\e(B" . "\e$,15[6-5o\e(B")
+  ("\e$(6$D\e(B" . "\e$,15\6-5p\e(B")
+  ("\e$(6$E\e(B" . "\e$,15\6-5^\e(B")
+  ("\e$(6$F\e(B" . "\e$,15^6-5Z\e(B")
+  ("\e$(6$G\e(B" . "\e$,15^6-5\\e(B")
+  ("\e$(6$H\e(B" . "\e$,15_6-5U\e(B")
+  ("\e$(6$I\e(B" . "\e$,15_6-5_\e(B")
+  ("\e$(6$J\e(B" . "\e$,15_6-5`\e(B")
+  ("\e$(6$K\e(B" . "\e$,15_6-5o\e(B")
+  ("\e$(6$L\e(B" . "\e$,15`6-5o\e(B")
+  ("\e$(6$M\e(B" . "\e$,15a6-5W6-5o\e(B")
+  ("\e$(6$N\e(B" . "\e$,15a6-5X6-5p\e(B")
+  ("\e$(6$O\e(B" . "\e$,15a6-5p6-5o\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2450 \e$(5$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_\e(B
-  ("\e$(5$P\e(B" . "\e$,15a6-5W\e(B")
-  ("\e$(5$Q\e(B" . "\e$,15a6-5X\e(B")
-  ("\e$(5$R\e(B" . "\e$,15a6-5a\e(B")
-  ("\e$(5$S\e(B" . "\e$,15a6-5n\e(B")
-  ("\e$(5$T\e(B" . "\e$,15a6-5o\e(B")
+  ;;2450 \e$(6$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_\e(B
+  ("\e$(6$P\e(B" . "\e$,15a6-5W\e(B")
+  ("\e$(6$Q\e(B" . "\e$,15a6-5X\e(B")
+  ("\e$(6$R\e(B" . "\e$,15a6-5a\e(B")
+  ("\e$(6$S\e(B" . "\e$,15a6-5n\e(B")
+  ("\e$(6$T\e(B" . "\e$,15a6-5o\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2460 \e$(5$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o\e(B
-  ("\e$(5$`\e(B" . "\e$,15b6-5o\e(B")
-  ("\e$(5$a\e(B" . "\e$,15d6-5d\e(B")
-  ("\e$(5$b\e(B" . "\e$,15d6-5h\e(B")
-  ("\e$(5$c\e(B" . "\e$,15f6-5f6-5o\e(B")
-  ("\e$(5$d\e(B" . "\e$,15f6-5g6-5o\e(B")
-  ("\e$(5$e\e(B" . "\e$,15f6-5m6-5o\e(B")
-  ("\e$(5$f\e(B" . "\e$,15f6-5p6-5o\e(B")
-  ("\e$(5$g\e(B" . "\e$,15f6-5u6-5o\e(B")
-  ("\e$(5$h\e(B" . "\e$,15f6-5W6-5p\e(B")
-  ("\e$(5$i\e(B" . "\e$,15f6-5X6-5p\e(B")
-  ("\e$(5$j\e(B" . "\e$,15f6-5f6-5u\e(B")
-  ("\e$(5$k\e(B" . "\e$,15f6-5g6-5u\e(B")
-  ("\e$(5$l\e(B" . "\e$,15f6-5W\e(B")
-  ("\e$(5$m\e(B" . "\e$,15f6-5X\e(B")
-  ("\e$(5$n\e(B" . "\e$,15f6-5f\e(B")
-  ("\e$(5$o\e(B" . "\e$,15f6-5g\e(B")
+  ;;2460 \e$(6$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o\e(B
+  ("\e$(6$`\e(B" . "\e$,15b6-5o\e(B")
+  ("\e$(6$a\e(B" . "\e$,15d6-5d\e(B")
+  ("\e$(6$b\e(B" . "\e$,15d6-5h\e(B")
+  ("\e$(6$c\e(B" . "\e$,15f6-5f6-5o\e(B")
+  ("\e$(6$d\e(B" . "\e$,15f6-5g6-5o\e(B")
+  ("\e$(6$e\e(B" . "\e$,15f6-5m6-5o\e(B")
+  ("\e$(6$f\e(B" . "\e$,15f6-5p6-5o\e(B")
+  ("\e$(6$g\e(B" . "\e$,15f6-5u6-5o\e(B")
+  ("\e$(6$h\e(B" . "\e$,15f6-5W6-5p\e(B")
+  ("\e$(6$i\e(B" . "\e$,15f6-5X6-5p\e(B")
+  ("\e$(6$j\e(B" . "\e$,15f6-5f6-5u\e(B")
+  ("\e$(6$k\e(B" . "\e$,15f6-5g6-5u\e(B")
+  ("\e$(6$l\e(B" . "\e$,15f6-5W\e(B")
+  ("\e$(6$m\e(B" . "\e$,15f6-5X\e(B")
+  ("\e$(6$n\e(B" . "\e$,15f6-5f\e(B")
+  ("\e$(6$o\e(B" . "\e$,15f6-5g\e(B")
   ;;      0 1 2 3 4 5 6 7 8 9 a b c d e f
-  ;;2470 \e$(5$p$q$r$s$t$u$v$w$x$y$z${$|$}$~\e(B
-  ("\e$(5$p\e(B" . "\e$,15f6-5h\e(B")
-  ("\e$(5$q\e(B" . "\e$,15f6-5l\e(B")
-  ("\e$(5$r\e(B" . "\e$,15f6-5m\e(B")
-  ("\e$(5$s\e(B" . "\e$,15f6-5n\e(B")
-  ("\e$(5$t\e(B" . "\e$,15f6-5o\e(B")
-  ("\e$(5$u\e(B" . "\e$,15f6-5u\e(B")
-  ("\e$(5$v\e(B" . "\e$,15g6-5h\e(B")
-  ("\e$(5$w\e(B" . "\e$,15h6-5h\e(B")
-  ("\e$(5$x\e(B" . "\e$,15j6-5d\e(B")
-  ("\e$(5$y\e(B" . "\e$,15j6-5h\e(B")
-  ("\e$(5$z\e(B" . "\e$,15j6-5r\e(B")
-  ("\e$(5${\e(B" . "\e$,15l6-5h\e(B")
-  ("\e$(5$|\e(B" . "\e$,15l6-5l\e(B")
-  ("\e$(5$}\e(B" . "\e$,15l6-5u\e(B")
-  ("\e$(5$~\e(B" . "\e$,15m6-5h\e(B")))
+  ;;2470 \e$(6$p$q$r$s$t$u$v$w$x$y$z${$|$}$~\e(B
+  ("\e$(6$p\e(B" . "\e$,15f6-5h\e(B")
+  ("\e$(6$q\e(B" . "\e$,15f6-5l\e(B")
+  ("\e$(6$r\e(B" . "\e$,15f6-5m\e(B")
+  ("\e$(6$s\e(B" . "\e$,15f6-5n\e(B")
+  ("\e$(6$t\e(B" . "\e$,15f6-5o\e(B")
+  ("\e$(6$u\e(B" . "\e$,15f6-5u\e(B")
+  ("\e$(6$v\e(B" . "\e$,15g6-5h\e(B")
+  ("\e$(6$w\e(B" . "\e$,15h6-5h\e(B")
+  ("\e$(6$x\e(B" . "\e$,15j6-5d\e(B")
+  ("\e$(6$y\e(B" . "\e$,15j6-5h\e(B")
+  ("\e$(6$z\e(B" . "\e$,15j6-5r\e(B")
+  ("\e$(6${\e(B" . "\e$,15l6-5h\e(B")
+  ("\e$(6$|\e(B" . "\e$,15l6-5l\e(B")
+  ("\e$(6$}\e(B" . "\e$,15l6-5u\e(B")
+  ("\e$(6$~\e(B" . "\e$,15m6-5h\e(B")))
 
 (defconst indian-2-column-to-ucs-regexp
-  "\e$(5!j!j\e(B\\|\e$(5"8"q\e(B\\|[\e$(5#&#'!*#*\e(B]\e$(5"p\e(B\\|[\e$(5!!\e(B-\e$(5$~\e(B]")
+  "\e$(6!j!j\e(B\\|\e$(6"8"q\e(B\\|[\e$(6#&#'!*#*\e(B]\e$(6"p\e(B\\|[\e$(6!!\e(B-\e$(6$~\e(B]")
 
 (put 'indian-2-column-to-ucs-chartable 'char-table-extra-slots 1)
 (defconst indian-2-column-to-ucs-chartable