From: Bruno Haible Date: Sun, 11 May 2008 13:35:10 +0000 (+0000) Subject: No need to use Combining.txt from Unicode 3.0. X-Git-Tag: v0.18~427 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13b51980fb325db9870c737641753c8485ad748d;p=thirdparty%2Fgettext.git No need to use Combining.txt from Unicode 3.0. --- diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 7581441ac..34219fcba 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,5 +1,12 @@ 2008-05-11 Bruno Haible + * lib/gen-lbrkprop.c (unicode_combining): Remove variable. + (fill_combining): Remove function. + (main): Take one argument less. + * lib/Combining.txt: Remove file. + * modules/gen-lbrkprop (Files): Remove Combining.txt. + * Makefile.am (EXTRA_DIST): Likewise. + * lib/gen-lbrkprop.c: Change copyright to GPLv3+. (output_tables): Emit a GPLv3+ header. diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am index 9499db641..a723fa667 100644 --- a/gnulib-local/Makefile.am +++ b/gnulib-local/Makefile.am @@ -33,7 +33,6 @@ lib/ChangeLog.0 \ lib/ChangeLog.1 \ lib/closeout.c \ lib/closeout.h \ -lib/Combining.txt \ lib/error.h.diff \ lib/error-progname.c \ lib/error-progname.h \ diff --git a/gnulib-local/lib/Combining.txt b/gnulib-local/lib/Combining.txt deleted file mode 100644 index c01774b88..000000000 --- a/gnulib-local/lib/Combining.txt +++ /dev/null @@ -1,105 +0,0 @@ -Property dump for: 0x20000004 (Combining) - -0300..034E (79 chars) -0360..0362 (3 chars) -0483..0486 (4 chars) -0488..0489 (2 chars) -0591..05A1 (17 chars) -05A3..05B9 (23 chars) -05BB..05BD (3 chars) -05BF -05C1..05C2 (2 chars) -05C4 -064B..0655 (11 chars) -0670 -06D6..06E4 (15 chars) -06E7..06E8 (2 chars) -06EA..06ED (4 chars) -0711 -0730..074A (27 chars) -07A6..07B0 (11 chars) -0901..0903 (3 chars) -093C -093E..094D (16 chars) -0951..0954 (4 chars) -0962..0963 (2 chars) -0981..0983 (3 chars) -09BC -09BE..09C4 (7 chars) -09C7..09C8 (2 chars) -09CB..09CD (3 chars) -09D7 -09E2..09E3 (2 chars) -0A02 -0A3C -0A3E..0A42 (5 chars) -0A47..0A48 (2 chars) -0A4B..0A4D (3 chars) -0A70..0A71 (2 chars) -0A81..0A83 (3 chars) -0ABC -0ABE..0AC5 (8 chars) -0AC7..0AC9 (3 chars) -0ACB..0ACD (3 chars) -0B01..0B03 (3 chars) -0B3C -0B3E..0B43 (6 chars) -0B47..0B48 (2 chars) -0B4B..0B4D (3 chars) -0B56..0B57 (2 chars) -0B82..0B83 (2 chars) -0BBE..0BC2 (5 chars) -0BC6..0BC8 (3 chars) -0BCA..0BCD (4 chars) -0BD7 -0C01..0C03 (3 chars) -0C3E..0C44 (7 chars) -0C46..0C48 (3 chars) -0C4A..0C4D (4 chars) -0C55..0C56 (2 chars) -0C82..0C83 (2 chars) -0CBE..0CC4 (7 chars) -0CC6..0CC8 (3 chars) -0CCA..0CCD (4 chars) -0CD5..0CD6 (2 chars) -0D02..0D03 (2 chars) -0D3E..0D43 (6 chars) -0D46..0D48 (3 chars) -0D4A..0D4D (4 chars) -0D57 -0D82..0D83 (2 chars) -0DCA -0DCF..0DD4 (6 chars) -0DD6 -0DD8..0DDF (8 chars) -0DF2..0DF3 (2 chars) -0E31 -0E34..0E3A (7 chars) -0E47..0E4E (8 chars) -0EB1 -0EB4..0EB9 (6 chars) -0EBB..0EBC (2 chars) -0EC8..0ECD (6 chars) -0F18..0F19 (2 chars) -0F35 -0F37 -0F39 -0F3E..0F3F (2 chars) -0F71..0F84 (20 chars) -0F86..0F87 (2 chars) -0F90..0F97 (8 chars) -0F99..0FBC (36 chars) -0FC6 -102C..1032 (7 chars) -1036..1039 (4 chars) -1056..1059 (4 chars) -17B4..17D3 (32 chars) -18A9 -20D0..20E3 (20 chars) -302A..302F (6 chars) -3099..309A (2 chars) -F8F0..F8FF (16 chars) -FB1E -FE20..FE23 (4 chars) - -******************************************* diff --git a/gnulib-local/lib/gen-lbrkprop.c b/gnulib-local/lib/gen-lbrkprop.c index 225c9a22c..1410aa05f 100644 --- a/gnulib-local/lib/gen-lbrkprop.c +++ b/gnulib-local/lib/gen-lbrkprop.c @@ -18,7 +18,6 @@ /* Usage example: $ gen-lbrkprop /usr/local/share/Unidata/UnicodeData.txt \ - Combining.txt \ /usr/local/share/Unidata/EastAsianWidth.txt \ /usr/local/share/Unidata/LineBreak.txt \ 3.1.0 @@ -248,87 +247,6 @@ fill_attributes (const char *unicodedata_filename) } } -/* The combining property from the PropList.txt file. */ -char unicode_combining[0x110000]; - -/* Stores in unicode_combining[] the Combining property from the - Unicode 3.0 PropList.txt file. */ -static void -fill_combining (const char *proplist_filename) -{ - unsigned int i; - FILE *stream; - char buf[100+1]; - - for (i = 0; i < 0x110000; i++) - unicode_combining[i] = 0; - - stream = fopen (proplist_filename, "r"); - if (stream == NULL) - { - fprintf (stderr, "error during fopen of '%s'\n", proplist_filename); - exit (1); - } - - /* Search for the "Property dump for: 0x20000004 (Combining)" line. */ - do - { - if (fscanf (stream, "%100[^\n]\n", buf) < 1) - { - fprintf (stderr, "no combining property found in '%s'\n", - proplist_filename); - exit (1); - } - } - while (strstr (buf, "(Combining)") == NULL); - - for (;;) - { - unsigned int i1, i2; - - if (fscanf (stream, "%100[^\n]\n", buf) < 1) - { - fprintf (stderr, "premature end of combining property in '%s'\n", - proplist_filename); - exit (1); - } - if (buf[0] == '*') - break; - if (strlen (buf) >= 10 && buf[4] == '.' && buf[5] == '.') - { - if (sscanf (buf, "%4X..%4X", &i1, &i2) < 2) - { - fprintf (stderr, "parse error in combining property in '%s'\n", - proplist_filename); - exit (1); - } - } - else if (strlen (buf) >= 4) - { - if (sscanf (buf, "%4X", &i1) < 1) - { - fprintf (stderr, "parse error in combining property in '%s'\n", - proplist_filename); - exit (1); - } - i2 = i1; - } - else - { - fprintf (stderr, "parse error in combining property in '%s'\n", - proplist_filename); - exit (1); - } - for (i = i1; i <= i2; i++) - unicode_combining[i] = 1; - } - if (ferror (stream) || fclose (stream)) - { - fprintf (stderr, "error reading from '%s'\n", proplist_filename); - exit (1); - } -} - /* The width property from the EastAsianWidth.txt file. Each is NULL (unassigned) or "N", "A", "H", "W", "F", "Na". */ const char * unicode_width[0x110000]; @@ -1383,22 +1301,21 @@ output_tables (const char *filename, const char *version) int main (int argc, char * argv[]) { - if (argc != 6) + if (argc != 5) { - fprintf (stderr, "Usage: %s UnicodeData.txt Combining.txt EastAsianWidth.txt LineBreak.txt version\n", + fprintf (stderr, "Usage: %s UnicodeData.txt EastAsianWidth.txt LineBreak.txt version\n", argv[0]); exit (1); } fill_attributes (argv[1]); - fill_combining (argv[2]); - fill_width (argv[3]); - fill_org_lbp (argv[4]); + fill_width (argv[2]); + fill_org_lbp (argv[3]); debug_output_tables ("lbrkprop.txt"); debug_output_org_tables ("lbrkprop_org.txt"); - output_tables ("lbrkprop.h", argv[5]); + output_tables ("lbrkprop.h", argv[4]); return 0; } diff --git a/gnulib-local/modules/gen-lbrkprop b/gnulib-local/modules/gen-lbrkprop index 2dad8e439..de117307e 100644 --- a/gnulib-local/modules/gen-lbrkprop +++ b/gnulib-local/modules/gen-lbrkprop @@ -4,7 +4,6 @@ Generates lbrkprop.h. Files: lib/gen-lbrkprop.c lib/3level.h -lib/Combining.txt Depends-on: