[PATCH] Update Macintosh character maps (bug 23073)

Florian Weimer fweimer@redhat.com
Fri Apr 20 11:13:00 GMT 2018


On 04/18/2018 02:46 PM, Andreas Schwab wrote:

> diff --git a/localedata/charmaps/MAC-IS b/localedata/charmaps/MAC-IS
> index 835a49c664..b3c308a9c0 100644
> --- a/localedata/charmaps/MAC-IS
> +++ b/localedata/charmaps/MAC-IS
> @@ -163,7 +163,7 @@ CHARMAP
>   <U00F9>     /x9d         LATIN SMALL LETTER U WITH GRAVE
>   <U00FB>     /x9e         LATIN SMALL LETTER U WITH CIRCUMFLEX
>   <U00FC>     /x9f         LATIN SMALL LETTER U WITH DIAERESIS
> -<U2020>     /xa0         DAGGER
> +<U00DD>     /xa0         LATIN CAPITAL LETTER Y WITH ACUTE

I'm comparing against MacIceland (on Darwin 17.5.0).  This change is good.

> @@ -201,7 +201,7 @@ CHARMAP
>   <U221A>     /xc3         SQUARE ROOT
>   <U0192>     /xc4         LATIN SMALL LETTER F WITH HOOK
>   <U2248>     /xc5         ALMOST EQUAL TO
> -<U0394>     /xc6         GREEK CAPITAL LETTER DELTA
> +<U2206>     /xc6         INCREMENT

This one too.

> @@ -211,23 +211,23 @@ CHARMAP
>   <U00D5>     /xcd         LATIN CAPITAL LETTER O WITH TILDE
>   <U0152>     /xce         LATIN CAPITAL LIGATURE OE
>   <U0153>     /xcf         LATIN SMALL LIGATURE OE
> -<U2014>     /xd0         EM DASH
> -<U2013>     /xd1         EN DASH
> +<U2013>     /xd0         EN DASH
> +<U2014>     /xd1         EM DASH

Good as well.

> -<U25C6>     /xd7         BLACK DIAMOND
> +<U25CA>     /xd7         LOZENGE

Likewise.

> -<U00A4>     /xdb         CURRENCY SIGN
> -<U0110>     /xdc         LATIN CAPITAL LETTER D WITH STROKE
> -<U0111>     /xdd         LATIN SMALL LETTER D WITH STROKE
> +<U20AC>     /xdb         EURO SIGN
> +<U00D0>     /xdc         LATIN CAPITAL LETTER ETH
> +<U00F0>     /xdd         LATIN SMALL LETTER ETH

The Mac keeps the international currency sign for /xdb, so we should as 
well.  The other changes are good.

>   <U00DE>     /xde         LATIN CAPITAL LETTER THORN (Icelandic)
>   <U00FE>     /xdf         LATIN SMALL LETTER THORN (Icelandic)
> -<U2021>     /xe0         DOUBLE DAGGER
> +<U00FD>     /xe0         LATIN SMALL LETTER Y WITH ACUTE

Okay.

> @@ -243,12 +243,14 @@ CHARMAP
>   <U00CC>     /xed         LATIN CAPITAL LETTER I WITH GRAVE
>   <U00D3>     /xee         LATIN CAPITAL LETTER O WITH ACUTE
>   <U00D4>     /xef         LATIN CAPITAL LETTER O WITH CIRCUMFLEX
> -<UE01E>     /xf0         APPLE LOGO (Macintosh_F0)
> +<UF8FF>     /xf0         APPLE LOGO (Macintosh_F0)

MacOS has no mapping for /xf0 and returns EILSEQ under iconv.  I think 
we should do the same.  This may require reverting the mac-is.c change, too.

> +<U02C6>     /xf6         MODIFIER LETTER CIRCUMFLEX ACCENT
> +<U02DC>     /xf7         SMALL TILDE

Again okay.

In addition to the two discrepancies, I see this difference with your 
patch applied:

-<U03A9>     /xbd
+<U2126>     /xbd

That is, we use GREEK CAPITAL LETTER OMEGA, and MacOS uses OHM SIGN.  I 
think we should make the switch to align with MacOS.

NB: testrun.sh does not seem to force use of the non-installed gconv 
modules in the source tree.

Thanks,
Florian



More information about the Libc-alpha mailing list