+2001-12-09 Ulrich Drepper <drepper@redhat.com>
+
+ Implement transliteration of characters in strings of the locale
+ definitions.
+ * locale/programs/linereader.c: Adjust for additional parameter to
+ lr_token.
+ (get_string): If character <Uxxxx> is not found try to transliterate
+ it.
+ * locale/programs/ld-ctype.c: Adjust for additional parameter to
+ lr_token. Add const to charmap parameter of all functions.
+ (find_translit, find_translit2): New functions.
+ * locale/programs/charmap.c: Adjust for additional parameter to
+ lr_token.
+ * locale/programs/repertoire.c: Likewise.
+ * locale/programs/linereader.h: Likewise.
+ * locale/programs/ld-address.c: Likewise. Add const to charmap
+ parameter of all functions.
+ * locale/programs/ld-collate.c: Likewise.
+ * locale/programs/ld-identification.c: Likewise.
+ * locale/programs/ld-measurement.c: Likewise.
+ * locale/programs/ld-messages.c: Likewise.
+ * locale/programs/ld-monetary.c: Likewise.
+ * locale/programs/ld-name.c: Likewise.
+ * locale/programs/ld-numeric.c: Likewise.
+ * locale/programs/ld-paper.c: Likewise.
+ * locale/programs/ld-paper.c: Likewise.
+ * locale/programs/ld-telephone.c: Likewise.
+ * locale/programs/ld-time.c: Likewise.
+ * locale/programs/locfile.c: Likewise.
+ * locale/programs/localedef.c: Likewise.
+ * locale/programs/localedef.h: Likewise.
+ * locale/programs/locfile.h: Likewise. Add declaration for
+ find_translit.
+ * locale/programs/simple-hash.c: Add const to first parameter of
+ find_entry, iterate_table, and lookup.
+ * locale/programs/simple-hash.h: Likewise.
+ * locale/localeinfo.h: Don't define __LC_LAST here. Include <locale.h>
+ instead.
+ * include/locale.h: Define __LC_LAST.
+ * iconv/Makefile (CFLAGS-linereader.c): Define to -DNO_TRANSLITERATION.
+
2001-12-07 Geoff Keating <geoffk@redhat.com>
* sysdeps/powerpc/Dist: Update for recent FP changes.
-GNU C Library NEWS -- history of user-visible changes. 2001-11-28
+GNU C Library NEWS -- history of user-visible changes. 2001-12-09
Copyright (C) 1992-2000, 2001 Free Software Foundation, Inc.
See the end for copying conditions.
* iconv (the program and the interface) now accepts empty names (excluding
options like //TRANSLIT) to mean "use charset of current locale".
+
+* localedef now can transliterate characters in strings which are not in
+ the provided charmap. The information from the input locale is used.
\f
Version 2.2.5
CFLAGS-dummy-repertoire.c = -I../locale/programs
CFLAGS-charmap.c = -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
-DDEFAULT_CHARMAP=null_pointer -DNEED_NULL_POINTER
+CFLAGS-linereader.c = -DNO_TRANSLITERATION
tests = tst-iconv1 tst-iconv2 tst-iconv3
#ifndef _LOCALE_H
#include <locale/locale.h>
+/* This has to be changed whenever a new locale is defined. */
+#define __LC_LAST 13
+
/* Locale object for C locale. */
extern struct __locale_struct _nl_C_locobj;
#include <stddef.h>
#include <langinfo.h>
#include <limits.h>
+#include <locale.h>
#include <time.h>
#include <stdint.h>
#include <sys/types.h>
-/* This has to be changed whenever a new locale is defined. */
-#define __LC_LAST 13
-
#include <intl/loadinfo.h> /* For loaded_l10nfile definition. */
/* Magic number at the beginning of a locale data file for CATEGORY. */
cmfile = cmlr_open (path, filename, charmap_hash);
if (cmfile == NULL)
- {
- /* Try without the "/charmaps" part. */
- cmfile = cmlr_open (next, filename, charmap_hash);
- }
+ /* Try without the "/charmaps" part. */
+ cmfile = cmlr_open (next, filename, charmap_hash);
}
}
if (cmfile == NULL)
- {
- /* Try the default directory. */
- cmfile = cmlr_open (CHARMAP_PATH, filename, charmap_hash);
- }
+ /* Try the default directory. */
+ cmfile = cmlr_open (CHARMAP_PATH, filename, charmap_hash);
}
}
while (1)
{
/* What's on? */
- struct token *now = lr_token (cmfile, NULL, NULL, verbose);
+ struct token *now = lr_token (cmfile, NULL, NULL, NULL, verbose);
enum token_t nowtok = now->tok;
struct token *arg;
}
/* We know that we need an argument. */
- arg = lr_token (cmfile, NULL, NULL, verbose);
+ arg = lr_token (cmfile, NULL, NULL, NULL, verbose);
switch (nowtok)
{
void
-address_finish (struct localedef_t *locale, struct charmap_t *charmap)
+address_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
struct locale_address_t *address = locale->categories[LC_ADDRESS].address;
size_t cnt;
void
-address_output (struct localedef_t *locale, struct charmap_t *charmap,
+address_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
struct locale_address_t *address = locale->categories[LC_ADDRESS].address;
/* The parser for the LC_ADDRESS section of the locale definition. */
void
address_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct locale_address_t *address;
do
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* Ignore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
continue;
}
break; \
} \
\
- arg = lr_token (ldfile, charmap, NULL, verbose); \
+ arg = lr_token (ldfile, charmap, result, NULL, verbose); \
if (arg->tok != tok_string) \
goto err_label; \
if (address->cat != NULL) \
break; \
} \
\
- arg = lr_token (ldfile, charmap, NULL, verbose); \
+ arg = lr_token (ldfile, charmap, result, NULL, verbose); \
if (arg->tok != tok_string && arg->tok != tok_number) \
goto err_label; \
if (address->cat != NULL) \
break; \
} \
\
- arg = lr_token (ldfile, charmap, NULL, verbose); \
+ arg = lr_token (ldfile, charmap, result, NULL, verbose); \
if (arg->tok != tok_number) \
goto err_label; \
else if (address->cat != 0) \
case tok_end:
/* Next we assume `LC_ADDRESS'. */
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok == tok_eof)
break;
if (arg->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
/* Test whether this name is already defined somewhere. */
static int
check_duplicate (struct linereader *ldfile, struct locale_collate_t *collate,
- struct charmap_t *charmap, struct repertoire_t *repertoire,
- const char *symbol, size_t symbol_len)
+ const struct charmap_t *charmap,
+ struct repertoire_t *repertoire, const char *symbol,
+ size_t symbol_len)
{
void *ignore = NULL;
/* Read the direction specification. */
static void
read_directions (struct linereader *ldfile, struct token *arg,
- struct charmap_t *charmap, struct repertoire_t *repertoire,
- struct locale_collate_t *collate)
+ const struct charmap_t *charmap,
+ struct repertoire_t *repertoire, struct localedef_t *result)
{
int cnt = 0;
int max = nrules ?: 10;
enum coll_sort_rule *rules = calloc (max, sizeof (*rules));
int warned = 0;
+ struct locale_collate_t *collate = result->categories[LC_COLLATE].collate;
while (1)
{
}
if (valid)
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
if (arg->tok == tok_eof || arg->tok == tok_eol || arg->tok == tok_comma
|| arg->tok == tok_semicolon)
}
}
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
}
if (nrules == 0)
static void
insert_weights (struct linereader *ldfile, struct element_t *elem,
- struct charmap_t *charmap, struct repertoire_t *repertoire,
- struct locale_collate_t *collate, enum token_t ellipsis)
+ const struct charmap_t *charmap,
+ struct repertoire_t *repertoire, struct localedef_t *result,
+ enum token_t ellipsis)
{
int weight_cnt;
struct token *arg;
+ struct locale_collate_t *collate = result->categories[LC_COLLATE].collate;
/* Initialize all the fields. */
elem->file = ldfile->fname;
weight_cnt = 0;
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
do
{
if (arg->tok == tok_eof || arg->tok == tok_eol)
break;
}
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
/* This better should be the end of the line or a semicolon. */
if (arg->tok == tok_semicolon)
/* OK, ignore this and read the next token. */
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
else if (arg->tok != tok_eof && arg->tok != tok_eol)
{
/* It's a syntax error. */
static int
insert_value (struct linereader *ldfile, const char *symstr, size_t symlen,
- struct charmap_t *charmap, struct repertoire_t *repertoire,
- struct locale_collate_t *collate)
+ const struct charmap_t *charmap, struct repertoire_t *repertoire,
+ struct localedef_t *result)
{
/* First find out what kind of symbol this is. */
struct charseq *seq;
uint32_t wc;
struct element_t *elem = NULL;
+ struct locale_collate_t *collate = result->categories[LC_COLLATE].collate;
/* Try to find the character in the charmap. */
seq = charmap_find_value (charmap, symstr, symlen);
return 1;
}
- insert_weights (ldfile, elem, charmap, repertoire, collate, tok_none);
+ insert_weights (ldfile, elem, charmap, repertoire, result, tok_none);
return 0;
}
static void
handle_ellipsis (struct linereader *ldfile, const char *symstr, size_t symlen,
- enum token_t ellipsis, struct charmap_t *charmap,
+ enum token_t ellipsis, const struct charmap_t *charmap,
struct repertoire_t *repertoire,
- struct locale_collate_t *collate)
+ struct localedef_t *result)
{
struct element_t *startp;
struct element_t *endp;
+ struct locale_collate_t *collate = result->categories[LC_COLLATE].collate;
/* Unlink the entry added for the ellipsis. */
unlink_element (collate);
/* Process and add the end-entry. */
if (symstr != NULL
- && insert_value (ldfile, symstr, symlen, charmap, repertoire, collate))
+ && insert_value (ldfile, symstr, symlen, charmap, repertoire, result))
/* Something went wrong with inserting the to-value. This means
we cannot process the ellipsis. */
return;
void
-collate_finish (struct localedef_t *locale, struct charmap_t *charmap)
+collate_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
/* Now is the time when we can assign the individual collation
values for all the symbols. We have possibly different values
void
-collate_output (struct localedef_t *locale, struct charmap_t *charmap,
+collate_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
struct locale_collate_t *collate = locale->categories[LC_COLLATE].collate;
void
collate_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct repertoire_t *repertoire = NULL;
do
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
if (nowtok == tok_copy)
{
state = 2;
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_string)
{
SYNTAX_ERROR (_("%s: syntax error"), "LC_COLLATE");
skip_category:
do
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
while (now->tok != tok_eof && now->tok != tok_end);
if (now->tok != tok_eof
- || (now = lr_token (ldfile, charmap, NULL, verbose),
+ || (now = lr_token (ldfile, charmap, result, NULL, verbose),
now->tok == tok_eof))
lr_error (ldfile, _("%s: premature end of file"), "LC_COLLATE");
else if (now->tok != tok_lc_collate)
lr_ignore_rest (ldfile, 1);
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
/* Ingore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
continue;
}
{
case tok_copy:
/* Allow copying other locales. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_string)
goto err_label;
if (state != 0)
goto err_label;
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok != tok_number)
goto err_label;
if (collate->col_weight_max != -1)
if (state != 0)
goto err_label;
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
if (arg->tok != tok_bsymbol)
goto err_label;
else if (!ignore_content)
if (state != 0 && state != 2)
goto err_label;
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
if (arg->tok != tok_bsymbol)
goto err_label;
else
size_t symbol_len = arg->val.str.lenmb;
/* Next the `from' keyword. */
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
if (arg->tok != tok_from)
{
free ((char *) symbol);
ldfile->translate_strings = 1;
/* Finally the string with the replacement. */
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
ldfile->return_widestr = 0;
ldfile->translate_strings = 0;
if (state != 0 && state != 2)
goto err_label;
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
if (arg->tok != tok_bsymbol)
goto err_label;
else
size_t endsymbol_len = 0;
enum token_t ellipsis = tok_none;
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
if (arg->tok == tok_ellipsis2 || arg->tok == tok_ellipsis4)
{
ellipsis = arg->tok;
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire,
+ verbose);
if (arg->tok != tok_bsymbol)
{
free (symbol);
if (state != 0)
goto err_label;
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
if (arg->tok != tok_bsymbol)
goto err_label;
else
size_t symname_len;
struct symbol_t *symval;
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
if (arg->tok != tok_bsymbol)
{
if (newname != NULL)
case tok_script:
/* We get told about the scripts we know. */
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
if (arg->tok != tok_bsymbol)
goto err_label;
else
/* The 14652 draft does not specify whether all `order_start' lines
must contain the same number of sort-rules, but 14651 does. So
we require this here as well. */
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
if (arg->tok == tok_bsymbol)
{
/* This better should be a section name. */
}
/* Next should come the end of the line or a semicolon. */
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire,
+ verbose);
if (arg->tok == tok_eol)
{
uint32_t cnt;
}
/* Get the next token. */
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire,
+ verbose);
}
}
else
}
/* Now read the direction names. */
- read_directions (ldfile, arg, charmap, repertoire, collate);
+ read_directions (ldfile, arg, charmap, repertoire, result);
/* From now we need the strings untranslated. */
ldfile->translate_strings = 0;
if (was_ellipsis != tok_none)
{
handle_ellipsis (ldfile, NULL, 0, was_ellipsis, charmap,
- repertoire, collate);
+ repertoire, result);
was_ellipsis = tok_none;
}
{
handle_ellipsis (ldfile, arg->val.str.startmb,
arg->val.str.lenmb, was_ellipsis, charmap,
- repertoire, collate);
+ repertoire, result);
was_ellipsis = tok_none;
}
}
goto err_label;
state = 3;
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
if (arg->tok == tok_bsymbol || arg->tok == tok_ucs4)
{
/* Find this symbol in the sequence table. */
if (was_ellipsis != tok_none)
{
handle_ellipsis (ldfile, NULL, 0, was_ellipsis, charmap,
- repertoire, collate);
+ repertoire, result);
was_ellipsis = tok_none;
}
}
state = 5;
/* Get the name of the sections we are adding after. */
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire, verbose);
if (arg->tok == tok_bsymbol)
{
/* Now find a section with this name. */
{
lr_ignore_rest (ldfile, 0);
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
}
while (now->tok == tok_reorder_sections_after
|| now->tok == tok_reorder_sections_end
{
handle_ellipsis (ldfile, symstr, symlen, was_ellipsis,
- charmap, repertoire, collate);
+ charmap, repertoire, result);
/* Remember that we processed the ellipsis. */
was_ellipsis = tok_none;
seqp->section->last = seqp->last;
/* Now insert it in the new place. */
- insert_weights (ldfile, seqp, charmap, repertoire, collate,
+ insert_weights (ldfile, seqp, charmap, repertoire, result,
tok_none);
break;
}
/* Process the rest of the line which might change
the collation rules. */
- arg = lr_token (ldfile, charmap, repertoire, verbose);
+ arg = lr_token (ldfile, charmap, result, repertoire,
+ verbose);
if (arg->tok != tok_eof && arg->tok != tok_eol)
read_directions (ldfile, arg, charmap, repertoire,
- collate);
+ result);
}
break;
}
assert (state == 1);
handle_ellipsis (ldfile, symstr, symlen, was_ellipsis, charmap,
- repertoire, collate);
+ repertoire, result);
/* Remember that we processed the ellipsis. */
was_ellipsis = tok_none;
}
/* Now insert in the new place. */
- insert_value (ldfile, symstr, symlen, charmap, repertoire, collate);
+ insert_value (ldfile, symstr, symlen, charmap, repertoire, result);
break;
case tok_undefined:
else
/* Parse the weights. */
insert_weights (ldfile, &collate->undefined, charmap,
- repertoire, collate, tok_none);
+ repertoire, result, tok_none);
break;
case tok_ellipsis2: /* symbolic hexadecimal ellipsis */
was_ellipsis = nowtok;
insert_weights (ldfile, &collate->ellipsis_weight, charmap,
- repertoire, collate, nowtok);
+ repertoire, result, nowtok);
break;
case tok_end:
if (was_ellipsis != tok_none)
{
handle_ellipsis (ldfile, NULL, 0, was_ellipsis, charmap,
- repertoire, collate);
+ repertoire, result);
was_ellipsis = tok_none;
}
}
error (0, 0, _("%s: missing `reorder-sections-end' keyword"),
"LC_COLLATE");
}
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok == tok_eof)
break;
if (arg->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
struct obstack mempool;
};
+
/* Marker for an empty slot. This has the value 0xFFFFFFFF, regardless
whether 'int' is 16 bit, 32 bit, or 64 bit. */
#define EMPTY ((uint32_t) ~0)
/* Prototypes for local functions. */
static void ctype_startup (struct linereader *lr, struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
struct localedef_t *copy_locale,
int ignore_content);
static void ctype_class_new (struct linereader *lr,
struct locale_ctype_t *ctype, const char *name);
static void ctype_map_new (struct linereader *lr,
struct locale_ctype_t *ctype,
- const char *name, struct charmap_t *charmap);
+ const char *name, const struct charmap_t *charmap);
static uint32_t *find_idx (struct locale_ctype_t *ctype, uint32_t **table,
size_t *max, size_t *act, unsigned int idx);
static void set_class_defaults (struct locale_ctype_t *ctype,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
struct repertoire_t *repertoire);
static void allocate_arrays (struct locale_ctype_t *ctype,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
struct repertoire_t *repertoire);
static void
ctype_startup (struct linereader *lr, struct localedef_t *locale,
- struct charmap_t *charmap, struct localedef_t *copy_locale,
- int ignore_content)
+ const struct charmap_t *charmap,
+ struct localedef_t *copy_locale, int ignore_content)
{
unsigned int cnt;
struct locale_ctype_t *ctype;
void
-ctype_finish (struct localedef_t *locale, struct charmap_t *charmap)
+ctype_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
/* See POSIX.2, table 2-6 for the meaning of the following table. */
#define NCLASS 12
{
if (ctype->mbdigits_max == 0)
{
- ctype->mbdigits = obstack_alloc (&charmap->mem_pool,
+ ctype->mbdigits = obstack_alloc (&((struct charmap_t *) charmap)->mem_pool,
10 * sizeof (struct charseq *));
ctype->mbdigits_max = 10;
}
error (0, 0, _("\
no input digits defined and none of the standard names in the charmap"));
- ctype->mbdigits[cnt] = obstack_alloc (&charmap->mem_pool,
+ ctype->mbdigits[cnt] = obstack_alloc (&((struct charmap_t *) charmap)->mem_pool,
sizeof (struct charseq) + 1);
/* This is better than nothing. */
{
if (ctype->wcdigits_max == 0)
{
- ctype->wcdigits = obstack_alloc (&charmap->mem_pool,
+ ctype->wcdigits = obstack_alloc (&((struct charmap_t *) charmap)->mem_pool,
10 * sizeof (uint32_t));
ctype->wcdigits_max = 10;
}
void
-ctype_output (struct localedef_t *locale, struct charmap_t *charmap,
+ctype_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
static const char nulbytes[4] = { 0, 0, 0, 0 };
static void
ctype_map_new (struct linereader *lr, struct locale_ctype_t *ctype,
- const char *name, struct charmap_t *charmap)
+ const char *name, const struct charmap_t *charmap)
{
size_t max_chars = 0;
size_t cnt;
static int
-get_character (struct token *now, struct charmap_t *charmap,
+get_character (struct token *now, const struct charmap_t *charmap,
struct repertoire_t *repertoire,
struct charseq **seqp, uint32_t *wchp)
{
static void
charclass_symbolic_ellipsis (struct linereader *ldfile,
struct locale_ctype_t *ctype,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
struct repertoire_t *repertoire,
struct token *now,
const char *last_str,
static void
charclass_ucs4_ellipsis (struct linereader *ldfile,
struct locale_ctype_t *ctype,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
struct repertoire_t *repertoire,
struct token *now, uint32_t last_wch,
unsigned long int class256_bit,
static void
charclass_charcode_ellipsis (struct linereader *ldfile,
struct locale_ctype_t *ctype,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
struct repertoire_t *repertoire,
struct token *now, char *last_charcode,
uint32_t last_charcode_len,
}
+static uint32_t *
+find_translit2 (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
+ uint32_t wch)
+{
+ struct translit_t *trunp = ctype->translit;
+ struct translit_ignore_t *tirunp = ctype->translit_ignore;
+
+ while (trunp != NULL)
+ {
+ /* XXX We simplify things here. The transliterations we look
+ for are only allowed to have one character. */
+ if (trunp->from[0] == wch && trunp->from[1] == 0)
+ {
+ /* Found it. Now look for a transliteration which can be
+ represented with the character set. */
+ struct translit_to_t *torunp = trunp->to;
+
+ while (torunp != NULL)
+ {
+ int i;
+
+ for (i = 0; torunp->str[i] != 0; ++i)
+ {
+ char utmp[10];
+
+ snprintf (utmp, sizeof (utmp), "U%08X", torunp->str[i]);
+ if (charmap_find_value (charmap, utmp, 9) == NULL)
+ /* This character cannot be represented. */
+ break;
+ }
+
+ if (torunp->str[i] == 0)
+ return torunp->str;
+
+ torunp = torunp->next;
+ }
+
+ break;
+ }
+
+ trunp = trunp->next;
+ }
+
+ /* Check for ignored chars. */
+ while (tirunp != NULL)
+ {
+ if (tirunp->from <= wch && tirunp->to >= wch)
+ {
+ uint32_t wi;
+
+ for (wi = tirunp->from; wi <= wch; wi += tirunp->step)
+ if (wi == wch)
+ return (uint32_t []) { 0 };
+ }
+ }
+
+ /* Nothing found. */
+ return NULL;
+}
+
+
+uint32_t *
+find_translit (struct localedef_t *locale, const struct charmap_t *charmap,
+ uint32_t wch)
+{
+ struct locale_ctype_t *ctype;
+ uint32_t *result = NULL;
+
+ assert (locale != NULL);
+ ctype = locale->categories[LC_CTYPE].ctype;
+
+ if (ctype->translit != NULL)
+ result = find_translit2 (ctype, charmap, wch);
+
+ if (result == NULL)
+ {
+ struct translit_include_t *irunp = ctype->translit_include;
+
+ while (irunp != NULL && result == NULL)
+ {
+ result = find_translit (find_locale (CTYPE_LOCALE,
+ irunp->copy_locale,
+ irunp->copy_repertoire,
+ charmap),
+ charmap, wch);
+ irunp = irunp->next;
+ }
+ }
+
+ return result;
+}
+
+
/* Read one transliteration entry. */
static uint32_t *
read_widestring (struct linereader *ldfile, struct token *now,
- struct charmap_t *charmap, struct repertoire_t *repertoire)
+ const struct charmap_t *charmap,
+ struct repertoire_t *repertoire)
{
uint32_t *wstr;
static void
read_translit_entry (struct linereader *ldfile, struct locale_ctype_t *ctype,
- struct token *now, struct charmap_t *charmap,
+ struct token *now, const struct charmap_t *charmap,
struct repertoire_t *repertoire)
{
uint32_t *from_wstr = read_widestring (ldfile, now, charmap, repertoire);
/* Next we have one or more transliterations. They are
separated by semicolons. */
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, NULL, repertoire, verbose);
if (!first && (now->tok == tok_semicolon || now->tok == tok_eol))
{
static void
read_translit_ignore_entry (struct linereader *ldfile,
struct locale_ctype_t *ctype,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
struct repertoire_t *repertoire)
{
/* We expect a semicolon-separated list of characters we ignore. We are
single characters, possibly defining a range when an ellipsis is used. */
while (1)
{
- struct token *now = lr_token (ldfile, charmap, repertoire, verbose);
+ struct token *now = lr_token (ldfile, charmap, NULL, repertoire,
+ verbose);
struct translit_ignore_t *newp;
uint32_t from;
/* Now we expect either a semicolon, an ellipsis, or the end of the
line. */
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, NULL, repertoire, verbose);
if (now->tok == tok_ellipsis2 || now->tok == tok_ellipsis2_2)
{
uint32_t to;
int step = now->tok == tok_ellipsis2_2 ? 2 : 1;
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, NULL, repertoire, verbose);
if (now->tok == tok_eol || now->tok == tok_eof)
{
}
/* And the next token. */
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, NULL, repertoire, verbose);
}
if (now->tok == tok_eol || now->tok == tok_eof)
/* The parser for the LC_CTYPE section of the locale definition. */
void
ctype_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct repertoire_t *repertoire = NULL;
do
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* If we see `copy' now we are almost done. */
if (nowtok == tok_copy)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok != tok_string)
{
SYNTAX_ERROR (_("%s: syntax error"), "LC_CTYPE");
skip_category:
do
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
while (now->tok != tok_eof && now->tok != tok_end);
if (now->tok != tok_eof
- || (now = lr_token (ldfile, charmap, NULL, verbose),
+ || (now = lr_token (ldfile, charmap, NULL, NULL, verbose),
now->tok == tok_eof))
lr_error (ldfile, _("%s: premature end of file"), "LC_CTYPE");
else if (now->tok != tok_lc_ctype)
lr_ignore_rest (ldfile, 1);
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
nowtok = now->tok;
}
/* Ingore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
nowtok = now->tok;
continue;
}
switch (nowtok)
{
case tok_charclass:
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
while (now->tok == tok_ident || now->tok == tok_string)
{
ctype_class_new (ldfile, ctype, now->val.str.startmb);
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok != tok_semicolon)
break;
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
}
if (now->tok != tok_eol)
SYNTAX_ERROR (_("\
break;
case tok_charconv:
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
while (now->tok == tok_ident || now->tok == tok_string)
{
ctype_map_new (ldfile, ctype, now->val.str.startmb, charmap);
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok != tok_semicolon)
break;
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
}
if (now->tok != tok_eol)
SYNTAX_ERROR (_("\
/* We simply forget the `class' keyword and use the following
operand to determine the bit. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok == tok_ident || now->tok == tok_string)
{
/* Must can be one of the predefined class names. */
}
/* The next character must be a semicolon. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok != tok_semicolon)
goto err_label;
goto read_charclass;
last_token = tok_none;
ellipsis_token = tok_none;
step = 1;
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
while (now->tok != tok_eol && now->tok != tok_eof)
{
uint32_t wch;
}
/* Next we expect a semicolon or the end of the line. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok == tok_eol || now->tok == tok_eof)
break;
ellipsis_token = now->tok;
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
continue;
}
goto err_label;
/* And get the next character. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
ellipsis_token = tok_none;
step = 1;
/* We simply forget the `map' keyword and use the following
operand to determine the mapping. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok == tok_ident || now->tok == tok_string)
{
size_t cnt;
else
mapidx = now->tok - tok_toupper;
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
/* This better should be a semicolon. */
if (now->tok != tok_semicolon)
goto err_label;
}
ctype->tomap_done[mapidx] = 1;
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
while (now->tok != tok_eol && now->tok != tok_eof)
{
struct charseq *from_seq;
goto err_label;
/* Next comes the from-value. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (get_character (now, charmap, repertoire, &from_seq,
&from_wch) != 0)
goto err_label;
/* The next is a comma. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok != tok_comma)
goto err_label;
/* And the other value. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (get_character (now, charmap, repertoire, &to_seq,
&to_wch) != 0)
goto err_label;
/* And the last thing is the closing brace. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok != tok_close_brace)
goto err_label;
}
/* Now comes a semicolon or the end of the line/file. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok == tok_semicolon)
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
}
break;
do
{
lr_ignore_rest (ldfile, 0);
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
}
while (now->tok != tok_translit_end && now->tok != tok_eof);
ldfile->return_widestr = 1;
/* We proceed until we see the `translit_end' token. */
- while (now = lr_token (ldfile, charmap, repertoire, verbose),
+ while (now = lr_token (ldfile, charmap, NULL, repertoire, verbose),
now->tok != tok_translit_end && now->tok != tok_eof)
{
if (now->tok == tok_eol)
const char *repertoire_name;
struct translit_include_t *include_stmt, **include_ptr;
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
/* This should be a string or an identifier. In any
case something to name a locale. */
if (now->tok != tok_string && now->tok != tok_ident)
locale_name = now->val.str.startmb;
/* Next should be a semicolon. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok != tok_semicolon)
goto translit_syntax;
/* Now the repertoire name. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if ((now->tok != tok_string && now->tok != tok_ident)
|| now->val.str.startmb == NULL)
goto translit_syntax;
{
/* We expect a single character or string as the
argument. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
wstr = read_widestring (ldfile, now, charmap,
repertoire);
break;
/* Maybe there is another replacement we can use. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok == tok_eol || now->tok == tok_eof)
{
/* Nothing found. We tell the user. */
case tok_end:
/* Next we assume `LC_CTYPE'. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (now->tok == tok_eof)
break;
if (now->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, NULL, NULL, verbose);
nowtok = now->tok;
}
static void
-set_class_defaults (struct locale_ctype_t *ctype, struct charmap_t *charmap,
+set_class_defaults (struct locale_ctype_t *ctype,
+ const struct charmap_t *charmap,
struct repertoire_t *repertoire)
{
size_t cnt;
error (0, 0, _("\
no output digits defined and none of the standard names in the charmap"));
- ctype->mboutdigits[cnt] = obstack_alloc (&charmap->mem_pool,
+ ctype->mboutdigits[cnt] = obstack_alloc (&((struct charmap_t *) charmap)->mem_pool,
sizeof (struct charseq)
+ 1);
/* Flattens the included transliterations into a translit list.
Inserts them in the list at `cursor', and returns the new cursor. */
static struct translit_t **
-translit_flatten (struct locale_ctype_t *ctype, struct charmap_t *charmap,
+translit_flatten (struct locale_ctype_t *ctype,
+ const struct charmap_t *charmap,
struct translit_t **cursor)
{
while (ctype->translit_include != NULL)
}
static void
-allocate_arrays (struct locale_ctype_t *ctype, struct charmap_t *charmap,
+allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
struct repertoire_t *repertoire)
{
size_t idx, nr;
void
-identification_finish (struct localedef_t *locale, struct charmap_t *charmap)
+identification_finish (struct localedef_t *locale,
+ const struct charmap_t *charmap)
{
struct locale_identification_t *identification
= locale->categories[LC_IDENTIFICATION].identification;
void
-identification_output (struct localedef_t *locale, struct charmap_t *charmap,
+identification_output (struct localedef_t *locale,
+ const struct charmap_t *charmap,
const char *output_path)
{
struct locale_identification_t *identification
/* The parser for the LC_IDENTIFICATION section of the locale definition. */
void
identification_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct locale_identification_t *identification;
do
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* Ignore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
continue;
}
break; \
} \
\
- arg = lr_token (ldfile, charmap, NULL, verbose); \
+ arg = lr_token (ldfile, charmap, result, NULL, verbose); \
if (arg->tok != tok_string) \
goto err_label; \
if (identification->cat != NULL) \
}
/* We expect two operands. */
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok != tok_string && arg->tok != tok_ident)
goto err_label;
/* Next is a semicolon. */
- cattok = lr_token (ldfile, charmap, NULL, verbose);
+ cattok = lr_token (ldfile, charmap, result, NULL, verbose);
if (cattok->tok != tok_semicolon)
goto err_label;
/* Now a LC_xxx identifier. */
- cattok = lr_token (ldfile, charmap, NULL, verbose);
+ cattok = lr_token (ldfile, charmap, result, NULL, verbose);
switch (cattok->tok)
{
#define CATEGORY(lname, uname) \
case tok_end:
/* Next we assume `LC_IDENTIFICATION'. */
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok == tok_eof)
break;
if (arg->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
void
-measurement_finish (struct localedef_t *locale, struct charmap_t *charmap)
+measurement_finish (struct localedef_t *locale,
+ const struct charmap_t *charmap)
{
struct locale_measurement_t *measurement =
locale->categories[LC_MEASUREMENT].measurement;
void
-measurement_output (struct localedef_t *locale, struct charmap_t *charmap,
- const char *output_path)
+measurement_output (struct localedef_t *locale,
+ const struct charmap_t *charmap, const char *output_path)
{
struct locale_measurement_t *measurement =
locale->categories[LC_MEASUREMENT].measurement;
/* The parser for the LC_MEASUREMENT section of the locale definition. */
void
measurement_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct locale_measurement_t *measurement;
do
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* Ingore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
continue;
}
break; \
} \
\
- arg = lr_token (ldfile, charmap, NULL, verbose); \
+ arg = lr_token (ldfile, charmap, result, NULL, verbose); \
if (arg->tok != tok_number) \
goto err_label; \
else if (measurement->cat != 0) \
case tok_end:
/* Next we assume `LC_MEASUREMENT'. */
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok == tok_eof)
break;
if (arg->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
void
-messages_finish (struct localedef_t *locale, struct charmap_t *charmap)
+messages_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
struct locale_messages_t *messages
= locale->categories[LC_MESSAGES].messages;
void
-messages_output (struct localedef_t *locale, struct charmap_t *charmap,
+messages_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
struct locale_messages_t *messages
/* The parser for the LC_MESSAGES section of the locale definition. */
void
messages_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct repertoire_t *repertoire = NULL;
do
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* Ignore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
continue;
}
lr_ignore_rest (ldfile, 0); \
break; \
} \
- now = lr_token (ldfile, charmap, repertoire, verbose); \
+ now = lr_token (ldfile, charmap, result, repertoire, verbose); \
if (now->tok != tok_string) \
goto syntax_error; \
else if (!ignore_content && now->val.str.startmb == NULL) \
case tok_end:
/* Next we assume `LC_MESSAGES'. */
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok == tok_eof)
break;
if (arg->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
void
-monetary_finish (struct localedef_t *locale, struct charmap_t *charmap)
+monetary_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
struct locale_monetary_t *monetary
= locale->categories[LC_MONETARY].monetary;
void
-monetary_output (struct localedef_t *locale, struct charmap_t *charmap,
+monetary_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
struct locale_monetary_t *monetary
/* The parser for the LC_MONETARY section of the locale definition. */
void
monetary_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct repertoire_t *repertoire = NULL;
do
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* Ignore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
continue;
}
break; \
} \
\
- now = lr_token (ldfile, charmap, NULL, verbose); \
+ now = lr_token (ldfile, charmap, result, NULL, verbose); \
if (now->tok != tok_string) \
goto err_label; \
else if (monetary->cat != NULL) \
} \
\
ldfile->return_widestr = 1; \
- now = lr_token (ldfile, charmap, repertoire, verbose); \
+ now = lr_token (ldfile, charmap, result, repertoire, verbose); \
if (now->tok != tok_string) \
goto err_label; \
if (monetary->cat != NULL) \
break; \
} \
\
- now = lr_token (ldfile, charmap, NULL, verbose); \
+ now = lr_token (ldfile, charmap, result, NULL, verbose); \
if (now->tok != tok_minus1 && now->tok != tok_number) \
goto err_label; \
else if (monetary->cat != -2) \
break;
}
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_minus1 && now->tok != tok_number)
goto err_label;
else
grouping[act++] = now->val.num;
/* Next must be semicolon. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_semicolon)
break;
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
}
while (now->tok == tok_minus1 || now->tok == tok_number);
break;
}
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_number)
goto err_label;
if (now->val.num == 0)
if (!ignore_content)
monetary->conversion_rate[0] = now->val.num;
/* Next must be a semicolon. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_semicolon)
goto err_label;
/* And another number. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_number)
goto err_label;
if (now->val.num == 0)
case tok_end:
/* Next we assume `LC_MONETARY'. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok == tok_eof)
break;
if (now->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
void
-name_finish (struct localedef_t *locale, struct charmap_t *charmap)
+name_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
struct locale_name_t *name = locale->categories[LC_NAME].name;
int nothing = 0;
void
-name_output (struct localedef_t *locale, struct charmap_t *charmap,
+name_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
struct locale_name_t *name = locale->categories[LC_NAME].name;
/* The parser for the LC_NAME section of the locale definition. */
void
name_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct locale_name_t *name;
do
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* Ignore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
continue;
}
break; \
} \
\
- arg = lr_token (ldfile, charmap, NULL, verbose); \
+ arg = lr_token (ldfile, charmap, result, NULL, verbose); \
if (arg->tok != tok_string) \
goto err_label; \
if (name->cat != NULL) \
case tok_end:
/* Next we assume `LC_NAME'. */
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok == tok_eof)
break;
if (arg->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
void
-numeric_finish (struct localedef_t *locale, struct charmap_t *charmap)
+numeric_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
struct locale_numeric_t *numeric = locale->categories[LC_NUMERIC].numeric;
int nothing = 0;
void
-numeric_output (struct localedef_t *locale, struct charmap_t *charmap,
+numeric_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
struct locale_numeric_t *numeric = locale->categories[LC_NUMERIC].numeric;
/* The parser for the LC_NUMERIC section of the locale definition. */
void
numeric_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct repertoire_t *repertoire = NULL;
do
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* Ingore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
continue;
}
} \
\
ldfile->return_widestr = 1; \
- now = lr_token (ldfile, charmap, repertoire, verbose); \
+ now = lr_token (ldfile, charmap, result, repertoire, verbose); \
if (now->tok != tok_string) \
goto err_label; \
if (numeric->cat != NULL) \
break;
}
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_minus1 && now->tok != tok_number)
goto err_label;
else
grouping[act++] = now->val.num;
/* Next must be semicolon. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_semicolon)
break;
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
}
while (now->tok == tok_minus1 || now->tok == tok_number);
case tok_end:
/* Next we assume `LC_NUMERIC'. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok == tok_eof)
break;
if (now->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
void
-paper_finish (struct localedef_t *locale, struct charmap_t *charmap)
+paper_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
struct locale_paper_t *paper = locale->categories[LC_PAPER].paper;
int nothing = 0;
void
-paper_output (struct localedef_t *locale, struct charmap_t *charmap,
+paper_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
struct locale_paper_t *paper = locale->categories[LC_PAPER].paper;
/* The parser for the LC_PAPER section of the locale definition. */
void
paper_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct locale_paper_t *paper;
do
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* Ingore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
continue;
}
break; \
} \
\
- arg = lr_token (ldfile, charmap, NULL, verbose); \
+ arg = lr_token (ldfile, charmap, result, NULL, verbose); \
if (arg->tok != tok_number) \
goto err_label; \
else if (paper->cat != 0) \
case tok_end:
/* Next we assume `LC_PAPER'. */
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok == tok_eof)
break;
if (arg->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
void
-telephone_finish (struct localedef_t *locale, struct charmap_t *charmap)
+telephone_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
struct locale_telephone_t *telephone =
locale->categories[LC_TELEPHONE].telephone;
void
-telephone_output (struct localedef_t *locale, struct charmap_t *charmap,
+telephone_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
struct locale_telephone_t *telephone =
/* The parser for the LC_TELEPHONE section of the locale definition. */
void
telephone_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct locale_telephone_t *telephone;
do
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* Ingore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
continue;
}
break; \
} \
\
- arg = lr_token (ldfile, charmap, NULL, verbose); \
+ arg = lr_token (ldfile, charmap, result, NULL, verbose); \
if (arg->tok != tok_string) \
goto err_label; \
if (telephone->cat != NULL) \
case tok_end:
/* Next we assume `LC_TELEPHONE'. */
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, result, NULL, verbose);
if (arg->tok == tok_eof)
break;
if (arg->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
nowtok = now->tok;
}
void
-time_finish (struct localedef_t *locale, struct charmap_t *charmap)
+time_finish (struct localedef_t *locale, const struct charmap_t *charmap)
{
struct locale_time_t *time = locale->categories[LC_TIME].time;
int nothing = 0;
void
-time_output (struct localedef_t *locale, struct charmap_t *charmap,
+time_output (struct localedef_t *locale, const struct charmap_t *charmap,
const char *output_path)
{
struct locale_time_t *time = locale->categories[LC_TIME].time;
/* The parser for the LC_TIME section of the locale definition. */
void
time_read (struct linereader *ldfile, struct localedef_t *result,
- struct charmap_t *charmap, const char *repertoire_name,
+ const struct charmap_t *charmap, const char *repertoire_name,
int ignore_content)
{
struct repertoire_t *repertoire = NULL;
do
{
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, result, repertoire, verbose);
nowtok = now->tok;
}
while (nowtok == tok_eol);
/* Ingore empty lines. */
if (nowtok == tok_eol)
{
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, result, repertoire, verbose);
nowtok = now->tok;
continue;
}
\
for (cnt = 0; cnt < max; ++cnt) \
{ \
- now = lr_token (ldfile, charmap, repertoire, verbose); \
+ now = lr_token (ldfile, charmap, result, repertoire, verbose); \
if (now->tok == tok_eol) \
{ \
if (cnt < min) \
} \
\
/* Match the semicolon. */ \
- now = lr_token (ldfile, charmap, repertoire, verbose); \
+ now = lr_token (ldfile, charmap, result, repertoire, verbose); \
if (now->tok != tok_semicolon && now->tok != tok_eol) \
break; \
} \
\
if (now->tok == tok_semicolon) \
{ \
- now = lr_token (ldfile, charmap, repertoire, verbose); \
+ now = lr_token (ldfile, charmap, result, repertoire, \
+ verbose); \
if (now->tok == tok_eol) \
lr_error (ldfile, _("extra trailing semicolon")); \
else if (now->tok == tok_string) \
}
do
{
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, result, repertoire, verbose);
if (now->tok != tok_string)
goto err_label;
if (!ignore_content && (now->val.str.startmb == NULL
* sizeof (char *));
time->wera[time->num_era++] = now->val.str.startwc;
}
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, result, repertoire, verbose);
if (now->tok != tok_eol && now->tok != tok_semicolon)
goto err_label;
}
break; \
} \
\
- now = lr_token (ldfile, charmap, repertoire, verbose); \
+ now = lr_token (ldfile, charmap, result, repertoire, verbose); \
if (now->tok != tok_string) \
goto err_label; \
else if (time->cat != NULL) \
break; \
} \
\
- now = lr_token (ldfile, charmap, repertoire, verbose); \
+ now = lr_token (ldfile, charmap, result, repertoire, verbose); \
if (now->tok != tok_number) \
goto err_label; \
else if (time->cat != 0) \
break;
}
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, result, repertoire, verbose);
if (now->tok != tok_number)
goto err_label;
time->week_ndays = now->val.num;
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, result, repertoire, verbose);
if (now->tok != tok_semicolon)
goto err_label;
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, result, repertoire, verbose);
if (now->tok != tok_number)
goto err_label;
time->week_1stday = now->val.num;
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, result, repertoire, verbose);
if (now->tok != tok_semicolon)
goto err_label;
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, result, repertoire, verbose);
if (now->tok != tok_number)
goto err_label;
time->week_1stweek = now->val.num;
case tok_end:
/* Next we assume `LC_TIME'. */
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, result, repertoire, verbose);
if (now->tok == tok_eof)
break;
if (now->tok == tok_eol)
}
/* Prepare for the next round. */
- now = lr_token (ldfile, charmap, repertoire, verbose);
+ now = lr_token (ldfile, charmap, result, repertoire, verbose);
nowtok = now->tok;
}
# include <config.h>
#endif
+#include <assert.h>
#include <ctype.h>
#include <errno.h>
#include <libintl.h>
#include "charmap.h"
#include "error.h"
#include "linereader.h"
+#include "localedef.h"
+#include "locfile.h"
/* Prototypes for a few program-wide used functions. */
extern void *xmalloc (size_t __n);
static struct token *get_ident (struct linereader *lr);
static struct token *get_string (struct linereader *lr,
const struct charmap_t *charmap,
+ struct localedef_t *locale,
const struct repertoire_t *repertoire,
int verbose);
struct token *
lr_token (struct linereader *lr, const struct charmap_t *charmap,
- const struct repertoire_t *repertoire, int verbose)
+ struct localedef_t *locale, const struct repertoire_t *repertoire,
+ int verbose)
{
int ch;
return &lr->token;
case '"':
- return get_string (lr, charmap, repertoire, verbose);
+ return get_string (lr, charmap, locale, repertoire, verbose);
case '-':
ch = lr_getc (lr);
static struct token *
get_string (struct linereader *lr, const struct charmap_t *charmap,
- const struct repertoire_t *repertoire, int verbose)
+ struct localedef_t *locale, const struct repertoire_t *repertoire,
+ int verbose)
{
int return_widestr = lr->return_widestr;
char *buf;
if (cp == &buf[bufact])
{
char utmp[10];
- const char *symbol = NULL;
/* Yes, it is. */
ADDC ('\0');
the repertoire the name of the character and
find it in the charmap. */
if (repertoire != NULL)
- symbol = repertoire_find_symbol (repertoire, wch);
-
- if (symbol == NULL)
- /* We cannot generate a string since we
- cannot map from the Unicode number to the
- character symbol. */
- illegal_string = 1;
- else
{
- seq = charmap_find_value (charmap, symbol,
- strlen (symbol));
+ const char *symbol;
- if (seq == NULL)
- /* Not a known name. */
- illegal_string = 1;
+ symbol = repertoire_find_symbol (repertoire, wch);
+
+ if (symbol != NULL)
+ seq = charmap_find_value (charmap, symbol,
+ strlen (symbol));
+ }
+
+ if (seq == NULL)
+ {
+#ifndef NO_TRANSLITERATION
+ /* Transliterate if possible. */
+ if (locale != NULL)
+ {
+ uint32_t *translit;
+
+ if ((locale->avail & CTYPE_LOCALE) == 0)
+ {
+ /* Load the CTYPE data now. */
+ int old_needed = locale->needed;
+
+ locale->needed = 0;
+ locale = load_locale (CTYPE_LOCALE,
+ locale->name,
+ locale->repertoire_name,
+ charmap, locale);
+ locale->needed = old_needed;
+ }
+
+ if ((locale->avail & CTYPE_LOCALE) != 0
+ && ((translit = find_translit (locale,
+ charmap, wch))
+ != NULL))
+ /* The CTYPE data contains a matching
+ transliteration. */
+ {
+ int i;
+
+ for (i = 0; translit[i] != 0; ++i)
+ {
+ char utmp[10];
+
+ snprintf (utmp, sizeof (utmp), "U%08X",
+ translit[i]);
+ seq = charmap_find_value (charmap, utmp,
+ 9);
+ assert (seq != NULL);
+ ADDS (seq->bytes, seq->nbytes);
+ }
+
+ continue;
+ }
+ }
+#endif /* NO_TRANSLITERATION */
+
+ /* Not a known name. */
+ illegal_string = 1;
}
}
typedef const struct keyword_t *(*kw_hash_fct_t) (const char *, unsigned int);
struct charset_t;
-
+struct localedef_t;
struct token
{
/* Functions defined in linereader.c. */
extern struct linereader *lr_open (const char *fname, kw_hash_fct_t hf);
-extern struct linereader *lr_create (FILE *fp, const char *fname, kw_hash_fct_t hf);
+extern struct linereader *lr_create (FILE *fp, const char *fname,
+ kw_hash_fct_t hf);
extern int lr_eof (struct linereader *lr);
extern void lr_close (struct linereader *lr);
extern int lr_next (struct linereader *lr);
extern struct token *lr_token (struct linereader *lr,
const struct charmap_t *charmap,
+ struct localedef_t *locale,
const struct repertoire_t *repertoire,
int verbose);
struct localedef_t *
find_locale (int locale, const char *name, const char *repertoire_name,
- struct charmap_t *charmap)
+ const struct charmap_t *charmap)
{
struct localedef_t *result;
struct localedef_t *
load_locale (int locale, const char *name, const char *repertoire_name,
- struct charmap_t *charmap, struct localedef_t *copy_locale)
+ const struct charmap_t *charmap, struct localedef_t *copy_locale)
{
struct localedef_t *result;
/* General definitions for localedef(1).
- Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
/* 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);
+ const 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,
+ const struct charmap_t *charmap,
struct localedef_t *copy_locale);
#endif /* localedef.h */
int
-locfile_read (struct localedef_t *result, struct charmap_t *charmap)
+locfile_read (struct localedef_t *result, const struct charmap_t *charmap)
{
const char *filename = result->name;
const char *repertoire_name = result->repertoire_name;
/* Parse locale definition file and store result in RESULT. */
while (1)
{
- struct token *now = lr_token (ldfile, charmap, NULL, verbose);
+ struct token *now = lr_token (ldfile, charmap, NULL, NULL, verbose);
enum token_t nowtok = now->tok;
struct token *arg;
case tok_escape_char:
case tok_comment_char:
/* We need an argument. */
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (arg->tok != tok_ident)
{
case tok_repertoiremap:
/* We need an argument. */
- arg = lr_token (ldfile, charmap, NULL, verbose);
+ arg = lr_token (ldfile, charmap, NULL, NULL, verbose);
if (arg->tok != tok_ident)
{
/* Semantic checking of locale specifications. */
static void (*const check_funcs[]) (struct localedef_t *,
- struct charmap_t *) =
+ const struct charmap_t *) =
{
[LC_CTYPE] = ctype_finish,
[LC_COLLATE] = collate_finish,
void
check_all_categories (struct localedef_t *definitions,
- struct charmap_t *charmap)
+ const struct charmap_t *charmap)
{
int cnt;
/* Writing the locale data files. All files use the same output_path. */
-static void (*const write_funcs[]) (struct localedef_t *, struct charmap_t *,
- const char *) =
+static void (*const write_funcs[]) (struct localedef_t *,
+ const struct charmap_t *, const char *) =
{
[LC_CTYPE] = ctype_output,
[LC_COLLATE] = collate_output,
void
write_all_categories (struct localedef_t *definitions,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path)
{
int cnt;
/* General handling of `copy'. */
static inline void
-handle_copy (struct linereader *ldfile, struct charmap_t *charmap,
+handle_copy (struct linereader *ldfile, const struct charmap_t *charmap,
const char *repertoire_name, struct localedef_t *result,
enum token_t token, int locale, const char *locale_name,
int ignore_content)
struct token *now;
int warned = 0;
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != tok_string)
lr_error (ldfile, _("expect string argument for `copy'"));
else if (!ignore_content)
/* The rest of the line must be empty and the next keyword must be
`END xxx'. */
- while ((now = lr_token (ldfile, charmap, NULL, verbose))->tok != tok_end
- && now->tok != tok_eof)
+ while ((now = lr_token (ldfile, charmap, result, NULL, verbose))->tok
+ != tok_end && now->tok != tok_eof)
{
if (warned == 0)
{
if (now->tok != tok_eof)
{
/* Handle `END xxx'. */
- now = lr_token (ldfile, charmap, NULL, verbose);
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
if (now->tok != token)
lr_error (ldfile, _("\
/* Found in locfile.c. */
extern int locfile_read (struct localedef_t *result,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
/* Check validity of all the locale data. */
extern void check_all_categories (struct localedef_t *definitions,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
/* Write out all locale categories. */
extern void write_all_categories (struct localedef_t *definitions,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
/* Write out the data. */
/* Handle LC_CTYPE category. */
extern void ctype_read (struct linereader *ldfile,
struct localedef_t *result,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *repertoire_name,
int ignore_content);
extern void ctype_finish (struct localedef_t *locale,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
extern void ctype_output (struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
+extern uint32_t *find_translit (struct localedef_t *locale,
+ const struct charmap_t *charmap, uint32_t wch);
/* Handle LC_COLLATE category. */
extern void collate_read (struct linereader *ldfile,
struct localedef_t *result,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *repertoire_name,
int ignore_content);
extern void collate_finish (struct localedef_t *locale,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
extern void collate_output (struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
/* Handle LC_MONETARY category. */
extern void monetary_read (struct linereader *ldfile,
struct localedef_t *result,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *repertoire_name,
int ignore_content);
extern void monetary_finish (struct localedef_t *locale,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
extern void monetary_output (struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
/* Handle LC_NUMERIC category. */
extern void numeric_read (struct linereader *ldfile,
struct localedef_t *result,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *repertoire_name,
int ignore_content);
extern void numeric_finish (struct localedef_t *locale,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
extern void numeric_output (struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
/* Handle LC_MESSAGES category. */
extern void messages_read (struct linereader *ldfile,
struct localedef_t *result,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *repertoire_name,
int ignore_content);
extern void messages_finish (struct localedef_t *locale,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
extern void messages_output (struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
/* Handle LC_TIME category. */
extern void time_read (struct linereader *ldfile,
struct localedef_t *result,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *repertoire_name,
int ignore_content);
extern void time_finish (struct localedef_t *locale,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
extern void time_output (struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
/* Handle LC_PAPER category. */
extern void paper_read (struct linereader *ldfile,
struct localedef_t *result,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *repertoire_name,
int ignore_content);
extern void paper_finish (struct localedef_t *locale,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
extern void paper_output (struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
/* Handle LC_NAME category. */
extern void name_read (struct linereader *ldfile,
struct localedef_t *result,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *repertoire_name,
int ignore_content);
extern void name_finish (struct localedef_t *locale,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
extern void name_output (struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
/* Handle LC_ADDRESS category. */
extern void address_read (struct linereader *ldfile,
struct localedef_t *result,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *repertoire_name,
int ignore_content);
extern void address_finish (struct localedef_t *locale,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
extern void address_output (struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
/* Handle LC_TELEPHONE category. */
extern void telephone_read (struct linereader *ldfile,
struct localedef_t *result,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *repertoire_name,
int ignore_content);
extern void telephone_finish (struct localedef_t *locale,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
extern void telephone_output (struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
/* Handle LC_MEASUREMENT category. */
extern void measurement_read (struct linereader *ldfile,
struct localedef_t *result,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *repertoire_name,
int ignore_content);
extern void measurement_finish (struct localedef_t *locale,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
extern void measurement_output (struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
/* Handle LC_IDENTIFICATION category. */
extern void identification_read (struct linereader *ldfile,
struct localedef_t *result,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *repertoire_name,
int ignore_content);
extern void identification_finish (struct localedef_t *locale,
- struct charmap_t *charmap);
+ const struct charmap_t *charmap);
extern void identification_output (struct localedef_t *locale,
- struct charmap_t *charmap,
+ const struct charmap_t *charmap,
const char *output_path);
#endif /* locfile.h */
while (1)
{
/* What's on? */
- struct token *now = lr_token (repfile, NULL, NULL, verbose);
+ struct token *now = lr_token (repfile, NULL, NULL, NULL, verbose);
enum token_t nowtok = now->tok;
struct token *arg;
if (nowtok == tok_escape_char || nowtok == tok_comment_char)
{
/* We know that we need an argument. */
- arg = lr_token (repfile, NULL, NULL, verbose);
+ arg = lr_token (repfile, NULL, NULL, NULL, verbose);
if (arg->tok != tok_ident)
{
+2001-12-09 Ulrich Drepper <drepper@redhat.com>
+
+ * charmaps/TCVN5712-1: Add combined characters.
+
2001-12-05 Ulrich Drepper <drepper@redhat.com>
* locales/bg_BG: Rewrite.
<code_set_name> TCVN5712-1
<comment_char> %
<escape_char> /
+<mb_cur_min> 1
+<mb_cur_max> 2
% alias TCVN
% alias TCVN-5712
<U00FD> /xfd LATIN SMALL LETTER Y WITH ACUTE
<U1EF5> /xfe LATIN SMALL LETTER Y WITH DOT BELOW
<U1ED0> /xff LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
+<U0106> /x43/xb3 LATIN CAPITAL LETTER C WITH ACUTE
+<U0107> /x63/xb3 LATIN SMALL LETTER C WITH ACUTE
+<U00D1> /x4e/xb2 LATIN CAPITAL LETTER N WITH TILDE
+<U00F1> /x6e/xb2 LATIN SMALL LETTER N WITH TILDE
+<U0139> /x4c/xb3 LATIN CAPITAL LETTER L WITH ACUTE
+<U013A> /x6c/xb3 LATIN SMALL LETTER L WITH ACUTE
+<U0143> /x4e/xb3 LATIN CAPITAL LETTER N WITH ACUTE
+<U0144> /x6e/xb3 LATIN SMALL LETTER N WITH ACUTE
+<U0154> /x52/xb3 LATIN CAPITAL LETTER R WITH ACUTE
+<U0155> /x72/xb3 LATIN SMALL LETTER R WITH ACUTE
+<U015A> /x53/xb3 LATIN CAPITAL LETTER S WITH ACUTE
+<U015B> /x73/xb3 LATIN SMALL LETTER S WITH ACUTE
+<U0179> /x5a/xb3 LATIN CAPITAL LETTER Z WITH ACUTE
+<U017A> /x7a/xb3 LATIN SMALL LETTER Z WITH ACUTE
+<U01F4> /x47/xb3 LATIN CAPITAL LETTER G WITH ACUTE
+<U01F5> /x67/xb3 LATIN SMALL LETTER G WITH ACUTE
+<U01F8> /x4e/xb0 LATIN CAPITAL LETTER N WITH GRAVE
+<U01F9> /x6e/xb0 LATIN SMALL LETTER N WITH GRAVE
+<U1E04> /x42/xb4 LATIN CAPITAL LETTER B WITH DOT BELOW
+<U1E05> /x62/xb4 LATIN SMALL LETTER B WITH DOT BELOW
+<U1E0C> /x44/xb4 LATIN CAPITAL LETTER D WITH DOT BELOW
+<U1E0D> /x64/xb4 LATIN SMALL LETTER D WITH DOT BELOW
+<U1E24> /x48/xb4 LATIN CAPITAL LETTER H WITH DOT BELOW
+<U1E25> /x68/xb4 LATIN SMALL LETTER H WITH DOT BELOW
+<U1E30> /x4b/xb3 LATIN CAPITAL LETTER K WITH ACUTE
+<U1E31> /x6b/xb3 LATIN SMALL LETTER K WITH ACUTE
+<U1E32> /x4b/xb4 LATIN CAPITAL LETTER K WITH DOT BELOW
+<U1E33> /x6b/xb4 LATIN SMALL LETTER K WITH DOT BELOW
+<U1E36> /x4c/xb4 LATIN CAPITAL LETTER L WITH DOT BELOW
+<U1E37> /x6c/xb4 LATIN SMALL LETTER L WITH DOT BELOW
+<U1E3E> /x4d/xb3 LATIN CAPITAL LETTER M WITH ACUTE
+<U1E3F> /x6d/xb3 LATIN SMALL LETTER M WITH ACUTE
+<U1E42> /x4d/xb4 LATIN CAPITAL LETTER M WITH DOT BELOW
+<U1E43> /x6d/xb4 LATIN SMALL LETTER M WITH DOT BELOW
+<U1E46> /x4e/xb4 LATIN CAPITAL LETTER N WITH DOT BELOW
+<U1E47> /x6e/xb4 LATIN SMALL LETTER N WITH DOT BELOW
+<U1E54> /x50/xb3 LATIN CAPITAL LETTER P WITH ACUTE
+<U1E55> /x70/xb3 LATIN SMALL LETTER P WITH ACUTE
+<U1E5A> /x52/xb4 LATIN CAPITAL LETTER R WITH DOT BELOW
+<U1E5B> /x72/xb4 LATIN SMALL LETTER R WITH DOT BELOW
+<U1E62> /x53/xb4 LATIN CAPITAL LETTER S WITH DOT BELOW
+<U1E63> /x73/xb4 LATIN SMALL LETTER S WITH DOT BELOW
+<U1E6C> /x54/xb4 LATIN CAPITAL LETTER T WITH DOT BELOW
+<U1E6D> /x74/xb4 LATIN SMALL LETTER T WITH DOT BELOW
+<U1E7C> /x56/xb2 LATIN CAPITAL LETTER V WITH TILDE
+<U1E7D> /x76/xb2 LATIN SMALL LETTER V WITH TILDE
+<U1E7E> /x56/xb4 LATIN CAPITAL LETTER V WITH DOT BELOW
+<U1E7F> /x76/xb4 LATIN SMALL LETTER V WITH DOT BELOW
+<U1E80> /x57/xb0 LATIN CAPITAL LETTER W WITH GRAVE
+<U1E81> /x77/xb0 LATIN SMALL LETTER W WITH GRAVE
+<U1E82> /x57/xb3 LATIN CAPITAL LETTER W WITH ACUTE
+<U1E83> /x77/xb3 LATIN SMALL LETTER W WITH ACUTE
+<U1E88> /x57/xb4 LATIN CAPITAL LETTER W WITH DOT BELOW
+<U1E89> /x77/xb4 LATIN SMALL LETTER W WITH DOT BELOW
+<U1E92> /x5a/xb4 LATIN CAPITAL LETTER Z WITH DOT BELOW
+<U1E93> /x7a/xb4 LATIN SMALL LETTER Z WITH DOT BELOW
END CHARMAP
projects / platform / upstream / glibc.git / commitdiff