Update.

1999-05-23  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* malloc/malloc.h: Add __THROW for __MALLOC_P to synch with usage
	of __P in the rest of glibc; define __MALLOC_PMT and use it.
	Reported by Stephan Kulow <coolo@kde.org>.

3 files changed, 978 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index f06d8ce06b..5b6f1903b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-05-23  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* malloc/malloc.h: Add __THROW for __MALLOC_P to synch with usage
+	of __P in the rest of glibc; define __MALLOC_PMT and use it.
+	Reported by Stephan Kulow <coolo@kde.org>.
+
 1999-05-23  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/alpha/fpu/bits/fenv.h: Pretty print.
diff --git a/localedata/charmaps/KSX1001 b/localedata/charmaps/KSX1001
new file mode 100644
index 0000000000..3bfc17804c
--- /dev/null
+++ b/localedata/charmaps/KSX1001
@@ -0,0 +1,934 @@
+<code_set_name> KS_X_1001
+<comment_char> %
+<escape_char> /
+% Hangul character code set KS X 1001 (KS_C_5601-1987)
+% Edited by Won-Kyu Park <wkpark@chem.skku.ac.kr> Fri Feb 12 01:55:19 KST 1999
+
+<mb_cur_max> 2
+<mb_cur_min> 1
+CHARMAP
+<IS>	 /xA1/xA1 <U3000>	# IDEOGRAPHIC SPACE
+<,_>	 /xA1/xA2 <U3001>	# IDEOGRAPHIC COMMA
+<._>	 /xA1/xA3 <U3002>	# IDEOGRAPHIC FULL STOP
+<.M>	 /xA1/xA4 <U00B7>	# MIDDLE DOT
+<..>	 /xA1/xA5 <U2025>	# TWO DOT LEADER
+<.3>	 /xA1/xA6 <U2026>	# HORIZONTAL ELLIPSIS
+<':>	 /xA1/xA7 <U00A8>	# DIAERESIS
+<+">	 /xA1/xA8 <U3003>	# DITTO MARK
+<-->	 /xA1/xA9 <U00AD>	# SOFT HYPHEN
+<-3>	 /xA1/xAA <U2015>	# HORIZONTAL BAR
+<PP>	 /xA1/xAB <U2225>	# PARALLEL TO
+<k0112>	 /xA1/xAC <UFF3C>	# FULLWIDTH REVERSE SOLIDUS
+<?1>	 /xA1/xAD <U223C>	# TILDE OPERATOR
+<'6>	 /xA1/xAE <U2018>	# LEFT SINGLE QUOTATION MARK
+<'9>	 /xA1/xAF <U2019>	# RIGHT SINGLE QUOTATION MARK
+<"6>	 /xA1/xB0 <U201C>	# LEFT DOUBLE QUOTATION MARK
+<"9>	 /xA1/xB1 <U201D>	# RIGHT DOUBLE QUOTATION MARK
+<('>	 /xA1/xB2 <U3014>	# LEFT TORTOISE SHELL BRACKET
+<)'>	 /xA1/xB3 <U3015>	# RIGHT TORTOISE SHELL BRACKET
+<k0120>	 /xA1/xB4 <U3008>	# LEFT ANGLE BRACKET
+<k0121>	 /xA1/xB5 <U3009>	# RIGHT ANGLE BRACKET
+<<+>	 /xA1/xB6 <U300A>	# LEFT DOUBLE ANGLE BRACKET
+</>+>	 /xA1/xB7 <U300B>	# RIGHT DOUBLE ANGLE BRACKET
+<<'>	 /xA1/xB8 <U300C>	# LEFT CORNER BRACKET
+</>'>	 /xA1/xB9 <U300D>	# RIGHT CORNER BRACKET
+<<">	 /xA1/xBA <U300E>	# LEFT WHITE CORNER BRACKET
+</>">	 /xA1/xBB <U300F>	# RIGHT WHITE CORNER BRACKET
+<(">	 /xA1/xBC <U3010>	# LEFT BLACK LENTICULAR BRACKET
+<)">	 /xA1/xBD <U3011>	# RIGHT BLACK LENTICULAR BRACKET
+<+->	 /xA1/xBE <U00B1>	# PLUS-MINUS SIGN
+<*X>	 /xA1/xBF <U00D7>	# MULTIPLICATION SIGN
+<-:>	 /xA1/xC0 <U00F7>	# DIVISION SIGN
+<!=>	 /xA1/xC1 <U2260>	# NOT EQUAL TO
+<=<>	 /xA1/xC2 <U2264>	# LESS-THAN OR EQUAL TO
+</>=>	 /xA1/xC3 <U2265>	# GREATER-THAN OR EQUAL TO
+<00>	 /xA1/xC4 <U221E>	# INFINITY
+<.:>	 /xA1/xC5 <U2234>	# THEREFORE
+<DG>	 /xA1/xC6 <U00B0>	# DEGREE SIGN
+<1'>	 /xA1/xC7 <U2032>	# PRIME
+<2'>	 /xA1/xC8 <U2033>	# DOUBLE PRIME
+<oC>	 /xA1/xC9 <U2103>	# DEGREE CELSIUS
+<AO>	 /xA1/xCA <U212B>	# ANGSTROM SIGN
+<k0143>	 /xA1/xCB <UFFE0>	# FULLWIDTH CENT SIGN
+<k0144>	 /xA1/xCC <UFFE1>	# FULLWIDTH POUND SIGN
+<k0145>	 /xA1/xCD <UFFE5>	# FULLWIDTH YEN SIGN
+<Ml>	 /xA1/xCE <U2642>	# MALE SIGN
+<Fm>	 /xA1/xCF <U2640>	# FEMALE SIGN
+<-V>	 /xA1/xD0 <U2220>	# ANGLE
+<-T>	 /xA1/xD1 <U22A5>	# UP TACK
+<(A>	 /xA1/xD2 <U2312>	# ARC
+<dP>	 /xA1/xD3 <U2202>	# PARTIAL DIFFERENTIAL
+<NB>	 /xA1/xD4 <U2207>	# NABLA
+<=3>	 /xA1/xD5 <U2261>	# IDENTICAL TO
+<k0154>	 /xA1/xD6 <U2252>	# APPROXIMATELY EQUAL TO OR THE IMAGE OF
+<SE>	 /xA1/xD7 <U00A7>	# SECTION SIGN
+<:X>	 /xA1/xD8 <U203B>	# REFERENCE MARK
+<*1>	 /xA1/xD9 <U2606>	# WHITE STAR
+<*2>	 /xA1/xDA <U2605>	# BLACK STAR
+<0m>	 /xA1/xDB <U25CB>	# WHITE CIRCLE
+<0M>	 /xA1/xDC <U25CF>	# BLACK CIRCLE
+<0o>	 /xA1/xDD <U25CE>	# BULLSEYE
+<Dw>	 /xA1/xDE <U25C7>	# WHITE DIAMOND
+<Db>	 /xA1/xDF <U25C6>	# BLACK DIAMOND
+<OS>	 /xA1/xE0 <U25A1>	# WHITE SQUARE
+<fS>	 /xA1/xE1 <U25A0>	# BLACK SQUARE
+<uT>	 /xA1/xE2 <U25B3>	# WHITE UP-POINTING TRIANGLE
+<UT>	 /xA1/xE3 <U25B2>	# BLACK UP-POINTING TRIANGLE
+<dT>	 /xA1/xE4 <U25BD>	# WHITE DOWN-POINTING TRIANGLE
+<Dt>	 /xA1/xE5 <U25BC>	# BLACK DOWN-POINTING TRIANGLE
+<-/>>	 /xA1/xE6 <U2192>	# RIGHTWARDS ARROW
+<<->	 /xA1/xE7 <U2190>	# LEFTWARDS ARROW
+<-!>	 /xA1/xE8 <U2191>	# UPWARDS ARROW
+<-v>	 /xA1/xE9 <U2193>	# DOWNWARDS ARROW
+<</>>	 /xA1/xEA <U2194>	# LEFT RIGHT ARROW
+<=_>	 /xA1/xEB <U3013>	# GETA MARK
+<<*>	 /xA1/xEC <U226A>	# MUCH LESS-THAN
+<*/>>	 /xA1/xED <U226B>	# MUCH GREATER-THAN
+<RT>	 /xA1/xEE <U221A>	# SQUARE ROOT
+<k0179>	 /xA1/xEF <U223D>	# REVERSED TILDE
+<0(>	 /xA1/xF0 <U221D>	# PROPORTIONAL TO
+<:.>	 /xA1/xF1 <U2235>	# BECAUSE
+<In>	 /xA1/xF2 <U222B>	# INTEGRAL
+<DI>	 /xA1/xF3 <U222C>	# DOUBLE INTEGRAL
+<(->	 /xA1/xF4 <U2208>	# ELEMENT OF
+<-)>	 /xA1/xF5 <U220B>	# CONTAINS AS MEMBER
+<(_>	 /xA1/xF6 <U2286>	# SUBSET OF OR EQUAL TO
+<)_>	 /xA1/xF7 <U2287>	# SUPERSET OF OR EQUAL TO
+<(C>	 /xA1/xF8 <U2282>	# SUBSET OF
+<)C>	 /xA1/xF9 <U2283>	# SUPERSET OF
+<)U>	 /xA1/xFA <U222A>	# UNION
+<(U>	 /xA1/xFB <U2229>	# INTERSECTION
+<AN>	 /xA1/xFC <U2227>	# LOGICAL AND
+<OR>	 /xA1/xFD <U2228>	# LOGICAL OR
+<k0194>	 /xA1/xFE <UFFE2>	# FULLWIDTH NOT SIGN
+<=/>>	 /xA2/xA1 <U21D2>	# RIGHTWARDS DOUBLE ARROW
+<==>	 /xA2/xA2 <U21D4>	# LEFT RIGHT DOUBLE ARROW
+<FA>	 /xA2/xA3 <U2200>	# FOR ALL
+<TE>	 /xA2/xA4 <U2203>	# THERE EXISTS
+<''>	 /xA2/xA5 <U00B4>	# ACUTE ACCENT
+<k0206>	 /xA2/xA6 <UFF5E>	# FULLWIDTH TILDE
+<'<>	 /xA2/xA7 <U02C7>	# CARON
+<'(>	 /xA2/xA8 <U02D8>	# BREVE
+<'">	 /xA2/xA9 <U02DD>	# DOUBLE ACUTE ACCENT
+<'0>	 /xA2/xAA <U02DA>	# RING ABOVE
+<'.>	 /xA2/xAB <U02D9>	# DOT ABOVE
+<',>	 /xA2/xAC <U00B8>	# CEDILLA
+<';>	 /xA2/xAD <U02DB>	# OGONEK
+<!I>	 /xA2/xAE <U00A1>	# INVERTED EXCLAMATION MARK
+<?I>	 /xA2/xAF <U00BF>	# INVERTED QUESTION MARK
+<k0216>	 /xA2/xB0 <U02D0>	# MODIFIER LETTER TRIANGULAR COLON
+<Io>	 /xA2/xB1 <U222E>	# CONTOUR INTEGRAL
+<+Z>	 /xA2/xB2 <U2211>	# N-ARY SUMMATION
+<*P>	 /xA2/xB3 <U220F>	# N-ARY PRODUCT
+<Cu>	 /xA2/xB4 <U00A4>	# CURRENCY SIGN
+<oF>	 /xA2/xB5 <U2109>	# DEGREE FAHRENHEIT
+<%0>	 /xA2/xB6 <U2030>	# PER MILLE SIGN
+<Tl>	 /xA2/xB7 <U25C1>	# WHITE LEFT-POINTING TRIANGLE
+<k0224>	 /xA2/xB8 <U25C0>	# BLACK LEFT-POINTING TRIANGLE
+<Tr>	 /xA2/xB9 <U25B7>	# WHITE RIGHT-POINTING TRIANGLE
+<k0226>	 /xA2/xBA <U25B6>	# BLACK RIGHT-POINTING TRIANGLE
+<cS->	 /xA2/xBB <U2664>	# WHITE SPADE SUIT
+<cS>	 /xA2/xBC <U2660>	# BLACK SPADE SUIT
+<cH>	 /xA2/xBD <U2661>	# WHITE HEART SUIT
+<cH->	 /xA2/xBE <U2665>	# BLACK HEART SUIT
+<cC->	 /xA2/xBF <U2667>	# WHITE CLUB SUIT
+<cC>	 /xA2/xC0 <U2663>	# BLACK CLUB SUIT
+<0.>	 /xA2/xC1 <U2299>	# CIRCLED DOT OPERATOR
+<k0234>	 /xA2/xC2 <U25C8>	# WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND
+<Rr>	 /xA2/xC3 <U25A3>	# WHITE SQUARE CONTAINING BLACK SMALL SQUARE
+<0L>	 /xA2/xC4 <U25D0>	# CIRCLE WITH LEFT HALF BLACK
+<0R>	 /xA2/xC5 <U25D1>	# CIRCLE WITH RIGHT HALF BLACK
+<:S>	 /xA2/xC6 <U2592>	# MEDIUM SHADE
+<RF>	 /xA2/xC7 <U25A4>	# SQUARE WITH HORIZONTAL FILL
+<k0240>	 /xA2/xC8 <U25A5>	# SQUARE WITH VERTICAL FILL
+<RK>	 /xA2/xC9 <U25A8>	# SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL
+<RZ>	 /xA2/xCA <U25A7>	# SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL
+<RH>	 /xA2/xCB <U25A6>	# SQUARE WITH ORTHOGONAL CROSSHATCH FILL
+<RX>	 /xA2/xCC <U25A9>	# SQUARE WITH DIAGONAL CROSSHATCH FILL
+<k0245>	 /xA2/xCD <U2668>	# HOT SPRINGS
+<tel>	 /xA2/xCE <U260F>	# WHITE TELEPHONE
+<TEL>	 /xA2/xCF <U260E>	# BLACK TELEPHONE
+<<H>	 /xA2/xD0 <U261C>	# WHITE LEFT POINTING INDEX
+</>H>	 /xA2/xD1 <U261E>	# WHITE RIGHT POINTING INDEX
+<PI>	 /xA2/xD2 <U00B6>	# PILCROW SIGN
+<//->	 /xA2/xD3 <U2020>	# DAGGER
+<//=>	 /xA2/xD4 <U2021>	# DOUBLE DAGGER
+<UD>	 /xA2/xD5 <U2195>	# UP DOWN ARROW
+</////>>	 /xA2/xD6 <U2197>	# NORTH EAST ARROW
+<<////>	 /xA2/xD7 <U2199>	# SOUTH WEST ARROW
+<<!!>	 /xA2/xD8 <U2196>	# NORTH WEST ARROW
+<!!/>>	 /xA2/xD9 <U2198>	# SOUTH EAST ARROW
+<Mb>	 /xA2/xDA <U266D>	# MUSIC FLAT SIGN
+<Md>	 /xA2/xDB <U2669>	# QUARTER NOTE
+<M8>	 /xA2/xDC <U266A>	# EIGHTH NOTE
+<M16>	 /xA2/xDD <U266C>	# BEAMED SIXTEENTH NOTES
+<KSC>	 /xA2/xDE <U327F>	# KOREAN STANDARD SYMBOL
+<(JU)>	 /xA2/xDF <U321C>	# PARENTHESIZED HANGUL CIEUC U
+<N0>	 /xA2/xE0 <U2116>	# NUMERO SIGN
+<k0265>	 /xA2/xE1 <U33C7>	# SQUARE CO
+<TM>	 /xA2/xE2 <U2122>	# TRADE MARK SIGN
+<am>	 /xA2/xE3 <U33C2>	# SQUARE AM
+<pm>	 /xA2/xE4 <U33D8>	# SQUARE PM
+<k0269>	 /xA2/xE5 <U2121>	# TELEPHONE SIGN
+<k0301>	 /xA3/xA1 <UFF01>	# FULLWIDTH EXCLAMATION MARK
+<k0302>	 /xA3/xA2 <UFF02>	# FULLWIDTH QUOTATION MARK
+<k0303>	 /xA3/xA3 <UFF03>	# FULLWIDTH NUMBER SIGN
+<k0304>	 /xA3/xA4 <UFF04>	# FULLWIDTH DOLLAR SIGN
+<k0305>	 /xA3/xA5 <UFF05>	# FULLWIDTH PERCENT SIGN
+<k0306>	 /xA3/xA6 <UFF06>	# FULLWIDTH AMPERSAND
+<k0307>	 /xA3/xA7 <UFF07>	# FULLWIDTH APOSTROPHE
+<k0308>	 /xA3/xA8 <UFF08>	# FULLWIDTH LEFT PARENTHESIS
+<k0309>	 /xA3/xA9 <UFF09>	# FULLWIDTH RIGHT PARENTHESIS
+<k0310>	 /xA3/xAA <UFF0A>	# FULLWIDTH ASTERISK
+<k0311>	 /xA3/xAB <UFF0B>	# FULLWIDTH PLUS SIGN
+<k0312>	 /xA3/xAC <UFF0C>	# FULLWIDTH COMMA
+<k0313>	 /xA3/xAD <UFF0D>	# FULLWIDTH HYPHEN-MINUS
+<k0314>	 /xA3/xAE <UFF0E>	# FULLWIDTH FULL STOP
+<k0315>	 /xA3/xAF <UFF0F>	# FULLWIDTH SOLIDUS
+<k0316>	 /xA3/xB0 <UFF10>	# FULLWIDTH DIGIT ZERO
+<k0317>	 /xA3/xB1 <UFF11>	# FULLWIDTH DIGIT ONE
+<k0318>	 /xA3/xB2 <UFF12>	# FULLWIDTH DIGIT TWO
+<k0319>	 /xA3/xB3 <UFF13>	# FULLWIDTH DIGIT THREE
+<k0320>	 /xA3/xB4 <UFF14>	# FULLWIDTH DIGIT FOUR
+<k0321>	 /xA3/xB5 <UFF15>	# FULLWIDTH DIGIT FIVE
+<k0322>	 /xA3/xB6 <UFF16>	# FULLWIDTH DIGIT SIX
+<k0323>	 /xA3/xB7 <UFF17>	# FULLWIDTH DIGIT SEVEN
+<k0324>	 /xA3/xB8 <UFF18>	# FULLWIDTH DIGIT EIGHT
+<k0325>	 /xA3/xB9 <UFF19>	# FULLWIDTH DIGIT NINE
+<k0326>	 /xA3/xBA <UFF1A>	# FULLWIDTH COLON
+<k0327>	 /xA3/xBB <UFF1B>	# FULLWIDTH SEMICOLON
+<k0328>	 /xA3/xBC <UFF1C>	# FULLWIDTH LESS-THAN SIGN
+<k0329>	 /xA3/xBD <UFF1D>	# FULLWIDTH EQUALS SIGN
+<k0330>	 /xA3/xBE <UFF1E>	# FULLWIDTH GREATER-THAN SIGN
+<k0331>	 /xA3/xBF <UFF1F>	# FULLWIDTH QUESTION MARK
+<k0332>	 /xA3/xC0 <UFF20>	# FULLWIDTH COMMERCIAL AT
+<k0333>	 /xA3/xC1 <UFF21>	# FULLWIDTH LATIN CAPITAL LETTER A
+<k0334>	 /xA3/xC2 <UFF22>	# FULLWIDTH LATIN CAPITAL LETTER B
+<k0335>	 /xA3/xC3 <UFF23>	# FULLWIDTH LATIN CAPITAL LETTER C
+<k0336>	 /xA3/xC4 <UFF24>	# FULLWIDTH LATIN CAPITAL LETTER D
+<k0337>	 /xA3/xC5 <UFF25>	# FULLWIDTH LATIN CAPITAL LETTER E
+<k0338>	 /xA3/xC6 <UFF26>	# FULLWIDTH LATIN CAPITAL LETTER F
+<k0339>	 /xA3/xC7 <UFF27>	# FULLWIDTH LATIN CAPITAL LETTER G
+<k0340>	 /xA3/xC8 <UFF28>	# FULLWIDTH LATIN CAPITAL LETTER H
+<k0341>	 /xA3/xC9 <UFF29>	# FULLWIDTH LATIN CAPITAL LETTER I
+<k0342>	 /xA3/xCA <UFF2A>	# FULLWIDTH LATIN CAPITAL LETTER J
+<k0343>	 /xA3/xCB <UFF2B>	# FULLWIDTH LATIN CAPITAL LETTER K
+<k0344>	 /xA3/xCC <UFF2C>	# FULLWIDTH LATIN CAPITAL LETTER L
+<k0345>	 /xA3/xCD <UFF2D>	# FULLWIDTH LATIN CAPITAL LETTER M
+<k0346>	 /xA3/xCE <UFF2E>	# FULLWIDTH LATIN CAPITAL LETTER N
+<k0347>	 /xA3/xCF <UFF2F>	# FULLWIDTH LATIN CAPITAL LETTER O
+<k0348>	 /xA3/xD0 <UFF30>	# FULLWIDTH LATIN CAPITAL LETTER P
+<k0349>	 /xA3/xD1 <UFF31>	# FULLWIDTH LATIN CAPITAL LETTER Q
+<k0350>	 /xA3/xD2 <UFF32>	# FULLWIDTH LATIN CAPITAL LETTER R
+<k0351>	 /xA3/xD3 <UFF33>	# FULLWIDTH LATIN CAPITAL LETTER S
+<k0352>	 /xA3/xD4 <UFF34>	# FULLWIDTH LATIN CAPITAL LETTER T
+<k0353>	 /xA3/xD5 <UFF35>	# FULLWIDTH LATIN CAPITAL LETTER U
+<k0354>	 /xA3/xD6 <UFF36>	# FULLWIDTH LATIN CAPITAL LETTER V
+<k0355>	 /xA3/xD7 <UFF37>	# FULLWIDTH LATIN CAPITAL LETTER W
+<k0356>	 /xA3/xD8 <UFF38>	# FULLWIDTH LATIN CAPITAL LETTER X
+<k0357>	 /xA3/xD9 <UFF39>	# FULLWIDTH LATIN CAPITAL LETTER Y
+<k0358>	 /xA3/xDA <UFF3A>	# FULLWIDTH LATIN CAPITAL LETTER Z
+<k0359>	 /xA3/xDB <UFF3B>	# FULLWIDTH LEFT SQUARE BRACKET
+<k0360>	 /xA3/xDC <UFFE6>	# FULLWIDTH WON SIGN
+<k0361>	 /xA3/xDD <UFF3D>	# FULLWIDTH RIGHT SQUARE BRACKET
+<k0362>	 /xA3/xDE <UFF3E>	# FULLWIDTH CIRCUMFLEX ACCENT
+<k0363>	 /xA3/xDF <UFF3F>	# FULLWIDTH LOW LINE
+<k0364>	 /xA3/xE0 <UFF40>	# FULLWIDTH GRAVE ACCENT
+<k0365>	 /xA3/xE1 <UFF41>	# FULLWIDTH LATIN SMALL LETTER A
+<k0366>	 /xA3/xE2 <UFF42>	# FULLWIDTH LATIN SMALL LETTER B
+<k0367>	 /xA3/xE3 <UFF43>	# FULLWIDTH LATIN SMALL LETTER C
+<k0368>	 /xA3/xE4 <UFF44>	# FULLWIDTH LATIN SMALL LETTER D
+<k0369>	 /xA3/xE5 <UFF45>	# FULLWIDTH LATIN SMALL LETTER E
+<k0370>	 /xA3/xE6 <UFF46>	# FULLWIDTH LATIN SMALL LETTER F
+<k0371>	 /xA3/xE7 <UFF47>	# FULLWIDTH LATIN SMALL LETTER G
+<k0372>	 /xA3/xE8 <UFF48>	# FULLWIDTH LATIN SMALL LETTER H
+<k0373>	 /xA3/xE9 <UFF49>	# FULLWIDTH LATIN SMALL LETTER I
+<k0374>	 /xA3/xEA <UFF4A>	# FULLWIDTH LATIN SMALL LETTER J
+<k0375>	 /xA3/xEB <UFF4B>	# FULLWIDTH LATIN SMALL LETTER K
+<k0376>	 /xA3/xEC <UFF4C>	# FULLWIDTH LATIN SMALL LETTER L
+<k0377>	 /xA3/xED <UFF4D>	# FULLWIDTH LATIN SMALL LETTER M
+<k0378>	 /xA3/xEE <UFF4E>	# FULLWIDTH LATIN SMALL LETTER N
+<k0379>	 /xA3/xEF <UFF4F>	# FULLWIDTH LATIN SMALL LETTER O
+<k0380>	 /xA3/xF0 <UFF50>	# FULLWIDTH LATIN SMALL LETTER P
+<k0381>	 /xA3/xF1 <UFF51>	# FULLWIDTH LATIN SMALL LETTER Q
+<k0382>	 /xA3/xF2 <UFF52>	# FULLWIDTH LATIN SMALL LETTER R
+<k0383>	 /xA3/xF3 <UFF53>	# FULLWIDTH LATIN SMALL LETTER S
+<k0384>	 /xA3/xF4 <UFF54>	# FULLWIDTH LATIN SMALL LETTER T
+<k0385>	 /xA3/xF5 <UFF55>	# FULLWIDTH LATIN SMALL LETTER U
+<k0386>	 /xA3/xF6 <UFF56>	# FULLWIDTH LATIN SMALL LETTER V
+<k0387>	 /xA3/xF7 <UFF57>	# FULLWIDTH LATIN SMALL LETTER W
+<k0388>	 /xA3/xF8 <UFF58>	# FULLWIDTH LATIN SMALL LETTER X
+<k0389>	 /xA3/xF9 <UFF59>	# FULLWIDTH LATIN SMALL LETTER Y
+<k0390>	 /xA3/xFA <UFF5A>	# FULLWIDTH LATIN SMALL LETTER Z
+<k0391>	 /xA3/xFB <UFF5B>	# FULLWIDTH LEFT CURLY BRACKET
+<k0392>	 /xA3/xFC <UFF5C>	# FULLWIDTH VERTICAL LINE
+<k0393>	 /xA3/xFD <UFF5D>	# FULLWIDTH RIGHT CURLY BRACKET
+<k0394>	 /xA3/xFE <UFFE3>	# FULLWIDTH MACRON
+
+<k0401>...<k0494>	/d164/d161
+
+<1r>	 /xA5/xA1 <U2170>	# SMALL ROMAN NUMERAL ONE
+<2r>	 /xA5/xA2 <U2171>	# SMALL ROMAN NUMERAL TWO
+<3r>	 /xA5/xA3 <U2172>	# SMALL ROMAN NUMERAL THREE
+<4r>	 /xA5/xA4 <U2173>	# SMALL ROMAN NUMERAL FOUR
+<5r>	 /xA5/xA5 <U2174>	# SMALL ROMAN NUMERAL FIVE
+<6r>	 /xA5/xA6 <U2175>	# SMALL ROMAN NUMERAL SIX
+<7r>	 /xA5/xA7 <U2176>	# SMALL ROMAN NUMERAL SEVEN
+<8r>	 /xA5/xA8 <U2177>	# SMALL ROMAN NUMERAL EIGHT
+<9r>	 /xA5/xA9 <U2178>	# SMALL ROMAN NUMERAL NINE
+<ar>	 /xA5/xAA <U2179>	# SMALL ROMAN NUMERAL TEN
+<1R>	 /xA5/xB0 <U2160>	# ROMAN NUMERAL ONE
+<2R>	 /xA5/xB1 <U2161>	# ROMAN NUMERAL TWO
+<3R>	 /xA5/xB2 <U2162>	# ROMAN NUMERAL THREE
+<4R>	 /xA5/xB3 <U2163>	# ROMAN NUMERAL FOUR
+<5R>	 /xA5/xB4 <U2164>	# ROMAN NUMERAL FIVE
+<6R>	 /xA5/xB5 <U2165>	# ROMAN NUMERAL SIX
+<7R>	 /xA5/xB6 <U2166>	# ROMAN NUMERAL SEVEN
+<8R>	 /xA5/xB7 <U2167>	# ROMAN NUMERAL EIGHT
+<9R>	 /xA5/xB8 <U2168>	# ROMAN NUMERAL NINE
+<aR>	 /xA5/xB9 <U2169>	# ROMAN NUMERAL TEN
+<A*>	 /xA5/xC1 <U0391>	# GREEK CAPITAL LETTER ALPHA
+<B*>	 /xA5/xC2 <U0392>	# GREEK CAPITAL LETTER BETA
+<G*>	 /xA5/xC3 <U0393>	# GREEK CAPITAL LETTER GAMMA
+<D*>	 /xA5/xC4 <U0394>	# GREEK CAPITAL LETTER DELTA
+<E*>	 /xA5/xC5 <U0395>	# GREEK CAPITAL LETTER EPSILON
+<Z*>	 /xA5/xC6 <U0396>	# GREEK CAPITAL LETTER ZETA
+<Y*>	 /xA5/xC7 <U0397>	# GREEK CAPITAL LETTER ETA
+<H*>	 /xA5/xC8 <U0398>	# GREEK CAPITAL LETTER THETA
+<I*>	 /xA5/xC9 <U0399>	# GREEK CAPITAL LETTER IOTA
+<K*>	 /xA5/xCA <U039A>	# GREEK CAPITAL LETTER KAPPA
+<L*>	 /xA5/xCB <U039B>	# GREEK CAPITAL LETTER LAMDA
+<M*>	 /xA5/xCC <U039C>	# GREEK CAPITAL LETTER MU
+<N*>	 /xA5/xCD <U039D>	# GREEK CAPITAL LETTER NU
+<C*>	 /xA5/xCE <U039E>	# GREEK CAPITAL LETTER XI
+<O*>	 /xA5/xCF <U039F>	# GREEK CAPITAL LETTER OMICRON
+<P*>	 /xA5/xD0 <U03A0>	# GREEK CAPITAL LETTER PI
+<R*>	 /xA5/xD1 <U03A1>	# GREEK CAPITAL LETTER RHO
+<S*>	 /xA5/xD2 <U03A3>	# GREEK CAPITAL LETTER SIGMA
+<T*>	 /xA5/xD3 <U03A4>	# GREEK CAPITAL LETTER TAU
+<U*>	 /xA5/xD4 <U03A5>	# GREEK CAPITAL LETTER UPSILON
+<F*>	 /xA5/xD5 <U03A6>	# GREEK CAPITAL LETTER PHI
+<X*>	 /xA5/xD6 <U03A7>	# GREEK CAPITAL LETTER CHI
+<Q*>	 /xA5/xD7 <U03A8>	# GREEK CAPITAL LETTER PSI
+<W*>	 /xA5/xD8 <U03A9>	# GREEK CAPITAL LETTER OMEGA
+<a*>	 /xA5/xE1 <U03B1>	# GREEK SMALL LETTER ALPHA
+<b*>	 /xA5/xE2 <U03B2>	# GREEK SMALL LETTER BETA
+<g*>	 /xA5/xE3 <U03B3>	# GREEK SMALL LETTER GAMMA
+<d*>	 /xA5/xE4 <U03B4>	# GREEK SMALL LETTER DELTA
+<e*>	 /xA5/xE5 <U03B5>	# GREEK SMALL LETTER EPSILON
+<z*>	 /xA5/xE6 <U03B6>	# GREEK SMALL LETTER ZETA
+<y*>	 /xA5/xE7 <U03B7>	# GREEK SMALL LETTER ETA
+<h*>	 /xA5/xE8 <U03B8>	# GREEK SMALL LETTER THETA
+<i*>	 /xA5/xE9 <U03B9>	# GREEK SMALL LETTER IOTA
+<k*>	 /xA5/xEA <U03BA>	# GREEK SMALL LETTER KAPPA
+<l*>	 /xA5/xEB <U03BB>	# GREEK SMALL LETTER LAMDA
+<m*>	 /xA5/xEC <U03BC>	# GREEK SMALL LETTER MU
+<n*>	 /xA5/xED <U03BD>	# GREEK SMALL LETTER NU
+<c*>	 /xA5/xEE <U03BE>	# GREEK SMALL LETTER XI
+<o*>	 /xA5/xEF <U03BF>	# GREEK SMALL LETTER OMICRON
+<p*>	 /xA5/xF0 <U03C0>	# GREEK SMALL LETTER PI
+<r*>	 /xA5/xF1 <U03C1>	# GREEK SMALL LETTER RHO
+<s*>	 /xA5/xF2 <U03C3>	# GREEK SMALL LETTER SIGMA
+<t*>	 /xA5/xF3 <U03C4>	# GREEK SMALL LETTER TAU
+<u*>	 /xA5/xF4 <U03C5>	# GREEK SMALL LETTER UPSILON
+<f*>	 /xA5/xF5 <U03C6>	# GREEK SMALL LETTER PHI
+<x*>	 /xA5/xF6 <U03C7>	# GREEK SMALL LETTER CHI
+<q*>	 /xA5/xF7 <U03C8>	# GREEK SMALL LETTER PSI
+<w*>	 /xA5/xF8 <U03C9>	# GREEK SMALL LETTER OMEGA
+<hh>	 /xA6/xA1 <U2500>	# BOX DRAWINGS LIGHT HORIZONTAL
+<vv>	 /xA6/xA2 <U2502>	# BOX DRAWINGS LIGHT VERTICAL
+<dr>	 /xA6/xA3 <U250C>	# BOX DRAWINGS LIGHT DOWN AND RIGHT
+<dl>	 /xA6/xA4 <U2510>	# BOX DRAWINGS LIGHT DOWN AND LEFT
+<ul>	 /xA6/xA5 <U2518>	# BOX DRAWINGS LIGHT UP AND LEFT
+<ur>	 /xA6/xA6 <U2514>	# BOX DRAWINGS LIGHT UP AND RIGHT
+<vr>	 /xA6/xA7 <U251C>	# BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+<dh>	 /xA6/xA8 <U252C>	# BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+<vl>	 /xA6/xA9 <U2524>	# BOX DRAWINGS LIGHT VERTICAL AND LEFT
+<uh>	 /xA6/xAA <U2534>	# BOX DRAWINGS LIGHT UP AND HORIZONTAL
+<vh>	 /xA6/xAB <U253C>	# BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+<HH>	 /xA6/xAC <U2501>	# BOX DRAWINGS HEAVY HORIZONTAL
+<VV>	 /xA6/xAD <U2503>	# BOX DRAWINGS HEAVY VERTICAL
+<DR>	 /xA6/xAE <U250F>	# BOX DRAWINGS HEAVY DOWN AND RIGHT
+<LD>	 /xA6/xAF <U2513>	# BOX DRAWINGS HEAVY DOWN AND LEFT
+<UL>	 /xA6/xB0 <U251B>	# BOX DRAWINGS HEAVY UP AND LEFT
+<UR>	 /xA6/xB1 <U2517>	# BOX DRAWINGS HEAVY UP AND RIGHT
+<VR>	 /xA6/xB2 <U2523>	# BOX DRAWINGS HEAVY VERTICAL AND RIGHT
+<DH>	 /xA6/xB3 <U2533>	# BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
+<VL>	 /xA6/xB4 <U252B>	# BOX DRAWINGS HEAVY VERTICAL AND LEFT
+<UH>	 /xA6/xB5 <U253B>	# BOX DRAWINGS HEAVY UP AND HORIZONTAL
+<VH>	 /xA6/xB6 <U254B>	# BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
+<Vr>	 /xA6/xB7 <U2520>	# BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
+<dH>	 /xA6/xB8 <U252F>	# BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
+<Vl>	 /xA6/xB9 <U2528>	# BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
+<uH>	 /xA6/xBA <U2537>	# BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
+<vH>	 /xA6/xBB <U253F>	# BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
+<vR>	 /xA6/xBC <U251D>	# BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
+<Dh>	 /xA6/xBD <U2530>	# BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
+<vL>	 /xA6/xBE <U2525>	# BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
+<Uh>	 /xA6/xBF <U2538>	# BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
+<Vh>	 /xA6/xC0 <U2542>	# BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
+<Dl>	 /xA6/xC1 <U2512>	# BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT
+<dL>	 /xA6/xC2 <U2511>	# BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY
+<Ul>	 /xA6/xC3 <U251A>	# BOX DRAWINGS UP HEAVY AND LEFT LIGHT
+<uL>	 /xA6/xC4 <U2519>	# BOX DRAWINGS UP LIGHT AND LEFT HEAVY
+<Ur>	 /xA6/xC5 <U2516>	# BOX DRAWINGS UP HEAVY AND RIGHT LIGHT
+<uR>	 /xA6/xC6 <U2515>	# BOX DRAWINGS UP LIGHT AND RIGHT HEAVY
+<Dr>	 /xA6/xC7 <U250E>	# BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT
+<dR>	 /xA6/xC8 <U250D>	# BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY
+<Udr>	 /xA6/xC9 <U251E>	# BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT
+<uDr>	 /xA6/xCA <U251F>	# BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT
+<UdR>	 /xA6/xCB <U2521>	# BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY
+<uDR>	 /xA6/xCC <U2522>	# BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY
+<Udl>	 /xA6/xCD <U2526>	# BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT
+<uDl>	 /xA6/xCE <U2527>	# BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT
+<UdL>	 /xA6/xCF <U2529>	# BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY
+<uDL>	 /xA6/xD0 <U252A>	# BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY
+<dLr>	 /xA6/xD1 <U252D>	# BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT
+<dlR>	 /xA6/xD2 <U252E>	# BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT
+<DLr>	 /xA6/xD3 <U2531>	# BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY
+<DlR>	 /xA6/xD4 <U2532>	# BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY
+<uLr>	 /xA6/xD5 <U2535>	# BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT
+<ulR>	 /xA6/xD6 <U2536>	# BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT
+<ULr>	 /xA6/xD7 <U2539>	# BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY
+<UlR>	 /xA6/xD8 <U253A>	# BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY
+<vLr>	 /xA6/xD9 <U253D>	# BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT
+<vlR>	 /xA6/xDA <U253E>	# BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT
+<Udh>	 /xA6/xDB <U2540>	# BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT
+<uDh>	 /xA6/xDC <U2541>	# BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT
+<UdLr>	 /xA6/xDD <U2543>	# BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT
+<UdlR>	 /xA6/xDE <U2544>	# BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT
+<uDLr>	 /xA6/xDF <U2545>	# BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT
+<uDlR>	 /xA6/xE0 <U2546>	# BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT
+<UdH>	 /xA6/xE1 <U2547>	# BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY
+<uDH>	 /xA6/xE2 <U2548>	# BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY
+<VLr>	 /xA6/xE3 <U2549>	# BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY
+<VlR>	 /xA6/xE4 <U254A>	# BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY
+<k0701>	 /xA7/xA1 <U3395>	# SQUARE MU L
+<k0702>	 /xA7/xA2 <U3396>	# SQUARE ML
+<k0703>	 /xA7/xA3 <U3397>	# SQUARE DL
+<k0704>	 /xA7/xA4 <U2113>	# SCRIPT SMALL L
+<k0705>	 /xA7/xA5 <U3398>	# SQUARE KL
+<k0706>	 /xA7/xA6 <U33C4>	# SQUARE CC
+<k0707>	 /xA7/xA7 <U33A3>	# SQUARE MM CUBED
+<k0708>	 /xA7/xA8 <U33A4>	# SQUARE CM CUBED
+<k0709>	 /xA7/xA9 <U33A5>	# SQUARE M CUBED
+<k0710>	 /xA7/xAA <U33A6>	# SQUARE KM CUBED
+<k0711>	 /xA7/xAB <U3399>	# SQUARE FM
+<k0712>	 /xA7/xAC <U339A>	# SQUARE NM
+<k0713>	 /xA7/xAD <U339B>	# SQUARE MU M
+<k0714>	 /xA7/xAE <U339C>	# SQUARE MM
+<k0715>	 /xA7/xAF <U339D>	# SQUARE CM
+<k0716>	 /xA7/xB0 <U339E>	# SQUARE KM
+<k0717>	 /xA7/xB1 <U339F>	# SQUARE MM SQUARED
+<k0718>	 /xA7/xB2 <U33A0>	# SQUARE CM SQUARED
+<k0719>	 /xA7/xB3 <U33A1>	# SQUARE M SQUARED
+<k0720>	 /xA7/xB4 <U33A2>	# SQUARE KM SQUARED
+<k0721>	 /xA7/xB5 <U33CA>	# SQUARE HA
+<k0722>	 /xA7/xB6 <U338D>	# SQUARE MU G
+<k0723>	 /xA7/xB7 <U338E>	# SQUARE MG
+<k0724>	 /xA7/xB8 <U338F>	# SQUARE KG
+<k0725>	 /xA7/xB9 <U33CF>	# SQUARE KT
+<k0726>	 /xA7/xBA <U3388>	# SQUARE CAL
+<k0727>	 /xA7/xBB <U3389>	# SQUARE KCAL
+<k0728>	 /xA7/xBC <U33C8>	# SQUARE DB
+<k0729>	 /xA7/xBD <U33A7>	# SQUARE M OVER S
+<k0730>	 /xA7/xBE <U33A8>	# SQUARE M OVER S SQUARED
+<k0731>	 /xA7/xBF <U33B0>	# SQUARE PS
+<k0732>	 /xA7/xC0 <U33B1>	# SQUARE NS
+<k0733>	 /xA7/xC1 <U33B2>	# SQUARE MU S
+<k0734>	 /xA7/xC2 <U33B3>	# SQUARE MS
+<k0735>	 /xA7/xC3 <U33B4>	# SQUARE PV
+<k0736>	 /xA7/xC4 <U33B5>	# SQUARE NV
+<k0737>	 /xA7/xC5 <U33B6>	# SQUARE MU V
+<k0738>	 /xA7/xC6 <U33B7>	# SQUARE MV
+<k0739>	 /xA7/xC7 <U33B8>	# SQUARE KV
+<k0740>	 /xA7/xC8 <U33B9>	# SQUARE MV MEGA
+<k0741>	 /xA7/xC9 <U3380>	# SQUARE PA AMPS
+<k0742>	 /xA7/xCA <U3381>	# SQUARE NA
+<k0743>	 /xA7/xCB <U3382>	# SQUARE MU A
+<k0744>	 /xA7/xCC <U3383>	# SQUARE MA
+<k0745>	 /xA7/xCD <U3384>	# SQUARE KA
+<k0746>	 /xA7/xCE <U33BA>	# SQUARE PW
+<k0747>	 /xA7/xCF <U33BB>	# SQUARE NW
+<k0748>	 /xA7/xD0 <U33BC>	# SQUARE MU W
+<k0749>	 /xA7/xD1 <U33BD>	# SQUARE MW
+<k0750>	 /xA7/xD2 <U33BE>	# SQUARE KW
+<k0751>	 /xA7/xD3 <U33BF>	# SQUARE MW MEGA
+<k0752>	 /xA7/xD4 <U3390>	# SQUARE HZ
+<k0753>	 /xA7/xD5 <U3391>	# SQUARE KHZ
+<k0754>	 /xA7/xD6 <U3392>	# SQUARE MHZ
+<k0755>	 /xA7/xD7 <U3393>	# SQUARE GHZ
+<k0756>	 /xA7/xD8 <U3394>	# SQUARE THZ
+<Om>	 /xA7/xD9 <U2126>	# OHM SIGN
+<k0758>	 /xA7/xDA <U33C0>	# SQUARE K OHM
+<k0759>	 /xA7/xDB <U33C1>	# SQUARE M OHM
+<k0760>	 /xA7/xDC <U338A>	# SQUARE PF
+<k0761>	 /xA7/xDD <U338B>	# SQUARE NF
+<k0762>	 /xA7/xDE <U338C>	# SQUARE MU F
+<k0763>	 /xA7/xDF <U33D6>	# SQUARE MOL
+<k0764>	 /xA7/xE0 <U33C5>	# SQUARE CD
+<k0765>	 /xA7/xE1 <U33AD>	# SQUARE RAD
+<k0766>	 /xA7/xE2 <U33AE>	# SQUARE RAD OVER S
+<k0767>	 /xA7/xE3 <U33AF>	# SQUARE RAD OVER S SQUARED
+<k0768>	 /xA7/xE4 <U33DB>	# SQUARE SR
+<k0769>	 /xA7/xE5 <U33A9>	# SQUARE PA
+<k0770>	 /xA7/xE6 <U33AA>	# SQUARE KPA
+<k0771>	 /xA7/xE7 <U33AB>	# SQUARE MPA
+<k0772>	 /xA7/xE8 <U33AC>	# SQUARE GPA
+<k0773>	 /xA7/xE9 <U33DD>	# SQUARE WB
+<k0774>	 /xA7/xEA <U33D0>	# SQUARE LM
+<k0775>	 /xA7/xEB <U33D3>	# SQUARE LX
+<k0776>	 /xA7/xEC <U33C3>	# SQUARE BQ
+<k0777>	 /xA7/xED <U33C9>	# SQUARE GY
+<k0778>	 /xA7/xEE <U33DC>	# SQUARE SV
+<k0779>	 /xA7/xEF <U33C6>	# SQUARE C OVER KG
+<AE>	 /xA8/xA1 <U00C6>	# LATIN CAPITAL LIGATURE AE
+<D->	 /xA8/xA2 <U00D0>	# LATIN CAPITAL LETTER ETH
+<-a>	 /xA8/xA3 <U00AA>	# FEMININE ORDINAL INDICATOR
+<H//>	 /xA8/xA4 <U0126>	# LATIN CAPITAL LETTER H WITH STROKE
+<IJ>	 /xA8/xA6 <U0132>	# LATIN CAPITAL LIGATURE IJ
+<L.>	 /xA8/xA8 <U013F>	# LATIN CAPITAL LETTER L WITH MIDDLE DOT
+<L//>	 /xA8/xA9 <U0141>	# LATIN CAPITAL LETTER L WITH STROKE
+<O//>	 /xA8/xAA <U00D8>	# LATIN CAPITAL LETTER O WITH STROKE
+<OE>	 /xA8/xAB <U0152>	# LATIN CAPITAL LIGATURE OE
+<-o>	 /xA8/xAC <U00BA>	# MASCULINE ORDINAL INDICATOR
+<TH>	 /xA8/xAD <U00DE>	# LATIN CAPITAL LETTER THORN
+<T//>	 /xA8/xAE <U0166>	# LATIN CAPITAL LETTER T WITH STROKE
+<NG>	 /xA8/xAF <U014A>	# LATIN CAPITAL LETTER ENG
+
+<k0817>...<k0844>	/d168/d177
+
+<a-o>	 /xA8/xCD <U24D0>	# CIRCLED LATIN SMALL LETTER A
+<b-o>	 /xA8/xCE <U24D1>	# CIRCLED LATIN SMALL LETTER B
+<c-o>	 /xA8/xCF <U24D2>	# CIRCLED LATIN SMALL LETTER C
+<d-o>	 /xA8/xD0 <U24D3>	# CIRCLED LATIN SMALL LETTER D
+<e-o>	 /xA8/xD1 <U24D4>	# CIRCLED LATIN SMALL LETTER E
+<f-o>	 /xA8/xD2 <U24D5>	# CIRCLED LATIN SMALL LETTER F
+<g-o>	 /xA8/xD3 <U24D6>	# CIRCLED LATIN SMALL LETTER G
+<h-o>	 /xA8/xD4 <U24D7>	# CIRCLED LATIN SMALL LETTER H
+<i-o>	 /xA8/xD5 <U24D8>	# CIRCLED LATIN SMALL LETTER I
+<j-o>	 /xA8/xD6 <U24D9>	# CIRCLED LATIN SMALL LETTER J
+<k-o>	 /xA8/xD7 <U24DA>	# CIRCLED LATIN SMALL LETTER K
+<l-o>	 /xA8/xD8 <U24DB>	# CIRCLED LATIN SMALL LETTER L
+<m-o>	 /xA8/xD9 <U24DC>	# CIRCLED LATIN SMALL LETTER M
+<n-o>	 /xA8/xDA <U24DD>	# CIRCLED LATIN SMALL LETTER N
+<o-o>	 /xA8/xDB <U24DE>	# CIRCLED LATIN SMALL LETTER O
+<p-o>	 /xA8/xDC <U24DF>	# CIRCLED LATIN SMALL LETTER P
+<q-o>	 /xA8/xDD <U24E0>	# CIRCLED LATIN SMALL LETTER Q
+<r-o>	 /xA8/xDE <U24E1>	# CIRCLED LATIN SMALL LETTER R
+<s-o>	 /xA8/xDF <U24E2>	# CIRCLED LATIN SMALL LETTER S
+<t-o>	 /xA8/xE0 <U24E3>	# CIRCLED LATIN SMALL LETTER T
+<u-o>	 /xA8/xE1 <U24E4>	# CIRCLED LATIN SMALL LETTER U
+<v-o>	 /xA8/xE2 <U24E5>	# CIRCLED LATIN SMALL LETTER V
+<w-o>	 /xA8/xE3 <U24E6>	# CIRCLED LATIN SMALL LETTER W
+<x-o>	 /xA8/xE4 <U24E7>	# CIRCLED LATIN SMALL LETTER X
+<y-o>	 /xA8/xE5 <U24E8>	# CIRCLED LATIN SMALL LETTER Y
+<z-o>	 /xA8/xE6 <U24E9>	# CIRCLED LATIN SMALL LETTER Z
+<1-o>	 /xA8/xE7 <U2460>	# CIRCLED DIGIT ONE
+<2-o>	 /xA8/xE8 <U2461>	# CIRCLED DIGIT TWO
+<3-o>	 /xA8/xE9 <U2462>	# CIRCLED DIGIT THREE
+<4-o>	 /xA8/xEA <U2463>	# CIRCLED DIGIT FOUR
+<5-o>	 /xA8/xEB <U2464>	# CIRCLED DIGIT FIVE
+<6-o>	 /xA8/xEC <U2465>	# CIRCLED DIGIT SIX
+<7-o>	 /xA8/xED <U2466>	# CIRCLED DIGIT SEVEN
+<8-o>	 /xA8/xEE <U2467>	# CIRCLED DIGIT EIGHT
+<9-o>	 /xA8/xEF <U2468>	# CIRCLED DIGIT NINE
+<10-o>	 /xA8/xF0 <U2469>	# CIRCLED NUMBER TEN
+<11-o>	 /xA8/xF1 <U246A>	# CIRCLED NUMBER ELEVEN
+<12-o>	 /xA8/xF2 <U246B>	# CIRCLED NUMBER TWELVE
+<13-o>	 /xA8/xF3 <U246C>	# CIRCLED NUMBER THIRTEEN
+<14-o>	 /xA8/xF4 <U246D>	# CIRCLED NUMBER FOURTEEN
+<15-o>	 /xA8/xF5 <U246E>	# CIRCLED NUMBER FIFTEEN
+<12>	 /xA8/xF6 <U00BD>	# VULGAR FRACTION ONE HALF
+<13>	 /xA8/xF7 <U2153>	# VULGAR FRACTION ONE THIRD
+<23>	 /xA8/xF8 <U2154>	# VULGAR FRACTION TWO THIRDS
+<14>	 /xA8/xF9 <U00BC>	# VULGAR FRACTION ONE QUARTER
+<34>	 /xA8/xFA <U00BE>	# VULGAR FRACTION THREE QUARTERS
+<18>	 /xA8/xFB <U215B>	# VULGAR FRACTION ONE EIGHTH
+<38>	 /xA8/xFC <U215C>	# VULGAR FRACTION THREE EIGHTHS
+<58>	 /xA8/xFD <U215D>	# VULGAR FRACTION FIVE EIGHTHS
+<78>	 /xA8/xFE <U215E>	# VULGAR FRACTION SEVEN EIGHTHS
+<ae>	 /xA9/xA1 <U00E6>	# LATIN SMALL LIGATURE AE
+<d//>	 /xA9/xA2 <U0111>	# LATIN SMALL LETTER D WITH STROKE
+<d->	 /xA9/xA3 <U00F0>	# LATIN SMALL LETTER ETH
+<h//>	 /xA9/xA4 <U0127>	# LATIN SMALL LETTER H WITH STROKE
+<i.>	 /xA9/xA5 <U0131>	# LATIN SMALL LETTER DOTLESS I
+<ij>	 /xA9/xA6 <U0133>	# LATIN SMALL LIGATURE IJ
+<kk>	 /xA9/xA7 <U0138>	# LATIN SMALL LETTER KRA
+<l.>	 /xA9/xA8 <U0140>	# LATIN SMALL LETTER L WITH MIDDLE DOT
+<l//>	 /xA9/xA9 <U0142>	# LATIN SMALL LETTER L WITH STROKE
+<o//>	 /xA9/xAA <U00F8>	# LATIN SMALL LETTER O WITH STROKE
+<oe>	 /xA9/xAB <U0153>	# LATIN SMALL LIGATURE OE
+<ss>	 /xA9/xAC <U00DF>	# LATIN SMALL LETTER SHARP S
+<th>	 /xA9/xAD <U00FE>	# LATIN SMALL LETTER THORN
+<t//>	 /xA9/xAE <U0167>	# LATIN SMALL LETTER T WITH STROKE
+<ng>	 /xA9/xAF <U014B>	# LATIN SMALL LETTER ENG
+<'n>	 /xA9/xB0 <U0149>	# LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+
+<k0917>...<k0944>	/d169/d177
+
+<(a)>	 /xA9/xCD <U249C>	# PARENTHESIZED LATIN SMALL LETTER A
+<(b)>	 /xA9/xCE <U249D>	# PARENTHESIZED LATIN SMALL LETTER B
+<(c)>	 /xA9/xCF <U249E>	# PARENTHESIZED LATIN SMALL LETTER C
+<(d)>	 /xA9/xD0 <U249F>	# PARENTHESIZED LATIN SMALL LETTER D
+<(e)>	 /xA9/xD1 <U24A0>	# PARENTHESIZED LATIN SMALL LETTER E
+<(f)>	 /xA9/xD2 <U24A1>	# PARENTHESIZED LATIN SMALL LETTER F
+<(g)>	 /xA9/xD3 <U24A2>	# PARENTHESIZED LATIN SMALL LETTER G
+<(h)>	 /xA9/xD4 <U24A3>	# PARENTHESIZED LATIN SMALL LETTER H
+<(i)>	 /xA9/xD5 <U24A4>	# PARENTHESIZED LATIN SMALL LETTER I
+<(j)>	 /xA9/xD6 <U24A5>	# PARENTHESIZED LATIN SMALL LETTER J
+<(k)>	 /xA9/xD7 <U24A6>	# PARENTHESIZED LATIN SMALL LETTER K
+<(l)>	 /xA9/xD8 <U24A7>	# PARENTHESIZED LATIN SMALL LETTER L
+<(m)>	 /xA9/xD9 <U24A8>	# PARENTHESIZED LATIN SMALL LETTER M
+<(n)>	 /xA9/xDA <U24A9>	# PARENTHESIZED LATIN SMALL LETTER N
+<(o)>	 /xA9/xDB <U24AA>	# PARENTHESIZED LATIN SMALL LETTER O
+<(p)>	 /xA9/xDC <U24AB>	# PARENTHESIZED LATIN SMALL LETTER P
+<(q)>	 /xA9/xDD <U24AC>	# PARENTHESIZED LATIN SMALL LETTER Q
+<(r)>	 /xA9/xDE <U24AD>	# PARENTHESIZED LATIN SMALL LETTER R
+<(s)>	 /xA9/xDF <U24AE>	# PARENTHESIZED LATIN SMALL LETTER S
+<(t)>	 /xA9/xE0 <U24AF>	# PARENTHESIZED LATIN SMALL LETTER T
+<(u)>	 /xA9/xE1 <U24B0>	# PARENTHESIZED LATIN SMALL LETTER U
+<(v)>	 /xA9/xE2 <U24B1>	# PARENTHESIZED LATIN SMALL LETTER V
+<(w)>	 /xA9/xE3 <U24B2>	# PARENTHESIZED LATIN SMALL LETTER W
+<(x)>	 /xA9/xE4 <U24B3>	# PARENTHESIZED LATIN SMALL LETTER X
+<(y)>	 /xA9/xE5 <U24B4>	# PARENTHESIZED LATIN SMALL LETTER Y
+<(z)>	 /xA9/xE6 <U24B5>	# PARENTHESIZED LATIN SMALL LETTER Z
+<(1)>	 /xA9/xE7 <U2474>	# PARENTHESIZED DIGIT ONE
+<(2)>	 /xA9/xE8 <U2475>	# PARENTHESIZED DIGIT TWO
+<(3)>	 /xA9/xE9 <U2476>	# PARENTHESIZED DIGIT THREE
+<(4)>	 /xA9/xEA <U2477>	# PARENTHESIZED DIGIT FOUR
+<(5)>	 /xA9/xEB <U2478>	# PARENTHESIZED DIGIT FIVE
+<(6)>	 /xA9/xEC <U2479>	# PARENTHESIZED DIGIT SIX
+<(7)>	 /xA9/xED <U247A>	# PARENTHESIZED DIGIT SEVEN
+<(8)>	 /xA9/xEE <U247B>	# PARENTHESIZED DIGIT EIGHT
+<(9)>	 /xA9/xEF <U247C>	# PARENTHESIZED DIGIT NINE
+<(10)>	 /xA9/xF0 <U247D>	# PARENTHESIZED NUMBER TEN
+<(11)>	 /xA9/xF1 <U247E>	# PARENTHESIZED NUMBER ELEVEN
+<(12)>	 /xA9/xF2 <U247F>	# PARENTHESIZED NUMBER TWELVE
+<(13)>	 /xA9/xF3 <U2480>	# PARENTHESIZED NUMBER THIRTEEN
+<(14)>	 /xA9/xF4 <U2481>	# PARENTHESIZED NUMBER FOURTEEN
+<(15)>	 /xA9/xF5 <U2482>	# PARENTHESIZED NUMBER FIFTEEN
+<1S>	 /xA9/xF6 <U00B9>	# SUPERSCRIPT ONE
+<2S>	 /xA9/xF7 <U00B2>	# SUPERSCRIPT TWO
+<3S>	 /xA9/xF8 <U00B3>	# SUPERSCRIPT THREE
+<4S>	 /xA9/xF9 <U2074>	# SUPERSCRIPT FOUR
+<nS>	 /xA9/xFA <U207F>	# SUPERSCRIPT LATIN SMALL LETTER N
+<1s>	 /xA9/xFB <U2081>	# SUBSCRIPT ONE
+<2s>	 /xA9/xFC <U2082>	# SUBSCRIPT TWO
+<3s>	 /xA9/xFD <U2083>	# SUBSCRIPT THREE
+<4s>	 /xA9/xFE <U2084>	# SUBSCRIPT FOUR
+<A5>	 /xAA/xA1 <U3041>	# HIRAGANA LETTER SMALL A
+<a5>	 /xAA/xA2 <U3042>	# HIRAGANA LETTER A
+<I5>	 /xAA/xA3 <U3043>	# HIRAGANA LETTER SMALL I
+<i5>	 /xAA/xA4 <U3044>	# HIRAGANA LETTER I
+<U5>	 /xAA/xA5 <U3045>	# HIRAGANA LETTER SMALL U
+<u5>	 /xAA/xA6 <U3046>	# HIRAGANA LETTER U
+<E5>	 /xAA/xA7 <U3047>	# HIRAGANA LETTER SMALL E
+<e5>	 /xAA/xA8 <U3048>	# HIRAGANA LETTER E
+<O5>	 /xAA/xA9 <U3049>	# HIRAGANA LETTER SMALL O
+<o5>	 /xAA/xAA <U304A>	# HIRAGANA LETTER O
+<ka>	 /xAA/xAB <U304B>	# HIRAGANA LETTER KA
+<ga>	 /xAA/xAC <U304C>	# HIRAGANA LETTER GA
+<ki>	 /xAA/xAD <U304D>	# HIRAGANA LETTER KI
+<gi>	 /xAA/xAE <U304E>	# HIRAGANA LETTER GI
+<ku>	 /xAA/xAF <U304F>	# HIRAGANA LETTER KU
+<gu>	 /xAA/xB0 <U3050>	# HIRAGANA LETTER GU
+<ke>	 /xAA/xB1 <U3051>	# HIRAGANA LETTER KE
+<ge>	 /xAA/xB2 <U3052>	# HIRAGANA LETTER GE
+<ko>	 /xAA/xB3 <U3053>	# HIRAGANA LETTER KO
+<go>	 /xAA/xB4 <U3054>	# HIRAGANA LETTER GO
+<sa>	 /xAA/xB5 <U3055>	# HIRAGANA LETTER SA
+<za>	 /xAA/xB6 <U3056>	# HIRAGANA LETTER ZA
+<si>	 /xAA/xB7 <U3057>	# HIRAGANA LETTER SI
+<zi>	 /xAA/xB8 <U3058>	# HIRAGANA LETTER ZI
+<su>	 /xAA/xB9 <U3059>	# HIRAGANA LETTER SU
+<zu>	 /xAA/xBA <U305A>	# HIRAGANA LETTER ZU
+<se>	 /xAA/xBB <U305B>	# HIRAGANA LETTER SE
+<ze>	 /xAA/xBC <U305C>	# HIRAGANA LETTER ZE
+<so>	 /xAA/xBD <U305D>	# HIRAGANA LETTER SO
+<zo>	 /xAA/xBE <U305E>	# HIRAGANA LETTER ZO
+<ta>	 /xAA/xBF <U305F>	# HIRAGANA LETTER TA
+<da>	 /xAA/xC0 <U3060>	# HIRAGANA LETTER DA
+<ti>	 /xAA/xC1 <U3061>	# HIRAGANA LETTER TI
+<di>	 /xAA/xC2 <U3062>	# HIRAGANA LETTER DI
+<tU>	 /xAA/xC3 <U3063>	# HIRAGANA LETTER SMALL TU
+<tu>	 /xAA/xC4 <U3064>	# HIRAGANA LETTER TU
+<du>	 /xAA/xC5 <U3065>	# HIRAGANA LETTER DU
+<te>	 /xAA/xC6 <U3066>	# HIRAGANA LETTER TE
+<de>	 /xAA/xC7 <U3067>	# HIRAGANA LETTER DE
+<to>	 /xAA/xC8 <U3068>	# HIRAGANA LETTER TO
+<do>	 /xAA/xC9 <U3069>	# HIRAGANA LETTER DO
+<na>	 /xAA/xCA <U306A>	# HIRAGANA LETTER NA
+<ni>	 /xAA/xCB <U306B>	# HIRAGANA LETTER NI
+<nu>	 /xAA/xCC <U306C>	# HIRAGANA LETTER NU
+<ne>	 /xAA/xCD <U306D>	# HIRAGANA LETTER NE
+<no>	 /xAA/xCE <U306E>	# HIRAGANA LETTER NO
+<ha>	 /xAA/xCF <U306F>	# HIRAGANA LETTER HA
+<ba>	 /xAA/xD0 <U3070>	# HIRAGANA LETTER BA
+<pa>	 /xAA/xD1 <U3071>	# HIRAGANA LETTER PA
+<hi>	 /xAA/xD2 <U3072>	# HIRAGANA LETTER HI
+<bi>	 /xAA/xD3 <U3073>	# HIRAGANA LETTER BI
+<pi>	 /xAA/xD4 <U3074>	# HIRAGANA LETTER PI
+<hu>	 /xAA/xD5 <U3075>	# HIRAGANA LETTER HU
+<bu>	 /xAA/xD6 <U3076>	# HIRAGANA LETTER BU
+<pu>	 /xAA/xD7 <U3077>	# HIRAGANA LETTER PU
+<he>	 /xAA/xD8 <U3078>	# HIRAGANA LETTER HE
+<be>	 /xAA/xD9 <U3079>	# HIRAGANA LETTER BE
+<pe>	 /xAA/xDA <U307A>	# HIRAGANA LETTER PE
+<ho>	 /xAA/xDB <U307B>	# HIRAGANA LETTER HO
+<bo>	 /xAA/xDC <U307C>	# HIRAGANA LETTER BO
+<po>	 /xAA/xDD <U307D>	# HIRAGANA LETTER PO
+<ma>	 /xAA/xDE <U307E>	# HIRAGANA LETTER MA
+<mi>	 /xAA/xDF <U307F>	# HIRAGANA LETTER MI
+<mu>	 /xAA/xE0 <U3080>	# HIRAGANA LETTER MU
+<me>	 /xAA/xE1 <U3081>	# HIRAGANA LETTER ME
+<mo>	 /xAA/xE2 <U3082>	# HIRAGANA LETTER MO
+<yA>	 /xAA/xE3 <U3083>	# HIRAGANA LETTER SMALL YA
+<ya>	 /xAA/xE4 <U3084>	# HIRAGANA LETTER YA
+<yU>	 /xAA/xE5 <U3085>	# HIRAGANA LETTER SMALL YU
+<yu>	 /xAA/xE6 <U3086>	# HIRAGANA LETTER YU
+<yO>	 /xAA/xE7 <U3087>	# HIRAGANA LETTER SMALL YO
+<yo>	 /xAA/xE8 <U3088>	# HIRAGANA LETTER YO
+<ra>	 /xAA/xE9 <U3089>	# HIRAGANA LETTER RA
+<ri>	 /xAA/xEA <U308A>	# HIRAGANA LETTER RI
+<ru>	 /xAA/xEB <U308B>	# HIRAGANA LETTER RU
+<re>	 /xAA/xEC <U308C>	# HIRAGANA LETTER RE
+<ro>	 /xAA/xED <U308D>	# HIRAGANA LETTER RO
+<wA>	 /xAA/xEE <U308E>	# HIRAGANA LETTER SMALL WA
+<wa>	 /xAA/xEF <U308F>	# HIRAGANA LETTER WA
+<wi>	 /xAA/xF0 <U3090>	# HIRAGANA LETTER WI
+<we>	 /xAA/xF1 <U3091>	# HIRAGANA LETTER WE
+<wo>	 /xAA/xF2 <U3092>	# HIRAGANA LETTER WO
+<n5>	 /xAA/xF3 <U3093>	# HIRAGANA LETTER N
+<a6>	 /xAB/xA1 <U30A1>	# KATAKANA LETTER SMALL A
+<A6>	 /xAB/xA2 <U30A2>	# KATAKANA LETTER A
+<i6>	 /xAB/xA3 <U30A3>	# KATAKANA LETTER SMALL I
+<I6>	 /xAB/xA4 <U30A4>	# KATAKANA LETTER I
+<u6>	 /xAB/xA5 <U30A5>	# KATAKANA LETTER SMALL U
+<U6>	 /xAB/xA6 <U30A6>	# KATAKANA LETTER U
+<e6>	 /xAB/xA7 <U30A7>	# KATAKANA LETTER SMALL E
+<E6>	 /xAB/xA8 <U30A8>	# KATAKANA LETTER E
+<o6>	 /xAB/xA9 <U30A9>	# KATAKANA LETTER SMALL O
+<O6>	 /xAB/xAA <U30AA>	# KATAKANA LETTER O
+<Ka>	 /xAB/xAB <U30AB>	# KATAKANA LETTER KA
+<Ga>	 /xAB/xAC <U30AC>	# KATAKANA LETTER GA
+<Ki>	 /xAB/xAD <U30AD>	# KATAKANA LETTER KI
+<Gi>	 /xAB/xAE <U30AE>	# KATAKANA LETTER GI
+<Ku>	 /xAB/xAF <U30AF>	# KATAKANA LETTER KU
+<Gu>	 /xAB/xB0 <U30B0>	# KATAKANA LETTER GU
+<Ke>	 /xAB/xB1 <U30B1>	# KATAKANA LETTER KE
+<Ge>	 /xAB/xB2 <U30B2>	# KATAKANA LETTER GE
+<Ko>	 /xAB/xB3 <U30B3>	# KATAKANA LETTER KO
+<Go>	 /xAB/xB4 <U30B4>	# KATAKANA LETTER GO
+<Sa>	 /xAB/xB5 <U30B5>	# KATAKANA LETTER SA
+<Za>	 /xAB/xB6 <U30B6>	# KATAKANA LETTER ZA
+<Si>	 /xAB/xB7 <U30B7>	# KATAKANA LETTER SI
+<Zi>	 /xAB/xB8 <U30B8>	# KATAKANA LETTER ZI
+<Su>	 /xAB/xB9 <U30B9>	# KATAKANA LETTER SU
+<Zu>	 /xAB/xBA <U30BA>	# KATAKANA LETTER ZU
+<Se>	 /xAB/xBB <U30BB>	# KATAKANA LETTER SE
+<Ze>	 /xAB/xBC <U30BC>	# KATAKANA LETTER ZE
+<So>	 /xAB/xBD <U30BD>	# KATAKANA LETTER SO
+<Zo>	 /xAB/xBE <U30BE>	# KATAKANA LETTER ZO
+<Ta>	 /xAB/xBF <U30BF>	# KATAKANA LETTER TA
+<Da>	 /xAB/xC0 <U30C0>	# KATAKANA LETTER DA
+<Ti>	 /xAB/xC1 <U30C1>	# KATAKANA LETTER TI
+<Di>	 /xAB/xC2 <U30C2>	# KATAKANA LETTER DI
+<TU>	 /xAB/xC3 <U30C3>	# KATAKANA LETTER SMALL TU
+<Tu>	 /xAB/xC4 <U30C4>	# KATAKANA LETTER TU
+<Du>	 /xAB/xC5 <U30C5>	# KATAKANA LETTER DU
+<Te>	 /xAB/xC6 <U30C6>	# KATAKANA LETTER TE
+<De>	 /xAB/xC7 <U30C7>	# KATAKANA LETTER DE
+<To>	 /xAB/xC8 <U30C8>	# KATAKANA LETTER TO
+<Do>	 /xAB/xC9 <U30C9>	# KATAKANA LETTER DO
+<Na>	 /xAB/xCA <U30CA>	# KATAKANA LETTER NA
+<Ni>	 /xAB/xCB <U30CB>	# KATAKANA LETTER NI
+<Nu>	 /xAB/xCC <U30CC>	# KATAKANA LETTER NU
+<Ne>	 /xAB/xCD <U30CD>	# KATAKANA LETTER NE
+<No>	 /xAB/xCE <U30CE>	# KATAKANA LETTER NO
+<Ha>	 /xAB/xCF <U30CF>	# KATAKANA LETTER HA
+<Ba>	 /xAB/xD0 <U30D0>	# KATAKANA LETTER BA
+<Pa>	 /xAB/xD1 <U30D1>	# KATAKANA LETTER PA
+<Hi>	 /xAB/xD2 <U30D2>	# KATAKANA LETTER HI
+<Bi>	 /xAB/xD3 <U30D3>	# KATAKANA LETTER BI
+<Pi>	 /xAB/xD4 <U30D4>	# KATAKANA LETTER PI
+<Hu>	 /xAB/xD5 <U30D5>	# KATAKANA LETTER HU
+<Bu>	 /xAB/xD6 <U30D6>	# KATAKANA LETTER BU
+<Pu>	 /xAB/xD7 <U30D7>	# KATAKANA LETTER PU
+<He>	 /xAB/xD8 <U30D8>	# KATAKANA LETTER HE
+<Be>	 /xAB/xD9 <U30D9>	# KATAKANA LETTER BE
+<Pe>	 /xAB/xDA <U30DA>	# KATAKANA LETTER PE
+<Ho>	 /xAB/xDB <U30DB>	# KATAKANA LETTER HO
+<Bo>	 /xAB/xDC <U30DC>	# KATAKANA LETTER BO
+<Po>	 /xAB/xDD <U30DD>	# KATAKANA LETTER PO
+<Ma>	 /xAB/xDE <U30DE>	# KATAKANA LETTER MA
+<Mi>	 /xAB/xDF <U30DF>	# KATAKANA LETTER MI
+<Mu>	 /xAB/xE0 <U30E0>	# KATAKANA LETTER MU
+<Me>	 /xAB/xE1 <U30E1>	# KATAKANA LETTER ME
+<Mo>	 /xAB/xE2 <U30E2>	# KATAKANA LETTER MO
+<YA>	 /xAB/xE3 <U30E3>	# KATAKANA LETTER SMALL YA
+<Ya>	 /xAB/xE4 <U30E4>	# KATAKANA LETTER YA
+<YU>	 /xAB/xE5 <U30E5>	# KATAKANA LETTER SMALL YU
+<Yu>	 /xAB/xE6 <U30E6>	# KATAKANA LETTER YU
+<YO>	 /xAB/xE7 <U30E7>	# KATAKANA LETTER SMALL YO
+<Yo>	 /xAB/xE8 <U30E8>	# KATAKANA LETTER YO
+<Ra>	 /xAB/xE9 <U30E9>	# KATAKANA LETTER RA
+<Ri>	 /xAB/xEA <U30EA>	# KATAKANA LETTER RI
+<Ru>	 /xAB/xEB <U30EB>	# KATAKANA LETTER RU
+<Re>	 /xAB/xEC <U30EC>	# KATAKANA LETTER RE
+<Ro>	 /xAB/xED <U30ED>	# KATAKANA LETTER RO
+<WA>	 /xAB/xEE <U30EE>	# KATAKANA LETTER SMALL WA
+<Wa>	 /xAB/xEF <U30EF>	# KATAKANA LETTER WA
+<Wi>	 /xAB/xF0 <U30F0>	# KATAKANA LETTER WI
+<We>	 /xAB/xF1 <U30F1>	# KATAKANA LETTER WE
+<Wo>	 /xAB/xF2 <U30F2>	# KATAKANA LETTER WO
+<N6>	 /xAB/xF3 <U30F3>	# KATAKANA LETTER N
+<Vu>	 /xAB/xF4 <U30F4>	# KATAKANA LETTER VU
+<KA>	 /xAB/xF5 <U30F5>	# KATAKANA LETTER SMALL KA
+<KE>	 /xAB/xF6 <U30F6>	# KATAKANA LETTER SMALL KE
+<A=>	 /xAC/xA1 <U0410>	# CYRILLIC CAPITAL LETTER A
+<B=>	 /xAC/xA2 <U0411>	# CYRILLIC CAPITAL LETTER BE
+<V=>	 /xAC/xA3 <U0412>	# CYRILLIC CAPITAL LETTER VE
+<G=>	 /xAC/xA4 <U0413>	# CYRILLIC CAPITAL LETTER GHE
+<D=>	 /xAC/xA5 <U0414>	# CYRILLIC CAPITAL LETTER DE
+<E=>	 /xAC/xA6 <U0415>	# CYRILLIC CAPITAL LETTER IE
+<IO>	 /xAC/xA7 <U0401>	# CYRILLIC CAPITAL LETTER IO
+<Z%>	 /xAC/xA8 <U0416>	# CYRILLIC CAPITAL LETTER ZHE
+<Z=>	 /xAC/xA9 <U0417>	# CYRILLIC CAPITAL LETTER ZE
+<I=>	 /xAC/xAA <U0418>	# CYRILLIC CAPITAL LETTER I
+<J=>	 /xAC/xAB <U0419>	# CYRILLIC CAPITAL LETTER SHORT I
+<K=>	 /xAC/xAC <U041A>	# CYRILLIC CAPITAL LETTER KA
+<L=>	 /xAC/xAD <U041B>	# CYRILLIC CAPITAL LETTER EL
+<M=>	 /xAC/xAE <U041C>	# CYRILLIC CAPITAL LETTER EM
+<N=>	 /xAC/xAF <U041D>	# CYRILLIC CAPITAL LETTER EN
+<O=>	 /xAC/xB0 <U041E>	# CYRILLIC CAPITAL LETTER O
+<P=>	 /xAC/xB1 <U041F>	# CYRILLIC CAPITAL LETTER PE
+<R=>	 /xAC/xB2 <U0420>	# CYRILLIC CAPITAL LETTER ER
+<S=>	 /xAC/xB3 <U0421>	# CYRILLIC CAPITAL LETTER ES
+<T=>	 /xAC/xB4 <U0422>	# CYRILLIC CAPITAL LETTER TE
+<U=>	 /xAC/xB5 <U0423>	# CYRILLIC CAPITAL LETTER U
+<F=>	 /xAC/xB6 <U0424>	# CYRILLIC CAPITAL LETTER EF
+<H=>	 /xAC/xB7 <U0425>	# CYRILLIC CAPITAL LETTER HA
+<C=>	 /xAC/xB8 <U0426>	# CYRILLIC CAPITAL LETTER TSE
+<C%>	 /xAC/xB9 <U0427>	# CYRILLIC CAPITAL LETTER CHE
+<S%>	 /xAC/xBA <U0428>	# CYRILLIC CAPITAL LETTER SHA
+<Sc>	 /xAC/xBB <U0429>	# CYRILLIC CAPITAL LETTER SHCHA
+<=">	 /xAC/xBC <U042A>	# CYRILLIC CAPITAL LETTER HARD SIGN
+<Y=>	 /xAC/xBD <U042B>	# CYRILLIC CAPITAL LETTER YERU
+<%">	 /xAC/xBE <U042C>	# CYRILLIC CAPITAL LETTER SOFT SIGN
+<JE>	 /xAC/xBF <U042D>	# CYRILLIC CAPITAL LETTER E
+<JU>	 /xAC/xC0 <U042E>	# CYRILLIC CAPITAL LETTER YU
+<JA>	 /xAC/xC1 <U042F>	# CYRILLIC CAPITAL LETTER YA
+<a=>	 /xAC/xD1 <U0430>	# CYRILLIC SMALL LETTER A
+<b=>	 /xAC/xD2 <U0431>	# CYRILLIC SMALL LETTER BE
+<v=>	 /xAC/xD3 <U0432>	# CYRILLIC SMALL LETTER VE
+<g=>	 /xAC/xD4 <U0433>	# CYRILLIC SMALL LETTER GHE
+<d=>	 /xAC/xD5 <U0434>	# CYRILLIC SMALL LETTER DE
+<e=>	 /xAC/xD6 <U0435>	# CYRILLIC SMALL LETTER IE
+<io>	 /xAC/xD7 <U0451>	# CYRILLIC SMALL LETTER IO
+<z%>	 /xAC/xD8 <U0436>	# CYRILLIC SMALL LETTER ZHE
+<z=>	 /xAC/xD9 <U0437>	# CYRILLIC SMALL LETTER ZE
+<i=>	 /xAC/xDA <U0438>	# CYRILLIC SMALL LETTER I
+<j=>	 /xAC/xDB <U0439>	# CYRILLIC SMALL LETTER SHORT I
+<k=>	 /xAC/xDC <U043A>	# CYRILLIC SMALL LETTER KA
+<l=>	 /xAC/xDD <U043B>	# CYRILLIC SMALL LETTER EL
+<m=>	 /xAC/xDE <U043C>	# CYRILLIC SMALL LETTER EM
+<n=>	 /xAC/xDF <U043D>	# CYRILLIC SMALL LETTER EN
+<o=>	 /xAC/xE0 <U043E>	# CYRILLIC SMALL LETTER O
+<p=>	 /xAC/xE1 <U043F>	# CYRILLIC SMALL LETTER PE
+<r=>	 /xAC/xE2 <U0440>	# CYRILLIC SMALL LETTER ER
+<s=>	 /xAC/xE3 <U0441>	# CYRILLIC SMALL LETTER ES
+<t=>	 /xAC/xE4 <U0442>	# CYRILLIC SMALL LETTER TE
+<u=>	 /xAC/xE5 <U0443>	# CYRILLIC SMALL LETTER U
+<f=>	 /xAC/xE6 <U0444>	# CYRILLIC SMALL LETTER EF
+<h=>	 /xAC/xE7 <U0445>	# CYRILLIC SMALL LETTER HA
+<c=>	 /xAC/xE8 <U0446>	# CYRILLIC SMALL LETTER TSE
+<c%>	 /xAC/xE9 <U0447>	# CYRILLIC SMALL LETTER CHE
+<s%>	 /xAC/xEA <U0448>	# CYRILLIC SMALL LETTER SHA
+<sc>	 /xAC/xEB <U0449>	# CYRILLIC SMALL LETTER SHCHA
+<='>	 /xAC/xEC <U044A>	# CYRILLIC SMALL LETTER HARD SIGN
+<y=>	 /xAC/xED <U044B>	# CYRILLIC SMALL LETTER YERU
+<%'>	 /xAC/xEE <U044C>	# CYRILLIC SMALL LETTER SOFT SIGN
+<je>	 /xAC/xEF <U044D>	# CYRILLIC SMALL LETTER E
+<ju>	 /xAC/xF0 <U044E>	# CYRILLIC SMALL LETTER YU
+<ja>	 /xAC/xF1 <U044F>	# CYRILLIC SMALL LETTER YA
+
+<k1601>...<k1694>		/d176/d161
+<k1701>...<k1794>		/d177/d161
+<k1801>...<k1894>		/d178/d161
+<k1901>...<k1994>		/d179/d161
+<k2001>...<k2094>		/d180/d161
+<k2101>...<k2194>		/d181/d161
+<k2201>...<k2294>		/d182/d161
+<k2301>...<k2394>		/d183/d161
+<k2401>...<k2494>		/d184/d161
+<k2501>...<k2594>		/d185/d161
+<k2601>...<k2694>		/d186/d161
+<k2701>...<k2794>		/d187/d161
+<k2801>...<k2894>		/d188/d161
+<k2901>...<k2994>		/d189/d161
+<k3001>...<k3094>		/d190/d161
+<k3101>...<k3194>		/d191/d161
+<k3201>...<k3294>		/d192/d161
+<k3301>...<k3394>		/d193/d161
+<k3401>...<k3494>		/d194/d161
+<k3501>...<k3594>		/d195/d161
+<k3601>...<k3694>		/d196/d161
+<k3701>...<k3794>		/d197/d161
+<k3801>...<k3894>		/d198/d161
+<k3901>...<k3994>		/d199/d161
+<k4001>...<k4094>		/d200/d161
+<k4101>...<k4194>		/d201/d161
+<k4201>...<k4294>		/d202/d161
+<k4301>...<k4394>		/d203/d161
+<k4401>...<k4494>		/d204/d161
+<k4501>...<k4594>		/d205/d161
+<k4601>...<k4694>		/d206/d161
+<k4701>...<k4794>		/d207/d161
+<k4801>...<k4894>		/d208/d161
+<k4901>...<k4994>		/d209/d161
+<k5001>...<k5094>		/d210/d161
+<k5101>...<k5194>		/d211/d161
+<k5201>...<k5294>		/d212/d161
+<k5301>...<k5394>		/d213/d161
+<k5401>...<k5494>		/d214/d161
+<k5501>...<k5594>		/d215/d161
+<k5601>...<k5694>		/d216/d161
+<k5701>...<k5794>		/d217/d161
+<k5801>...<k5894>		/d218/d161
+<k5901>...<k5994>		/d219/d161
+<k6001>...<k6094>		/d220/d161
+<k6101>...<k6194>		/d221/d161
+<k6201>...<k6294>		/d222/d161
+<k6301>...<k6394>		/d223/d161
+<k6401>...<k6494>		/d224/d161
+<k6501>...<k6594>		/d225/d161
+<k6601>...<k6694>		/d226/d161
+<k6701>...<k6794>		/d227/d161
+<k6801>...<k6894>		/d228/d161
+<k6901>...<k6994>		/d229/d161
+<k7001>...<k7094>		/d230/d161
+<k7101>...<k7194>		/d231/d161
+<k7201>...<k7294>		/d232/d161
+<k7301>...<k7394>		/d233/d161
+<k7401>...<k7494>		/d234/d161
+<k7501>...<k7594>		/d235/d161
+<k7601>...<k7694>		/d236/d161
+<k7701>...<k7794>		/d237/d161
+<k7801>...<k7894>		/d238/d161
+<k7901>...<k7994>		/d239/d161
+<k8001>...<k8094>		/d240/d161
+<k8101>...<k8194>		/d241/d161
+<k8201>...<k8294>		/d242/d161
+<k8301>...<k8394>		/d243/d161
+<k8401>...<k8494>		/d244/d161
+<k8501>...<k8594>		/d245/d161
+<k8601>...<k8694>		/d246/d161
+<k8701>...<k8794>		/d247/d161
+<k8801>...<k8894>		/d248/d161
+<k8901>...<k8994>		/d249/d161
+<k9001>...<k9094>		/d250/d161
+<k9101>...<k9194>		/d251/d161
+<k9201>...<k9294>		/d252/d161
+<k9301>...<k9394>		/d253/d161
+END CHARMAP
diff --git a/malloc/malloc.h b/malloc/malloc.h
index 81966b856c..a93c77a853 100644
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -1,5 +1,5 @@
 /* Prototypes and definition for malloc implementation.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -55,11 +55,36 @@
 # define __malloc_ptrdiff_t ptrdiff_t
 #endif
 
-#if defined __STDC__ || defined __cplusplus || defined __GNUC__
-# define __MALLOC_P(args)        args
-#else
-# define __MALLOC_P(args)        ()
-#endif
+#ifdef __GNUC__
+
+/* GCC can always grok prototypes.  For C++ programs we add throw()
+   to help it optimize the function calls.  But this works only with
+   gcc 2.8.x and egcs.  */
+# if defined __cplusplus && __GNUC_MINOR__ >= 8
+#  define __THROW	throw ()
+# else
+#  define __THROW
+# endif
+# define __MALLOC_P(args)	args __THROW
+/* This macro will be used for functions which might take C++ callback
+   functions.  */
+# define __MALLOC_PMT(args)	args
+
+#else	/* Not GCC.  */
+
+# if (defined __STDC__ && __STDC__) || defined __cplusplus
+
+#  define __MALLOC_P(args)	args
+#  define __MALLOC_PMT(args)	args
+
+# else	/* Not ANSI C or C++.  */
+
+#  define __MALLOC_P(args)	()	/* No prototypes.  */
+#  define __MALLOC_PMT(args)	()
+
+# endif	/* ANSI C or C++.  */
+
+#endif	/* GCC.  */
 
 #ifndef NULL
 # ifdef __cplusplus
@@ -114,7 +139,7 @@ extern __malloc_ptr_t  pvalloc __MALLOC_P ((size_t __size));
 
 /* Underlying allocation function; successive calls should return
    contiguous pieces of memory.  */
-extern __malloc_ptr_t (*__morecore) __MALLOC_P ((ptrdiff_t __size));
+extern __malloc_ptr_t (*__morecore) __MALLOC_PMT ((ptrdiff_t __size));
 
 /* Default value of `__morecore'.  */
 extern __malloc_ptr_t __default_morecore __MALLOC_P ((ptrdiff_t __size));
@@ -180,18 +205,18 @@ extern int malloc_set_state __MALLOC_P ((__malloc_ptr_t __ptr));
 
 #if defined __GLIBC__ || defined MALLOC_HOOKS
 /* Hooks for debugging versions. */
-extern void (*__malloc_initialize_hook) __MALLOC_P ((void));
-extern void (*__free_hook) __MALLOC_P ((__malloc_ptr_t __ptr,
+extern void (*__malloc_initialize_hook) __MALLOC_PMT ((void));
+extern void (*__free_hook) __MALLOC_PMT ((__malloc_ptr_t __ptr,
 					__const __malloc_ptr_t));
-extern __malloc_ptr_t (*__malloc_hook) __MALLOC_P ((size_t __size,
+extern __malloc_ptr_t (*__malloc_hook) __MALLOC_PMT ((size_t __size,
 						    __const __malloc_ptr_t));
-extern __malloc_ptr_t (*__realloc_hook) __MALLOC_P ((__malloc_ptr_t __ptr,
+extern __malloc_ptr_t (*__realloc_hook) __MALLOC_PMT ((__malloc_ptr_t __ptr,
 						     size_t __size,
 						     __const __malloc_ptr_t));
-extern __malloc_ptr_t (*__memalign_hook) __MALLOC_P ((size_t __size,
+extern __malloc_ptr_t (*__memalign_hook) __MALLOC_PMT ((size_t __size,
 						      size_t __alignment,
 						      __const __malloc_ptr_t));
-extern void (*__after_morecore_hook) __MALLOC_P ((void));
+extern void (*__after_morecore_hook) __MALLOC_PMT ((void));
 
 /* Activate a standard set of debugging hooks. */
 extern void __malloc_check_init __MALLOC_P ((void));