From patchwork Sat Feb 20 07:54:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 10951 X-Patchwork-Delegate: vapier@gentoo.org Received: (qmail 77915 invoked by alias); 20 Feb 2016 07:54:23 -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 77905 invoked by uid 89); 20 Feb 2016 07:54:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.8 required=5.0 tests=AC_HTML_NONSENSE_TAGS, BAYES_50, RP_MATCHES_RCVD, SPF_PASS autolearn=no version=3.3.2 spammy=lc_time, LC_TIME, lc_ctype, LC_CTYPE X-HELO: smtp.gentoo.org From: Mike Frysinger To: libc-alpha@sourceware.org Subject: [PATCH 1/3] localedata: use same comment_char/escape_char in these files Date: Sat, 20 Feb 2016 02:54:13 -0500 Message-Id: <1455954855-26431-1-git-send-email-vapier@gentoo.org> These files are small and easy to convert to what most others use. --- localedata/locales/POSIX | 289 +++++++++++++++++++++-------------------- localedata/locales/iso14651_t1 | 6 +- 2 files changed, 150 insertions(+), 145 deletions(-) diff --git a/localedata/locales/POSIX b/localedata/locales/POSIX index df89cb8..2804bdb 100644 --- a/localedata/locales/POSIX +++ b/localedata/locales/POSIX @@ -1,95 +1,98 @@ -# POSIX Standard Locale -# -# As per ISO/IEC 9945-2:1993 specifications -# except for these additional identifying comments -# -# Source: ISO/IEC JTC1/SC22/WG15 -# Address: C/O DKUUG, Fruebjergvej 3 -# DK-2100 Copenhagen O, Denmark -# Contact: Keld Simonsen -# Email: Keld.Simonsen@dkuug.dk -# Tel: +45 - 39179944 -# Fax: +45 - 31208948 -# Language: POSIX -# Territory: -# Revision: 1.1 -# Date: 1997-03-15 -# Application: general -# Users: general -# Charset: ISO646:1993 -# Distribution and use is free, also for -# commercial purposes. +comment_char % +escape_char / + +% POSIX Standard Locale +% +% As per ISO/IEC 9945-2:1993 specifications +% except for these additional identifying comments +% +% Source: ISO/IEC JTC1/SC22/WG15 +% Address: C/O DKUUG, Fruebjergvej 3 +% DK-2100 Copenhagen O, Denmark +% Contact: Keld Simonsen +% Email: Keld.Simonsen@dkuug.dk +% Tel: +45 - 39179944 +% Fax: +45 - 31208948 +% Language: POSIX +% Territory: +% Revision: 1.1 +% Date: 1997-03-15 +% Application: general +% Users: general +% Charset: ISO646:1993 +% Distribution and use is free, also for +% commercial purposes. LC_CTYPE -# The following is the POSIX Locale LC_CTYPE. -# "alpha" is by default "upper" and "lower" -# "alnum" is by definiton "alpha" and "digit" -# "print" is by default "alnum", "punct" and the character -# "graph" is by default "alnum" and "punct" -# -upper ;;;;;;;;\ - ;;;;;;;;\ - ;;;;;;;;\ +% The following is the POSIX Locale LC_CTYPE. +% "alpha" is by default "upper" and "lower" +% "alnum" is by definiton "alpha" and "digit" +% "print" is by default "alnum", "punct" and the character +% "graph" is by default "alnum" and "punct" +% +upper ;;;;;;;;/ + ;;;;;;;;/ + ;;;;;;;;/ ; -# -lower ;;;;;;;;\ - ;;;;;;;;\ - ;;;;;;;;\ +% +lower ;;;;;;;;/ + ;;;;;;;;/ + ;;;;;;;;/ ; -# -digit ;;;;;\ +% +digit ;;;;;/ ;;;; -# -space ;;;;\ +% +space ;;;;/ ; -# -cntrl ;;;;;\ - ;;\ - ;;;;;;;;\ - ;;;;;;;;\ - ;;;;;;;;\ +% +cntrl ;;;;;/ + ;;/ + ;;;;;;;;/ + ;;;;;;;;/ + ;;;;;;;;/ ; -# -punct ;;;\ - ;;;;\ - ;;;\ - ;;;;;\ - ;;;;\ - ;;;\ - ;;;\ - ;;;\ +% +punct ;;;/ + ;;;;/ + ;;;/ + ;;;;;/ + ;;;;/ + ;;;/ + ;;;/ + ;;;/ ;;; -# -xdigit ;;;;;;;;\ - ;;;;;;;;\ +% +xdigit ;;;;;;;;/ + ;;;;;;;;/ ;;;;; -# +% blank ; -# -tolower (,);(,);(,);\ - (,);(,);(,);\ - (,);(,);(,);\ - (,);(,);(,);\ - (,);(,);(,);\ - (,);(,);(,);\ - (,);(,);(,);\ - (,);(,);(,);\ +% +tolower (,);(,);(,);/ + (,);(,);(,);/ + (,);(,);(,);/ + (,);(,);(,);/ + (,);(,);(,);/ + (,);(,);(,);/ + (,);(,);(,);/ + (,);(,);(,);/ (,);(,) -# -toupper (,);(,);(,);\ - (,);(,);(,);\ - (,);(,);(,);\ - (,);(,);(,);\ - (,);(,);(,);\ - (,);(,);(,);\ - (,);(,);(,);\ - (,);(,);(,);\ +% +toupper (,);(,);(,);/ + (,);(,);(,);/ + (,);(,);(,);/ + (,);(,);(,);/ + (,);(,);(,);/ + (,);(,);(,);/ + (,);(,);(,);/ + (,);(,);(,);/ (,);(,) END LC_CTYPE LC_COLLATE -# This is the POSIX Locale definition for the LC_COLLATE category. -# The order is the same as in the ASCII code set. +% This is the POSIX Locale definition for the LC_COLLATE category. +% The order is the same as in the ASCII code set. order_start forward @@ -221,13 +224,13 @@ order_start forward UNDEFINED order_end -# +% END LC_COLLATE LC_MONETARY -# This is the POSIX Locale definition for -# the LC_MONETARY category. -# +% This is the POSIX Locale definition for +% the LC_MONETARY category. +% int_curr_symbol "" currency_symbol "" mon_decimal_point "" @@ -243,92 +246,92 @@ n_cs_precedes -1 n_sep_by_space -1 p_sign_posn -1 n_sign_posn -1 -# +% END LC_MONETARY LC_NUMERIC -# This is the POSIX Locale definition for -# the LC_NUMERIC category. -# +% This is the POSIX Locale definition for +% the LC_NUMERIC category. +% decimal_point "" thousands_sep "" grouping -1 -# +% END LC_NUMERIC LC_TIME -# This is the POSIX Locale definition for -# the LC_TIME category. -# -# Abbreviated weekday names (%s) -abday "";"";\ - "";"";\ - "";"";\ +% This is the POSIX Locale definition for +% the LC_TIME category. +% +% Abbreviated weekday names (%s) +abday "";"";/ + "";"";/ + "";"";/ "" -# -# Full weekday names (%A) -day "";\ - "";\ - "";\ - "";\ - "";\ - "";\ +% +% Full weekday names (%A) +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ "" -# -# Abbreviated month names (%b) -abmon "";"";\ - "";"";\ - "";"";\ - "";"";\ - "";"";\ +% +% Abbreviated month names (%b) +abmon "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ "";"" -# -# Full month names (%B) -mon "";\ - "";\ - "";\ - "";\ - "";\ - "";\ - "";\ - "";\ - "";\ - "";\ - "";\ +% +% Full month names (%B) +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ "" -# -# Equivalent of AM/PM (%p) "AM"/"PM" +% +% Equivalent of AM/PM (%p) "AM"/"PM" am_pm "";"" -# -# Appropriate date and time representation (%c) -# "%a %b %e %H:%M:%S %Y" -d_t_fmt "\ -\ +% +% Appropriate date and time representation (%c) +% "%a %b %e %H:%M:%S %Y" +d_t_fmt "/ +/ " -# -# Appropriate date representation (%x) "%m/%d/%y" +% +% Appropriate date representation (%x) "%m/%d/%y" d_fmt "" -# -# Appropriate time representation (%X) "%H:%M:%S" +% +% Appropriate time representation (%X) "%H:%M:%S" t_fmt "" -# -# Appropriate 12 h time representation (%r) "%I:%M:%S %p" -t_fmt_ampm "\ +% +% Appropriate 12 h time representation (%r) "%I:%M:%S %p" +t_fmt_ampm "/ " -# -# Appropriate date representation (date(1)) "%a %b %e %H:%M:%S %Z %Y" +% +% Appropriate date representation (date(1)) "%a %b %e %H:%M:%S %Z %Y" date_fmt "" END LC_TIME LC_MESSAGES -# This is the POSIX Locale definition for -# the LC_NUMERIC category. -# +% This is the POSIX Locale definition for +% the LC_NUMERIC category. +% yesexpr "" -# +% noexpr "" -# +% yesstr "" -# +% nostr "" END LC_MESSAGES diff --git a/localedata/locales/iso14651_t1 b/localedata/locales/iso14651_t1 index dd694d0..0d10f4f 100644 --- a/localedata/locales/iso14651_t1 +++ b/localedata/locales/iso14651_t1 @@ -1,3 +1,6 @@ +comment_char % +escape_char / + LC_COLLATE copy "iso14651_t1_common" @@ -8,7 +11,6 @@ order_start ;forward;forward;forward;forward,position ;IGNORE;IGNORE;IGNORE .. ..;IGNORE;IGNORE;IGNORE ;IGNORE;IGNORE;IGNORE -# order_end -# + END LC_COLLATE