From patchwork Wed Apr 18 12:46:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 26776 Received: (qmail 81445 invoked by alias); 18 Apr 2018 12:46:18 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 81433 invoked by uid 89); 18 Apr 2018 12:46:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.0 required=5.0 tests=BAYES_20, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS, UPPERCASE_50_75 autolearn=ham version=3.3.2 spammy=capital, breve, LOGO, cent X-HELO: mx2.suse.de From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Update Macintosh character maps (bug 23073) X-Yow: I'm a fuschia bowling ball somewhere in Brittany Date: Wed, 18 Apr 2018 14:46:11 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 This updates the macintosh character maps from the tables available from and . Note that this makes MAC-CYRILLIC identical to MAC-UK (it was identical to CP10007 before). * localedata/charmaps/MACINTOSH: Update from . * localedata/charmaps/MAC-CYRILLIC: Likewise. * localedata/charmaps/MAC-IS: Likewise. * localedata/charmaps/MAC-UK: Likewise. * localedata/charmaps/MAC-SAMI: Update from . * iconvdata/mac-is.c (HAS_HOLES): Define to 0. --- iconvdata/mac-is.c | 2 +- localedata/charmaps/MAC-CYRILLIC | 5 ++--- localedata/charmaps/MAC-IS | 22 ++++++++++++---------- localedata/charmaps/MAC-SAMI | 12 ++++++------ localedata/charmaps/MAC-UK | 2 +- localedata/charmaps/MACINTOSH | 4 ++-- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/iconvdata/mac-is.c b/iconvdata/mac-is.c index c46234d5ab..3e18bebad4 100644 --- a/iconvdata/mac-is.c +++ b/iconvdata/mac-is.c @@ -23,6 +23,6 @@ #define TABLES #define CHARSET_NAME "MAC-IS//" -#define HAS_HOLES 1 /* Not all 256 character are defined. */ +#define HAS_HOLES 0 #include <8bit-gap.c> diff --git a/localedata/charmaps/MAC-CYRILLIC b/localedata/charmaps/MAC-CYRILLIC index 482cfd4691..32463f2be4 100644 --- a/localedata/charmaps/MAC-CYRILLIC +++ b/localedata/charmaps/MAC-CYRILLIC @@ -2,7 +2,6 @@ % / -% alias CP10007 CHARMAP /x00 NULL /x01 START OF HEADING @@ -166,7 +165,7 @@ CHARMAP /x9f CYRILLIC CAPITAL LETTER YA /xa0 DAGGER /xa1 DEGREE SIGN - /xa2 CENT SIGN + /xa2 CYRILLIC CAPITAL LETTER GHE WITH UPTURN /xa3 POUND SIGN /xa4 SECTION SIGN /xa5 BULLET @@ -259,5 +258,5 @@ CHARMAP /xfc CYRILLIC SMALL LETTER SOFT SIGN /xfd CYRILLIC SMALL LETTER E /xfe CYRILLIC SMALL LETTER YU - /xff CURRENCY SIGN + /xff EURO SIGN END CHARMAP 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 /x9d LATIN SMALL LETTER U WITH GRAVE /x9e LATIN SMALL LETTER U WITH CIRCUMFLEX /x9f LATIN SMALL LETTER U WITH DIAERESIS - /xa0 DAGGER + /xa0 LATIN CAPITAL LETTER Y WITH ACUTE /xa1 DEGREE SIGN /xa2 CENT SIGN /xa3 POUND SIGN @@ -201,7 +201,7 @@ CHARMAP /xc3 SQUARE ROOT /xc4 LATIN SMALL LETTER F WITH HOOK /xc5 ALMOST EQUAL TO - /xc6 GREEK CAPITAL LETTER DELTA + /xc6 INCREMENT /xc7 LEFT-POINTING DOUBLE ANGLE QUOTATION MARK /xc8 RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK /xc9 HORIZONTAL ELLIPSIS @@ -211,23 +211,23 @@ CHARMAP /xcd LATIN CAPITAL LETTER O WITH TILDE /xce LATIN CAPITAL LIGATURE OE /xcf LATIN SMALL LIGATURE OE - /xd0 EM DASH - /xd1 EN DASH + /xd0 EN DASH + /xd1 EM DASH /xd2 LEFT DOUBLE QUOTATION MARK /xd3 RIGHT DOUBLE QUOTATION MARK /xd4 LEFT SINGLE QUOTATION MARK /xd5 RIGHT SINGLE QUOTATION MARK /xd6 DIVISION SIGN - /xd7 BLACK DIAMOND + /xd7 LOZENGE /xd8 LATIN SMALL LETTER Y WITH DIAERESIS /xd9 LATIN CAPITAL LETTER Y WITH DIAERESIS /xda FRACTION SLASH - /xdb CURRENCY SIGN - /xdc LATIN CAPITAL LETTER D WITH STROKE - /xdd LATIN SMALL LETTER D WITH STROKE + /xdb EURO SIGN + /xdc LATIN CAPITAL LETTER ETH + /xdd LATIN SMALL LETTER ETH /xde LATIN CAPITAL LETTER THORN (Icelandic) /xdf LATIN SMALL LETTER THORN (Icelandic) - /xe0 DOUBLE DAGGER + /xe0 LATIN SMALL LETTER Y WITH ACUTE /xe1 MIDDLE DOT /xe2 SINGLE LOW-9 QUOTATION MARK /xe3 DOUBLE LOW-9 QUOTATION MARK @@ -243,12 +243,14 @@ CHARMAP /xed LATIN CAPITAL LETTER I WITH GRAVE /xee LATIN CAPITAL LETTER O WITH ACUTE /xef LATIN CAPITAL LETTER O WITH CIRCUMFLEX - /xf0 APPLE LOGO (Macintosh_F0) + /xf0 APPLE LOGO (Macintosh_F0) /xf1 LATIN CAPITAL LETTER O WITH GRAVE /xf2 LATIN CAPITAL LETTER U WITH ACUTE /xf3 LATIN CAPITAL LETTER U WITH CIRCUMFLEX /xf4 LATIN CAPITAL LETTER U WITH GRAVE /xf5 LATIN SMALL LETTER DOTLESS I + /xf6 MODIFIER LETTER CIRCUMFLEX ACCENT + /xf7 SMALL TILDE /xf8 MACRON /xf9 BREVE /xfa DOT ABOVE (Mandarin Chinese light tone) diff --git a/localedata/charmaps/MAC-SAMI b/localedata/charmaps/MAC-SAMI index 0a112e97b6..675ee7ebf1 100644 --- a/localedata/charmaps/MAC-SAMI +++ b/localedata/charmaps/MAC-SAMI @@ -1,7 +1,7 @@ MAC-SAMI % / -% source: http://www.indigo.ie/egt/standards/se/mac-sami.html +% source: http://www.evertype.com/standards/se/mac-sami.html % author: Regnor Jernsletten % date: 2001-07-31 % comment: Macintosh sami standard. @@ -185,8 +185,8 @@ CHARMAP /xaf LATIN CAPITAL LETTER O WITH STROKE /xb0 LATIN CAPITAL LETTER D WITH STROKE /xb1 LATIN CAPITAL LETTER ENG - /xb2 LATIN CAPITAL LETTER H WITH CARON - /xb3 LATIN SMALL LETTER H WITH CARON + /xb2 LESS-THAN OR EQUAL TO + /xb3 GREATER-THAN OR EQUAL TO /xb4 LATIN CAPITAL LETTER S WITH CARON /xb5 LATIN CAPITAL LETTER T WITH STROKE /xb6 PARTIAL DIFFERENTIAL @@ -205,7 +205,7 @@ CHARMAP /xc3 SQUARE ROOT /xc4 LATIN SMALL LETTER F WITH HOOK /xc5 ALMOST EQUAL TO - /xc6 INCREMENT + /xc6 LATIN CAPITAL LETTER H WITH CARON /xc7 LEFT-POINTING DOUBLE ANGLE QUOTATION MARK /xc8 RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK /xc9 HORIZONTAL ELLIPSIS @@ -222,11 +222,11 @@ CHARMAP /xd4 LEFT SINGLE QUOTATION MARK /xd5 RIGHT SINGLE QUOTATION MARK /xd6 DIVISION SIGN - /xd7 LOZENGE + /xd7 LATIN SMALL LETTER H WITH CARON /xd8 LATIN SMALL LETTER Y WITH DIAERESIS /xd9 LATIN CAPITAL LETTER Y WITH DIAERESIS /xda FRACTION SLASH - /xdb CURRENCY SIGN + /xdb EURO SIGN /xdc LATIN CAPITAL LETTER ETH /xdd LATIN SMALL LETTER ETH /xde LATIN CAPITAL LETTER THORN diff --git a/localedata/charmaps/MAC-UK b/localedata/charmaps/MAC-UK index f9da2dda35..a3d278011c 100644 --- a/localedata/charmaps/MAC-UK +++ b/localedata/charmaps/MAC-UK @@ -259,5 +259,5 @@ CHARMAP /xfc CYRILLIC SMALL LETTER SOFT SIGN /xfd CYRILLIC SMALL LETTER E /xfe CYRILLIC SMALL LETTER YU - /xff CURRENCY SIGN + /xff EURO SIGN END CHARMAP diff --git a/localedata/charmaps/MACINTOSH b/localedata/charmaps/MACINTOSH index b826dc944f..86d732fb63 100644 --- a/localedata/charmaps/MACINTOSH +++ b/localedata/charmaps/MACINTOSH @@ -204,7 +204,7 @@ CHARMAP /xc3 SQUARE ROOT /xc4 LATIN SMALL LETTER F WITH HOOK /xc5 ALMOST EQUAL TO - /xc6 GREEK CAPITAL LETTER DELTA + /xc6 INCREMENT /xc7 LEFT-POINTING DOUBLE ANGLE QUOTATION MARK /xc8 RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK /xc9 HORIZONTAL ELLIPSIS @@ -246,7 +246,7 @@ CHARMAP /xed LATIN CAPITAL LETTER I WITH GRAVE /xee LATIN CAPITAL LETTER O WITH ACUTE /xef LATIN CAPITAL LETTER O WITH CIRCUMFLEX - /xf0 APPLE LOGO (Macintosh_F0) + /xf0 APPLE LOGO (Macintosh_F0) /xf1 LATIN CAPITAL LETTER O WITH GRAVE /xf2 LATIN CAPITAL LETTER U WITH ACUTE /xf3 LATIN CAPITAL LETTER U WITH CIRCUMFLEX