mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
ef44614405
2000-07-23 Bruno Haible <haible@clisp.cons.org> * wctype/wchar-lookup.h: New file. * wctype/iswctype.c: Include "wchar-lookup.h". (__iswctype): Support alternate locale format with 3-level tables. * wctype/iswctype_l.c (__iswctype_l): Likewise. * wctype/towctrans.c (__towctrans): Likewise. * wctype/towctrans_l.c (__towctrans_l): Likewise. * wctype/wcfuncs.c: Include "wchar-lookup.h". (__ctype32_wctype, __ctype32_wctrans): Declare external. (__iswalnum, __iswalpha, __iswcntrl, __iswdigit, __iswlower, __iswgraph, __iswprint, __iswpunct, __iswspace, __iswupper, __iswxdigit, towlower, towupper): Support alternate locale format with 3-level tables. * wctype/wcextra.c (iswblank): Likewise. * wctype/wcfuncs_l.c: Include "wchar-lookup.h". (__iswalnum_l, __iswalpha_l, __iswcntrl_l, __iswdigit_l, __iswlower_l, __iswgraph_l, __iswprint_l, __iswpunct_l, __iswspace_l, __iswupper_l, __iswxdigit_l, __towlower_l, __towupper_l): Support alternate locale format with 3-level tables. * wctype/wcextra_l.c (__iswblank_l): Likewise. * wctype/wctype.c (__wctype): Likewise. In the alternate locale format, return a 3-level table pointer. * wctype/wctype_l.c (__wctype_l): Likewise. * wctype/wctrans.c (wctrans): Likewise. * wctype/wctype.h (__ISwupper, __ISwlower, __ISwalpha, __ISwdigit, __ISwxdigit, __ISwspace, __ISwprint, __ISwgraph, __ISwblank, __ISwcntrl, __ISwpunct, __ISwalnum): New enum values. (iswctype): Remove macro definition. * wcsmbs/wcwidth.h: Include "wchar-lookup.h". (internal_wcwidth): Support alternate locale format with 3-level tables. * locale/langinfo.h (_NL_CTYPE_CLASS_OFFSET, _NL_CTYPE_MAP_OFFSET): New nl_items. * locale/categories.def (_NL_CTYPE_CLASS_OFFSET, _NL_CTYPE_MAP_OFFSET): Define them as being type "word". * locale/C-ctype.c (_nl_C_LC_CTYPE): Add initializers for them. * ctype/ctype-info.c (__ctype32_wctype, __ctype32_wctrans, __ctype32_width): New exported variables. * locale/lc-ctype.c (_nl_postload_ctype): Initialize them in the alternate locale format. Don't initialize __ctype_names and __ctype_width in the alternate locale format. * locale/programs/localedef.h (oldstyle_tables): New declaration. * locale/programs/localedef.c (oldstyle_tables): New variable. (OPT_OLDSTYLE): New macro. (options): Add --old-style option. (parse_opt): Handle --old-style option. * locale/programs/ld-ctype.c (locale_ctype_t): Add class_offset, map_offset, class_3level, map_3level, width_3level members. (ctype_output): Support for alternate locale format: Computation of nelems changes. _NL_CTYPE_TOUPPER32, _NL_CTYPE_TOLOWER32 and _NL_CTYPE_CLASS32 only 256 characters. _NL_CTYPE_NAMES empty. New fields _NL_CTYPE_CLASS_OFFSET, _NL_CTYPE_MAP_OFFSET. Field _NL_CTYPE_WIDTH now contains the three-level table. Extra elems now contain both class and map tables. (struct wctype_table): New type. (wctype_table_init, wctype_table_add, wctype_table_finalize): New functions. (struct wcwidth_table): New type. (wcwidth_table_init, wcwidth_table_add, wcwidth_table_finalize): New functions. (struct wctrans_table): New type. (wctrans_table_init, wctrans_table_add, wctrans_table_finalize): New functions. (allocate_arrays): Support for alternate locale format: Set plane_size and plane_cnt to 0. Restrict ctype->ctype32_b to the first 256 characters. Compute ctype->class_3level. Restrict ctype->map32[idx] to the first 256 characters. Compute ctype->map_3level. Set ctype->class_offset and ctype->map_offset. Compute ctype->width_3level instead of ctype->width.
143 lines
4.0 KiB
C
143 lines
4.0 KiB
C
/* General definitions for localedef(1).
|
|
Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#ifndef _LOCALEDEF_H
|
|
#define _LOCALEDEF_H 1
|
|
|
|
/* Get the basic locale definitions. */
|
|
#include <locale.h>
|
|
#include <stddef.h>
|
|
|
|
#include "repertoire.h"
|
|
|
|
|
|
/* We need a bitmask for the locales. */
|
|
enum
|
|
{
|
|
CTYPE_LOCALE = 1 << LC_CTYPE,
|
|
NUMERIC_LOCALE = 1 << LC_NUMERIC,
|
|
TIME_LOCALE = 1 << LC_TIME,
|
|
COLLATE_LOCALE = 1 << LC_COLLATE,
|
|
MONETARY_LOCALE = 1 << LC_MONETARY,
|
|
MESSAGES_LOCALE = 1 << LC_MESSAGES,
|
|
PAPER_LOCALE = 1 << LC_PAPER,
|
|
NAME_LOCALE = 1 << LC_NAME,
|
|
ADDRESS_LOCALE = 1 << LC_ADDRESS,
|
|
TELEPHONE_LOCALE = 1 << LC_TELEPHONE,
|
|
MEASUREMENT_LOCALE = 1 << LC_MEASUREMENT,
|
|
IDENTIFICATION_LOCALE = 1 << LC_IDENTIFICATION,
|
|
ALL_LOCALES = (1 << LC_CTYPE
|
|
| 1 << LC_NUMERIC
|
|
| 1 << LC_TIME
|
|
| 1 << LC_COLLATE
|
|
| 1 << LC_MONETARY
|
|
| 1 << LC_MESSAGES
|
|
| 1 << LC_PAPER
|
|
| 1 << LC_NAME
|
|
| 1 << LC_ADDRESS
|
|
| 1 << LC_TELEPHONE
|
|
| 1 << LC_MEASUREMENT
|
|
| 1 << LC_IDENTIFICATION)
|
|
};
|
|
|
|
|
|
/* Opaque types for the different locales. */
|
|
struct locale_ctype_t;
|
|
struct locale_collate_t;
|
|
struct locale_monetary_t;
|
|
struct locale_numeric_t;
|
|
struct locale_time_t;
|
|
struct locale_messages_t;
|
|
struct locale_paper_t;
|
|
struct locale_name_t;
|
|
struct locale_address_t;
|
|
struct locale_telephone_t;
|
|
struct locale_measurement_t;
|
|
struct locale_identification_t;
|
|
|
|
|
|
/* Definitions for the locale. */
|
|
struct localedef_t
|
|
{
|
|
struct localedef_t *next;
|
|
|
|
const char *name;
|
|
|
|
int needed;
|
|
int avail;
|
|
|
|
union
|
|
{
|
|
void *generic;
|
|
struct locale_ctype_t *ctype;
|
|
struct locale_collate_t *collate;
|
|
struct locale_monetary_t *monetary;
|
|
struct locale_numeric_t *numeric;
|
|
struct locale_time_t *time;
|
|
struct locale_messages_t *messages;
|
|
struct locale_paper_t *paper;
|
|
struct locale_name_t *name;
|
|
struct locale_address_t *address;
|
|
struct locale_telephone_t *telephone;
|
|
struct locale_measurement_t *measurement;
|
|
struct locale_identification_t *identification;
|
|
} categories[__LC_LAST];
|
|
|
|
size_t len[__LC_LAST];
|
|
|
|
const char *copy_name[__LC_LAST];
|
|
|
|
const char *repertoire_name;
|
|
};
|
|
|
|
|
|
/* Global variables of the localedef program. */
|
|
extern int verbose;
|
|
extern int be_quiet;
|
|
extern int oldstyle_tables;
|
|
extern const char *repertoire_global;
|
|
|
|
|
|
/* Prototypes for a few program-wide used functions. */
|
|
extern void *xmalloc (size_t __n);
|
|
extern void *xcalloc (size_t __n, size_t __size);
|
|
extern void *xrealloc (void *__p, size_t __n);
|
|
extern char *xstrdup (const char *__str);
|
|
|
|
|
|
/* Mark given locale as to be read. */
|
|
extern struct localedef_t *add_to_readlist (int locale, const char *name,
|
|
const char *repertoire_name,
|
|
int generate,
|
|
struct localedef_t *copy_locale);
|
|
|
|
/* Find the information for the locale NAME. */
|
|
extern struct localedef_t *find_locale (int locale, const char *name,
|
|
const char *repertoire_name,
|
|
struct charmap_t *charmap);
|
|
|
|
/* Load (if necessary) the information for the locale NAME. */
|
|
extern struct localedef_t *load_locale (int locale, const char *name,
|
|
const char *repertoire_name,
|
|
struct charmap_t *charmap,
|
|
struct localedef_t *copy_locale);
|
|
|
|
#endif /* localedef.h */
|