Skip to content

Commit

Permalink
* charmaps/BIG5: Add mapping for <U20AC> back.
Browse files Browse the repository at this point in the history
	Patch by Tung-Han Hsieh <thhsieh@twcpro.phys.ntu.edu.tw>.
  • Loading branch information
Ulrich Drepper committed Nov 7, 2000
1 parent 17b16ef commit 1324aff
Show file tree
Hide file tree
Showing 7 changed files with 347 additions and 206 deletions.
19 changes: 19 additions & 0 deletions FAQ
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ please let me know.
in /etc/nsswitch.conf?
2.32. What has do be done when upgrading to glibc 2.2?
2.33. The makefiles want to do a CVS commit.
2.34. When compiling C++ programs, I get a compilation error in streambuf.h.
2.35. When recompiling GCC, I get compilation errors in libio.

3. Source and binary incompatibilities, and what to do about them

Expand Down Expand Up @@ -1249,6 +1251,22 @@ time. This is what you always have to use if you are checking sources
directly out of the public CVS repository or you have your own private
repository.


2.34. When compiling C++ programs, I get a compilation error in streambuf.h.

{BH} You are using g++ 2.95.2? After upgrading to glibc 2.2, you need to
apply a patch to the include files in /usr/include/g++, because the fpos_t
type has changed in glibc 2.2. The patch is at
http://clisp.cons.org/~haible/gccinclude-glibc-2.2-compat.diff


2.35. When recompiling GCC, I get compilation errors in libio.

{BH} You are trying to recompile gcc 2.95.2? After upgrading to glibc 2.2,
you need to apply a patch to the gcc sources, because the fpos_t type and
a few libio internals have changed in glibc 2.2. T he patch is at
http://clisp.cons.org/~haible/gcc-glibc-2.2-compat.diff


. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .

Expand Down Expand Up @@ -1830,6 +1848,7 @@ Answers were given by:
{HJ} H.J. Lu, <hjl@gnu.org>
{CG} Cristian Gafton, <gafton@redhat.com>
{AO} Alexandre Oliva, <oliva@lsd.ic.unicamp.br>
{BH} Bruno Haible, <haible@clisp.cons.org>

Local Variables:
mode:outline
Expand Down
16 changes: 15 additions & 1 deletion FAQ.in
Original file line number Diff line number Diff line change
Expand Up @@ -1022,14 +1022,27 @@ be needed after upgrading:
Please read also the NEWS file which is the authoritative source for this
and gives more details for some topics.


?? The makefiles want to do a CVS commit.

{UD} Only if you are not specifying the --without-cvs flag at configure
time. This is what you always have to use if you are checking sources
directly out of the public CVS repository or you have your own private
repository.

?? When compiling C++ programs, I get a compilation error in streambuf.h.

{BH} You are using g++ 2.95.2? After upgrading to glibc 2.2, you need to
apply a patch to the include files in /usr/include/g++, because the fpos_t
type has changed in glibc 2.2. The patch is at
http://clisp.cons.org/~haible/gccinclude-glibc-2.2-compat.diff

?? When recompiling GCC, I get compilation errors in libio.

{BH} You are trying to recompile gcc 2.95.2? After upgrading to glibc 2.2,
you need to apply a patch to the gcc sources, because the fpos_t type and
a few libio internals have changed in glibc 2.2. T he patch is at
http://clisp.cons.org/~haible/gcc-glibc-2.2-compat.diff


? Source and binary incompatibilities, and what to do about them

Expand Down Expand Up @@ -1580,6 +1593,7 @@ Answers were given by:
{HJ} H.J. Lu, <hjl@gnu.org>
{CG} Cristian Gafton, <gafton@redhat.com>
{AO} Alexandre Oliva, <oliva@lsd.ic.unicamp.br>
{BH} Bruno Haible, <haible@clisp.cons.org>

Local Variables:
mode:outline
Expand Down
406 changes: 222 additions & 184 deletions locale/C-translit.h

Large diffs are not rendered by default.

99 changes: 83 additions & 16 deletions locale/C-translit.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,23 @@
"\x00ab" "<<" /* <U00AB> LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
"\x00ad" "-" /* <U00AD> SOFT HYPHEN */
"\x00ae" "(R)" /* <U00AE> REGISTERED SIGN */
"\x00b5" "u" /* <U00B5> MICRO SIGN */
"\x00b8" "," /* <U00B8> CEDILLA */
"\x00bb" ">>" /* <U00BB> RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
"\x00bc" "1/4" /* <U00BC> VULGAR FRACTION ONE QUARTER */
"\x00bd" "1/2" /* <U00BD> VULGAR FRACTION ONE HALF */
"\x00be" "3/4" /* <U00BE> VULGAR FRACTION THREE QUARTERS */
"\x00bc" " 1/4 " /* <U00BC> VULGAR FRACTION ONE QUARTER */
"\x00bd" " 1/2 " /* <U00BD> VULGAR FRACTION ONE HALF */
"\x00be" " 3/4 " /* <U00BE> VULGAR FRACTION THREE QUARTERS */
"\x00c6" "AE" /* <U00C6> LATIN CAPITAL LETTER AE */
"\x00d7" "x" /* <U00D7> MULTIPLICATION SIGN */
"\x00df" "ss" /* <U00DF> LATIN SMALL LETTER SHARP S */
"\x00e6" "ae" /* <U00E6> LATIN SMALL LETTER AE */
"\x0132" "IJ" /* <U0132> LATIN CAPITAL LIGATURE IJ */
"\x0133" "ij" /* <U0133> LATIN SMALL LIGATURE IJ */
"\x0149" "'n" /* <U0149> LATIN SMALL LETTER N PRECEDED BY APOSTROPHE */
"\x0152" "OE" /* <U0152> LATIN CAPITAL LIGATURE OE */
"\x0152" "OE" /* <U0152> LATIN CAPITAL LIGATURE OE */
"\x0153" "oe" /* <U0153> LATIN SMALL LIGATURE OE */
"\x0153" "oe" /* <U0153> LATIN SMALL LIGATURE OE */
"\x017f" "s" /* <U017F> LATIN SMALL LETTER LONG S */
"\x01c7" "LJ" /* <U01C7> LATIN CAPITAL LETTER LJ */
"\x01c8" "Lj" /* <U01C8> LATIN CAPITAL LETTER L WITH SMALL LETTER J */
Expand All @@ -44,6 +52,12 @@
"\x01f1" "DZ" /* <U01F1> LATIN CAPITAL LETTER DZ */
"\x01f2" "Dz" /* <U01F2> LATIN CAPITAL LETTER D WITH SMALL LETTER Z */
"\x01f3" "dz" /* <U01F3> LATIN SMALL LETTER DZ */
"\x02bc" "'" /* <U02BC> MODIFIER LETTER APOSTROPHE */
"\x02c6" "^" /* <U02C6> MODIFIER LETTER CIRCUMFLEX ACCENT */
"\x02c8" "'" /* <U02C8> MODIFIER LETTER VERTICAL LINE */
"\x02cb" "`" /* <U02CB> MODIFIER LETTER GRAVE ACCENT */
"\x02cd" "_" /* <U02CD> MODIFIER LETTER LOW MACRON */
"\x02d0" ":" /* <U02D0> MODIFIER LETTER TRIANGULAR COLON */
"\x02dc" "~" /* <U02DC> SMALL TILDE */
"\x2002" " " /* <U2002> EN SPACE */
"\x2003" " " /* <U2003> EM SPACE */
Expand All @@ -53,6 +67,7 @@
"\x2008" " " /* <U2008> PUNCTUATION SPACE */
"\x2009" " " /* <U2009> THIN SPACE */
"\x200a" " " /* <U200A> HAIR SPACE */
"\x200b" "" /* <U200B> ZERO WIDTH SPACE */
"\x2010" "-" /* <U2010> HYPHEN */
"\x2011" "-" /* <U2011> NON-BREAKING HYPHEN */
"\x2012" "-" /* <U2012> FIGURE DASH */
Expand All @@ -72,6 +87,10 @@
"\x2024" "." /* <U2024> ONE DOT LEADER */
"\x2025" ".." /* <U2025> TWO DOT LEADER */
"\x2026" "..." /* <U2026> HORIZONTAL ELLIPSIS */
"\x202f" " " /* <U202F> NARROW NO-BREAK SPACE */
"\x2035" "`" /* <U2035> REVERSED PRIME */
"\x2036" "``" /* <U2036> REVERSED DOUBLE PRIME */
"\x2037" "```" /* <U2037> REVERSED TRIPLE PRIME */
"\x2039" "<" /* <U2039> SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
"\x203a" ">" /* <U203A> SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
"\x203c" "!!" /* <U203C> DOUBLE EXCLAMATION MARK */
Expand Down Expand Up @@ -107,25 +126,26 @@
"\x2128" "Z" /* <U2128> BLACK-LETTER CAPITAL Z */
"\x212c" "B" /* <U212C> SCRIPT CAPITAL B */
"\x212d" "C" /* <U212D> BLACK-LETTER CAPITAL C */
"\x212e" "e" /* <U212E> ESTIMATED SYMBOL */
"\x212f" "e" /* <U212F> SCRIPT SMALL E */
"\x2130" "E" /* <U2130> SCRIPT CAPITAL E */
"\x2131" "F" /* <U2131> SCRIPT CAPITAL F */
"\x2133" "M" /* <U2133> SCRIPT CAPITAL M */
"\x2134" "o" /* <U2134> SCRIPT SMALL O */
"\x2139" "i" /* <U2139> INFORMATION SOURCE */
"\x2153" "1/3" /* <U2153> VULGAR FRACTION ONE THIRD */
"\x2154" "2/3" /* <U2154> VULGAR FRACTION TWO THIRDS */
"\x2155" "1/5" /* <U2155> VULGAR FRACTION ONE FIFTH */
"\x2156" "2/5" /* <U2156> VULGAR FRACTION TWO FIFTHS */
"\x2157" "3/5" /* <U2157> VULGAR FRACTION THREE FIFTHS */
"\x2158" "4/5" /* <U2158> VULGAR FRACTION FOUR FIFTHS */
"\x2159" "1/6" /* <U2159> VULGAR FRACTION ONE SIXTH */
"\x215a" "5/6" /* <U215A> VULGAR FRACTION FIVE SIXTHS */
"\x215b" "1/8" /* <U215B> VULGAR FRACTION ONE EIGHTH */
"\x215c" "3/8" /* <U215C> VULGAR FRACTION THREE EIGHTHS */
"\x215d" "5/8" /* <U215D> VULGAR FRACTION FIVE EIGHTHS */
"\x215e" "7/8" /* <U215E> VULGAR FRACTION SEVEN EIGHTHS */
"\x215f" "1/" /* <U215F> FRACTION NUMERATOR ONE */
"\x2153" " 1/3 " /* <U2153> VULGAR FRACTION ONE THIRD */
"\x2154" " 2/3 " /* <U2154> VULGAR FRACTION TWO THIRDS */
"\x2155" " 1/5 " /* <U2155> VULGAR FRACTION ONE FIFTH */
"\x2156" " 2/5 " /* <U2156> VULGAR FRACTION TWO FIFTHS */
"\x2157" " 3/5 " /* <U2157> VULGAR FRACTION THREE FIFTHS */
"\x2158" " 4/5 " /* <U2158> VULGAR FRACTION FOUR FIFTHS */
"\x2159" " 1/6 " /* <U2159> VULGAR FRACTION ONE SIXTH */
"\x215a" " 5/6 " /* <U215A> VULGAR FRACTION FIVE SIXTHS */
"\x215b" " 1/8 " /* <U215B> VULGAR FRACTION ONE EIGHTH */
"\x215c" " 3/8 " /* <U215C> VULGAR FRACTION THREE EIGHTHS */
"\x215d" " 5/8 " /* <U215D> VULGAR FRACTION FIVE EIGHTHS */
"\x215e" " 7/8 " /* <U215E> VULGAR FRACTION SEVEN EIGHTHS */
"\x215f" " 1/" /* <U215F> FRACTION NUMERATOR ONE */
"\x2160" "I" /* <U2160> ROMAN NUMERAL ONE */
"\x2161" "II" /* <U2161> ROMAN NUMERAL TWO */
"\x2162" "III" /* <U2162> ROMAN NUMERAL THREE */
Expand Down Expand Up @@ -160,14 +180,59 @@
"\x217f" "m" /* <U217F> SMALL ROMAN NUMERAL ONE THOUSAND */
"\x2190" "<-" /* <U2190> LEFTWARDS ARROW */
"\x2192" "->" /* <U2192> RIGHTWARDS ARROW */
"\x2194" "<->" /* <U2194> LEFT RIGHT ARROW */
"\x21d0" "<=" /* <U21D0> LEFTWARDS DOUBLE ARROW */
"\x21d2" "=>" /* <U21D2> RIGHTWARDS DOUBLE ARROW */
"\x21d4" "<=>" /* <U21D4> LEFT RIGHT DOUBLE ARROW */
"\x2212" "-" /* <U2212> MINUS SIGN */
"\x2215" "/" /* <U2215> DIVISION SLASH */
"\x2216" "\\" /* <U2216> SET MINUS */
"\x2217" "*" /* <U2217> ASTERISK OPERATOR */
"\x2223" "|" /* <U2223> DIVIDES */
"\x2236" ":" /* <U2236> RATIO */
"\x223c" "~" /* <U223C> TILDE OPERATOR */
"\x2264" "<=" /* <U2264> LESS-THAN OR EQUAL TO */
"\x2265" ">=" /* <U2265> GREATER-THAN OR EQUAL TO */
"\x226a" "<<" /* <U226A> MUCH LESS-THAN */
"\x226b" ">>" /* <U226B> MUCH GREATER-THAN */
"\x22d8" "<<<" /* <U22D8> VERY MUCH LESS-THAN */
"\x22d9" ">>>" /* <U22D9> VERY MUCH GREATER-THAN */
"\x2400" "NUL" /* <U2400> SYMBOL FOR NULL */
"\x2401" "SOH" /* <U2401> SYMBOL FOR START OF HEADING */
"\x2402" "STX" /* <U2402> SYMBOL FOR START OF TEXT */
"\x2403" "ETX" /* <U2403> SYMBOL FOR END OF TEXT */
"\x2404" "EOT" /* <U2404> SYMBOL FOR END OF TRANSMISSION */
"\x2405" "ENQ" /* <U2405> SYMBOL FOR ENQUIRY */
"\x2406" "ACK" /* <U2406> SYMBOL FOR ACKNOWLEDGE */
"\x2407" "BEL" /* <U2407> SYMBOL FOR BELL */
"\x2408" "BS" /* <U2408> SYMBOL FOR BACKSPACE */
"\x2409" "HT" /* <U2409> SYMBOL FOR HORIZONTAL TABULATION */
"\x240a" "LF" /* <U240A> SYMBOL FOR LINE FEED */
"\x240b" "VT" /* <U240B> SYMBOL FOR VERTICAL TABULATION */
"\x240c" "FF" /* <U240C> SYMBOL FOR FORM FEED */
"\x240d" "CR" /* <U240D> SYMBOL FOR CARRIAGE RETURN */
"\x240e" "SO" /* <U240E> SYMBOL FOR SHIFT OUT */
"\x240f" "SI" /* <U240F> SYMBOL FOR SHIFT IN */
"\x2410" "DLE" /* <U2410> SYMBOL FOR DATA LINK ESCAPE */
"\x2411" "DC1" /* <U2411> SYMBOL FOR DEVICE CONTROL ONE */
"\x2412" "DC2" /* <U2412> SYMBOL FOR DEVICE CONTROL TWO */
"\x2413" "DC3" /* <U2413> SYMBOL FOR DEVICE CONTROL THREE */
"\x2414" "DC4" /* <U2414> SYMBOL FOR DEVICE CONTROL FOUR */
"\x2415" "NAK" /* <U2415> SYMBOL FOR NEGATIVE ACKNOWLEDGE */
"\x2416" "SYN" /* <U2416> SYMBOL FOR SYNCHRONOUS IDLE */
"\x2417" "ETB" /* <U2417> SYMBOL FOR END OF TRANSMISSION BLOCK */
"\x2418" "CAN" /* <U2418> SYMBOL FOR CANCEL */
"\x2419" "EM" /* <U2419> SYMBOL FOR END OF MEDIUM */
"\x241a" "SUB" /* <U241A> SYMBOL FOR SUBSTITUTE */
"\x241b" "ESC" /* <U241B> SYMBOL FOR ESCAPE */
"\x241c" "FS" /* <U241C> SYMBOL FOR FILE SEPARATOR */
"\x241d" "GS" /* <U241D> SYMBOL FOR GROUP SEPARATOR */
"\x241e" "RS" /* <U241E> SYMBOL FOR RECORD SEPARATOR */
"\x241f" "US" /* <U241F> SYMBOL FOR UNIT SEPARATOR */
"\x2420" "SP" /* <U2420> SYMBOL FOR SPACE */
"\x2421" "DEL" /* <U2421> SYMBOL FOR DELETE */
"\x2423" "_" /* <U2423> OPEN BOX */
"\x2424" "NL" /* <U2424> SYMBOL FOR NEWLINE */
"\x2460" "(1)" /* <U2460> CIRCLED DIGIT ONE */
"\x2461" "(2)" /* <U2461> CIRCLED DIGIT TWO */
"\x2462" "(3)" /* <U2462> CIRCLED DIGIT THREE */
Expand Down Expand Up @@ -318,6 +383,7 @@
"\x252c" "+" /* <U252C> BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
"\x2534" "+" /* <U2534> BOX DRAWINGS LIGHT UP AND HORIZONTAL */
"\x253c" "+" /* <U253C> BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
"\x25e6" "o" /* <U25E6> WHITE BULLET */
"\x3000" " " /* <U3000> IDEOGRAPHIC SPACE */
"\xfb00" "ff" /* <UFB00> LATIN SMALL LIGATURE FF */
"\xfb01" "fi" /* <UFB01> LATIN SMALL LIGATURE FI */
Expand Down Expand Up @@ -351,6 +417,7 @@
"\xfe69" "$" /* <UFE69> SMALL DOLLAR SIGN */
"\xfe6a" "%" /* <UFE6A> SMALL PERCENT SIGN */
"\xfe6b" "@" /* <UFE6B> SMALL COMMERCIAL AT */
"\xfeff" "" /* <UFEFF> ZERO WIDTH NO-BREAK SPACE */
"\xff01" "!" /* <UFF01> FULLWIDTH EXCLAMATION MARK */
"\xff02" "\"" /* <UFF02> FULLWIDTH QUOTATION MARK */
"\xff03" "#" /* <UFF03> FULLWIDTH NUMBER SIGN */
Expand Down
5 changes: 5 additions & 0 deletions localedata/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2000-11-06 Ulrich Drepper <drepper@redhat.com>

* charmaps/BIG5: Add mapping for <U20AC> back.
Patch by Tung-Han Hsieh <thhsieh@twcpro.phys.ntu.edu.tw>.

2000-11-03 Bruno Haible <haible@clisp.cons.org>

* locales/translit_neutral: Add more entries. Mostly from Markus Kuhn.
Expand Down
6 changes: 2 additions & 4 deletions localedata/charmaps/BIG5
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<escape_char> /
%
% Chinese charmap for BIG5 (CP950)
% version: 0.91
% version: 0.92
% Contact: Tung-Han Hsieh <thhsieh@linux.org.tw>
% Yuan-Chung Cheng <platin@ms31.hinet.net>
% Distribution and use is free, even for comercial purpose.
Expand All @@ -19,9 +19,6 @@
% /xa2/xcc, /xa2/xce, /xf9/xe9, /xf9/xea, /xf9/xeb,
% /xf9/xf9, /xf9/xfa, /xf9/xfb, /xf9/xfc, /xf9/xfd
%
% The mapping /xa3/xe1 <==> <U20AC> is removed because only CP950.TXT contains
% this mapping, but not found in elsewhere. It might be a mistake.
%
% alias BIG5-CP950

CHARMAP
Expand Down Expand Up @@ -565,6 +562,7 @@ CHARMAP
<U02CA> /xa3/xbd MODIFIER LETTER ACUTE ACCENT
<U02C7> /xa3/xbe CARON
<U02CB> /xa3/xbf MODIFIER LETTER GRAVE ACCENT
<U20AC> /xa3/xe1 EURO SIGN
<U4E00> /xa4/x40 <CJK>
<U4E59> /xa4/x41 <CJK>
<U4E01> /xa4/x42 <CJK>
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/generic/dl-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ _dl_load_cache_lookup (const char *name)
cache_new = (void *) -1;
}
else if (file != NULL && cachesize > sizeof *cache_new
&& memcmp (cache_new->magic, CACHEMAGIC_VERSION_NEW,
&& memcmp (file, CACHEMAGIC_VERSION_NEW,
sizeof CACHEMAGIC_VERSION_NEW - 1) == 0)
{
cache_new = file;
Expand Down

0 comments on commit 1324aff

Please sign in to comment.