Update.

2000-09-26  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/i386/bits/time.h: Remove CLOCK_MONOTONIC.

6 files changed, 29 insertions, 858 deletions

diff --git a/ChangeLog b/ChangeLog
index 52811371d9..9d52b8bddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/bits/time.h: Remove CLOCK_MONOTONIC.
+
 2000-09-26  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/sparc/sparc32/bits/endian.h: Remove.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index daa6f06951..6d22d9b8a5 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-26  Ulrich Drepper  <drepper@redhat.com>
 
+	* spinlock.h (__pthread_set_own_extricate_if): Optimize a bit.
+	Patch by Kaz Kylheku <kaz@ashi.footprints.net>.
+
 	* sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Remove
 	_POSIX_MONOTONIC_CLOCK.
 
diff --git a/linuxthreads/spinlock.h b/linuxthreads/spinlock.h
index c194d79bd6..2d3e9bf9f2 100644
--- a/linuxthreads/spinlock.h
+++ b/linuxthreads/spinlock.h
@@ -212,11 +212,22 @@ static inline long atomic_decrement(struct pthread_atomic *pa)
 
 
 static inline void
-__pthread_set_own_extricate_if(pthread_descr self, pthread_extricate_if *peif)
+__pthread_set_own_extricate_if (pthread_descr self, pthread_extricate_if *peif)
 {
-  /* The locks here are not ensuring an atomic update of the p_extricate
-     pointer.  They protect users of the pointer from using stale memory.  */
-  __pthread_lock(THREAD_GETMEM(self, p_lock), self);
-  THREAD_SETMEM(self, p_extricate, peif);
-  __pthread_unlock(THREAD_GETMEM (self, p_lock));
+  /* Only store a non-null peif if the thread has cancellation enabled.
+     Otherwise pthread_cancel will unconditionally call the extricate handler,
+     and restart the thread giving rise to forbidden spurious wakeups. */
+  if (peif == NULL
+      || THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE)
+    {
+      /* If we are removing the extricate interface, we need to synchronize
+	 against pthread_cancel so that it does not continue with a pointer
+         to a deallocated pthread_extricate_if struct! The thread lock
+         is (ab)used for this synchronization purpose. */
+      if (peif == NULL)
+	__pthread_lock (THREAD_GETMEM(self, p_lock), self);
+      THREAD_SETMEM(self, p_extricate, peif);
+      if (peif == NULL)
+	__pthread_unlock (THREAD_GETMEM(self, p_lock));
+    }
 }
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 6b0258461f..454fdbfbee 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* charmaps/KSX1001: Removed.  It's not sufficient for a charmap and
+	we have EUC-KR.
+
 2000-09-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/uk_UA: Fix yesexpr.
diff --git a/localedata/charmaps/KSX1001 b/localedata/charmaps/KSX1001
deleted file mode 100644
index fad17e10c0..0000000000
--- a/localedata/charmaps/KSX1001
+++ /dev/null
@@ -1,850 +0,0 @@
-<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
-<U3000>     /xa1/xa1     # IDEOGRAPHIC SPACE
-<U3001>     /xa1/xa2     # IDEOGRAPHIC COMMA
-<U3002>     /xa1/xa3     # IDEOGRAPHIC FULL STOP
-<U00B7>     /xa1/xa4     # MIDDLE DOT
-<U2025>     /xa1/xa5     # TWO DOT LEADER
-<U2026>     /xa1/xa6     # HORIZONTAL ELLIPSIS
-<U00A8>     /xa1/xa7     # DIAERESIS
-<U3003>     /xa1/xa8     # DITTO MARK
-<U00AD>     /xa1/xa9     # SOFT HYPHEN
-<U2015>     /xa1/xaa     # HORIZONTAL BAR
-<U2225>     /xa1/xab     # PARALLEL TO
-<UFF3C>     /xa1/xac     # FULLWIDTH REVERSE SOLIDUS
-<U223C>     /xa1/xad     # TILDE OPERATOR
-<U2018>     /xa1/xae     # LEFT SINGLE QUOTATION MARK
-<U2019>     /xa1/xaf     # RIGHT SINGLE QUOTATION MARK
-<U201C>     /xa1/xb0     # LEFT DOUBLE QUOTATION MARK
-<U201D>     /xa1/xb1     # RIGHT DOUBLE QUOTATION MARK
-<U3014>     /xa1/xb2     # LEFT TORTOISE SHELL BRACKET
-<U3015>     /xa1/xb3     # RIGHT TORTOISE SHELL BRACKET
-<U3008>     /xa1/xb4     # LEFT ANGLE BRACKET
-<U3009>     /xa1/xb5     # RIGHT ANGLE BRACKET
-<U300A>     /xa1/xb6     # LEFT DOUBLE ANGLE BRACKET
-<U300B>     /xa1/xb7     # RIGHT DOUBLE ANGLE BRACKET
-<U300C>     /xa1/xb8     # LEFT CORNER BRACKET
-<U300D>     /xa1/xb9     # RIGHT CORNER BRACKET
-<U300E>     /xa1/xba     # LEFT WHITE CORNER BRACKET
-<U300F>     /xa1/xbb     # RIGHT WHITE CORNER BRACKET
-<U3010>     /xa1/xbc     # LEFT BLACK LENTICULAR BRACKET
-<U3011>     /xa1/xbd     # RIGHT BLACK LENTICULAR BRACKET
-<U00B1>     /xa1/xbe     # PLUS-MINUS SIGN
-<U00D7>     /xa1/xbf     # MULTIPLICATION SIGN
-<U00F7>     /xa1/xc0     # DIVISION SIGN
-<U2260>     /xa1/xc1     # NOT EQUAL TO
-<U2264>     /xa1/xc2     # LESS-THAN OR EQUAL TO
-<U2265>     /xa1/xc3     # GREATER-THAN OR EQUAL TO
-<U221E>     /xa1/xc4     # INFINITY
-<U2234>     /xa1/xc5     # THEREFORE
-<U00B0>     /xa1/xc6     # DEGREE SIGN
-<U2032>     /xa1/xc7     # PRIME
-<U2033>     /xa1/xc8     # DOUBLE PRIME
-<U2103>     /xa1/xc9     # DEGREE CELSIUS
-<U212B>     /xa1/xca     # ANGSTROM SIGN
-<UFFE0>     /xa1/xcb     # FULLWIDTH CENT SIGN
-<UFFE1>     /xa1/xcc     # FULLWIDTH POUND SIGN
-<UFFE5>     /xa1/xcd     # FULLWIDTH YEN SIGN
-<U2642>     /xa1/xce     # MALE SIGN
-<U2640>     /xa1/xcf     # FEMALE SIGN
-<U2220>     /xa1/xd0     # ANGLE
-<U22A5>     /xa1/xd1     # UP TACK
-<U2312>     /xa1/xd2     # ARC
-<U2202>     /xa1/xd3     # PARTIAL DIFFERENTIAL
-<U2207>     /xa1/xd4     # NABLA
-<U2261>     /xa1/xd5     # IDENTICAL TO
-<U2252>     /xa1/xd6     # APPROXIMATELY EQUAL TO OR THE IMAGE OF
-<U00A7>     /xa1/xd7     # SECTION SIGN
-<U203B>     /xa1/xd8     # REFERENCE MARK
-<U2606>     /xa1/xd9     # WHITE STAR
-<U2605>     /xa1/xda     # BLACK STAR
-<U25CB>     /xa1/xdb     # WHITE CIRCLE
-<U25CF>     /xa1/xdc     # BLACK CIRCLE
-<U25CE>     /xa1/xdd     # BULLSEYE
-<U25C7>     /xa1/xde     # WHITE DIAMOND
-<U25C6>     /xa1/xdf     # BLACK DIAMOND
-<U25A1>     /xa1/xe0     # WHITE SQUARE
-<U25A0>     /xa1/xe1     # BLACK SQUARE
-<U25B3>     /xa1/xe2     # WHITE UP-POINTING TRIANGLE
-<U25B2>     /xa1/xe3     # BLACK UP-POINTING TRIANGLE
-<U25BD>     /xa1/xe4     # WHITE DOWN-POINTING TRIANGLE
-<U25BC>     /xa1/xe5     # BLACK DOWN-POINTING TRIANGLE
-<U2192>     /xa1/xe6     # RIGHTWARDS ARROW
-<U2190>     /xa1/xe7     # LEFTWARDS ARROW
-<U2191>     /xa1/xe8     # UPWARDS ARROW
-<U2193>     /xa1/xe9     # DOWNWARDS ARROW
-<U2194>     /xa1/xea     # LEFT RIGHT ARROW
-<U3013>     /xa1/xeb     # GETA MARK
-<U226A>     /xa1/xec     # MUCH LESS-THAN
-<U226B>     /xa1/xed     # MUCH GREATER-THAN
-<U221A>     /xa1/xee     # SQUARE ROOT
-<U223D>     /xa1/xef     # REVERSED TILDE
-<U221D>     /xa1/xf0     # PROPORTIONAL TO
-<U2235>     /xa1/xf1     # BECAUSE
-<U222B>     /xa1/xf2     # INTEGRAL
-<U222C>     /xa1/xf3     # DOUBLE INTEGRAL
-<U2208>     /xa1/xf4     # ELEMENT OF
-<U220B>     /xa1/xf5     # CONTAINS AS MEMBER
-<U2286>     /xa1/xf6     # SUBSET OF OR EQUAL TO
-<U2287>     /xa1/xf7     # SUPERSET OF OR EQUAL TO
-<U2282>     /xa1/xf8     # SUBSET OF
-<U2283>     /xa1/xf9     # SUPERSET OF
-<U222A>     /xa1/xfa     # UNION
-<U2229>     /xa1/xfb     # INTERSECTION
-<U2227>     /xa1/xfc     # LOGICAL AND
-<U2228>     /xa1/xfd     # LOGICAL OR
-<UFFE2>     /xa1/xfe     # FULLWIDTH NOT SIGN
-<U21D2>     /xa2/xa1     # RIGHTWARDS DOUBLE ARROW
-<U21D4>     /xa2/xa2     # LEFT RIGHT DOUBLE ARROW
-<U2200>     /xa2/xa3     # FOR ALL
-<U2203>     /xa2/xa4     # THERE EXISTS
-<U00B4>     /xa2/xa5     # ACUTE ACCENT
-<UFF5E>     /xa2/xa6     # FULLWIDTH TILDE
-<U02C7>     /xa2/xa7     # CARON
-<U02D8>     /xa2/xa8     # BREVE
-<U02DD>     /xa2/xa9     # DOUBLE ACUTE ACCENT
-<U02DA>     /xa2/xaa     # RING ABOVE
-<U02D9>     /xa2/xab     # DOT ABOVE
-<U00B8>     /xa2/xac     # CEDILLA
-<U02DB>     /xa2/xad     # OGONEK
-<U00A1>     /xa2/xae     # INVERTED EXCLAMATION MARK
-<U00BF>     /xa2/xaf     # INVERTED QUESTION MARK
-<U02D0>     /xa2/xb0     # MODIFIER LETTER TRIANGULAR COLON
-<U222E>     /xa2/xb1     # CONTOUR INTEGRAL
-<U2211>     /xa2/xb2     # N-ARY SUMMATION
-<U220F>     /xa2/xb3     # N-ARY PRODUCT
-<U00A4>     /xa2/xb4     # CURRENCY SIGN
-<U2109>     /xa2/xb5     # DEGREE FAHRENHEIT
-<U2030>     /xa2/xb6     # PER MILLE SIGN
-<U25C1>     /xa2/xb7     # WHITE LEFT-POINTING TRIANGLE
-<U25C0>     /xa2/xb8     # BLACK LEFT-POINTING TRIANGLE
-<U25B7>     /xa2/xb9     # WHITE RIGHT-POINTING TRIANGLE
-<U25B6>     /xa2/xba     # BLACK RIGHT-POINTING TRIANGLE
-<U2664>     /xa2/xbb     # WHITE SPADE SUIT
-<U2660>     /xa2/xbc     # BLACK SPADE SUIT
-<U2661>     /xa2/xbd     # WHITE HEART SUIT
-<U2665>     /xa2/xbe     # BLACK HEART SUIT
-<U2667>     /xa2/xbf     # WHITE CLUB SUIT
-<U2663>     /xa2/xc0     # BLACK CLUB SUIT
-<U2299>     /xa2/xc1     # CIRCLED DOT OPERATOR
-<U25C8>     /xa2/xc2     # WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND
-<U25A3>     /xa2/xc3     # WHITE SQUARE CONTAINING BLACK SMALL SQUARE
-<U25D0>     /xa2/xc4     # CIRCLE WITH LEFT HALF BLACK
-<U25D1>     /xa2/xc5     # CIRCLE WITH RIGHT HALF BLACK
-<U2592>     /xa2/xc6     # MEDIUM SHADE
-<U25A4>     /xa2/xc7     # SQUARE WITH HORIZONTAL FILL
-<U25A5>     /xa2/xc8     # SQUARE WITH VERTICAL FILL
-<U25A8>     /xa2/xc9     # SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL
-<U25A7>     /xa2/xca     # SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL
-<U25A6>     /xa2/xcb     # SQUARE WITH ORTHOGONAL CROSSHATCH FILL
-<U25A9>     /xa2/xcc     # SQUARE WITH DIAGONAL CROSSHATCH FILL
-<U2668>     /xa2/xcd     # HOT SPRINGS
-<U260F>     /xa2/xce     # WHITE TELEPHONE
-<U260E>     /xa2/xcf     # BLACK TELEPHONE
-<U261C>     /xa2/xd0     # WHITE LEFT POINTING INDEX
-<U261E>     /xa2/xd1     # WHITE RIGHT POINTING INDEX
-<U00B6>     /xa2/xd2     # PILCROW SIGN
-<U2020>     /xa2/xd3     # DAGGER
-<U2021>     /xa2/xd4     # DOUBLE DAGGER
-<U2195>     /xa2/xd5     # UP DOWN ARROW
-<U2197>     /xa2/xd6     # NORTH EAST ARROW
-<U2199>     /xa2/xd7     # SOUTH WEST ARROW
-<U2196>     /xa2/xd8     # NORTH WEST ARROW
-<U2198>     /xa2/xd9     # SOUTH EAST ARROW
-<U266D>     /xa2/xda     # MUSIC FLAT SIGN
-<U2669>     /xa2/xdb     # QUARTER NOTE
-<U266A>     /xa2/xdc     # EIGHTH NOTE
-<U266C>     /xa2/xdd     # BEAMED SIXTEENTH NOTES
-<U327F>     /xa2/xde     # KOREAN STANDARD SYMBOL
-<U321C>     /xa2/xdf     # PARENTHESIZED HANGUL CIEUC U
-<U2116>     /xa2/xe0     # NUMERO SIGN
-<U33C7>     /xa2/xe1     # SQUARE CO
-<U2122>     /xa2/xe2     # TRADE MARK SIGN
-<U33C2>     /xa2/xe3     # SQUARE AM
-<U33D8>     /xa2/xe4     # SQUARE PM
-<U2121>     /xa2/xe5     # TELEPHONE SIGN
-<UFF01>     /xa3/xa1     # FULLWIDTH EXCLAMATION MARK
-<UFF02>     /xa3/xa2     # FULLWIDTH QUOTATION MARK
-<UFF03>     /xa3/xa3     # FULLWIDTH NUMBER SIGN
-<UFF04>     /xa3/xa4     # FULLWIDTH DOLLAR SIGN
-<UFF05>     /xa3/xa5     # FULLWIDTH PERCENT SIGN
-<UFF06>     /xa3/xa6     # FULLWIDTH AMPERSAND
-<UFF07>     /xa3/xa7     # FULLWIDTH APOSTROPHE
-<UFF08>     /xa3/xa8     # FULLWIDTH LEFT PARENTHESIS
-<UFF09>     /xa3/xa9     # FULLWIDTH RIGHT PARENTHESIS
-<UFF0A>     /xa3/xaa     # FULLWIDTH ASTERISK
-<UFF0B>     /xa3/xab     # FULLWIDTH PLUS SIGN
-<UFF0C>     /xa3/xac     # FULLWIDTH COMMA
-<UFF0D>     /xa3/xad     # FULLWIDTH HYPHEN-MINUS
-<UFF0E>     /xa3/xae     # FULLWIDTH FULL STOP
-<UFF0F>     /xa3/xaf     # FULLWIDTH SOLIDUS
-<UFF10>     /xa3/xb0     # FULLWIDTH DIGIT ZERO
-<UFF11>     /xa3/xb1     # FULLWIDTH DIGIT ONE
-<UFF12>     /xa3/xb2     # FULLWIDTH DIGIT TWO
-<UFF13>     /xa3/xb3     # FULLWIDTH DIGIT THREE
-<UFF14>     /xa3/xb4     # FULLWIDTH DIGIT FOUR
-<UFF15>     /xa3/xb5     # FULLWIDTH DIGIT FIVE
-<UFF16>     /xa3/xb6     # FULLWIDTH DIGIT SIX
-<UFF17>     /xa3/xb7     # FULLWIDTH DIGIT SEVEN
-<UFF18>     /xa3/xb8     # FULLWIDTH DIGIT EIGHT
-<UFF19>     /xa3/xb9     # FULLWIDTH DIGIT NINE
-<UFF1A>     /xa3/xba     # FULLWIDTH COLON
-<UFF1B>     /xa3/xbb     # FULLWIDTH SEMICOLON
-<UFF1C>     /xa3/xbc     # FULLWIDTH LESS-THAN SIGN
-<UFF1D>     /xa3/xbd     # FULLWIDTH EQUALS SIGN
-<UFF1E>     /xa3/xbe     # FULLWIDTH GREATER-THAN SIGN
-<UFF1F>     /xa3/xbf     # FULLWIDTH QUESTION MARK
-<UFF20>     /xa3/xc0     # FULLWIDTH COMMERCIAL AT
-<UFF21>     /xa3/xc1     # FULLWIDTH LATIN CAPITAL LETTER A
-<UFF22>     /xa3/xc2     # FULLWIDTH LATIN CAPITAL LETTER B
-<UFF23>     /xa3/xc3     # FULLWIDTH LATIN CAPITAL LETTER C
-<UFF24>     /xa3/xc4     # FULLWIDTH LATIN CAPITAL LETTER D
-<UFF25>     /xa3/xc5     # FULLWIDTH LATIN CAPITAL LETTER E
-<UFF26>     /xa3/xc6     # FULLWIDTH LATIN CAPITAL LETTER F
-<UFF27>     /xa3/xc7     # FULLWIDTH LATIN CAPITAL LETTER G
-<UFF28>     /xa3/xc8     # FULLWIDTH LATIN CAPITAL LETTER H
-<UFF29>     /xa3/xc9     # FULLWIDTH LATIN CAPITAL LETTER I
-<UFF2A>     /xa3/xca     # FULLWIDTH LATIN CAPITAL LETTER J
-<UFF2B>     /xa3/xcb     # FULLWIDTH LATIN CAPITAL LETTER K
-<UFF2C>     /xa3/xcc     # FULLWIDTH LATIN CAPITAL LETTER L
-<UFF2D>     /xa3/xcd     # FULLWIDTH LATIN CAPITAL LETTER M
-<UFF2E>     /xa3/xce     # FULLWIDTH LATIN CAPITAL LETTER N
-<UFF2F>     /xa3/xcf     # FULLWIDTH LATIN CAPITAL LETTER O
-<UFF30>     /xa3/xd0     # FULLWIDTH LATIN CAPITAL LETTER P
-<UFF31>     /xa3/xd1     # FULLWIDTH LATIN CAPITAL LETTER Q
-<UFF32>     /xa3/xd2     # FULLWIDTH LATIN CAPITAL LETTER R
-<UFF33>     /xa3/xd3     # FULLWIDTH LATIN CAPITAL LETTER S
-<UFF34>     /xa3/xd4     # FULLWIDTH LATIN CAPITAL LETTER T
-<UFF35>     /xa3/xd5     # FULLWIDTH LATIN CAPITAL LETTER U
-<UFF36>     /xa3/xd6     # FULLWIDTH LATIN CAPITAL LETTER V
-<UFF37>     /xa3/xd7     # FULLWIDTH LATIN CAPITAL LETTER W
-<UFF38>     /xa3/xd8     # FULLWIDTH LATIN CAPITAL LETTER X
-<UFF39>     /xa3/xd9     # FULLWIDTH LATIN CAPITAL LETTER Y
-<UFF3A>     /xa3/xda     # FULLWIDTH LATIN CAPITAL LETTER Z
-<UFF3B>     /xa3/xdb     # FULLWIDTH LEFT SQUARE BRACKET
-<UFFE6>     /xa3/xdc     # FULLWIDTH WON SIGN
-<UFF3D>     /xa3/xdd     # FULLWIDTH RIGHT SQUARE BRACKET
-<UFF3E>     /xa3/xde     # FULLWIDTH CIRCUMFLEX ACCENT
-<UFF3F>     /xa3/xdf     # FULLWIDTH LOW LINE
-<UFF40>     /xa3/xe0     # FULLWIDTH GRAVE ACCENT
-<UFF41>     /xa3/xe1     # FULLWIDTH LATIN SMALL LETTER A
-<UFF42>     /xa3/xe2     # FULLWIDTH LATIN SMALL LETTER B
-<UFF43>     /xa3/xe3     # FULLWIDTH LATIN SMALL LETTER C
-<UFF44>     /xa3/xe4     # FULLWIDTH LATIN SMALL LETTER D
-<UFF45>     /xa3/xe5     # FULLWIDTH LATIN SMALL LETTER E
-<UFF46>     /xa3/xe6     # FULLWIDTH LATIN SMALL LETTER F
-<UFF47>     /xa3/xe7     # FULLWIDTH LATIN SMALL LETTER G
-<UFF48>     /xa3/xe8     # FULLWIDTH LATIN SMALL LETTER H
-<UFF49>     /xa3/xe9     # FULLWIDTH LATIN SMALL LETTER I
-<UFF4A>     /xa3/xea     # FULLWIDTH LATIN SMALL LETTER J
-<UFF4B>     /xa3/xeb     # FULLWIDTH LATIN SMALL LETTER K
-<UFF4C>     /xa3/xec     # FULLWIDTH LATIN SMALL LETTER L
-<UFF4D>     /xa3/xed     # FULLWIDTH LATIN SMALL LETTER M
-<UFF4E>     /xa3/xee     # FULLWIDTH LATIN SMALL LETTER N
-<UFF4F>     /xa3/xef     # FULLWIDTH LATIN SMALL LETTER O
-<UFF50>     /xa3/xf0     # FULLWIDTH LATIN SMALL LETTER P
-<UFF51>     /xa3/xf1     # FULLWIDTH LATIN SMALL LETTER Q
-<UFF52>     /xa3/xf2     # FULLWIDTH LATIN SMALL LETTER R
-<UFF53>     /xa3/xf3     # FULLWIDTH LATIN SMALL LETTER S
-<UFF54>     /xa3/xf4     # FULLWIDTH LATIN SMALL LETTER T
-<UFF55>     /xa3/xf5     # FULLWIDTH LATIN SMALL LETTER U
-<UFF56>     /xa3/xf6     # FULLWIDTH LATIN SMALL LETTER V
-<UFF57>     /xa3/xf7     # FULLWIDTH LATIN SMALL LETTER W
-<UFF58>     /xa3/xf8     # FULLWIDTH LATIN SMALL LETTER X
-<UFF59>     /xa3/xf9     # FULLWIDTH LATIN SMALL LETTER Y
-<UFF5A>     /xa3/xfa     # FULLWIDTH LATIN SMALL LETTER Z
-<UFF5B>     /xa3/xfb     # FULLWIDTH LEFT CURLY BRACKET
-<UFF5C>     /xa3/xfc     # FULLWIDTH VERTICAL LINE
-<UFF5D>     /xa3/xfd     # FULLWIDTH RIGHT CURLY BRACKET
-<UFFE3>     /xa3/xfe     # FULLWIDTH MACRON
-<U2170>     /xa5/xa1     # SMALL ROMAN NUMERAL ONE
-<U2171>     /xa5/xa2     # SMALL ROMAN NUMERAL TWO
-<U2172>     /xa5/xa3     # SMALL ROMAN NUMERAL THREE
-<U2173>     /xa5/xa4     # SMALL ROMAN NUMERAL FOUR
-<U2174>     /xa5/xa5     # SMALL ROMAN NUMERAL FIVE
-<U2175>     /xa5/xa6     # SMALL ROMAN NUMERAL SIX
-<U2176>     /xa5/xa7     # SMALL ROMAN NUMERAL SEVEN
-<U2177>     /xa5/xa8     # SMALL ROMAN NUMERAL EIGHT
-<U2178>     /xa5/xa9     # SMALL ROMAN NUMERAL NINE
-<U2179>     /xa5/xaa     # SMALL ROMAN NUMERAL TEN
-<U2160>     /xa5/xb0     # ROMAN NUMERAL ONE
-<U2161>     /xa5/xb1     # ROMAN NUMERAL TWO
-<U2162>     /xa5/xb2     # ROMAN NUMERAL THREE
-<U2163>     /xa5/xb3     # ROMAN NUMERAL FOUR
-<U2164>     /xa5/xb4     # ROMAN NUMERAL FIVE
-<U2165>     /xa5/xb5     # ROMAN NUMERAL SIX
-<U2166>     /xa5/xb6     # ROMAN NUMERAL SEVEN
-<U2167>     /xa5/xb7     # ROMAN NUMERAL EIGHT
-<U2168>     /xa5/xb8     # ROMAN NUMERAL NINE
-<U2169>     /xa5/xb9     # ROMAN NUMERAL TEN
-<U0391>     /xa5/xc1     # GREEK CAPITAL LETTER ALPHA
-<U0392>     /xa5/xc2     # GREEK CAPITAL LETTER BETA
-<U0393>     /xa5/xc3     # GREEK CAPITAL LETTER GAMMA
-<U0394>     /xa5/xc4     # GREEK CAPITAL LETTER DELTA
-<U0395>     /xa5/xc5     # GREEK CAPITAL LETTER EPSILON
-<U0396>     /xa5/xc6     # GREEK CAPITAL LETTER ZETA
-<U0397>     /xa5/xc7     # GREEK CAPITAL LETTER ETA
-<U0398>     /xa5/xc8     # GREEK CAPITAL LETTER THETA
-<U0399>     /xa5/xc9     # GREEK CAPITAL LETTER IOTA
-<U039A>     /xa5/xca     # GREEK CAPITAL LETTER KAPPA
-<U039B>     /xa5/xcb     # GREEK CAPITAL LETTER LAMDA
-<U039C>     /xa5/xcc     # GREEK CAPITAL LETTER MU
-<U039D>     /xa5/xcd     # GREEK CAPITAL LETTER NU
-<U039E>     /xa5/xce     # GREEK CAPITAL LETTER XI
-<U039F>     /xa5/xcf     # GREEK CAPITAL LETTER OMICRON
-<U03A0>     /xa5/xd0     # GREEK CAPITAL LETTER PI
-<U03A1>     /xa5/xd1     # GREEK CAPITAL LETTER RHO
-<U03A3>     /xa5/xd2     # GREEK CAPITAL LETTER SIGMA
-<U03A4>     /xa5/xd3     # GREEK CAPITAL LETTER TAU
-<U03A5>     /xa5/xd4     # GREEK CAPITAL LETTER UPSILON
-<U03A6>     /xa5/xd5     # GREEK CAPITAL LETTER PHI
-<U03A7>     /xa5/xd6     # GREEK CAPITAL LETTER CHI
-<U03A8>     /xa5/xd7     # GREEK CAPITAL LETTER PSI
-<U03A9>     /xa5/xd8     # GREEK CAPITAL LETTER OMEGA
-<U03B1>     /xa5/xe1     # GREEK SMALL LETTER ALPHA
-<U03B2>     /xa5/xe2     # GREEK SMALL LETTER BETA
-<U03B3>     /xa5/xe3     # GREEK SMALL LETTER GAMMA
-<U03B4>     /xa5/xe4     # GREEK SMALL LETTER DELTA
-<U03B5>     /xa5/xe5     # GREEK SMALL LETTER EPSILON
-<U03B6>     /xa5/xe6     # GREEK SMALL LETTER ZETA
-<U03B7>     /xa5/xe7     # GREEK SMALL LETTER ETA
-<U03B8>     /xa5/xe8     # GREEK SMALL LETTER THETA
-<U03B9>     /xa5/xe9     # GREEK SMALL LETTER IOTA
-<U03BA>     /xa5/xea     # GREEK SMALL LETTER KAPPA
-<U03BB>     /xa5/xeb     # GREEK SMALL LETTER LAMDA
-<U03BC>     /xa5/xec     # GREEK SMALL LETTER MU
-<U03BD>     /xa5/xed     # GREEK SMALL LETTER NU
-<U03BE>     /xa5/xee     # GREEK SMALL LETTER XI
-<U03BF>     /xa5/xef     # GREEK SMALL LETTER OMICRON
-<U03C0>     /xa5/xf0     # GREEK SMALL LETTER PI
-<U03C1>     /xa5/xf1     # GREEK SMALL LETTER RHO
-<U03C3>     /xa5/xf2     # GREEK SMALL LETTER SIGMA
-<U03C4>     /xa5/xf3     # GREEK SMALL LETTER TAU
-<U03C5>     /xa5/xf4     # GREEK SMALL LETTER UPSILON
-<U03C6>     /xa5/xf5     # GREEK SMALL LETTER PHI
-<U03C7>     /xa5/xf6     # GREEK SMALL LETTER CHI
-<U03C8>     /xa5/xf7     # GREEK SMALL LETTER PSI
-<U03C9>     /xa5/xf8     # GREEK SMALL LETTER OMEGA
-<U2500>     /xa6/xa1     # BOX DRAWINGS LIGHT HORIZONTAL
-<U2502>     /xa6/xa2     # BOX DRAWINGS LIGHT VERTICAL
-<U250C>     /xa6/xa3     # BOX DRAWINGS LIGHT DOWN AND RIGHT
-<U2510>     /xa6/xa4     # BOX DRAWINGS LIGHT DOWN AND LEFT
-<U2518>     /xa6/xa5     # BOX DRAWINGS LIGHT UP AND LEFT
-<U2514>     /xa6/xa6     # BOX DRAWINGS LIGHT UP AND RIGHT
-<U251C>     /xa6/xa7     # BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-<U252C>     /xa6/xa8     # BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-<U2524>     /xa6/xa9     # BOX DRAWINGS LIGHT VERTICAL AND LEFT
-<U2534>     /xa6/xaa     # BOX DRAWINGS LIGHT UP AND HORIZONTAL
-<U253C>     /xa6/xab     # BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-<U2501>     /xa6/xac     # BOX DRAWINGS HEAVY HORIZONTAL
-<U2503>     /xa6/xad     # BOX DRAWINGS HEAVY VERTICAL
-<U250F>     /xa6/xae     # BOX DRAWINGS HEAVY DOWN AND RIGHT
-<U2513>     /xa6/xaf     # BOX DRAWINGS HEAVY DOWN AND LEFT
-<U251B>     /xa6/xb0     # BOX DRAWINGS HEAVY UP AND LEFT
-<U2517>     /xa6/xb1     # BOX DRAWINGS HEAVY UP AND RIGHT
-<U2523>     /xa6/xb2     # BOX DRAWINGS HEAVY VERTICAL AND RIGHT
-<U2533>     /xa6/xb3     # BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
-<U252B>     /xa6/xb4     # BOX DRAWINGS HEAVY VERTICAL AND LEFT
-<U253B>     /xa6/xb5     # BOX DRAWINGS HEAVY UP AND HORIZONTAL
-<U254B>     /xa6/xb6     # BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
-<U2520>     /xa6/xb7     # BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
-<U252F>     /xa6/xb8     # BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
-<U2528>     /xa6/xb9     # BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
-<U2537>     /xa6/xba     # BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
-<U253F>     /xa6/xbb     # BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
-<U251D>     /xa6/xbc     # BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
-<U2530>     /xa6/xbd     # BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
-<U2525>     /xa6/xbe     # BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
-<U2538>     /xa6/xbf     # BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
-<U2542>     /xa6/xc0     # BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
-<U2512>     /xa6/xc1     # BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT
-<U2511>     /xa6/xc2     # BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY
-<U251A>     /xa6/xc3     # BOX DRAWINGS UP HEAVY AND LEFT LIGHT
-<U2519>     /xa6/xc4     # BOX DRAWINGS UP LIGHT AND LEFT HEAVY
-<U2516>     /xa6/xc5     # BOX DRAWINGS UP HEAVY AND RIGHT LIGHT
-<U2515>     /xa6/xc6     # BOX DRAWINGS UP LIGHT AND RIGHT HEAVY
-<U250E>     /xa6/xc7     # BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT
-<U250D>     /xa6/xc8     # BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY
-<U251E>     /xa6/xc9     # BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT
-<U251F>     /xa6/xca     # BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT
-<U2521>     /xa6/xcb     # BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY
-<U2522>     /xa6/xcc     # BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY
-<U2526>     /xa6/xcd     # BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT
-<U2527>     /xa6/xce     # BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT
-<U2529>     /xa6/xcf     # BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY
-<U252A>     /xa6/xd0     # BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY
-<U252D>     /xa6/xd1     # BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT
-<U252E>     /xa6/xd2     # BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT
-<U2531>     /xa6/xd3     # BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY
-<U2532>     /xa6/xd4     # BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY
-<U2535>     /xa6/xd5     # BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT
-<U2536>     /xa6/xd6     # BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT
-<U2539>     /xa6/xd7     # BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY
-<U253A>     /xa6/xd8     # BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY
-<U253D>     /xa6/xd9     # BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT
-<U253E>     /xa6/xda     # BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT
-<U2540>     /xa6/xdb     # BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT
-<U2541>     /xa6/xdc     # BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT
-<U2543>     /xa6/xdd     # BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT
-<U2544>     /xa6/xde     # BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT
-<U2545>     /xa6/xdf     # BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT
-<U2546>     /xa6/xe0     # BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT
-<U2547>     /xa6/xe1     # BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY
-<U2548>     /xa6/xe2     # BOX DRAWINGS UP LIGHT AND DOWN HORIZ