[PATCH] Remove obsolete aliases that broke 'locale -a'
Paul Eggert
eggert@cs.ucla.edu
Fri May 15 07:23:00 GMT 2015
Mike Frysinger wrote:
> i think we should normalize everything to UTF-8 where appropriate
Yes, it makes sense. Attached is a first cut at doing that, for files other
than locale.aliases. This patch may be a bit of a pain to read, as it contains
all sorts of encodings in the old lines.
-------------- next part --------------
From 614a6075b8e605c88205ad5d1ee9f2793a0a7b57 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 15 May 2015 00:18:59 -0700
Subject: [PATCH] Convert source files to UTF-8
---
ChangeLog.10 | 4 +-
ChangeLog.11 | 2 +-
ChangeLog.12 | 2 +-
ChangeLog.14 | 8 +-
ChangeLog.6 | 2 +-
ChangeLog.7 | 6 +-
ChangeLog.8 | 4 +-
localedata/bug-iconv-trans.c | 2 +-
localedata/locales/an_ES | 6 +-
localedata/locales/cs_CZ | 214 +++++++-------
localedata/locales/gl_ES | 4 +-
localedata/locales/gv_GB | 4 +-
localedata/locales/ku_TR | 2 +-
localedata/locales/kw_GB | 4 +-
localedata/locales/sk_SK | 16 +-
localedata/locales/so_DJ | 2 +-
localedata/locales/so_ET | 2 +-
localedata/locales/so_KE | 2 +-
localedata/locales/so_SO | 2 +-
localedata/locales/sv_SE | 28 +-
localedata/locales/wo_SN | 3 +-
localedata/locales/zh_HK | 4 +-
localedata/tests-mbwc/dat_mbrtowc.c | 36 +--
localedata/tests-mbwc/dat_mbsrtowcs.c | 12 +-
localedata/tests-mbwc/dat_strcoll.c | 10 +-
localedata/tests-mbwc/dat_swscanf.c | 12 +-
localedata/tests-mbwc/dat_wcrtomb.c | 4 +-
localedata/tests-mbwc/dat_wcsrtombs.c | 10 +-
localedata/tests-mbwc/dat_wcstombs.c | 10 +-
localedata/tests-mbwc/dat_wctomb.c | 4 +-
localedata/tst-xlocale1.c | 4 +-
localedata/tst-xlocale2.c | 2 +-
posix/PTESTS | 542 +++++++++++++++++-----------------
posix/PTESTS2C.sed | 2 +-
posix/bug-regex1.c | 4 +-
posix/ptestcases.h | 2 +-
posix/tst-regex.c | 4 +-
string/strverscmp.c | 2 +-
sysdeps/i386/fpu/e_atanh.S | 2 +-
sysdeps/i386/fpu/e_atanhl.S | 2 +-
sysdeps/i386/fpu/e_log10.S | 4 +-
sysdeps/i386/fpu/e_log10f.S | 4 +-
sysdeps/i386/fpu/e_log10l.S | 4 +-
sysdeps/i386/fpu/e_log2.S | 4 +-
sysdeps/i386/fpu/e_log2f.S | 4 +-
sysdeps/i386/fpu/e_log2l.S | 4 +-
sysdeps/i386/fpu/e_pow.S | 20 +-
sysdeps/i386/fpu/e_powf.S | 20 +-
sysdeps/i386/fpu/e_powl.S | 20 +-
sysdeps/i386/fpu/s_asinh.S | 2 +-
sysdeps/i386/fpu/s_asinhf.S | 2 +-
sysdeps/i386/fpu/s_log1p.S | 4 +-
sysdeps/i386/fpu/s_log1pf.S | 4 +-
sysdeps/i386/fpu/s_log1pl.S | 4 +-
sysdeps/ia64/fpu/s_tanf.S | 4 +-
sysdeps/x86_64/fpu/e_log10l.S | 4 +-
sysdeps/x86_64/fpu/e_log2l.S | 4 +-
sysdeps/x86_64/fpu/e_powl.S | 20 +-
sysdeps/x86_64/fpu/s_log1pl.S | 4 +-
timezone/southamerica | 10 +-
60 files changed, 566 insertions(+), 567 deletions(-)
diff --git a/ChangeLog.10 b/ChangeLog.10
index 6736bcc..268b269 100644
--- a/ChangeLog.10
+++ b/ChangeLog.10
@@ -1482,7 +1482,7 @@
* manual/getopt.texi (Using the getopt function): Fix description of
return value for format string starting with '-' (PR libc/1551).
- Patch by Raúl Núñez de Arenas Coronado <dervishd@jazzfree.com>
+ Patch by Raúl Núñez de Arenas Coronado <dervishd@jazzfree.com>
* sunrpc/clnt_perr.c (rpc_errlist): Fix index for RPC_PROGVERSMISMATCH.
Patch by jens.moeller@westgeo.com (PR libc/1550).
@@ -7316,7 +7316,7 @@
1999-07-25 Andreas Jaeger <aj@arthur.rhein-neckar.de>
- * localedata/tst-rpmatch.sh: Use "&" instead of "§" to avoid a bug
+ * localedata/tst-rpmatch.sh: Use "&" instead of "§" to avoid a bug
in bash 2.03.
1999-07-25 Ulrich Drepper <drepper@cygnus.com>
diff --git a/ChangeLog.11 b/ChangeLog.11
index d9b0364..bd4f0b2 100644
--- a/ChangeLog.11
+++ b/ChangeLog.11
@@ -1733,7 +1733,7 @@
2000-09-28 Ulrich Drepper <drepper@redhat.com>
* manual/errno.texi: Correct error text for ENXIO.
- Reported by Jörg Schilling <schilling@fokus.gmd.de>.
+ Reported by Jörg Schilling <schilling@fokus.gmd.de>.
2000-09-27 Jes Sorensen <jes@linuxcare.com>
diff --git a/ChangeLog.12 b/ChangeLog.12
index 2a4620e..6f8a4b0 100644
--- a/ChangeLog.12
+++ b/ChangeLog.12
@@ -9884,7 +9884,7 @@
* manual/startup.texi (Program Arguments): Fix type of main's envp
parameter.
- Reported by Raúl Núñez de Arenas Coronado <dervishd@linuxfreak.com>.
+ Reported by Raúl Núñez de Arenas Coronado <dervishd@linuxfreak.com>.
* iconvdata/gconv-modules: Add CP950 alias.
diff --git a/ChangeLog.14 b/ChangeLog.14
index 708e765..3e16a91 100644
--- a/ChangeLog.14
+++ b/ChangeLog.14
@@ -4149,7 +4149,7 @@
* sysdeps/x86_64/fpu/s_ilogbl.S: New file.
* sysdeps/x86_64/fpu/e_remainderl.S: New file.
- * math/libm-test.inc (floor_test): Test also ±0.25.
+ * math/libm-test.inc (floor_test): Test also ±0.25.
(ceil_test): Test -0.25.
2003-11-17 Ulrich Drepper <drepper@redhat.com>
@@ -4658,7 +4658,7 @@
(hol_entry_long_iterate): Change __attribute to __attribute__.
(_help, __argp_error, __argp_failure) [!_LIBC && (HAVE_FLOCKFILE
&& HAVE_FUNLOCKFILE)]: Protect call to flockfile and funlockfile.
- (__argp_basename) [!_LIBC]: New. Taken from LSH, by Niels Möller,
+ (__argp_basename) [!_LIBC]: New. Taken from LSH, by Niels Möller,
modified after comments from Ulrich Drepper.
(__argp_short_program_name): Ditto.
(__argp_state_help, __argp_error, __argp_failure): Use it.
@@ -12372,7 +12372,7 @@
* elf/reldep6.c: Create relocation dependency before closing the first
module.
-2003-01-10 Guido Günther <agx@sigxcpu.org>
+2003-01-10 Guido Günther <agx@sigxcpu.org>
* sysdeps/unix/mips/fork.S: Add PSEUDO_END.
* sysdeps/unix/mips/brk.S: Likewise.
@@ -15234,7 +15234,7 @@
* manual/examples/dir.c: Don't include <stddef.h>.
* manual/examples/select.c: Include <errno.h> for TEMP_FAILURE_RETRY.
- Reported by Frédéric Delanoy <delanoy_f@yahoo.com>.
+ Reported by Frédéric Delanoy <delanoy_f@yahoo.com>.
2002-11-02 H.J. Lu <hjl@gnu.org>
diff --git a/ChangeLog.6 b/ChangeLog.6
index 5858bd0..b920271 100644
--- a/ChangeLog.6
+++ b/ChangeLog.6
@@ -1636,7 +1636,7 @@ Thu Dec 19 20:58:53 1996 Ulrich Drepper <drepper@cygnus.com>
Define __USE_POSIX199309.
* posix/unistd.h: Declare fdatasync only if __USE_POSIX199309.
* time/time.c: Declare nanosleep only if __USE_POSIX199309.
- Patches by Rüdiger Helsch <rh@unifix.de>.
+ Patches by Rüdiger Helsch <rh@unifix.de>.
* locale/locale.h: Add declaration of newlocale and freelocale.
diff --git a/ChangeLog.7 b/ChangeLog.7
index cc1a5a7..d386678 100644
--- a/ChangeLog.7
+++ b/ChangeLog.7
@@ -415,7 +415,7 @@
definition. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>.
* stdlib/strtod.c: Handle numbers like 0.0e10000 correctly which
- produce ±0.0. Reported by Joe Keane <jgk@jgk.org>.
+ produce ±0.0. Reported by Joe Keane <jgk@jgk.org>.
* sysdeps/libm-ieee754/s_ceill.c: Fix typos.
* sysdeps/libm-ieee754/s_llrint.c: Correct code, it never worked.
@@ -5782,7 +5782,7 @@
1997-07-05 11:56 Ulrich Drepper <drepper@cygnus.com>
* login/login.c (tty_name): Use newly allocated buffer.
- Patch by Jaakko Hyvätti <jaakko.hyvatti@iki.fi>.
+ Patch by Jaakko Hyvätti <jaakko.hyvatti@iki.fi>.
* time/asctime.c: Never translate week and month name according
to LC_TIME. Patch by Paul Eggert <eggert@twinsun.com>.
@@ -9333,7 +9333,7 @@
* string/tst-svc.c: New file. Test for strverscmp.
* string/tst-svc.input: New file. Input data for tst-svc.
* string/tst-svc.expect: New file. Expected out from tst-svc.
- Patches by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>.
+ Patches by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>.
* math/Makefile (calls): Add s_signbit.
diff --git a/ChangeLog.8 b/ChangeLog.8
index 5c3be9f..662028b 100644
--- a/ChangeLog.8
+++ b/ChangeLog.8
@@ -8314,7 +8314,7 @@
1998-02-27 Ulrich Drepper <drepper@cygnus.com>
* misc/efgcvt_r.c (APPEND): Handle printing of 0.0 correctly.
- Reported by Göran Uddeborg <goeran@uddeborg.pp.se>.
+ Reported by Göran Uddeborg <goeran@uddeborg.pp.se>.
* misc/tst-efgcvt.c (ecvt_tests): Add new test case for reported
bug.
@@ -8322,7 +8322,7 @@
1998-02-25 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/arith.texi (Old-style number conversion): Correct
- typo. Reported by Göran Uddeborg <goeran@uddeborg.pp.se>.
+ typo. Reported by Göran Uddeborg <goeran@uddeborg.pp.se>.
1998-02-27 Ulrich Drepper <drepper@cygnus.com>
diff --git a/localedata/bug-iconv-trans.c b/localedata/bug-iconv-trans.c
index 3886247..189bb8b 100644
--- a/localedata/bug-iconv-trans.c
+++ b/localedata/bug-iconv-trans.c
@@ -7,7 +7,7 @@ int
main (void)
{
iconv_t cd;
- const char str[] = "ÄäÖöÜüß";
+ const char str[] = "\304\344\326\366\334\374\337";
const char expected[] = "AEaeOEoeUEuess";
char *inptr = (char *) str;
size_t inlen = strlen (str) + 1;
diff --git a/localedata/locales/an_ES b/localedata/locales/an_ES
index a06ab8e..cc18c6b 100644
--- a/localedata/locales/an_ES
+++ b/localedata/locales/an_ES
@@ -4,7 +4,7 @@ escape_char /
% Aragonese Language Locale for Spain
% Source:
% Address:
-% Contact: Jordi Mallach Pérez
+% Contact: Jordi Mallach Pérez
% Email: jordi@gnu.org
% Language: an
% Territory: ES
@@ -22,7 +22,7 @@ LC_IDENTIFICATION
title "Aragonese locale for Spain"
source ""
address ""
-contact "Jordi Mallach Pérez"
+contact "Jordi Mallach Pérez"
email "bug-glibc-locales@gnu.org"
tel ""
fax ""
@@ -136,6 +136,6 @@ country_ab3 "<U0045><U0053><U0050>"
country_num 724
% E
country_car "<U0045>"
-% aragonés
+% aragonés
lang_name "<U0061><U0072><U0061><U0067><U006F><U006E><U00E9><U0073>"
END LC_ADDRESS
diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ
index 2a7b4fa..365c0a6 100644
--- a/localedata/locales/cs_CZ
+++ b/localedata/locales/cs_CZ
@@ -3,8 +3,8 @@ comment_char %
%
% Czech Language Locale for Czech
% Source:
-% Address: U ¹koly 292 Without diactitical chars: U skoly 292
-% 783 72 Velký Týnec 782 72 Velky Tynec
+% Address: U Å¡koly 292 Without diactitical chars: U skoly 292
+% 783 72 Velký Týnec 782 72 Velky Tynec
% Contact: Vladimir Michl
% Email: Vladimir.Michl@upol.cz
% Tel: +420/68/5391545
@@ -20,8 +20,8 @@ comment_char %
% Distribution and use is free, also for commercial purposes.
% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-% Soubor cs_CZ je primárním souborem, cs_CZ@-ch je vytvoøen z nìj odebráním
-% definic ch a jeho øazení.
+% Soubor cs_CZ je primárnÃm souborem, cs_CZ@-ch je vytvoÅ™en z nÄ›j odebránÃm
+% definic ch a jeho Å™azenÃ.
%
% File cs_CZ is primary file. File cs_CZ@-ch is created from cs_CZ by script.
% File cs_CZ@-ch is without definition of character Ch and its collation.
@@ -30,78 +30,78 @@ comment_char %
%Changes:
% 2000-06-28: Jakub Jelinek <jakub@redhat.com>
% Adapted to new glibc 2.2 style locale format
-% 1997-08-20: Michael Mráka <michael@fi.muni.cz>
-% Zmìny zejména v sekci LC_TIME. (Changes especially in LC_TIME section.)
-% 1997-10-16: Michael Mráka <michael@fi.muni.cz>
-% Zmìny v abecedním øazení (sekce LC_COLLATE).
+% 1997-08-20: Michael Mráka <michael@fi.muni.cz>
+% Změny zejména v sekci LC_TIME. (Changes especially in LC_TIME section.)
+% 1997-10-16: Michael Mráka <michael@fi.muni.cz>
+% ZmÄ›ny v abecednÃm Å™azenà (sekce LC_COLLATE).
% (Alphabetical order changes (LC_LC_COLLATE section).)
-% xx: Doplnìno na unicode. Snaha o co nejvìt¹í soulad s ÈSN 97 6030
+% xx: Doplněno na unicode. Snaha o co největšà soulad s ČSN 97 6030
% Added Unicode. Czech collation acording to czech standard CSN 97 6030.
% 1999-02-07: Vladimir Michl
% Changed abbreviations of months
% Changed collation of characters
-% Zdroje informací:
-% ÈSN 97 6030
-% Nádvorník a kol.: Pravidla jmeného katalogu (èl. 201 - 210)
+% Zdroje informacÃ:
+% ÄŒSN 97 6030
+% NádvornÃk a kol.: Pravidla jmeného katalogu (Äl. 201 - 210)
-% Odli¹nosti od normy:
+% Odlišnosti od normy:
% 3.1:
-% Porovnávané výrazy jsou porovnány celé, jako jeden celek. Pøi porovnávání
-% jsou vynechány v¹echny speciální znaky, které nejsou písmena, nebo èíslice
-% (kromì nerozdìlitelné mezery).
-% K tìmto znakùm se pøihlí¾í pouze pøi jinak zcela shodných výrazech.
-% V cs_CZ je spojení písmen c a h následujících po sobì je v¾dy pova¾ováno
-% jako písmeno ch.
-% V cs_CZ@-ch je spojení písmen c a h pova¾ováno jako dvì písmena c a h, tj.
-% písmeno ch je zaøazeno pod písmeno c.
+% Porovnávané výrazy jsou porovnány celé, jako jeden celek. PÅ™i porovnávánÃ
+% jsou vynechány vÅ¡echny speciálnà znaky, které nejsou pÃsmena, nebo ÄÃslice
+% (kromě nerozdělitelné mezery).
+% K tÄ›mto znakům se pÅ™ihlÞà pouze pÅ™i jinak zcela shodných výrazech.
+% V cs_CZ je spojenà pÃsmen c a h následujÃcÃch po sobÄ› je vždy považováno
+% jako pÃsmeno ch.
+% V cs_CZ@-ch je spojenà pÃsmen c a h považováno jako dvÄ› pÃsmena c a h, tj.
+% pÃsmeno ch je zaÅ™azeno pod pÃsmeno c.
% 3.2:
-% Mezera se øadí pøed první písmeno abecedy, ale ka¾dý znak mezery je
-% uva¾ován samostatnì. Toto pravidlo je uplatnìno na hesla, která jsou si
-% jinak rovna (v prvních tøech prùchodech).
+% Mezera se Å™adà pÅ™ed prvnà pÃsmeno abecedy, ale každý znak mezery je
+% uvažován samostatně. Toto pravidlo je uplatněno na hesla, která jsou si
+% jinak rovna (v prvnÃch tÅ™ech průchodech).
% 3.6:
-% Není dodr¾en celý.
+% Nenà dodržen celý.
% 3.7:
-% Pokud jsou hesla stejná pøi primárním øazení (podle std. èes. abecedy)
-% a zároveò stejná i pøi sekundárním øazení (porovnávání diakritických
-% znamének), pak mají velká písmena pøednost pøed malými.
+% Pokud jsou hesla stejná pÅ™i primárnÃm Å™azenà (podle std. Äes. abecedy)
+% a zároveň stejná i pÅ™i sekundárnÃm Å™azenà (porovnávánà diakritických
+% znamének), pak majà velká pÃsmena pÅ™ednost pÅ™ed malými.
% 3.8:
-% Tento bod je dodr¾en pouze pro nìkolik písmen (nìmecké ostré Beta (ss))
-% Zde pøedpokládám splnìní podmínek bodu 3.9 (tj. pøi vìt¹ím výskytu
-% písmen z cicích abeced je povoleno je nerozepisovat a øadit a¾ za lat.
-% abecedu a èíslice)
+% Tento bod je dodržen pouze pro nÄ›kolik pÃsmen (nÄ›mecké ostré Beta (ss))
+% Zde pÅ™edpokládám splnÄ›nà podmÃnek bodu 3.9 (tj. pÅ™i vÄ›tÅ¡Ãm výskytu
+% pÃsmen z cicÃch abeced je povoleno je nerozepisovat a Å™adit až za lat.
+% abecedu a ÄÃslice)
% 3.10:
-% Èísla nejsou øazena podle èíselné hodnoty, ale podle hodnoty jednotlivých
-% èíslic.
+% ÄŒÃsla nejsou Å™azena podle ÄÃselné hodnoty, ale podle hodnoty jednotlivých
+% ÄÃslic.
% 3.12:
-% Pokud jsou hesla shodná v prvních tøech prùchodech, pak jsou srovnána tak
-% jak jsou, i s nepísmenými a neèíselnými znaèkami. Algoritmus jakým je
-% seøazen pøíklad uvedený v normì mi není zcela jasný a podle mì odporuje
-% døíve popsaným pravidlùm øazení.
-% Pøíklad seøazení:
-% Dle normy Dle mé definice
+% Pokud jsou hesla shodná v prvnÃch tÅ™ech průchodech, pak jsou srovnána tak
+% jak jsou, i s nepÃsmenými a neÄÃselnými znaÄkami. Algoritmus jakým je
+% seÅ™azen pÅ™Ãklad uvedený v normÄ› mi nenà zcela jasný a podle mÄ› odporuje
+% dÅ™Ãve popsaným pravidlům Å™azenÃ.
+% PÅ™Ãklad seÅ™azenÃ:
+% Dle normy Dle mé definice
% a a
% a- a-
-% a-b á
-% a-b- â
+% a-b á
+% a-b- â
% a-c a-b
-% á a-b-
-% â a-c
+% á a-b-
+% â a-c
% 3.13:
-% Tento bod jsem se sna¾il dodr¾et, bohu¾el seøadit znaménka je dost nároèné.
+% Tento bod jsem se snažil dodržet, bohužel seÅ™adit znaménka je dost nároÄné.
-% zpracování (compilation):
+% zpracovánà (compilation):
%% localedef -i cs_CZ -f "ISO-8859-2" 'cs_CZ.ISO-8859-2'
% or
%% localedef -i cs_CZ@-ch -f "ISO-8859-2" 'cs_CZ.ISO-8859-2'
-%% pro úspì¹né pøelo¾ení je tøeba mít kolekci národních prostøedí WG15collection
-%% nebo nainstalovánu knihovnu glibc-2.* s lokalizaèními soubory.
-%% Tyto soubory musí být v adresáøi /usr/share/i18n/locales a
+%% pro úspěšné pÅ™eloženà je tÅ™eba mÃt kolekci národnÃch prostÅ™edà WG15collection
+%% nebo nainstalovánu knihovnu glibc-2.* s lokalizaÄnÃmi soubory.
+%% Tyto soubory musà být v adresáři /usr/share/i18n/locales a
%% /usr/share/i18n/charmaps.
-%% Definice národních prostøedí se pak budou tvoøit v adresáøi /usr/share/locale
+%% Definice národnÃch prostÅ™edà se pak budou tvoÅ™it v adresáři /usr/share/locale
-%% V souboru /usr/share/locale/locale.alias je tøeba mít øádek
+%% V souboru /usr/share/locale/locale.alias je tÅ™eba mÃt řádek
%% czech cs_CZ.ISO88592
LC_IDENTIFICATION
@@ -131,7 +131,7 @@ category "cs_CZ:2000";LC_TELEPHONE
category "cs_CZ:2000";LC_MEASUREMENT
END LC_IDENTIFICATION
-%% Poøadí znakù
+%% Pořadà znaků
%% ----------------------------------------------------------
LC_COLLATE
@@ -287,7 +287,7 @@ collating-symbol <KATAKANA>
collating-symbol <SPECIAL>
-% Definice písmene ch
+% Definice pÃsmene ch
collating-element <c-h> from "<U0063><U0068>"
collating-element <C-h> from "<U0043><U0068>"
@@ -307,28 +307,28 @@ order_start forward;forward;forward;forward
<CAPITAL-SMALL>
% Accents:
-% Poøadí akcentù: nahoøe, dole, vzadu, vpøedu, uvnitø nebo pøes písmeno
-% pokud toto nerozhodne zále¾í na poètu a tvaru
+% PoÅ™adà akcentů: nahoÅ™e, dole, vzadu, vpÅ™edu, uvnitÅ™ nebo pÅ™es pÃsmeno
+% pokud toto nerozhodne záležà na poÄtu a tvaru
<NONE>
-% nahoøe
-<DOT> % Teèka
-<MACRON> % Vodorovná èárka nahoøe
-<ACUTE> % Èárka ' (napø: á)
-<GRAVE> % Zpìtná èárka `
-<CIRCUMFLEX> % Støí¹ka ^ (napø: â)
-<CARON> % Háèek
+% nahoře
+<DOT> % TeÄka
+<MACRON> % Vodorovná Äárka nahoÅ™e
+<ACUTE> % Čárka ' (např: á)
+<GRAVE> % ZpÄ›tná Äárka `
+<CIRCUMFLEX> % StÅ™ÃÅ¡ka ^ (napÅ™: â)
+<CARON> % HáÄek
<TILDE> % Tilda (~)
-<BREVE> % Dolní pùlkrou¾ek (vypadá jako sjednocení)
-<INVERTED-BREVE>% Horní pùlkrou¾ek (vypadá jako prùnik)
-<RING> % Krou¾ek
-<HOOK> % netu¹ím jaké diakritické znaménko to je, pøedpokládám je nahoøe
-<HORN> % netu¹ím jaké diakritické znaménko to je, pøedpokládám je nahoøe
+<BREVE> % Dolnà půlkroužek (vypadá jako sjednocenÃ)
+<INVERTED-BREVE>% Hornà půlkroužek (vypadá jako průnik)
+<RING> % Kroužek
+<HOOK> % netuÅ¡Ãm jaké diakritické znaménko to je, pÅ™edpokládám je nahoÅ™e
+<HORN> % netuÅ¡Ãm jaké diakritické znaménko to je, pÅ™edpokládám je nahoÅ™e
-<DIAERESIS> % Dvì teèky
+<DIAERESIS> % DvÄ› teÄky
<ACUTE+DOT>
-<DOUBLE-ACUTE> % Dvì èárky
-<DOUBLE-GRAVE> % Dvì zpìtné èárky
+<DOUBLE-ACUTE> % DvÄ› Äárky
+<DOUBLE-GRAVE> % DvÄ› zpÄ›tné Äárky
<TILDE+ACUTE>
<BREVE+MACRON>
<BREVE+ACUTE>
@@ -357,9 +357,9 @@ order_start forward;forward;forward;forward
<TILDE+DIAERESIS>
<CARON+DIAERESIS>
-% nahoøe a dole
-<DOT+DOT-BELOW> % Zde si nejsem jist jak je to mínìno, zda obì pod
-<MACRON+DOT-BELOW> % nebo pouze to druhé
+% nahoře a dole
+<DOT+DOT-BELOW> % Zde si nejsem jist jak je to mÃnÄ›no, zda obÄ› pod
+<MACRON+DOT-BELOW> % nebo pouze to druhé
<BREVE+DOT-BELOW>
<CIRCUMFLEX+DOT-BELOW>
<CEDILLA+ACUTE>
@@ -368,7 +368,7 @@ order_start forward;forward;forward;forward
<OGONEK+MACRON>
<HORN+DOT-BELOW>
<MACRON+DIAERESIS-BELOW>
-% nahoøe a uprostøed
+% nahoře a uprostřed
<STROKE+ACUTE>
% dole
@@ -376,14 +376,14 @@ order_start forward;forward;forward;forward
<LINE-BELOW>
<TILDE-BELOW>
<BREVE-BELOW>
-<CEDILLA> % Zobáèek pod písmenem vypadá skoro jako s (º)
-<OGONEK> % Zobáèek pod písmenem obrácený k pøedchozímu (jako c)(ê)
+<CEDILLA> % ZobáÄek pod pÃsmenem vypadá skoro jako s (ÅŸ)
+<OGONEK> % ZobáÄek pod pÃsmenem obrácený k pÅ™edchozÃmu (jako c)(Ä™)
<RING-BELOW>
% za
-% pøed
+% před
<PRECEDED-BY-APOSTROPHE>
-% uprostøed
-<STROKE> % ©krtnutí písmene v prostøedku (polské ³)
+% uprostřed
+<STROKE> % Å krtnutà pÃsmene v prostÅ™edku (polské Å‚)
<GREEK>
<TONOS>
@@ -405,7 +405,7 @@ order_start forward;forward;forward;forward
<U200A> IGNORE;IGNORE;IGNORE;<U200A>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Zde jsou v¹echna latinská písmena s diakritikou
+% Zde jsou vÅ¡echna latinská pÃsmena s diakritikou
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<U0041> <U0041>;<NONE>;<CAPITAL>;<U0041>
@@ -1043,7 +1043,7 @@ order_start forward;forward;forward;forward
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Èíslice
+% ÄŒÃslice
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<U0030> <U0030>;<U0030>;IGNORE;<U0030>
@@ -1075,8 +1075,8 @@ order_start forward;forward;forward;forward
<U2079> <U0039>;<U2079>;IGNORE;<U0039>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% V¹echny speciální znaky (sna¾il jsem se to seøadit podle normy, ale moc se
-% mi nedaøilo)
+% Všechny speciálnà znaky (snažil jsem se to seřadit podle normy, ale moc se
+% mi nedařilo)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<U0009> IGNORE;IGNORE;IGNORE;<U0009>
@@ -1085,7 +1085,7 @@ order_start forward;forward;forward;forward
<U000A> IGNORE;IGNORE;IGNORE;<U000A>
<U000C> IGNORE;IGNORE;IGNORE;<U000C>
-% znaménka
+% znaménka
<U002E> IGNORE;IGNORE;IGNORE;<U002E>
<U002C> IGNORE;IGNORE;IGNORE;<U002C>
<U003B> IGNORE;IGNORE;IGNORE;<U003B>
@@ -1132,7 +1132,7 @@ order_start forward;forward;forward;forward
<U007B> IGNORE;IGNORE;IGNORE;<U007B>
<U007D> IGNORE;IGNORE;IGNORE;<U007D>
-% ustálené znaèky
+% ustálené znaÄky
<U0026> IGNORE;IGNORE;IGNORE;<U0026>
<U00A3> IGNORE;IGNORE;IGNORE;<U00A3>
<U00A7> IGNORE;IGNORE;IGNORE;<U00A7>
@@ -1156,7 +1156,7 @@ order_start forward;forward;forward;forward
<U2126> IGNORE;IGNORE;IGNORE;<U2126>
<U212B> IGNORE;IGNORE;IGNORE;<U212B>
-% grafické znaèky a obrazce lineární
+% grafické znaÄky a obrazce lineárnÃ
<U005F> IGNORE;IGNORE;IGNORE;<U005F>
<U003D> IGNORE;IGNORE;IGNORE;<U003D>
<U005E> IGNORE;IGNORE;IGNORE;<U005E>
@@ -1188,19 +1188,19 @@ order_start forward;forward;forward;forward
<U2245> IGNORE;IGNORE;IGNORE;<U2245>
<U2248> IGNORE;IGNORE;IGNORE;<U2248>
-% grafické znaèky a obrazce plo¹né
+% grafické znaÄky a obrazce ploÅ¡né
<U00B0> IGNORE;IGNORE;IGNORE;<U00B0>
<U2103> IGNORE;IGNORE;IGNORE;<U2103>
<U2109> IGNORE;IGNORE;IGNORE;<U2109>
<U00A4> IGNORE;IGNORE;IGNORE;<U00A4>
-% Akcenty, nevím kam je zaøadit (nìkteré jsou brány jako uvozovky)
+% Akcenty, nevÃm kam je zaÅ™adit (nÄ›které jsou brány jako uvozovky)
<U02D9> IGNORE;IGNORE;IGNORE;<U02D9>
<U00AF> IGNORE;IGNORE;IGNORE;<U203E>
<U203E> IGNORE;IGNORE;IGNORE;<U203E>
<U00B4> IGNORE;IGNORE;IGNORE;<U00B4>
-%<U0060> IGNORE;IGNORE;IGNORE;<U0060> % pøemístìn do uvozovek
-%<U005E> IGNORE;IGNORE;IGNORE;<U005E> % pøemístìn do obrazcù lineárních
+%<U0060> IGNORE;IGNORE;IGNORE;<U0060> % pÅ™emÃstÄ›n do uvozovek
+%<U005E> IGNORE;IGNORE;IGNORE;<U005E> % pÅ™emÃstÄ›n do obrazců lineárnÃch
<U02C7> IGNORE;IGNORE;IGNORE;<U02C7>
% tilda
<U02D8> IGNORE;IGNORE;IGNORE;<U02D8>
@@ -1211,7 +1211,7 @@ order_start forward;forward;forward;forward
<U02DD> IGNORE;IGNORE;IGNORE;<U02DD>
<U00B7> IGNORE;IGNORE;IGNORE;<U00B7>
-% Neseøazeno
+% Neseřazeno
<U0374> IGNORE;IGNORE;IGNORE;<U0374>
<U0375> IGNORE;IGNORE;IGNORE;<U0375>
<U037A> IGNORE;IGNORE;IGNORE;<U037A>
@@ -1730,7 +1730,7 @@ order_start forward;forward;forward;forward
UNDEFINED IGNORE;IGNORE;IGNORE;IGNORE
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Zbytek vìcí z unikodu
+% Zbytek věcà z unikodu
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<U0391> <U0391>;<CAPITAL>;<GREEK>;<U0391>
@@ -2299,7 +2299,7 @@ order_end
END LC_COLLATE
-% Definice typù znakù
+% Definice typů znaků
LC_CTYPE
copy "i18n"
@@ -2322,7 +2322,7 @@ nostr "<U006E><U0065>"
END LC_MESSAGES
-%% LC_MONETARY -- jde jen o peníze
+%% LC_MONETARY -- jde jen o penÃze
%% -------------------------------------------------
LC_MONETARY
@@ -2345,7 +2345,7 @@ n_sign_posn 1
END LC_MONETARY
-%% O èíslech
+%% O ÄÃslech
%% --------------
LC_NUMERIC
@@ -2356,7 +2356,7 @@ grouping 3;3
END LC_NUMERIC
-%% Èas
+%% ÄŒas
LC_TIME
@@ -2389,8 +2389,8 @@ mon "<U006C><U0065><U0064><U0065><U006E>";/
"<U006C><U0069><U0073><U0074><U006F><U0070><U0061><U0064>";/
"<U0070><U0072><U006F><U0073><U0069><U006E><U0065><U0063>"
-% Obávám se, ¾e èe¹tina ¾ádné zkratky pro mìsíce nezná :-)
-% Zkratky vytvoøené podle pravidel zkracování, docela neobvyklé
+% Obávám se, že ÄeÅ¡tina žádné zkratky pro mÄ›sÃce nezná :-)
+% Zkratky vytvoÅ™ené podle pravidel zkracovánÃ, docela neobvyklé
%abmon "<U006C><U0065><U006E>";/
% "<U00FA><U006F><U0072>";/
% "<U0062><U0065><U006E>";/
@@ -2404,10 +2404,10 @@ mon "<U006C><U0065><U0064><U0065><U006E>";/
% "<U006C><U0061><U0064>";/
% "<U0070><U0065><U0063>"
-% Asi trochu srozumitelnìj¹í. Algoritmus je jednoduchý.
-% v¾dy první tøi písmena z názvu mìsíce. Výjimka èerven a èervenec, kdy
-% se vezmou první dvì písmena a poslední (nebo také první písmeno
-% a dvì koncová).
+% Asi trochu srozumitelnÄ›jÅ¡Ã. Algoritmus je jednoduchý.
+% vždy prvnà tÅ™i pÃsmena z názvu mÄ›sÃce. Výjimka Äerven a Äervenec, kdy
+% se vezmou prvnà dvÄ› pÃsmena a poslednà (nebo také prvnà pÃsmeno
+% a dvě koncová).
abmon "<U006C><U0065><U0064>";/
"<U00FA><U006E><U006F>";/
"<U0062><U0159><U0065>";/
@@ -2421,10 +2421,10 @@ abmon "<U006C><U0065><U0064>";/
"<U006C><U0069><U0073>";/
"<U0070><U0072><U006F>"
-% Zde jsou zkratky doporuèené poradnou Ústavu pro Jazyk Èeský.
-% Ano, vidíte správnì, jsou to anglické zkratky. Myslím si, ¾e nejsou
-% a¾ tak za¾ité, aby se pou¾ívaly. Pokud èlovìk nezná celé názvy mìsícù,
-% tì¾ko tyto zkratky odvozuje.
+% Zde jsou zkratky doporuÄené poradnou Ústavu pro Jazyk ÄŒeský.
+% Ano, vidÃte správnÄ›, jsou to anglické zkratky. MyslÃm si, že nejsou
+% až tak zažité, aby se použÃvaly. Pokud ÄlovÄ›k nezná celé názvy mÄ›sÃců,
+% těžko tyto zkratky odvozuje.
%abmon "<U004A><U0061><U006E>";/
% "<U0046><U0065><U0062>";/
% "<U004D><U0061><U0072>";/
@@ -2505,4 +2505,4 @@ lang_lib "<U0063><U007A><U0065>"
END LC_ADDRESS
%% END OF LOCALIZATION FILE for cs_CZ.ISO-8859-2
-%% Konec lokalizaèního souboru pro èeské prostøedí
+%% Konec lokalizaÄnÃho souboru pro Äeské prostÅ™edÃ
diff --git a/localedata/locales/gl_ES b/localedata/locales/gl_ES
index 6bb2ae6..4200c7d 100644
--- a/localedata/locales/gl_ES
+++ b/localedata/locales/gl_ES
@@ -3,7 +3,7 @@ escape_char /
%
% Galician Language Locale for Spain
% Source: GPUL
-% Address: Facultade de Informática
+% Address: Facultade de Informática
% Campus de Elvin~a, s/n
% 15071 A Corun~a, Spain
% Contact: Jacobo Tarrio
@@ -22,7 +22,7 @@ escape_char /
LC_IDENTIFICATION
title "Galician locale for Spain"
source "GPUL"
-address "Facultade de Informática, Campus de Elvin~a, s/n, 15071 A Corun~a, Spain"
+address "Facultade de Informática, Campus de Elvin~a, s/n, 15071 A Corun~a, Spain"
contact ""
email "bug-glibc-locales@gnu.org"
tel ""
diff --git a/localedata/locales/gv_GB b/localedata/locales/gv_GB
index 7aede2e..364429c 100644
--- a/localedata/locales/gv_GB
+++ b/localedata/locales/gv_GB
@@ -6,7 +6,7 @@ comment_char %
% Manx Gaelic language locale for Britain
% Source: Alastair McKinstry
-% Address: Croí Lár, Ballinahalla, Maigh Cuilinn,
+% Address: Croà Lár, Ballinahalla, Maigh Cuilinn,
% Co. Gaillimh, Ireland
% Contact: Alastair McKinstry
% Email: mckinstry@computer.org
@@ -24,7 +24,7 @@ comment_char %
LC_IDENTIFICATION
title "Manx Gaelic locale for Britain"
source "Alastair McKinstry"
-address "Croí Lár, Ballinahalla, Maigh Cuilinn,, Co. Gaillimh, Ireland"
+address "Croà Lár, Ballinahalla, Maigh Cuilinn,, Co. Gaillimh, Ireland"
contact ""
email "bug-glibc-locales@gnu.org"
tel ""
diff --git a/localedata/locales/ku_TR b/localedata/locales/ku_TR
index d974bfb..d8bef9f 100644
--- a/localedata/locales/ku_TR
+++ b/localedata/locales/ku_TR
@@ -183,7 +183,7 @@ LC_NAME
name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
<U0025><U006D><U0025><U0074><U0025><U0066>"
% TODO
-% Sayýn
+% Sayýn
name_gen "<U0053><U0061><U0079><U0131><U006E>"
% "M."
name_mr "<U004D><U002E>"
diff --git a/localedata/locales/kw_GB b/localedata/locales/kw_GB
index ece7c55..aacbfb3 100644
--- a/localedata/locales/kw_GB
+++ b/localedata/locales/kw_GB
@@ -7,7 +7,7 @@ comment_char %
% Cornish language locale for Britain
% Source: Alastair McKinstry
-% Address: Croí Lár, Ballinahalla, Maigh Cuilinn,
+% Address: Croà Lár, Ballinahalla, Maigh Cuilinn,
% Co. Gaillimh, Ireland
% Contact: Alastair McKinstry
% Email: mckinstry@computer.org
@@ -25,7 +25,7 @@ comment_char %
LC_IDENTIFICATION
title "Cornish locale for Britain"
source "Alastair McKinstry"
-address "Croí Lár, Ballinahalla, Maigh Cuilinn,, Co. Gaillimh, Ireland"
+address "Croà Lár, Ballinahalla, Maigh Cuilinn,, Co. Gaillimh, Ireland"
contact ""
email "bug-glibc-locales@gnu.org"
tel ""
diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK
index dbfcfe9..1d887ac 100644
--- a/localedata/locales/sk_SK
+++ b/localedata/locales/sk_SK
@@ -18,18 +18,18 @@ comment_char %
% Charset: ISO-8859-2
% Distribution and use is free, also for commercial purposes.
-% 1997-05-14: Odvodené z cs_CZ locale Vladimíra Michla.
-% Collate algoritmy prevzaté bezo zmien (norma bola rovnaká),
+% 1997-05-14: Odvodené z cs_CZ locale VladimÃra Michla.
+% Collate algoritmy prevzaté bezo zmien (norma bola rovnaká),
% vysvetlenie pozri cs_CZ
% spracovanie:
%% localedef -i <tento-soubor> -f ISO-8859-2 sk_SK
-%% Do súboru /usr/share/locale/locale.alias je vhodné dopísa» nasledovné aliasy:
+%% Do súboru /usr/share/locale/locale.alias je vhodné dopÃsaÅ¥ nasledovné aliasy:
%% sk sk_SK.ISO-8859-2
%% slovak sk_SK.ISO-8859-2
-% Definícia typov znakov
+% DefinÃcia typov znakov
LC_IDENTIFICATION
title "Slovak locale for Slovak"
@@ -109,7 +109,7 @@ n_sign_posn 1
END LC_MONETARY
-%% Èísla
+%% ÄŒÃsla
%% --------------
LC_NUMERIC
@@ -120,7 +120,7 @@ grouping 3;3
END LC_NUMERIC
-%% Èas
+%% ÄŒas
LC_TIME
@@ -154,7 +154,7 @@ mon "<U006A><U0061><U006E><U0075><U00E1><U0072>";/
"<U006E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
"<U0064><U0065><U0063><U0065><U006D><U0062><U0065><U0072>"
-% Hm - máme zau¾ívané skratky pre mesiace ?
+% Hm - máme zaužÃvané skratky pre mesiace ?
abmon "<U006A><U0061><U006E>";/
"<U0066><U0065><U0062>";/
@@ -190,7 +190,7 @@ first_workday 2
END LC_TIME
%% END OF LOCALIZATION FILE for sk_SK.ISO-8859-2
-%% Koniec lokalizaèného súboru pre slovenské prostredie
+%% Koniec lokalizaÄného súboru pre slovenské prostredie
LC_PAPER
% FIXME
diff --git a/localedata/locales/so_DJ b/localedata/locales/so_DJ
index 00ddf69..c8aab1d 100644
--- a/localedata/locales/so_DJ
+++ b/localedata/locales/so_DJ
@@ -9,7 +9,7 @@ escape_char /
% Charset: ISO-8859-1
%
% Somali terms provided by Mohamed Diriye Abdullahi <diriyeam@magellan.umontreal.ca>
-% Department of Linguistics and Translation, Université de Montréal, Montreal.
+% Department of Linguistics and Translation, Université de Montréal, Montreal.
% Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
%
% This locale data has been developed under the Yeha Project:
diff --git a/localedata/locales/so_ET b/localedata/locales/so_ET
index 79941e7..e4a5adc 100644
--- a/localedata/locales/so_ET
+++ b/localedata/locales/so_ET
@@ -9,7 +9,7 @@ escape_char /
% Charset: UTF-8
%
% Somali terms provided by Mohamed Diriye Abdullahi <diriyeam@magellan.umontreal.ca>
-% Department of Linguistics and Translation, Université de Montréal, Montreal.
+% Department of Linguistics and Translation, Université de Montréal, Montreal.
% Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
%
% This locale data has been developed under the Yeha Project:
diff --git a/localedata/locales/so_KE b/localedata/locales/so_KE
index 0a1e978..fb8f8e6 100644
--- a/localedata/locales/so_KE
+++ b/localedata/locales/so_KE
@@ -9,7 +9,7 @@ escape_char /
% Charset: ISO-8859-1
%
% Somali terms provided by Mohamed Diriye Abdullahi <diriyeam@magellan.umontreal.ca>
-% Department of Linguistics and Translation, Université de Montréal, Montreal.
+% Department of Linguistics and Translation, Université de Montréal, Montreal.
% Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
%
% This locale data has been developed under the Yeha Project:
diff --git a/localedata/locales/so_SO b/localedata/locales/so_SO
index 4d6a24b..88d3495 100644
--- a/localedata/locales/so_SO
+++ b/localedata/locales/so_SO
@@ -9,7 +9,7 @@ escape_char /
% Charset: ISO-8859-1
%
% Somali terms provided by Mohamed Diriye Abdullahi <diriyeam@magellan.umontreal.ca>
-% Department of Linguistics and Translation, Université de Montréal, Montreal.
+% Department of Linguistics and Translation, Université de Montréal, Montreal.
% Prepared and contributed to glibc by Daniel Yacob <locales@geez.org>.
%
% This locale data has been developed under the Yeha Project:
diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE
index ecf7858..db20ddd 100644
--- a/localedata/locales/sv_SE
+++ b/localedata/locales/sv_SE
@@ -61,7 +61,7 @@ collating-symbol <ae>
collating-symbol <oumlaut>
collating-symbol <oslash>
-% æ is sorted after ä and å etc.
+% æ is sorted after ä and å etc.
reorder-after <REU>
<LIG>
@@ -83,26 +83,26 @@ reorder-after <U0076>
<U0077> <v>;<BAS>;<MIN>;<w> % w
reorder-after <U00E3>
-<U00E4> <ae>;<REU>;<MIN>;IGNORE % ä
-<U00E5> <aring>;<RNE>;<MIN>;IGNORE % å
-<U00E6> <ae>;<LIG>;<MIN>;IGNORE % æ
+<U00E4> <ae>;<REU>;<MIN>;IGNORE % ä
+<U00E5> <aring>;<RNE>;<MIN>;IGNORE % å
+<U00E6> <ae>;<LIG>;<MIN>;IGNORE % æ
reorder-after <U00F5>
-<U00F6> <oumlaut>;<REU>;<MIN>;IGNORE % ö
-<U00F8> <oslash>;<OBL>;<MIN>;IGNORE % ø
+<U00F6> <oumlaut>;<REU>;<MIN>;IGNORE % ö
+<U00F8> <oslash>;<OBL>;<MIN>;IGNORE % ø
reorder-after <U00C3>
-<U00C4> <ae>;<REU>;<CAP>;IGNORE % Ä
-<U00C5> <aring>;<RNE>;<CAP>;IGNORE % Å
-<U00C6> <ae>;<LIG>;<CAP>;IGNORE % Æ
+<U00C4> <ae>;<REU>;<CAP>;IGNORE % Ä
+<U00C5> <aring>;<RNE>;<CAP>;IGNORE % Ã…
+<U00C6> <ae>;<LIG>;<CAP>;IGNORE % Æ
reorder-after <U00D5>
-<U00D6> <oumlaut>;<REU>;<CAP>;IGNORE % Ö
-<U00D8> <oslash>;<OBL>;<CAP>;IGNORE % Ø
+<U00D6> <oumlaut>;<REU>;<CAP>;IGNORE % Ö
+<U00D8> <oslash>;<OBL>;<CAP>;IGNORE % Ø
-% ü/Ü is treated like y/Y but is sorted after the latter
+% ü/Ü is treated like y/Y but is sorted after the latter
reorder-after <U00FB>
-<U00FC> <y>;<REU>;<MIN>;IGNORE % ü
+<U00FC> <y>;<REU>;<MIN>;IGNORE % ü
reorder-after <U00DB>
-<U00DC> <y>;<REU>;<CAP>;IGNORE % Ü
+<U00DC> <y>;<REU>;<CAP>;IGNORE % Ü
reorder-end
END LC_COLLATE
diff --git a/localedata/locales/wo_SN b/localedata/locales/wo_SN
index 44dcabd..b31679f 100644
--- a/localedata/locales/wo_SN
+++ b/localedata/locales/wo_SN
@@ -61,7 +61,7 @@ END LC_COLLATE
LC_MESSAGES
% Yes=Waaw
-% No=Déet
+% No=Déet
yesexpr "<U005E><U005B><U0077><U0057><U0079><U0059><U005D><U002E><U002A>"
noexpr "<U005E><U005B><U0064><U0044><U006E><U004E><U005D><U002E><U002A>"
END LC_MESSAGES
@@ -186,4 +186,3 @@ lang_term "<U0077><U006F><U006C>"
% wol
lang_lib "<U0077><U006F><U006C>"
END LC_ADDRESS
-
diff --git a/localedata/locales/zh_HK b/localedata/locales/zh_HK
index 77a6f8c..d0cd837 100644
--- a/localedata/locales/zh_HK
+++ b/localedata/locales/zh_HK
@@ -123,12 +123,12 @@ d_t_fmt "<U0025><U0059><U5E74><U0025><U006D><U6708><U0025><U0064><U65E5>/
%
% Appropriate date representation
% Changed %b to %m, by Anthony Fok <anthony@thizlinux.com>, Feb 2002
-% %Y”N%mŒŽ%d“ú %A
+% %Y年%m月%d日 %A
d_fmt "<U0025><U0059><U5E74><U0025><U006D><U6708><U0025><U0064>/
<U65E5><U0020><U0025><U0041>"
%
% Appropriate time representation
-% %IŽž%M•ª%S•b %Z
+% %I時%M分%S秒 %Z
t_fmt "<U0025><U0049><U6642><U0025><U004D><U5206><U0025><U0053>/
<U79D2><U0020><U0025><U005A>"
%
diff --git a/localedata/tests-mbwc/dat_mbrtowc.c b/localedata/tests-mbwc/dat_mbrtowc.c
index b8eb3dd..d6951d1 100644
--- a/localedata/tests-mbwc/dat_mbrtowc.c
+++ b/localedata/tests-mbwc/dat_mbrtowc.c
@@ -23,9 +23,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = {
{ /*----------------- #01 -----------------*/
{
{
- { 1, 1, "ÄÖÜ", 1, 0, 0 },
- { 1, 1, "ÄÖÜ", 2, 0, 0 },
- { 1, 1, "ÄÖÜ", USE_MBCURMAX, 0, 0 },
+ { 1, 1, "\304\326\334", 1, 0, 0 },
+ { 1, 1, "\304\326\334", 2, 0, 0 },
+ { 1, 1, "\304\326\334", USE_MBCURMAX, 0, 0 },
}
},
{
@@ -39,9 +39,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = {
{ /*----------------- #02 -----------------*/
{
{
- { 1, 1, "ÄÖÜ", 1, 0, 0 },
- { 1, 1, "ÄÖÜ", 2, 0, 0 },
- { 1, 1, "ÄÖÜ", USE_MBCURMAX, 0, 0 },
+ { 1, 1, "\304\326\334", 1, 0, 0 },
+ { 1, 1, "\304\326\334", 2, 0, 0 },
+ { 1, 1, "\304\326\334", USE_MBCURMAX, 0, 0 },
}
},
{
@@ -63,9 +63,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = {
{ /*----------------- #01 -----------------*/
{
{
- { 1, 1, "ÄÖÜ", 1, 0, 0 },
- { 1, 1, "ÄÖÜ", 2, 0, 0 },
- { 1, 1, "ÄÖÜ", USE_MBCURMAX, 0, 0 },
+ { 1, 1, "\304\326\334", 1, 0, 0 },
+ { 1, 1, "\304\326\334", 2, 0, 0 },
+ { 1, 1, "\304\326\334", USE_MBCURMAX, 0, 0 },
}
},
{
@@ -79,9 +79,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = {
{ /*----------------- #02 -----------------*/
{
{
- { 1, 1, "ÄÖÜ", 1, 0, 0 },
- { 1, 1, "ÄÖÜ", 2, 0, 0 },
- { 1, 1, "ÄÖÜ", USE_MBCURMAX, 0, 0 },
+ { 1, 1, "\304\326\334", 1, 0, 0 },
+ { 1, 1, "\304\326\334", 2, 0, 0 },
+ { 1, 1, "\304\326\334", USE_MBCURMAX, 0, 0 },
}
},
{
@@ -101,9 +101,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = {
{ /*----------------- #01 -----------------*/
{
{
- { 1, 1, "ÄÖÜ", 1, 0, 0 },
- { 1, 1, "ÄÖÜ", 2, 0, 0 },
- { 1, 1, "ÄÖÜ", USE_MBCURMAX, 0, 0 },
+ { 1, 1, "\304\326\334", 1, 0, 0 },
+ { 1, 1, "\304\326\334", 2, 0, 0 },
+ { 1, 1, "\304\326\334", USE_MBCURMAX, 0, 0 },
}
},
{
@@ -117,9 +117,9 @@ TST_MBRTOWC tst_mbrtowc_loc [] = {
{ /*----------------- #02 -----------------*/
{
{
- { 1, 1, "ÄÖÜ", 1, 0, 0 },
- { 1, 1, "ÄÖÜ", 2, 0, 0 },
- { 1, 1, "ÄÖÜ", USE_MBCURMAX, 0, 0 },
+ { 1, 1, "\304\326\334", 1, 0, 0 },
+ { 1, 1, "\304\326\334", 2, 0, 0 },
+ { 1, 1, "\304\326\334", USE_MBCURMAX, 0, 0 },
}
},
{
diff --git a/localedata/tests-mbwc/dat_mbsrtowcs.c b/localedata/tests-mbwc/dat_mbsrtowcs.c
index e1ee181..e7a4d50 100644
--- a/localedata/tests-mbwc/dat_mbsrtowcs.c
+++ b/localedata/tests-mbwc/dat_mbsrtowcs.c
@@ -15,9 +15,9 @@ TST_MBSRTOWCS tst_mbsrtowcs_loc [] = {
{ /*----------------- #01 -----------------*/
{
{
- { 1, "üäö", 4, 0,0 },
- { 1, "üäö", 3, 0,0 },
- { 1, "üäö", 2, 0,0 },
+ { 1, "\374\344\366", 4, 0,0 },
+ { 1, "\374\344\366", 3, 0,0 },
+ { 1, "\374\344\366", 2, 0,0 },
}
},
{
@@ -31,9 +31,9 @@ TST_MBSRTOWCS tst_mbsrtowcs_loc [] = {
{ /*----------------- #02 -----------------*/
{
{
- { 1, "üäö", 4, 0,0 },
- { 1, "", 1, 0,0 },
- { 0, "üäö", 4, 0,0 },
+ { 1, "\374\344\366", 4, 0,0 },
+ { 1, "", 1, 0,0 },
+ { 0, "\374\344\366", 4, 0,0 },
}
},
{
diff --git a/localedata/tests-mbwc/dat_strcoll.c b/localedata/tests-mbwc/dat_strcoll.c
index b729ae9..9260d6c 100644
--- a/localedata/tests-mbwc/dat_strcoll.c
+++ b/localedata/tests-mbwc/dat_strcoll.c
@@ -27,13 +27,13 @@ TST_STRCOLL tst_strcoll_loc [] = {
{
{ Tstrcoll, TST_LOC_de },
{
- { /*input.*/ { "ÄBCDEFG", "ÄBCDEFG" }, /* #1 */
+ { /*input.*/ { "\304BCDEFG", "\304BCDEFG" }, /* #1 */
/*expect*/ { 0,1,0, },
},
- { /*input.*/ { "XX Ä XX", "XX B XX" }, /* #2 */
+ { /*input.*/ { "XX \304 XX", "XX B XX" }, /* #2 */
/*expect*/ { 0,0,-1, },
},
- { /*input.*/ { "XX B XX", "XX Ä XX" }, /* #3 */
+ { /*input.*/ { "XX B XX", "XX \304 XX" }, /* #3 */
/*expect*/ { 0,0,+1, },
},
{ /*input.*/ { "B", "a" }, /* #4 */
@@ -48,10 +48,10 @@ TST_STRCOLL tst_strcoll_loc [] = {
{ /*input.*/ { "A", "b" }, /* #7 */
/*expect*/ { 0,0,-1, },
},
- { /*input.*/ { "ä", "B" }, /* #8 */
+ { /*input.*/ { "\344", "B" }, /* #8 */
/*expect*/ { 0,0,-1, },
},
- { /*input.*/ { "B", "ä" }, /* #9 */
+ { /*input.*/ { "B", "\344" }, /* #9 */
/*expect*/ { 0,0,+1, },
},
{ .is_last = 1 } /* Last element. */
diff --git a/localedata/tests-mbwc/dat_swscanf.c b/localedata/tests-mbwc/dat_swscanf.c
index 7f65832..22812f5 100644
--- a/localedata/tests-mbwc/dat_swscanf.c
+++ b/localedata/tests-mbwc/dat_swscanf.c
@@ -23,20 +23,20 @@ TST_SWSCANF tst_swscanf_loc [] =
0x002D, 0x0031, 0x003A, /* %d: -1 */
0x0032, 0x003A, /* %u: 2 */
0x0033, 0x002C, 0x0033, 0x003A, /* %f: 3.3 */
- 0x00E4, 0x003A, /* %c: 'ä' */
- 0x00C4, 0x00DC, 0x0000, 0x0000, /* %s: "ÄÜ" */
+ 0x00E4, 0x003A, /* %c: 'ä' */
+ 0x00C4, 0x00DC, 0x0000, 0x0000, /* %s: "ÄÜ" */
},
L"%d:%u:%f:%c:%s", 0
},
{ /* The fields are: err_val, ret_flag, ret_val,
val_int, val_uns, val_flt, val_c, val_s, val_S. */
0,1,5,
- -1, 2, 3.3, 'ä', "ÄÜ", { 0x0000, },
+ -1, 2, 3.3, '\344', "\304\334", { 0x0000, },
},
},
/*------------------------ 02 -----------------------*/
{ { {
- 0x00E4, 0x00C4, 0x0000 /* "äÄ" */
+ 0x00E4, 0x00C4, 0x0000 /* "äÄ" */
},
L"%lc", 'C'
},
@@ -46,7 +46,7 @@ TST_SWSCANF tst_swscanf_loc [] =
},
/*------------------------ 03 -----------------------*/
{ { {
- 0x00E4, 0x00C4, 0x0000 /* "äÄ" */
+ 0x00E4, 0x00C4, 0x0000 /* "äÄ" */
},
L"%ls", 'S'
},
@@ -57,7 +57,7 @@ TST_SWSCANF tst_swscanf_loc [] =
/*------------------------ 04 -----------------------*/
/* <NO_WAIVER> x 2 */
{ { {
- 0x00E4, 0x00C4, 0x0000 /* "äÄ" */
+ 0x00E4, 0x00C4, 0x0000 /* "äÄ" */
},
L"1%d:2%d:3%d:4%d:5%d:6%d:7%d:8%d:9%d", 0
},
diff --git a/localedata/tests-mbwc/dat_wcrtomb.c b/localedata/tests-mbwc/dat_wcrtomb.c
index 8500f68..36fe8d3 100644
--- a/localedata/tests-mbwc/dat_wcrtomb.c
+++ b/localedata/tests-mbwc/dat_wcrtomb.c
@@ -13,11 +13,11 @@ TST_WCRTOMB tst_wcrtomb_loc [] = {
{
/* #01 : normal case */
{ /*input.*/ { 1, 0x00FC, 0,0 },
- /*expect*/ { 0, 1,1, "ü" },
+ /*expect*/ { 0, 1,1, "\xFC" },
},
/* #02 : normal case */
{ /*input.*/ { 1, 0x00D6, 0,0 },
- /*expect*/ { 0, 1,1, "Ö" },
+ /*expect*/ { 0, 1,1, "\xD6" },
},
/* #03 : error case */
{ /*input.*/ { 1, 0xFFA1, 0,0 },
diff --git a/localedata/tests-mbwc/dat_wcsrtombs.c b/localedata/tests-mbwc/dat_wcsrtombs.c
index d3148b2..5e57355 100644
--- a/localedata/tests-mbwc/dat_wcsrtombs.c
+++ b/localedata/tests-mbwc/dat_wcsrtombs.c
@@ -26,26 +26,26 @@ TST_WCSRTOMBS tst_wcsrtombs_loc [] = {
},
/* #02 : Only one chars should be stored in s. No null termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 1, 0, 0 },
- /*expect*/ { 0,1,1, "Ä" },
+ /*expect*/ { 0,1,1, "\xC4" },
},
/* #03 : Only two chars should be stored in s. No null termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 2, 0, 0 },
- /*expect*/ { 0,1,2, "ÄÖ" },
+ /*expect*/ { 0,1,2, "\xC4\xD6" },
},
/* #04 : Only three chars should be stored in s. No null
termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 3, 0, 0 },
- /*expect*/ { 0,1,3, "ÄÖÜ" },
+ /*expect*/ { 0,1,3, "\xC4\xD6\xDC" },
},
/* #05 : Only three chars should be stored in s with a null
termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 4, 0, 0 },
- /*expect*/ { 0,1,3, "ÄÖÜ" },
+ /*expect*/ { 0,1,3, "\xC4\xD6\xDC" },
},
/* #06 : Only three chars should be stored in s with a null
termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 5, 0, 0 },
- /*expect*/ { 0,1,3, "ÄÖÜ" },
+ /*expect*/ { 0,1,3, "\xC4\xD6\xDC" },
},
/* #07 : Invalid mb sequence. No chars should be stored in s. */
{ /*input.*/ { 1,1, { 0x0201,0x0221,0x0000,0x0000 }, 2, 0, 0 },
diff --git a/localedata/tests-mbwc/dat_wcstombs.c b/localedata/tests-mbwc/dat_wcstombs.c
index a6dd0ec..3cb080e 100644
--- a/localedata/tests-mbwc/dat_wcstombs.c
+++ b/localedata/tests-mbwc/dat_wcstombs.c
@@ -25,26 +25,26 @@ TST_WCSTOMBS tst_wcstombs_loc [] = {
},
/* #02 : Only one chars should be stored in s. No null termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 1 },
- /*expect*/ { 0,1,1, "Ä" },
+ /*expect*/ { 0,1,1, "\xC4" },
},
/* #03 : Only two chars should be stored in s. No null termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 2 },
- /*expect*/ { 0,1,2, "ÄÖ" },
+ /*expect*/ { 0,1,2, "\xC4\xD6" },
},
/* #04 : Only three chars should be stored in s. No null
termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 3 },
- /*expect*/ { 0,1,3, "ÄÖÜ" },
+ /*expect*/ { 0,1,3, "\xC4\xD6\xDC" },
},
/* #05 : Only three chars should be stored in s with a null
termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 4 },
- /*expect*/ { 0,1,3, "ÄÖÜ" },
+ /*expect*/ { 0,1,3, "\xC4\xD6\xDC" },
},
/* #06 : Only three chars should be stored in s with a null
termination. */
{ /*input.*/ { 1,1, { 0x00C4,0x00D6,0x00DC,0x0000 }, 5 },
- /*expect*/ { 0,1,3, "ÄÖÜ" },
+ /*expect*/ { 0,1,3, "\xC4\xD6\xDC" },
},
/* #07 : Invalid mb sequence. No chars should be stored in s. */
{ /*input.*/ { 1,1, { 0x0201,0x0221,0x0000,0x0000 }, 2 },
diff --git a/localedata/tests-mbwc/dat_wctomb.c b/localedata/tests-mbwc/dat_wctomb.c
index 7394ca5..346ab75 100644
--- a/localedata/tests-mbwc/dat_wctomb.c
+++ b/localedata/tests-mbwc/dat_wctomb.c
@@ -59,11 +59,11 @@ TST_WCTOMB tst_wctomb_loc [] = {
{
/* #01 : normal case */
{ /*input.*/ { 1, 0x00C4 },
- /*expect*/ { 0,1,1, "Ä" },
+ /*expect*/ { 0,1,1, "\xC4" },
},
/* #02 : normal case */
{ /*input.*/ { 1, 0x00DC },
- /*expect*/ { 0,1,1, "Ü" },
+ /*expect*/ { 0,1,1, "\xDC" },
},
/* #03 : normal case */
{ /*input.*/ { 1, 0x0092 },
diff --git a/localedata/tst-xlocale1.c b/localedata/tst-xlocale1.c
index 9f545a0..f0aff97 100644
--- a/localedata/tst-xlocale1.c
+++ b/localedata/tst-xlocale1.c
@@ -13,9 +13,9 @@ static struct
{
{ "C", "TRANSLIT", "translit", 0 },
{ "de_DE.ISO-8859-1", "TRANSLIT", "translit", 0 },
- { "de_DE.ISO-8859-1", "TRANSLIT", "trÄnslit", -1 },
+ { "de_DE.ISO-8859-1", "TRANSLIT", "tr\xC4nslit", -1 },
{ "de_DE.UTF-8", "TRANSLIT", "translit", 0 },
- { "de_DE.ISO-8859-1", "ä", "Ä", 1 }
+ { "de_DE.ISO-8859-1", "\xE4", "\xC4", 1 }
};
#define ntests (sizeof (tests) / sizeof (tests[0]))
diff --git a/localedata/tst-xlocale2.c b/localedata/tst-xlocale2.c
index 30d87de..8c8e4b7 100644
--- a/localedata/tst-xlocale2.c
+++ b/localedata/tst-xlocale2.c
@@ -36,7 +36,7 @@ main (void)
}
-static const char str[] = "0123456789abcdef ABCDEF ghijklmnopqrstuvwxyzäÄöÖüÜ";
+static const char str[] = "0123456789abcdef ABCDEF ghijklmnopqrstuvwxyz\xE4\xC4\xF6\xD6\xFC\xDC";
static const char exd[] = "11111111110000000000000000000000000000000000000000";
static const char exa[] = "00000000001111110111111011111111111111111111111111";
static const char exx[] = "11111111111111110111111000000000000000000000000000";
diff --git a/posix/PTESTS b/posix/PTESTS
index 02b357c..0cece0c 100644
--- a/posix/PTESTS
+++ b/posix/PTESTS
@@ -1,341 +1,341 @@
# 2.8.2 Regular Expression General Requirement
-2¦4¦bb*¦abbbc¦
-2¦2¦bb*¦ababbbc¦
-7¦9¦A#*::¦A:A#:qA::qA#::qA##::q¦
-1¦5¦A#*::¦A##::A#::qA::qA#:q¦
+2|4|bb*|abbbc|
+2|2|bb*|ababbbc|
+7|9|A#*::|A:A#:qA::qA#::qA##::q|
+1|5|A#*::|A##::A#::qA::qA#:q|
# 2.8.3.1.2 BRE Special Characters
# GA108
-2¦2¦\.¦a.c¦
-2¦2¦\[¦a[c¦
-2¦2¦\\¦a\c¦
-2¦2¦\*¦a*c¦
-2¦2¦\^¦a^c¦
-2¦2¦\$¦a$c¦
-7¦11¦X\*Y\*8¦Y*8X*8X*Y*8¦
+2|2|\.|a.c|
+2|2|\[|a[c|
+2|2|\\|a\c|
+2|2|\*|a*c|
+2|2|\^|a^c|
+2|2|\$|a$c|
+7|11|X\*Y\*8|Y*8X*8X*Y*8|
# GA109
-2¦2¦[.]¦a.c¦
-2¦2¦[[]¦a[c¦
--1¦-1¦[[]¦ac¦
-2¦2¦[\]¦a\c¦
-1¦1¦[\a]¦abc¦
-2¦2¦[\.]¦a\.c¦
-2¦2¦[\.]¦a.\c¦
-2¦2¦[*]¦a*c¦
-2¦2¦[$]¦a$c¦
-2¦2¦[X*Y8]¦7*8YX¦
+2|2|[.]|a.c|
+2|2|[[]|a[c|
+-1|-1|[[]|ac|
+2|2|[\]|a\c|
+1|1|[\a]|abc|
+2|2|[\.]|a\.c|
+2|2|[\.]|a.\c|
+2|2|[*]|a*c|
+2|2|[$]|a$c|
+2|2|[X*Y8]|7*8YX|
# GA110
-2¦2¦*¦a*c¦
-3¦4¦*a¦*b*a*c¦
-1¦5¦**9=¦***9=9¦
+2|2|*|a*c|
+3|4|*a|*b*a*c|
+1|5|**9=|***9=9|
# GA111
-1¦1¦^*¦*bc¦
--1¦-1¦^*¦a*c¦
--1¦-1¦^*¦^*ab¦
-1¦5¦^**9=¦***9=¦
--1¦-1¦^*5<*9¦5<9*5<*9¦
+1|1|^*|*bc|
+-1|-1|^*|a*c|
+-1|-1|^*|^*ab|
+1|5|^**9=|***9=|
+-1|-1|^*5<*9|5<9*5<*9|
# GA112
-2¦3¦\(*b\)¦a*b¦
--1¦-1¦\(*b\)¦ac¦
-1¦6¦A\(**9\)=¦A***9=79¦
+2|3|\(*b\)|a*b|
+-1|-1|\(*b\)|ac|
+1|6|A\(**9\)=|A***9=79|
# GA113(1)
-1¦3¦\(^*ab\)¦*ab¦
--1¦-1¦\(^*ab\)¦^*ab¦
--1¦-1¦\(^*b\)¦a*b¦
--1¦-1¦\(^*b\)¦^*b¦
+1|3|\(^*ab\)|*ab|
+-1|-1|\(^*ab\)|^*ab|
+-1|-1|\(^*b\)|a*b|
+-1|-1|\(^*b\)|^*b|
### GA113(2) GNU regex implements GA113(1)
-##-1¦-1¦\(^*ab\)¦*ab¦
-##-1¦-1¦\(^*ab\)¦^*ab¦
-##1¦1¦\(^*b\)¦b¦
-##1¦3¦\(^*b\)¦^^b¦
+##-1|-1|\(^*ab\)|*ab|
+##-1|-1|\(^*ab\)|^*ab|
+##1|1|\(^*b\)|b|
+##1|3|\(^*b\)|^^b|
# GA114
-1¦3¦a^b¦a^b¦
-1¦3¦a\^b¦a^b¦
-1¦1¦^^¦^bc¦
-2¦2¦\^¦a^c¦
-1¦1¦[c^b]¦^abc¦
-1¦1¦[\^ab]¦^ab¦
-2¦2¦[\^ab]¦c\d¦
--1¦-1¦[^^]¦^¦
-1¦3¦\(a^b\)¦a^b¦
-1¦3¦\(a\^b\)¦a^b¦
-2¦2¦\(\^\)¦a^b¦
+1|3|a^b|a^b|
+1|3|a\^b|a^b|
+1|1|^^|^bc|
+2|2|\^|a^c|
+1|1|[c^b]|^abc|
+1|1|[\^ab]|^ab|
+2|2|[\^ab]|c\d|
+-1|-1|[^^]|^|
+1|3|\(a^b\)|a^b|
+1|3|\(a\^b\)|a^b|
+2|2|\(\^\)|a^b|
# GA115
-3¦3¦$$¦ab$¦
--1¦-1¦$$¦$ab¦
-2¦3¦$c¦a$c¦
-2¦2¦[$]¦a$c¦
-1¦2¦\$a¦$a¦
-3¦3¦\$$¦ab$¦
-2¦6¦A\([34]$[34]\)B¦XA4$3BY¦
+3|3|$$|ab$|
+-1|-1|$$|$ab|
+2|3|$c|a$c|
+2|2|[$]|a$c|
+1|2|\$a|$a|
+3|3|\$$|ab$|
+2|6|A\([34]$[34]\)B|XA4$3BY|
# 2.8.3.1.3 Periods in BREs
# GA116
-1¦1¦.¦abc¦
--1¦-1¦.ab¦abc¦
-1¦3¦ab.¦abc¦
-1¦3¦a.b¦a,b¦
--1¦-1¦.......¦PqRs6¦
-1¦7¦.......¦PqRs6T8¦
+1|1|.|abc|
+-1|-1|.ab|abc|
+1|3|ab.|abc|
+1|3|a.b|a,b|
+-1|-1|.......|PqRs6|
+1|7|.......|PqRs6T8|
# 2.8.3.2 RE Bracket Expression
# GA118
-2¦2¦[abc]¦xbyz¦
--1¦-1¦[abc]¦xyz¦
-2¦2¦[abc]¦xbay¦
+2|2|[abc]|xbyz|
+-1|-1|[abc]|xyz|
+2|2|[abc]|xbay|
# GA119
-2¦2¦[^a]¦abc¦
-4¦4¦[^]cd]¦cd]ef¦
-2¦2¦[^abc]¦axyz¦
--1¦-1¦[^abc]¦abc¦
-3¦3¦[^[.a.]b]¦abc¦
-3¦3¦[^[=a=]b]¦abc¦
-2¦2¦[^-ac]¦abcde-¦
-2¦2¦[^ac-]¦abcde-¦
-3¦3¦[^a-b]¦abcde¦
-3¦3¦[^a-bd-e]¦dec¦
-2¦2¦[^---]¦-ab¦
-16¦16¦[^a-zA-Z0-9]¦pqrstVWXYZ23579#¦
+2|2|[^a]|abc|
+4|4|[^]cd]|cd]ef|
+2|2|[^abc]|axyz|
+-1|-1|[^abc]|abc|
+3|3|[^[.a.]b]|abc|
+3|3|[^[=a=]b]|abc|
+2|2|[^-ac]|abcde-|
+2|2|[^ac-]|abcde-|
+3|3|[^a-b]|abcde|
+3|3|[^a-bd-e]|dec|
+2|2|[^---]|-ab|
+16|16|[^a-zA-Z0-9]|pqrstVWXYZ23579#|
# GA120(1)
-3¦3¦[]a]¦cd]ef¦
-1¦1¦[]-a]¦a_b¦
-3¦3¦[][.-.]-0]¦ab0-]¦
-1¦1¦[]^a-z]¦string¦
+3|3|[]a]|cd]ef|
+1|1|[]-a]|a_b|
+3|3|[][.-.]-0]|ab0-]|
+1|1|[]^a-z]|string|
# GA120(2)
-4¦4¦[^]cd]¦cd]ef¦
-0¦0¦[^]]*¦]]]]]]]]X¦
-0¦0¦[^]]*¦]]]]]]]]¦
-9¦9¦[^]]\{1,\}¦]]]]]]]]X¦
--1¦-1¦[^]]\{1,\}¦]]]]]]]]¦
+4|4|[^]cd]|cd]ef|
+0|0|[^]]*|]]]]]]]]X|
+0|0|[^]]*|]]]]]]]]|
+9|9|[^]]\{1,\}|]]]]]]]]X|
+-1|-1|[^]]\{1,\}|]]]]]]]]|
# GA120(3)
-3¦3¦[c[.].]d]¦ab]cd¦
-2¦8¦[a-z]*[[.].]][A-Z]*¦Abcd]DEFg¦
+3|3|[c[.].]d]|ab]cd|
+2|8|[a-z]*[[.].]][A-Z]*|Abcd]DEFg|
# GA121
-2¦2¦[[.a.]b]¦Abc¦
-1¦1¦[[.a.]b]¦aBc¦
--1¦-1¦[[.a.]b]¦ABc¦
-3¦3¦[^[.a.]b]¦abc¦
-3¦3¦[][.-.]-0]¦ab0-]¦
-3¦3¦[A-[.].]c]¦ab]!¦
+2|2|[[.a.]b]|Abc|
+1|1|[[.a.]b]|aBc|
+-1|-1|[[.a.]b]|ABc|
+3|3|[^[.a.]b]|abc|
+3|3|[][.-.]-0]|ab0-]|
+3|3|[A-[.].]c]|ab]!|
# GA122
--2¦-2¦[[.ch.]]¦abc¦
--2¦-2¦[[.ab.][.CD.][.EF.]]¦yZabCDEFQ9¦
+-2|-2|[[.ch.]]|abc|
+-2|-2|[[.ab.][.CD.][.EF.]]|yZabCDEFQ9|
# GA125
-2¦2¦[[=a=]b]¦Abc¦
-1¦1¦[[=a=]b]¦aBc¦
--1¦-1¦[[=a=]b]¦ABc¦
-3¦3¦[^[=a=]b]¦abc¦
+2|2|[[=a=]b]|Abc|
+1|1|[[=a=]b]|aBc|
+-1|-1|[[=a=]b]|ABc|
+3|3|[^[=a=]b]|abc|
# GA126
#W the expected result for [[:alnum:]]* is 2-7 which is wrong
-0¦0¦[[:alnum:]]*¦ aB28gH¦
-2¦7¦[[:alnum:]][[:alnum:]]*¦ aB28gH¦
+0|0|[[:alnum:]]*| aB28gH|
+2|7|[[:alnum:]][[:alnum:]]*| aB28gH|
#W the expected result for [^[:alnum:]]* is 2-5 which is wrong
-0¦0¦[^[:alnum:]]*¦2 ,a¦
-2¦5¦[^[:alnum:]][^[:alnum:]]*¦2 ,a¦
+0|0|[^[:alnum:]]*|2 ,a|
+2|5|[^[:alnum:]][^[:alnum:]]*|2 ,a|
#W the expected result for [[:alpha:]]* is 2-5 which is wrong
-0¦0¦[[:alpha:]]*¦ aBgH2¦
-2¦5¦[[:alpha:]][[:alpha:]]*¦ aBgH2¦
-1¦6¦[^[:alpha:]]*¦2 8,a¦
-1¦2¦[[:blank:]]*¦
¦
-1¦8¦[^[:blank:]]*¦aB28gH, ¦
-1¦2¦[[:cntrl:]]*¦ ¦
-1¦8¦[^[:cntrl:]]*¦aB2 8gh,¦
+0|0|[[:alpha:]]*| aBgH2|
+2|5|[[:alpha:]][[:alpha:]]*| aBgH2|
+1|6|[^[:alpha:]]*|2 8,a|
+1|2|[[:blank:]]*|
|
+1|8|[^[:blank:]]*|aB28gH, |
+1|2|[[:cntrl:]]*| |
+1|8|[^[:cntrl:]]*|aB2 8gh,|
#W the expected result for [[:digit:]]* is 2-3 which is wrong
-0¦0¦[[:digit:]]*¦a28¦
-2¦3¦[[:digit:]][[:digit:]]*¦a28¦
-1¦8¦[^[:digit:]]*¦aB gH,¦
-1¦7¦[[:graph:]]*¦aB28gH, ¦
-1¦3¦[^[:graph:]]*¦ ,¦
-1¦2¦[[:lower:]]*¦agB¦
-1¦8¦[^[:lower:]]*¦B2 8H,a¦
-1¦8¦[[:print:]]*¦aB2 8gH, ¦
-1¦2¦[^[:print:]]*¦ ¦
+0|0|[[:digit:]]*|a28|
+2|3|[[:digit:]][[:digit:]]*|a28|
+1|8|[^[:digit:]]*|aB gH,|
+1|7|[[:graph:]]*|aB28gH, |
+1|3|[^[:graph:]]*| ,|
+1|2|[[:lower:]]*|agB|
+1|8|[^[:lower:]]*|B2 8H,a|
+1|8|[[:print:]]*|aB2 8gH, |
+1|2|[^[:print:]]*| |
#W the expected result for [[:punct:]]* is 2-2 which is wrong
-0¦0¦[[:punct:]]*¦a,2¦
-2¦3¦[[:punct:]][[:punct:]]*¦a,,2¦
-1¦9¦[^[:punct:]]*¦aB2 8gH¦
-1¦3¦[[:space:]]*¦
¦
+0|0|[[:punct:]]*|a,2|
+2|3|[[:punct:]][[:punct:]]*|a,,2|
+1|9|[^[:punct:]]*|aB2 8gH|
+1|3|[[:space:]]*|
|
#W the expected result for [^[:space:]]* is 2-9 which is wrong
-0¦0¦[^[:space:]]*¦ aB28gH, ¦
-2¦9¦[^[:space:]][^[:space:]]*¦ aB28gH, ¦
+0|0|[^[:space:]]*| aB28gH, |
+2|9|[^[:space:]][^[:space:]]*| aB28gH, |
#W the expected result for [[:upper:]]* is 2-3 which is wrong
-0¦0¦[[:upper:]]*¦aBH2¦
-2¦3¦[[:upper:]][[:upper:]]*¦aBH2¦
-1¦8¦[^[:upper:]]*¦a2 8g,B¦
+0|0|[[:upper:]]*|aBH2|
+2|3|[[:upper:]][[:upper:]]*|aBH2|
+1|8|[^[:upper:]]*|a2 8g,B|
#W the expected result for [[:xdigit:]]* is 2-5 which is wrong
-0¦0¦[[:xdigit:]]*¦gaB28h¦
-2¦5¦[[:xdigit:]][[:xdigit:]]*¦gaB28h¦
+0|0|[[:xdigit:]]*|gaB28h|
+2|5|[[:xdigit:]][[:xdigit:]]*|gaB28h|
#W the expected result for [^[:xdigit:]]* is 2-7 which is wrong
-2¦7¦[^[:xdigit:]][^[:xdigit:]]*¦a gH,2¦
+2|7|[^[:xdigit:]][^[:xdigit:]]*|a gH,2|
# GA127
--2¦-2¦[b-a]¦abc¦
-1¦1¦[a-c]¦bbccde¦
-2¦2¦[a-b]¦-bc¦
-3¦3¦[a-z0-9]¦AB0¦
-3¦3¦[^a-b]¦abcde¦
-3¦3¦[^a-bd-e]¦dec¦
-1¦1¦[]-a]¦a_b¦
-2¦2¦[+--]¦a,b¦
-2¦2¦[--/]¦a.b¦
-2¦2¦[^---]¦-ab¦
-3¦3¦[][.-.]-0]¦ab0-]¦
-3¦3¦[A-[.].]c]¦ab]!¦
-2¦6¦bc[d-w]xy¦abchxyz¦
+-2|-2|[b-a]|abc|
+1|1|[a-c]|bbccde|
+2|2|[a-b]|-bc|
+3|3|[a-z0-9]|AB0|
+3|3|[^a-b]|abcde|
+3|3|[^a-bd-e]|dec|
+1|1|[]-a]|a_b|
+2|2|[+--]|a,b|
+2|2|[--/]|a.b|
+2|2|[^---]|-ab|
+3|3|[][.-.]-0]|ab0-]|
+3|3|[A-[.].]c]|ab]!|
+2|6|bc[d-w]xy|abchxyz|
# GA129
-1¦1¦[a-cd-f]¦dbccde¦
--1¦-1¦[a-ce-f]¦dBCCdE¦
-2¦4¦b[n-zA-M]Y¦absY9Z¦
-2¦4¦b[n-zA-M]Y¦abGY9Z¦
+1|1|[a-cd-f]|dbccde|
+-1|-1|[a-ce-f]|dBCCdE|
+2|4|b[n-zA-M]Y|absY9Z|
+2|4|b[n-zA-M]Y|abGY9Z|
# GA130
-3¦3¦[-xy]¦ac-¦
-2¦4¦c[-xy]D¦ac-D+¦
-2¦2¦[--/]¦a.b¦
-2¦4¦c[--/]D¦ac.D+b¦
-2¦2¦[^-ac]¦abcde-¦
-1¦3¦a[^-ac]c¦abcde-¦
-3¦3¦[xy-]¦zc-¦
-2¦4¦c[xy-]7¦zc-786¦
-2¦2¦[^ac-]¦abcde-¦
-2¦4¦a[^ac-]c¦5abcde-¦
-2¦2¦[+--]¦a,b¦
-2¦4¦a[+--]B¦Xa,By¦
-2¦2¦[^---]¦-ab¦
-4¦6¦X[^---]Y¦X-YXaYXbY¦
+3|3|[-xy]|ac-|
+2|4|c[-xy]D|ac-D+|
+2|2|[--/]|a.b|
+2|4|c[--/]D|ac.D+b|
+2|2|[^-ac]|abcde-|
+1|3|a[^-ac]c|abcde-|
+3|3|[xy-]|zc-|
+2|4|c[xy-]7|zc-786|
+2|2|[^ac-]|abcde-|
+2|4|a[^ac-]c|5abcde-|
+2|2|[+--]|a,b|
+2|4|a[+--]B|Xa,By|
+2|2|[^---]|-ab|
+4|6|X[^---]Y|X-YXaYXbY|
# 2.8.3.3 BREs Matching Multiple Characters
# GA131
-3¦4¦cd¦abcdeabcde¦
-1¦2¦ag*b¦abcde¦
--1¦-1¦[a-c][e-f]¦abcdef¦
-3¦4¦[a-c][e-f]¦acbedf¦
-4¦8¦abc*XYZ¦890abXYZ#*¦
-4¦9¦abc*XYZ¦890abcXYZ#*¦
-4¦15¦abc*XYZ¦890abcccccccXYZ#*¦
--1¦-1¦abc*XYZ¦890abc*XYZ#*¦
+3|4|cd|abcdeabcde|
+1|2|ag*b|abcde|
+-1|-1|[a-c][e-f]|abcdef|
+3|4|[a-c][e-f]|acbedf|
+4|8|abc*XYZ|890abXYZ#*|
+4|9|abc*XYZ|890abcXYZ#*|
+4|15|abc*XYZ|890abcccccccXYZ#*|
+-1|-1|abc*XYZ|890abc*XYZ#*|
# GA132
-2¦4¦\(*bc\)¦a*bc¦
-1¦2¦\(ab\)¦abcde¦
-1¦10¦\(a\(b\(c\(d\(e\(f\(g\)h\(i\(j\)\)\)\)\)\)\)\)¦abcdefghijk¦
-3¦8¦43\(2\(6\)*0\)AB¦654320ABCD¦
-3¦9¦43\(2\(7\)*0\)AB¦6543270ABCD¦
-3¦12¦43\(2\(7\)*0\)AB¦6543277770ABCD¦
+2|4|\(*bc\)|a*bc|
+1|2|\(ab\)|abcde|
+1|10|\(a\(b\(c\(d\(e\(f\(g\)h\(i\(j\)\)\)\)\)\)\)\)|abcdefghijk|
+3|8|43\(2\(6\)*0\)AB|654320ABCD|
+3|9|43\(2\(7\)*0\)AB|6543270ABCD|
+3|12|43\(2\(7\)*0\)AB|6543277770ABCD|
# GA133
-1¦10¦\(a\(b\(c\(d\(e\(f\(g\)h\(i\(j\)\)\)\)\)\)\)\)¦abcdefghijk¦
--1¦-1¦\(a\(b\(c\(d\(e\(f\(g\)h\(i\(k\)\)\)\)\)\)\)\)¦abcdefghijk¦
+1|10|\(a\(b\(c\(d\(e\(f\(g\)h\(i\(j\)\)\)\)\)\)\)\)|abcdefghijk|
+-1|-1|\(a\(b\(c\(d\(e\(f\(g\)h\(i\(k\)\)\)\)\)\)\)\)|abcdefghijk|
# GA134
-2¦4¦\(bb*\)¦abbbc¦
-2¦2¦\(bb*\)¦ababbbc¦
-1¦6¦a\(.*b\)¦ababbbc¦
-1¦2¦a\(b*\)¦ababbbc¦
-1¦20¦a\(.*b\)c¦axcaxbbbcsxbbbbbbbbc¦
+2|4|\(bb*\)|abbbc|
+2|2|\(bb*\)|ababbbc|
+1|6|a\(.*b\)|ababbbc|
+1|2|a\(b*\)|ababbbc|
+1|20|a\(.*b\)c|axcaxbbbcsxbbbbbbbbc|
# GA135
-1¦7¦\(a\(b\(c\(d\(e\)\)\)\)\)\4¦abcdededede¦
+1|7|\(a\(b\(c\(d\(e\)\)\)\)\)\4|abcdededede|
#W POSIX does not really specify whether a\(b\)*c\1 matches acb.
#W back references are supposed to expand to the last match, but what
#W if there never was a match as in this case?
--1¦-1¦a\(b\)*c\1¦acb¦
-1¦11¦\(a\(b\(c\(d\(e\(f\(g\)h\(i\(j\)\)\)\)\)\)\)\)\9¦abcdefghijjk¦
+-1|-1|a\(b\)*c\1|acb|
+1|11|\(a\(b\(c\(d\(e\(f\(g\)h\(i\(j\)\)\)\)\)\)\)\)\9|abcdefghijjk|
# GA136
#W These two tests have the same problem as the test in GA135. No match
#W of a subexpression, why should the back reference be usable?
#W 1 2 a\(b\)*c\1 acb
-#W 4 7 a\(b\(c\(d\(f\)*\)\)\)\4¦xYzabcdePQRST
--1¦-1¦a\(b\)*c\1¦acb¦
--1¦-1¦a\(b\(c\(d\(f\)*\)\)\)\4¦xYzabcdePQRST¦
+#W 4 7 a\(b\(c\(d\(f\)*\)\)\)\4|xYzabcdePQRST
+-1|-1|a\(b\)*c\1|acb|
+-1|-1|a\(b\(c\(d\(f\)*\)\)\)\4|xYzabcdePQRST|
# GA137
--2¦-2¦\(a\(b\)\)\3¦foo¦
--2¦-2¦\(a\(b\)\)\(a\(b\)\)\5¦foo¦
+-2|-2|\(a\(b\)\)\3|foo|
+-2|-2|\(a\(b\)\)\(a\(b\)\)\5|foo|
# GA138
-1¦2¦ag*b¦abcde¦
-1¦10¦a.*b¦abababvbabc¦
-2¦5¦b*c¦abbbcdeabbbbbbcde¦
-2¦5¦bbb*c¦abbbcdeabbbbbbcde¦
-1¦5¦a\(b\)*c\1¦abbcbbb¦
--1¦-1¦a\(b\)*c\1¦abbdbd¦
-0¦0¦\([a-c]*\)\1¦abcacdef¦
-1¦6¦\([a-c]*\)\1¦abcabcabcd¦
-1¦2¦a^*b¦ab¦
-1¦5¦a^*b¦a^^^b¦
+1|2|ag*b|abcde|
+1|10|a.*b|abababvbabc|
+2|5|b*c|abbbcdeabbbbbbcde|
+2|5|bbb*c|abbbcdeabbbbbbcde|
+1|5|a\(b\)*c\1|abbcbbb|
+-1|-1|a\(b\)*c\1|abbdbd|
+0|0|\([a-c]*\)\1|abcacdef|
+1|6|\([a-c]*\)\1|abcabcabcd|
+1|2|a^*b|ab|
+1|5|a^*b|a^^^b|
# GA139
-1¦2¦a\{2\}¦aaaa¦
-1¦7¦\([a-c]*\)\{0,\}¦aabcaab¦
-1¦2¦\(a\)\1\{1,2\}¦aabc¦
-1¦3¦\(a\)\1\{1,2\}¦aaaabc¦
+1|2|a\{2\}|aaaa|
+1|7|\([a-c]*\)\{0,\}|aabcaab|
+1|2|\(a\)\1\{1,2\}|aabc|
+1|3|\(a\)\1\{1,2\}|aaaabc|
#W the expression \(\(a\)\1\)\{1,2\} is ill-formed, using \2
-1¦4¦\(\(a\)\2\)\{1,2\}¦aaaabc¦
+1|4|\(\(a\)\2\)\{1,2\}|aaaabc|
# GA140
-1¦2¦a\{2\}¦aaaa¦
--1¦-1¦a\{2\}¦abcd¦
-0¦0¦a\{0\}¦aaaa¦
-1¦64¦a\{64\}¦aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa¦
+1|2|a\{2\}|aaaa|
+-1|-1|a\{2\}|abcd|
+0|0|a\{0\}|aaaa|
+1|64|a\{64\}|aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
# GA141
-1¦7¦\([a-c]*\)\{0,\}¦aabcaab¦
+1|7|\([a-c]*\)\{0,\}|aabcaab|
#W the expected result for \([a-c]*\)\{2,\} is failure which isn't correct
-1¦3¦\([a-c]*\)\{2,\}¦abcdefg¦
-1¦3¦\([a-c]*\)\{1,\}¦abcdefg¦
--1¦-1¦a\{64,\}¦aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa¦
+1|3|\([a-c]*\)\{2,\}|abcdefg|
+1|3|\([a-c]*\)\{1,\}|abcdefg|
+-1|-1|a\{64,\}|aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
# GA142
-1¦3¦a\{2,3\}¦aaaa¦
--1¦-1¦a\{2,3\}¦abcd¦
-0¦0¦\([a-c]*\)\{0,0\}¦foo¦
-1¦63¦a\{1,63\}¦aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa¦
+1|3|a\{2,3\}|aaaa|
+-1|-1|a\{2,3\}|abcd|
+0|0|\([a-c]*\)\{0,0\}|foo|
+1|63|a\{1,63\}|aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa|
# 2.8.3.4 BRE Precedence
# GA143
#W There are numerous bugs in the original version.
-2¦19¦\^\[[[.].]]\\(\\1\\)\*\\{1,2\\}\$¦a^[]\(\1\)*\{1,2\}$b¦
-1¦6¦[[=*=]][[=\=]][[=]=]][[===]][[...]][[:punct:]]¦*\]=.;¦
-1¦6¦[$\(*\)^]*¦$\()*^¦
-1¦1¦[\1]¦1¦
-1¦1¦[\{1,2\}]¦{¦
+2|19|\^\[[[.].]]\\(\\1\\)\*\\{1,2\\}\$|a^[]\(\1\)*\{1,2\}$b|
+1|6|[[=*=]][[=\=]][[=]=]][[===]][[...]][[:punct:]]|*\]=.;|
+1|6|[$\(*\)^]*|$\()*^|
+1|1|[\1]|1|
+1|1|[\{1,2\}]|{|
#W the expected result for \(*\)*\1* is 2-2 which isn't correct
-0¦0¦\(*\)*\1*¦a*b*11¦
-2¦3¦\(*\)*\1*b¦a*b*11¦
+0|0|\(*\)*\1*|a*b*11|
+2|3|\(*\)*\1*b|a*b*11|
#W the expected result for \(a\(b\{1,2\}\)\{1,2\}\) is 1-5 which isn't correct
-1¦3¦\(a\(b\{1,2\}\)\{1,2\}\)¦abbab¦
-1¦5¦\(a\(b\{1,2\}\)\)\{1,2\}¦abbab¦
-1¦1¦^\(^\(^a$\)$\)$¦a¦
-1¦2¦\(a\)\1$¦aa¦
-1¦3¦ab*¦abb¦
-1¦4¦ab\{2,4\}¦abbbc¦
+1|3|\(a\(b\{1,2\}\)\{1,2\}\)|abbab|
+1|5|\(a\(b\{1,2\}\)\)\{1,2\}|abbab|
+1|1|^\(^\(^a$\)$\)$|a|
+1|2|\(a\)\1$|aa|
+1|3|ab*|abb|
+1|4|ab\{2,4\}|abbbc|
# 2.8.3.5 BRE Expression Anchoring
# GA144
-1¦1¦^a¦abc¦
--1¦-1¦^b¦abc¦
--1¦-1¦^[a-zA-Z]¦99Nine¦
-1¦4¦^[a-zA-Z]*¦Nine99¦
+1|1|^a|abc|
+-1|-1|^b|abc|
+-1|-1|^[a-zA-Z]|99Nine|
+1|4|^[a-zA-Z]*|Nine99|
# GA145(1)
-1¦2¦\(^a\)\1¦aabc¦
--1¦-1¦\(^a\)\1¦^a^abc¦
-1¦2¦\(^^a\)¦^a¦
-1¦1¦\(^^\)¦^^¦
-1¦3¦\(^abc\)¦abcdef¦
--1¦-1¦\(^def\)¦abcdef¦
+1|2|\(^a\)\1|aabc|
+-1|-1|\(^a\)\1|^a^abc|
+1|2|\(^^a\)|^a|
+1|1|\(^^\)|^^|
+1|3|\(^abc\)|abcdef|
+-1|-1|\(^def\)|abcdef|
### GA145(2) GNU regex implements GA145(1)
-##-1¦-1¦\(^a\)\1¦aabc¦
-##1¦4¦\(^a\)\1¦^a^abc¦
-##-1¦-1¦\(^^a\)¦^a¦
-##1¦2¦\(^^\)¦^^¦
+##-1|-1|\(^a\)\1|aabc|
+##1|4|\(^a\)\1|^a^abc|
+##-1|-1|\(^^a\)|^a|
+##1|2|\(^^\)|^^|
# GA146
-3¦3¦a$¦cba¦
--1¦-1¦a$¦abc¦
-5¦7¦[a-z]*$¦99ZZxyz¦
+3|3|a$|cba|
+-1|-1|a$|abc|
+5|7|[a-z]*$|99ZZxyz|
#W the expected result for [a-z]*$ is failure which isn't correct
-10¦9¦[a-z]*$¦99ZZxyz99¦
-3¦3¦$$¦ab$¦
--1¦-1¦$$¦$ab¦
-3¦3¦\$$¦ab$¦
+10|9|[a-z]*$|99ZZxyz99|
+3|3|$$|ab$|
+-1|-1|$$|$ab|
+3|3|\$$|ab$|
# GA147(1)
--1¦-1¦\(a$\)\1¦bcaa¦
--1¦-1¦\(a$\)\1¦ba$¦
--1¦-1¦\(ab$\)¦ab$¦
-1¦2¦\(ab$\)¦ab¦
-4¦6¦\(def$\)¦abcdef¦
--1¦-1¦\(abc$\)¦abcdef¦
+-1|-1|\(a$\)\1|bcaa|
+-1|-1|\(a$\)\1|ba$|
+-1|-1|\(ab$\)|ab$|
+1|2|\(ab$\)|ab|
+4|6|\(def$\)|abcdef|
+-1|-1|\(abc$\)|abcdef|
### GA147(2) GNU regex implements GA147(1)
-##-1¦-1¦\(a$\)\1¦bcaa¦
-##2¦5¦\(a$\)\1¦ba$a$¦
-##-1¦-1¦\(ab$\)¦ab¦
-##1¦3¦\(ab$\)¦ab$¦
+##-1|-1|\(a$\)\1|bcaa|
+##2|5|\(a$\)\1|ba$a$|
+##-1|-1|\(ab$\)|ab|
+##1|3|\(ab$\)|ab$|
# GA148
-0¦0¦^$¦¦
-1¦3¦^abc$¦abc¦
--1¦-1¦^xyz$¦^xyz^¦
--1¦-1¦^234$¦^234$¦
-1¦9¦^[a-zA-Z0-9]*$¦2aA3bB9zZ¦
--1¦-1¦^[a-z0-9]*$¦2aA3b#B9zZ¦
+0|0|^$||
+1|3|^abc$|abc|
+-1|-1|^xyz$|^xyz^|
+-1|-1|^234$|^234$|
+1|9|^[a-zA-Z0-9]*$|2aA3bB9zZ|
+-1|-1|^[a-z0-9]*$|2aA3b#B9zZ|
diff --git a/posix/PTESTS2C.sed b/posix/PTESTS2C.sed
index b6850a3..728dc8a 100644
--- a/posix/PTESTS2C.sed
+++ b/posix/PTESTS2C.sed
@@ -1,6 +1,6 @@
/^##/d
s/^# \(.*\)/ { 0, 0, "\1", NULL, },/
s/^#W \(.*\)/ { 0, 0, NULL, "\1" },/
-s/\([^¦]*\)¦\([^¦]*\)¦\([^¦]*\)¦\([^¦]*\)¦\(.*\)/ { \1, \2, "\3", "\4", \5 },/
+s/\([^|]*\)[|]\([^|]*\)[|]\([^|]*\)[|]\([^|]*\)[|]\(.*\)/ { \1, \2, "\3", "\4", \5 },/
s/\\/\\\\/g
s/
/\\r/g
diff --git a/posix/bug-regex1.c b/posix/bug-regex1.c
index 38eb543..2589073 100644
--- a/posix/bug-regex1.c
+++ b/posix/bug-regex1.c
@@ -23,7 +23,7 @@ main (void)
puts ("in C locale");
setlocale (LC_ALL, "C");
- s = re_compile_pattern ("[anù]*n", 7, ®ex);
+ s = re_compile_pattern ("[an\xF9]*n", 7, ®ex);
if (s != NULL)
{
puts ("re_compile_pattern return non-NULL value");
@@ -43,7 +43,7 @@ main (void)
puts ("in de_DE.ISO-8859-1 locale");
setlocale (LC_ALL, "de_DE.ISO-8859-1");
- s = re_compile_pattern ("[anù]*n", 7, ®ex);
+ s = re_compile_pattern ("[an\xF9]*n", 7, ®ex);
if (s != NULL)
{
puts ("re_compile_pattern return non-NULL value");
diff --git a/posix/ptestcases.h b/posix/ptestcases.h
index 506b1cc..2a54827 100644
--- a/posix/ptestcases.h
+++ b/posix/ptestcases.h
@@ -230,7 +230,7 @@
{ 0, 0, NULL, "These two tests have the same problem as the test in GA135. No match" },
{ 0, 0, NULL, "of a subexpression, why should the back reference be usable?" },
{ 0, 0, NULL, "1 2 a\\(b\\)*c\\1 acb" },
- { 0, 0, NULL, "4 7 a\\(b\\(c\\(d\\(f\\)*\\)\\)\\)\\4¦xYzabcdePQRST" },
+ { 0, 0, NULL, "4 7 a\\(b\\(c\\(d\\(f\\)*\\)\\)\\)\\4\xA6xYzabcdePQRST" },
{ -1, -1, "a\\(b\\)*c\\1", "acb", },
{ -1, -1, "a\\(b\\(c\\(d\\(f\\)*\\)\\)\\)\\4", "xYzabcdePQRST", },
{ 0, 0, "GA137", NULL, },
diff --git a/posix/tst-regex.c b/posix/tst-regex.c
index 715137b..1b4252b 100644
--- a/posix/tst-regex.c
+++ b/posix/tst-regex.c
@@ -126,11 +126,11 @@ do_test (void)
/* Run the actual tests. All tests are run in a single-byte and a
multi-byte locale. */
- result = test_expr ("[äáàâéèêíìîñöóòôüúùû]", 2, 2);
+ result = test_expr ("[\xE4\xE1\xE0\xE2\xE9\xE8\xEA\xED\xEC\xEE\xF1\xF6\xF3\xF2\xF4\xFC\xFA\xF9\xFB]", 2, 2);
result |= test_expr ("G.ran", 2, 3);
result |= test_expr ("G.\\{1\\}ran", 2, 3);
result |= test_expr ("G.*ran", 3, 44);
- result |= test_expr ("[äáàâ]", 0, 0);
+ result |= test_expr ("[\xE4\xE1\xE0\xE2]", 0, 0);
result |= test_expr ("Uddeborg", 2, 2);
result |= test_expr (".Uddeborg", 2, 2);
diff --git a/string/strverscmp.c b/string/strverscmp.c
index 38bf5e2..4f9525a 100644
--- a/string/strverscmp.c
+++ b/string/strverscmp.c
@@ -1,7 +1,7 @@
/* Compare strings while treating digits characters numerically.
Copyright (C) 1997-2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
+ Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --git a/sysdeps/i386/fpu/e_atanh.S b/sysdeps/i386/fpu/e_atanh.S
index 16e149b..8f87492 100644
--- a/sysdeps/i386/fpu/e_atanh.S
+++ b/sysdeps/i386/fpu/e_atanh.S
@@ -102,7 +102,7 @@ ENTRY(__ieee754_atanh)
fchs // 0.5*ln2*ld((1+x)/(1-x))
3: ret
- // x == NaN or ±Inf
+ // x == NaN or ±Inf
5: ja 6f
cmpl $0, 4(%esp)
je 7b
diff --git a/sysdeps/i386/fpu/e_atanhl.S b/sysdeps/i386/fpu/e_atanhl.S
index 88a9703..50d9cd2 100644
--- a/sysdeps/i386/fpu/e_atanhl.S
+++ b/sysdeps/i386/fpu/e_atanhl.S
@@ -105,7 +105,7 @@ ENTRY(__ieee754_atanhl)
fchs // 0.5*ln2*ld((1+x)/(1-x))
3: ret
- // x == NaN or ±Inf
+ // x == NaN or ±Inf
5: cmpl $0x80000000, 8(%esp)
ja 6f
cmpl $0, 4(%esp)
diff --git a/sysdeps/i386/fpu/e_log10.S b/sysdeps/i386/fpu/e_log10.S
index 1727708..8476bd5 100644
--- a/sysdeps/i386/fpu/e_log10.S
+++ b/sysdeps/i386/fpu/e_log10.S
@@ -38,7 +38,7 @@ ENTRY(__ieee754_log10)
fnstsw
fld %st // x : x : log10(2)
sahf
- jc 3f // in case x is NaN or ±Inf
+ jc 3f // in case x is NaN or ±Inf
4: fsubl MO(one) // x-1 : x : log10(2)
fld %st // x-1 : x-1 : x : log10(2)
fabs // |x-1| : x-1 : x : log10(2)
@@ -60,7 +60,7 @@ ENTRY(__ieee754_log10)
fyl2x // log10(x)
ret
-3: jp 4b // in case x is ±Inf
+3: jp 4b // in case x is ±Inf
fstp %st(1)
fstp %st(1)
ret
diff --git a/sysdeps/i386/fpu/e_log10f.S b/sysdeps/i386/fpu/e_log10f.S
index 72a3b88..c93a55a 100644
--- a/sysdeps/i386/fpu/e_log10f.S
+++ b/sysdeps/i386/fpu/e_log10f.S
@@ -39,7 +39,7 @@ ENTRY(__ieee754_log10f)
fnstsw
fld %st // x : x : log10(2)
sahf
- jc 3f // in case x is NaN or ±Inf
+ jc 3f // in case x is NaN or ±Inf
4: fsubl MO(one) // x-1 : x : log10(2)
fld %st // x-1 : x-1 : x : log10(2)
fabs // |x-1| : x-1 : x : log10(2)
@@ -61,7 +61,7 @@ ENTRY(__ieee754_log10f)
fyl2x // log10(x)
ret
-3: jp 4b // in case x is ±Inf
+3: jp 4b // in case x is ±Inf
fstp %st(1)
fstp %st(1)
ret
diff --git a/sysdeps/i386/fpu/e_log10l.S b/sysdeps/i386/fpu/e_log10l.S
index 45b9c6d..14ce6fe 100644
--- a/sysdeps/i386/fpu/e_log10l.S
+++ b/sysdeps/i386/fpu/e_log10l.S
@@ -40,7 +40,7 @@ ENTRY(__ieee754_log10l)
fnstsw
fld %st // x : x : log10(2)
sahf
- jc 3f // in case x is NaN or ±Inf
+ jc 3f // in case x is NaN or ±Inf
4: fsubl MO(one) // x-1 : x : log10(2)
fld %st // x-1 : x-1 : x : log10(2)
fabs // |x-1| : x-1 : x : log10(2)
@@ -62,7 +62,7 @@ ENTRY(__ieee754_log10l)
fyl2x // log10(x)
ret
-3: jp 4b // in case x is ±Inf
+3: jp 4b // in case x is ±Inf
fstp %st(1)
fstp %st(1)
ret
diff --git a/sysdeps/i386/fpu/e_log2.S b/sysdeps/i386/fpu/e_log2.S
index 73ff0ff..bda899b 100644
--- a/sysdeps/i386/fpu/e_log2.S
+++ b/sysdeps/i386/fpu/e_log2.S
@@ -39,7 +39,7 @@ ENTRY(__ieee754_log2)
fnstsw
fld %st // x : x : 1
sahf
- jc 3f // in case x is NaN or ±Inf
+ jc 3f // in case x is NaN or ±Inf
4: fsub %st(2), %st // x-1 : x : 1
fld %st // x-1 : x-1 : x : 1
fabs // |x-1| : x-1 : x : 1
@@ -61,7 +61,7 @@ ENTRY(__ieee754_log2)
fyl2x // log(x)
ret
-3: jp 4b // in case x is ±Inf
+3: jp 4b // in case x is ±Inf
fstp %st(1)
fstp %st(1)
ret
diff --git a/sysdeps/i386/fpu/e_log2f.S b/sysdeps/i386/fpu/e_log2f.S
index 344eeb4..2e619a3 100644
--- a/sysdeps/i386/fpu/e_log2f.S
+++ b/sysdeps/i386/fpu/e_log2f.S
@@ -39,7 +39,7 @@ ENTRY(__ieee754_log2f)
fnstsw
fld %st // x : x : 1
sahf
- jc 3f // in case x is NaN or ±Inf
+ jc 3f // in case x is NaN or ±Inf
4: fsub %st(2), %st // x-1 : x : 1
fld %st // x-1 : x-1 : x : 1
fabs // |x-1| : x-1 : x : 1
@@ -61,7 +61,7 @@ ENTRY(__ieee754_log2f)
fyl2x // log(x)
ret
-3: jp 4b // in case x is ±Inf
+3: jp 4b // in case x is ±Inf
fstp %st(1)
fstp %st(1)
ret
diff --git a/sysdeps/i386/fpu/e_log2l.S b/sysdeps/i386/fpu/e_log2l.S
index 0f5f7e5..100c0b0 100644
--- a/sysdeps/i386/fpu/e_log2l.S
+++ b/sysdeps/i386/fpu/e_log2l.S
@@ -39,7 +39,7 @@ ENTRY(__ieee754_log2l)
fnstsw
fld %st // x : x : 1
sahf
- jc 3f // in case x is NaN or ±Inf
+ jc 3f // in case x is NaN or ±Inf
4: fsub %st(2), %st // x-1 : x : 1
fld %st // x-1 : x-1 : x : 1
fabs // |x-1| : x-1 : x : 1
@@ -61,7 +61,7 @@ ENTRY(__ieee754_log2l)
fyl2x // log(x)
ret
-3: jp 4b // in case x is ±Inf
+3: jp 4b // in case x is ±Inf
fstp %st(1)
fstp %st(1)
ret
diff --git a/sysdeps/i386/fpu/e_pow.S b/sysdeps/i386/fpu/e_pow.S
index 40f8227..653c7cb 100644
--- a/sysdeps/i386/fpu/e_pow.S
+++ b/sysdeps/i386/fpu/e_pow.S
@@ -77,7 +77,7 @@ ENTRY(__ieee754_pow)
cmpb $0x40, %ah // is y == 0 ?
je 11f
- cmpb $0x05, %ah // is y == ±inf ?
+ cmpb $0x05, %ah // is y == ±inf ?
je 12f
cmpb $0x01, %ah // is y == NaN ?
@@ -93,10 +93,10 @@ ENTRY(__ieee754_pow)
movb %ah, %dh
andb $0x45, %ah
cmpb $0x40, %ah
- je 20f // x is ±0
+ je 20f // x is ±0
cmpb $0x05, %ah
- je 15f // x is ±inf
+ je 15f // x is ±inf
cmpb $0x01, %ah
je 32f // x is NaN
@@ -167,7 +167,7 @@ ENTRY(__ieee754_pow)
fstp %st(0) // ST*x
ret
- /* y is ±NAN */
+ /* y is ±NAN */
30: fldl 4(%esp) // x : y
fldl MO(one) // 1.0 : x : y
fucomp %st(1) // x : y
@@ -260,13 +260,13 @@ ENTRY(__ieee754_pow)
ret
- // pow(x,±0) = 1
+ // pow(x,±0) = 1
.align ALIGNARG(4)
11: fstp %st(0) // pop y
fldl MO(one)
ret
- // y == ±inf
+ // y == ±inf
.align ALIGNARG(4)
12: fstp %st(0) // pop y
fldl MO(one) // 1
@@ -297,7 +297,7 @@ ENTRY(__ieee754_pow)
cfi_adjust_cfa_offset (8)
.align ALIGNARG(4)
- // x is ±inf
+ // x is ±inf
15: fstp %st(0) // y
testb $2, %dh
jz 16f // jump if x == +inf
@@ -355,12 +355,12 @@ ENTRY(__ieee754_pow)
cfi_adjust_cfa_offset (8)
.align ALIGNARG(4)
- // x is ±0
+ // x is ±0
20: fstp %st(0) // y
testb $2, %dl
jz 21f // y > 0
- // x is ±0 and y is < 0. We must find out whether y is an odd integer.
+ // x is ±0 and y is < 0. We must find out whether y is an odd integer.
testb $2, %dh
jz 25f
@@ -407,7 +407,7 @@ ENTRY(__ieee754_pow)
cfi_adjust_cfa_offset (8)
.align ALIGNARG(4)
- // x is ±0 and y is > 0. We must find out whether y is an odd integer.
+ // x is ±0 and y is > 0. We must find out whether y is an odd integer.
21: testb $2, %dh
jz 22f
diff --git a/sysdeps/i386/fpu/e_powf.S b/sysdeps/i386/fpu/e_powf.S
index 0233828..bdf6b93 100644
--- a/sysdeps/i386/fpu/e_powf.S
+++ b/sysdeps/i386/fpu/e_powf.S
@@ -74,7 +74,7 @@ ENTRY(__ieee754_powf)
cmpb $0x40, %ah // is y == 0 ?
je 11f
- cmpb $0x05, %ah // is y == ±inf ?
+ cmpb $0x05, %ah // is y == ±inf ?
je 12f
cmpb $0x01, %ah // is y == NaN ?
@@ -90,10 +90,10 @@ ENTRY(__ieee754_powf)
movb %ah, %dh
andb $0x45, %ah
cmpb $0x40, %ah
- je 20f // x is ±0
+ je 20f // x is ±0
cmpb $0x05, %ah
- je 15f // x is ±inf
+ je 15f // x is ±inf
cmpb $0x01, %ah
je 32f // x is NaN
@@ -150,7 +150,7 @@ ENTRY(__ieee754_powf)
fstp %st(0) // ST*x
ret
- /* y is ±NAN */
+ /* y is ±NAN */
30: flds 4(%esp) // x : y
fldl MO(one) // 1.0 : x : y
fucomp %st(1) // x : y
@@ -199,13 +199,13 @@ ENTRY(__ieee754_powf)
ret
- // pow(x,±0) = 1
+ // pow(x,±0) = 1
.align ALIGNARG(4)
11: fstp %st(0) // pop y
fldl MO(one)
ret
- // y == ±inf
+ // y == ±inf
.align ALIGNARG(4)
12: fstp %st(0) // pop y
fldl MO(one) // 1
@@ -236,7 +236,7 @@ ENTRY(__ieee754_powf)
cfi_adjust_cfa_offset (4)
.align ALIGNARG(4)
- // x is ±inf
+ // x is ±inf
15: fstp %st(0) // y
testb $2, %dh
jz 16f // jump if x == +inf
@@ -292,12 +292,12 @@ ENTRY(__ieee754_powf)
cfi_adjust_cfa_offset (4)
.align ALIGNARG(4)
- // x is ±0
+ // x is ±0
20: fstp %st(0) // y
testb $2, %dl
jz 21f // y > 0
- // x is ±0 and y is < 0. We must find out whether y is an odd integer.
+ // x is ±0 and y is < 0. We must find out whether y is an odd integer.
testb $2, %dh
jz 25f
@@ -342,7 +342,7 @@ ENTRY(__ieee754_powf)
cfi_adjust_cfa_offset (4)
.align ALIGNARG(4)
- // x is ±0 and y is > 0. We must find out whether y is an odd integer.
+ // x is ±0 and y is > 0. We must find out whether y is an odd integer.
21: testb $2, %dh
jz 22f
diff --git a/sysdeps/i386/fpu/e_powl.S b/sysdeps/i386/fpu/e_powl.S
index bdfb5cf..ac9e965 100644
--- a/sysdeps/i386/fpu/e_powl.S
+++ b/sysdeps/i386/fpu/e_powl.S
@@ -83,7 +83,7 @@ ENTRY(__ieee754_powl)
cmpb $0x40, %ah // is y == 0 ?
je 11f
- cmpb $0x05, %ah // is y == ±inf ?
+ cmpb $0x05, %ah // is y == ±inf ?
je 12f
cmpb $0x01, %ah // is y == NaN ?
@@ -99,10 +99,10 @@ ENTRY(__ieee754_powl)
movb %ah, %dh
andb $0x45, %ah
cmpb $0x40, %ah
- je 20f // x is ±0
+ je 20f // x is ±0
cmpb $0x05, %ah
- je 15f // x is ±inf
+ je 15f // x is ±inf
cmpb $0x01, %ah
je 32f // x is NaN
@@ -189,7 +189,7 @@ ENTRY(__ieee754_powl)
fstp %st(0) // ST*x
ret
- /* y is ±NAN */
+ /* y is ±NAN */
30: fldt 4(%esp) // x : y
fldl MO(one) // 1.0 : x : y
fucomp %st(1) // x : y
@@ -235,13 +235,13 @@ ENTRY(__ieee754_powl)
cfi_adjust_cfa_offset (-36)
ret
- // pow(x,±0) = 1
+ // pow(x,±0) = 1
.align ALIGNARG(4)
11: fstp %st(0) // pop y
fldl MO(one)
ret
- // y == ±inf
+ // y == ±inf
.align ALIGNARG(4)
12: fstp %st(0) // pop y
fldl MO(one) // 1
@@ -272,7 +272,7 @@ ENTRY(__ieee754_powl)
cfi_adjust_cfa_offset (8)
.align ALIGNARG(4)
- // x is ±inf
+ // x is ±inf
15: fstp %st(0) // y
testb $2, %dh
jz 16f // jump if x == +inf
@@ -333,12 +333,12 @@ ENTRY(__ieee754_powl)
cfi_adjust_cfa_offset (8)
.align ALIGNARG(4)
- // x is ±0
+ // x is ±0
20: fstp %st(0) // y
testb $2, %dl
jz 21f // y > 0
- // x is ±0 and y is < 0. We must find out whether y is an odd integer.
+ // x is ±0 and y is < 0. We must find out whether y is an odd integer.
testb $2, %dh
jz 25f
@@ -388,7 +388,7 @@ ENTRY(__ieee754_powl)
cfi_adjust_cfa_offset (8)
.align ALIGNARG(4)
- // x is ±0 and y is > 0. We must find out whether y is an odd integer.
+ // x is ±0 and y is > 0. We must find out whether y is an odd integer.
21: testb $2, %dh
jz 22f
diff --git a/sysdeps/i386/fpu/s_asinh.S b/sysdeps/i386/fpu/s_asinh.S
index e4c0c67..dc34ceb 100644
--- a/sysdeps/i386/fpu/s_asinh.S
+++ b/sysdeps/i386/fpu/s_asinh.S
@@ -47,7 +47,7 @@ ENTRY(__asinh)
movl %eax, %edx
orl $0x800fffff, %edx
incl %edx
- jz 7f // x in ±Inf or NaN
+ jz 7f // x in ±Inf or NaN
xorl %ecx, 8(%esp)
fldl 4(%esp) // |x|
cmpl $0x3e300000, %eax
diff --git a/sysdeps/i386/fpu/s_asinhf.S b/sysdeps/i386/fpu/s_asinhf.S
index b1a28e7..269f306 100644
--- a/sysdeps/i386/fpu/s_asinhf.S
+++ b/sysdeps/i386/fpu/s_asinhf.S
@@ -47,7 +47,7 @@ ENTRY(__asinhf)
movl %eax, %edx
orl $0x807fffff, %edx
incl %edx
- jz 7f // x in ±Inf or NaN
+ jz 7f // x in ±Inf or NaN
xorl %ecx, 4(%esp)
flds 4(%esp) // |x|
cmpl $0x38000000, %eax
diff --git a/sysdeps/i386/fpu/s_log1p.S b/sysdeps/i386/fpu/s_log1p.S
index c2559a3..49df35d 100644
--- a/sysdeps/i386/fpu/s_log1p.S
+++ b/sysdeps/i386/fpu/s_log1p.S
@@ -42,7 +42,7 @@ ENTRY(__log1p)
fnstsw
fld %st
sahf
- jc 3f // in case x is NaN or ±Inf
+ jc 3f // in case x is NaN or ±Inf
4: fabs
#ifdef PIC
fcompl limit@GOTOFF(%edx)
@@ -82,7 +82,7 @@ ENTRY(__log1p)
cfi_adjust_cfa_offset (-8)
1: ret
-3: jp 4b // in case x is ±Inf
+3: jp 4b // in case x is ±Inf
fstp %st(1)
fstp %st(1)
ret
diff --git a/sysdeps/i386/fpu/s_log1pf.S b/sysdeps/i386/fpu/s_log1pf.S
index 8fca22e..a7d006c 100644
--- a/sysdeps/i386/fpu/s_log1pf.S
+++ b/sysdeps/i386/fpu/s_log1pf.S
@@ -42,7 +42,7 @@ ENTRY(__log1pf)
fnstsw
fld %st
sahf
- jc 3f // in case x is NaN or ±Inf
+ jc 3f // in case x is NaN or ±Inf
4: fabs
#ifdef PIC
fcomps limit@GOTOFF(%edx)
@@ -82,7 +82,7 @@ ENTRY(__log1pf)
cfi_adjust_cfa_offset (-4)
1: ret
-3: jp 4b // in case x is ±Inf
+3: jp 4b // in case x is ±Inf
fstp %st(1)
fstp %st(1)
ret
diff --git a/sysdeps/i386/fpu/s_log1pl.S b/sysdeps/i386/fpu/s_log1pl.S
index 8f87cf6..f50ab58 100644
--- a/sysdeps/i386/fpu/s_log1pl.S
+++ b/sysdeps/i386/fpu/s_log1pl.S
@@ -40,7 +40,7 @@ ENTRY(__log1pl)
fnstsw
fld %st
sahf
- jc 3f // in case x is NaN or ±Inf
+ jc 3f // in case x is NaN or ±Inf
4:
fabs
#ifdef PIC
@@ -69,7 +69,7 @@ ENTRY(__log1pl)
2: fyl2xp1
ret
-3: jp 4b // in case x is ±Inf
+3: jp 4b // in case x is ±Inf
fstp %st(1)
fstp %st(1)
ret
diff --git a/sysdeps/ia64/fpu/s_tanf.S b/sysdeps/ia64/fpu/s_tanf.S
index 7df762f..a25e97b 100644
--- a/sysdeps/ia64/fpu/s_tanf.S
+++ b/sysdeps/ia64/fpu/s_tanf.S
@@ -225,7 +225,7 @@ LOCAL_OBJECT_END(coeff_B)
LOCAL_LIBM_ENTRY(cotf)
{ .mlx
- getf.exp rExp = f8 // ***** Get 2ˆ17 * s + E
+ getf.exp rExp = f8 // ***** Get 2^17 * s + E
movl rSigRcpPiby2= 0xA2F9836E4E44152A // significand of 2/Pi
}
{ .mlx
@@ -252,7 +252,7 @@ LOCAL_LIBM_END(cotf)
GLOBAL_IEEE754_ENTRY(tanf)
{ .mlx
- getf.exp rExp = f8 // ***** Get 2ˆ17 * s + E
+ getf.exp rExp = f8 // ***** Get 2^17 * s + E
movl rSigRcpPiby2= 0xA2F9836E4E44152A // significand of 2/Pi
}
{ .mlx
diff --git a/sysdeps/x86_64/fpu/e_log10l.S b/sysdeps/x86_64/fpu/e_log10l.S
index 2607ad1..930e8f6 100644
--- a/sysdeps/x86_64/fpu/e_log10l.S
+++ b/sysdeps/x86_64/fpu/e_log10l.S
@@ -38,7 +38,7 @@ ENTRY(__ieee754_log10l)
fnstsw
fld %st // x : x : log10(2)
testb $1, %ah
- jnz 3f // in case x is NaN or ±Inf
+ jnz 3f // in case x is NaN or ±Inf
4: fsubl MO(one) // x-1 : x : log10(2)
fld %st // x-1 : x-1 : x : log10(2)
fabs // |x-1| : x-1 : x : log10(2)
@@ -61,7 +61,7 @@ ENTRY(__ieee754_log10l)
ret
3: testb $4, %ah
- jnz 4b // in case x is ±Inf
+ jnz 4b // in case x is ±Inf
fstp %st(1)
fstp %st(1)
ret
diff --git a/sysdeps/x86_64/fpu/e_log2l.S b/sysdeps/x86_64/fpu/e_log2l.S
index c12906d..76060fd 100644
--- a/sysdeps/x86_64/fpu/e_log2l.S
+++ b/sysdeps/x86_64/fpu/e_log2l.S
@@ -37,7 +37,7 @@ ENTRY(__ieee754_log2l)
fnstsw
fld %st // x : x : 1
testb $1, %ah
- jnz 3f // in case x is NaN or ±Inf
+ jnz 3f // in case x is NaN or ±Inf
4: fsub %st(2), %st // x-1 : x : 1
fld %st // x-1 : x-1 : x : 1
fabs // |x-1| : x-1 : x : 1
@@ -60,7 +60,7 @@ ENTRY(__ieee754_log2l)
ret
3: testb $4, %ah
- jnz 4b // in case x is ±Inf
+ jnz 4b // in case x is ±Inf
fstp %st(1)
fstp %st(1)
ret
diff --git a/sysdeps/x86_64/fpu/e_powl.S b/sysdeps/x86_64/fpu/e_powl.S
index 358abb8..9f77ed3 100644
--- a/sysdeps/x86_64/fpu/e_powl.S
+++ b/sysdeps/x86_64/fpu/e_powl.S
@@ -78,7 +78,7 @@ ENTRY(__ieee754_powl)
cmpb $0x40, %ah // is y == 0 ?
je 11f
- cmpb $0x05, %ah // is y == ±inf ?
+ cmpb $0x05, %ah // is y == ±inf ?
je 12f
cmpb $0x01, %ah // is y == NaN ?
@@ -91,10 +91,10 @@ ENTRY(__ieee754_powl)
movb %ah, %dh
andb $0x45, %ah
cmpb $0x40, %ah
- je 20f // x is ±0
+ je 20f // x is ±0
cmpb $0x05, %ah
- je 15f // x is ±inf
+ je 15f // x is ±inf
cmpb $0x01, %ah
je 31f // x is NaN
@@ -177,7 +177,7 @@ ENTRY(__ieee754_powl)
fstp %st(0) // ST*x
ret
- /* y is ±NAN */
+ /* y is ±NAN */
30: fldt 8(%rsp) // x : y
fldl MO(one) // 1.0 : x : y
fucomip %st(1),%st // x : y
@@ -214,13 +214,13 @@ ENTRY(__ieee754_powl)
cfi_adjust_cfa_offset (-40)
ret
- // pow(x,±0) = 1
+ // pow(x,±0) = 1
.align ALIGNARG(4)
11: fstp %st(0) // pop y
fldl MO(one)
ret
- // y == ±inf
+ // y == ±inf
.align ALIGNARG(4)
12: fstp %st(0) // pop y
fldl MO(one) // 1
@@ -255,7 +255,7 @@ ENTRY(__ieee754_powl)
ret
.align ALIGNARG(4)
- // x is ±inf
+ // x is ±inf
15: fstp %st(0) // y
testb $2, %dh
jz 16f // jump if x == +inf
@@ -321,12 +321,12 @@ ENTRY(__ieee754_powl)
ret
.align ALIGNARG(4)
- // x is ±0
+ // x is ±0
20: fstp %st(0) // y
testb $2, %dl
jz 21f // y > 0
- // x is ±0 and y is < 0. We must find out whether y is an odd integer.
+ // x is ±0 and y is < 0. We must find out whether y is an odd integer.
testb $2, %dh
jz 25f
@@ -370,7 +370,7 @@ ENTRY(__ieee754_powl)
ret
.align ALIGNARG(4)
- // x is ±0 and y is > 0. We must find out whether y is an odd integer.
+ // x is ±0 and y is > 0. We must find out whether y is an odd integer.
21: testb $2, %dh
jz 22f
diff --git a/sysdeps/x86_64/fpu/s_log1pl.S b/sysdeps/x86_64/fpu/s_log1pl.S
index e83f64d..cc6203f 100644
--- a/sysdeps/x86_64/fpu/s_log1pl.S
+++ b/sysdeps/x86_64/fpu/s_log1pl.S
@@ -43,7 +43,7 @@ ENTRY(__log1pl)
fnstsw
fld %st
testb $1, %ah
- jnz 3f // in case x is NaN or ±Inf
+ jnz 3f // in case x is NaN or ±Inf
4:
fabs
fldt MO(limit)
@@ -65,7 +65,7 @@ ENTRY(__log1pl)
ret
3: testb $4, %ah
- jnz 4b // in case x is ±Inf
+ jnz 4b // in case x is ±Inf
fstp %st(1)
fstp %st(1)
ret
diff --git a/timezone/southamerica b/timezone/southamerica
index 341e57f..70df4c9 100644
--- a/timezone/southamerica
+++ b/timezone/southamerica
@@ -368,19 +368,19 @@ Rule Arg 2008 max - Oct Sun>=15 0:00 1:00 S
# <a/>
# is the official page for the Province Government).
#
-# There's also a note in only one of the major national papers (La Nación) at
+# There's also a note in only one of the major national papers (La Nación) at
# <a href="http://www.lanacion.com.ar/nota.asp?nota_id=1107912">
# http://www.lanacion.com.ar/nota.asp?nota_id=1107912
# </a>
#
# The press release says:
-# (...) anunció que el próximo domingo a las 00:00 los puntanos deberán
+# (...) anunció que el próximo domingo a las 00:00 los puntanos deberán
# atrasar una hora sus relojes.
#
-# A partir de entonces, San Luis establecerá el huso horario propio de
+# A partir de entonces, San Luis establecerá el huso horario propio de
# la Provincia. De esta manera, durante el periodo del calendario anual
-# 2009, el cambio horario quedará comprendido entre las 00:00 del tercer
-# domingo de marzo y las 24:00 del segundo sábado de octubre.
+# 2009, el cambio horario quedará comprendido entre las 00:00 del tercer
+# domingo de marzo y las 24:00 del segundo sábado de octubre.
# Quick&dirty translation
# (...) announced that next Sunday, at 00:00, Puntanos (the San Luis
# inhabitants) will have to turn back one hour their clocks
--
2.1.0
More information about the Libc-alpha
mailing list