diff options
42 files changed, 3131 insertions, 67 deletions
diff --git a/argp/argp-help.c b/argp/argp-help.c index 5ab6aa7863..560fe5237f 100644 --- a/argp/argp-help.c +++ b/argp/argp-help.c @@ -357,7 +357,7 @@ struct hol_cluster const char *header; /* Used to order clusters within the same group with the same parent, - according to the order in which they occured in the parent argp's child + according to the order in which they occurred in the parent argp's child list. */ int index; @@ -1419,7 +1419,7 @@ argp_args_usage (const struct argp *argp, const struct argp_state *state, following the `\v' character (nothing for strings without). Each separate bit of documentation is separated a blank line, and if PRE_BLANK is true, then the first is as well. If FIRST_ONLY is true, only the first - occurance is output. Returns true if anything was output. */ + occurrence is output. Returns true if anything was output. */ static int argp_doc (const struct argp *argp, const struct argp_state *state, int post, int pre_blank, int first_only, diff --git a/argp/argp.h b/argp/argp.h index 0d40572963..ee59d259d0 100644 --- a/argp/argp.h +++ b/argp/argp.h @@ -184,7 +184,7 @@ typedef error_t (*argp_parser_t) (int key, char *arg, argp's, and perhaps a function to filter help output. When actually parsing options, getopt is called with the union of all the argp structures chained together through their CHILD pointers, with conflicts - being resolved in favor of the first occurance in the chain. */ + being resolved in favor of the first occurrence in the chain. */ struct argp { /* An array of argp_option structures, terminated by an entry with both diff --git a/elf/dl-object.c b/elf/dl-object.c index fd2cdaec83..4914bc2720 100644 --- a/elf/dl-object.c +++ b/elf/dl-object.c @@ -59,7 +59,7 @@ _dl_new_object (char *realname, const char *libname, int type, while (l->l_next) l = l->l_next; new->l_prev = l; - /* new->l_next = NULL; Would be necesary but we use calloc. */ + /* new->l_next = NULL; Would be necessary but we use calloc. */ l->l_next = new; /* Add the global scope. */ diff --git a/elf/dl-open.c b/elf/dl-open.c index 097fd372c0..f3d8368f88 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -249,7 +249,7 @@ _dl_open (const char *file, int mode, const void *caller) if (errstring) { - /* Some error occured during loading. */ + /* Some error occurred during loading. */ char *local_errstring; /* Remove the object from memory. It may be in an inconsistent @@ -1055,7 +1055,7 @@ typedef struct #define EF_MIPS_ARCH_4 0x30000000 /* -mips4 code. */ #define EF_MIPS_ARCH_5 0x40000000 /* -mips5 code. */ -/* The following are non-official names and should ot be used. */ +/* The following are non-official names and should not be used. */ #define E_MIPS_ARCH_1 0x00000000 /* -mips1 code. */ #define E_MIPS_ARCH_2 0x10000000 /* -mips2 code. */ diff --git a/elf/rtld.c b/elf/rtld.c index c7b98a1336..2f57037fc0 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -642,7 +642,7 @@ of this helper program; chances are you did not intend to run this program.\n\ _dl_rtld_map.l_prev = _dl_loaded; /* We have two ways to specify objects to preload: via environment - variable and via the file /etc/ld.so.preload. The later can also + variable and via the file /etc/ld.so.preload. The latter can also be used when security is enabled. */ preloads = NULL; npreloads = 0; diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c index 44cb5ccab5..4a42a84bc8 100644 --- a/iconv/gconv_open.c +++ b/iconv/gconv_open.c @@ -56,7 +56,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, nsteps * sizeof (struct __gconv_step_data)); /* Call all initialization functions for the transformation - step implemenations. */ + step implementations. */ for (cnt = 0; cnt < nsteps; ++cnt) { /* If this is the last step we must not allocate an diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 239c3a798e..0455ec55aa 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,9 @@ +2000-02-22 Ulrich Drepper <drepper@redhat.com> + + * locales/mk_MK: New file. + Contributed by Damjan Georgievski <gdamjan@freemail.org.mk> + * SUPPORTED: Add mk_MK ISO-8859-1. + 2000-02-12 Ulrich Drepper <drepper@redhat.com> * SUPPORTED: Add gl_ES.ISO-8859-1. diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index 3baa8b8438..93eba3ed5a 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -42,6 +42,7 @@ iw_IL ISO-8859-8 kl_GL ISO-8859-1 lt_LT ISO-8859-13 lv_LV ISO-8859-13 +mk_MK ISO-8859-5 nl_BE ISO-8859-1 nl_NL ISO-8859-1 no_NO ISO-8859-1 diff --git a/localedata/locales/mk_MK b/localedata/locales/mk_MK new file mode 100644 index 0000000000..2b91494f39 --- /dev/null +++ b/localedata/locales/mk_MK @@ -0,0 +1,3057 @@ +comment_char % +escape_char / +% Macedonian Language Locale for Macedonia +% Source: +% Address: +% Contact: Damjan Georgievski +% Email: gdamjan@freemail.org.mk +% Tel: +% Fax: none +% Language: mk +% Territory: MK +% Revision: 0.2 +% Date: 1999-12-22 +% Application: general +% Users: general +% Repertoiremap: +% Charset: ISO-8859-5 +% Distribution and use is free, also +% for commercial purposes. +% +% Based on the rusian locale, +% sligtly changed to reflect macedonian language. +% To compile: localedef -i mk_MK -f ISO-8859-5 mk_MK + +LC_COLLATE +% Base collation scheme: 1994-03-22 + +% Ordering algorithm: +% 1. Spaces and hyphen (but not soft +% hyphen) before punctuation +% characters, punctuation characters +% before numbers, +% numbers before letters. +% 2. Letters with diacritical marks are +% members of equivalence classes +% 3. A distinction is made with regards +% to case as noted below. +% 4. Special characters are ignored +% when comparing letters, but then +% they are considered +% 5. The alphabets are sorted in order +% of first appearance in ISO 10646: +% Latin, Greek, Cyrillic, etc. +% +% According to Greek specifications, +% the steps 2. and 3. above are reversed +% for the Greek script + +% collating symbols + +% The collating symbol naming is +% mostly taken from ISO 10646-1, +% for example the case and accent +% names are from this standard. + +collating-symbol <CAPITAL> +collating-symbol <CAPITAL-SMALL> +collating-symbol <SMALL-CAPITAL> +collating-symbol <SMALL> + +% <CAPITAL-SMALL> and <SMALL-CAPITAL> +% are for cases like Danish <A><a> +% and Spanish <C><h> being treated +% as one letter. + +% The <a8> ...... <z8> collating +% symbols have defined weights as +% the last character in a group of +% Latin letters. They are used +% to specify deltas by locales using +% a locale as the default ordering +% and by "replace-after" statements +% specifying the changed placement +% in an ordering of a character. + +collating-symbol <a8> +collating-symbol <b8> +collating-symbol <c8> +collating-symbol <d8> +collating-symbol <e8> +collating-symbol <f8> +collating-symbol <g8> +collating-symbol <h8> +collating-symbol <i8> +collating-symbol <j8> +collating-symbol <k8> +collating-symbol <l8> +collating-symbol <m8> +collating-symbol <n8> +collating-symbol <o8> +collating-symbol <p8> +collating-symbol <q8> +collating-symbol <r8> +collating-symbol <s8> +collating-symbol <t8> +collating-symbol <u8> +collating-symbol <v8> +collating-symbol <w8> +collating-symbol <x8> +collating-symbol <y8> +collating-symbol <z8> + +collating-symbol <NONE> +collating-symbol <ACUTE> +collating-symbol <ACUTE+DOT> +collating-symbol <GRAVE> +collating-symbol <DOUBLE-GRAVE> +collating-symbol <BREVE> +collating-symbol <BREVE+ACUTE> +collating-symbol <BREVE+GRAVE> +collating-symbol <BREVE+MACRON> +collating-symbol <BREVE+HOOK> +collating-symbol <BREVE+TILDE> +collating-symbol <BREVE+DOT-BELOW> +collating-symbol <BREVE-BELOW> +collating-symbol <INVERTED-BREVE> +collating-symbol <CIRCUMFLEX> +collating-symbol <CIRCUMFLEX+ACUTE> +collating-symbol <CIRCUMFLEX+GRAVE> +collating-symbol <CIRCUMFLEX+HOOK> +collating-symbol <CIRCUMFLEX+TILDE> +collating-symbol <CIRCUMFLEX+DOT-BELOW> +collating-symbol <CARON> +collating-symbol <CARON+DIAERESIS> +collating-symbol <CARON+DOT> +collating-symbol <RING> +collating-symbol <RING+ACUTE> +collating-symbol <RING-BELOW> +collating-symbol <DIAERESIS> +collating-symbol <DIAERESIS+MACRON> +collating-symbol <DIAERESIS+ACUTE> +collating-symbol <DIAERESIS+GRAVE> +collating-symbol <DIAERESIS+CARON> +collating-symbol <DOUBLE-ACUTE> +collating-symbol <HOOK> +collating-symbol <TILDE> +collating-symbol <TILDE+ACUTE> +collating-symbol <TILDE+DIAERESIS> +collating-symbol <TILDE-BELOW> +collating-symbol <DOT> +collating-symbol <DOT-BELOW> +collating-symbol <DOT+DOT-BELOW> +collating-symbol <STROKE> +collating-symbol <STROKE+ACUTE> +collating-symbol <CEDILLA> +collating-symbol <CEDILLA+ACUTE> +collating-symbol <CEDILLA+GRAVE> +collating-symbol <CEDILLA+BREVE> +collating-symbol <OGONEK> +collating-symbol <OGONEK+MACRON> +collating-symbol <MACRON> +collating-symbol <MACRON+ACUTE> +collating-symbol <MACRON+GRAVE> +collating-symbol <MACRON+DIAERESIS> +collating-symbol <MACRON+DIAERESIS-BELOW> +collating-symbol <MACRON+DOT> +collating-symbol <MACRON+DOT-BELOW> +collating-symbol <MACRON+CIRCUMFLEX> +collating-symbol <LINE-BELOW> +collating-symbol <HORN> +collating-symbol <HORN+ACUTE> +collating-symbol <HORN+GRAVE> +collating-symbol <HORN+HOOK> +collating-symbol <HORN+TILDE> +collating-symbol <HORN+DOT-BELOW> +collating-symbol <PRECEDED-BY-APOSTROPHE> +collating-symbol <GREEK> +collating-symbol <TONOS> +collating-symbol <DIALYTICA> +collating-symbol <DIALYTICA+TONOS> +collating-symbol <CYRILLIC> +collating-symbol <HIRAGANA> +collating-symbol <KATAKANA> +collating-symbol <SPECIAL> + +% letter;accent;case;specials + +order_start forward;backward/ + ;forward;position + +% <CAPITAL> or <SMALL> letters first: + +% <CAPITAL> before <SMALL> letter. +<CAPITAL> +<CAPITAL-SMALL> +<SMALL-CAPITAL> +<SMALL> + +% Accents: + +<NONE> +<ACUTE> +<ACUTE+DOT> +<GRAVE> +<DOUBLE-GRAVE> +<BREVE> +<BREVE+ACUTE> +<BREVE+GRAVE> +<BREVE+MACRON> +<BREVE+HOOK> +<BREVE+TILDE> +<BREVE+DOT-BELOW> +<BREVE-BELOW> +<INVERTED-BREVE> +<CIRCUMFLEX> +<CIRCUMFLEX+ACUTE> +<CIRCUMFLEX+GRAVE> +<CIRCUMFLEX+HOOK> +<CIRCUMFLEX+TILDE> +<CIRCUMFLEX+DOT-BELOW> +<CARON> +<CARON+DIAERESIS> +<CARON+DOT> +<RING> +<RING+ACUTE> +<RING-BELOW> +<DIAERESIS> +<DIAERESIS+MACRON> +<DIAERESIS+ACUTE> +<DIAERESIS+GRAVE> +<DIAERESIS+CARON> +<DOUBLE-ACUTE> +<HOOK> +<TILDE> +<TILDE+ACUTE> +<TILDE+DIAERESIS> +<TILDE-BELOW> +<DOT> +<DOT-BELOW> +<DOT+DOT-BELOW> +<STROKE> +<STROKE+ACUTE> +<CEDILLA> +<CEDILLA+ACUTE> +<CEDILLA+GRAVE> +<CEDILLA+BREVE> +<OGONEK> +<OGONEK+MACRON> +<MACRON> +<MACRON+ACUTE> +<MACRON+GRAVE> +<MACRON+DIAERESIS> +<MACRON+DIAERESIS-BELOW> +<MACRON+DOT> +<MACRON+DOT-BELOW> +<MACRON+CIRCUMFLEX> +<LINE-BELOW> +<HORN> +<HORN+ACUTE> +<HORN+GRAVE> +<HORN+HOOK> +<HORN+TILDE> +<HORN+DOT-BELOW> +<PRECEDED-BY-APOSTROPHE> +<GREEK> +<TONOS> +<DIALYTICA> +<DIALYTICA+TONOS> +<CYRILLIC> +<HIRAGANA> +<KATAKANA> +<SPECIAL> + +<NS> <NS>;<NS>;<NS>;IGNORE +<SP> IGNORE;IGNORE;IGNORE;<SP> +<HT> IGNORE;IGNORE;IGNORE;<HT> +<VT> IGNORE;IGNORE;IGNORE;<VT> +<CR> IGNORE;IGNORE;IGNORE;<CR> +<LF> IGNORE;IGNORE;IGNORE;<LF> +<FF> IGNORE;IGNORE;IGNORE;<FF> +<_> IGNORE;IGNORE;IGNORE;<_> +<'m> IGNORE;IGNORE;IGNORE;<'m> +<--> IGNORE;IGNORE;IGNORE;<--> +<-> IGNORE;IGNORE;IGNORE;<-> +<,> IGNORE;IGNORE;IGNORE;<,> +<;> IGNORE;IGNORE;IGNORE;<;> +<:> IGNORE;IGNORE;IGNORE;<:> +<!> IGNORE;IGNORE;IGNORE;<!> +<!I> IGNORE;IGNORE;IGNORE;<!I> +<?> IGNORE;IGNORE;IGNORE;<?> +<?I> IGNORE;IGNORE;IGNORE;<?I> +<//> IGNORE;IGNORE;IGNORE;<//> +<.> IGNORE;IGNORE;IGNORE;<.> +<''> IGNORE;IGNORE;IGNORE;<''> +<'!> IGNORE;IGNORE;IGNORE;<'!> +<'/>> IGNORE;IGNORE;IGNORE;<'/>> +<':> IGNORE;IGNORE;IGNORE;<':> +<'?> IGNORE;IGNORE;IGNORE;<'?> +<.M> IGNORE;IGNORE;IGNORE;<.M> +<',> IGNORE;IGNORE;IGNORE;<',> +<'> IGNORE;IGNORE;IGNORE;<'> +<'6> IGNORE;IGNORE;IGNORE;<'6> +<'9> IGNORE;IGNORE;IGNORE;<'9> +<"> IGNORE;IGNORE;IGNORE;<"> +<"6> IGNORE;IGNORE;IGNORE;<"6> +<"9> IGNORE;IGNORE;IGNORE;<"9> +<<<> IGNORE;IGNORE;IGNORE;<<<> +</>/>> IGNORE;IGNORE;IGNORE;</>/>> +<(> |