From 70185da887562da0a244f9fe0b08c093b0b414de Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 6 Jan 2009 11:59:56 +0000 Subject: [PATCH] =?utf8?q?Bug=20328206=20=E2=80=93=20Update/remove=20some?= =?utf8?q?=20old=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2009-01-06 Behdad Esfahbod Bug 328206 – Update/remove some old files * tools/Makefile.am: * tools/add-copyright: * tools/compress-table.pl: * tools/maps/README: * tools/maps/tis-620: Remove some old files. svn path=/trunk/; revision=2790 --- ChangeLog | 11 +++ tools/Makefile.am | 6 +- tools/add-copyright | 62 ---------------- tools/compress-table.pl | 123 -------------------------------- tools/maps/README | 12 ---- tools/maps/tis-620 | 185 ------------------------------------------------ 6 files changed, 12 insertions(+), 387 deletions(-) delete mode 100755 tools/add-copyright delete mode 100755 tools/compress-table.pl delete mode 100644 tools/maps/README delete mode 100644 tools/maps/tis-620 diff --git a/ChangeLog b/ChangeLog index b91485c..863d614 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2009-01-06 Behdad Esfahbod + Bug 328206 – Update/remove some old files + + * tools/Makefile.am: + * tools/add-copyright: + * tools/compress-table.pl: + * tools/maps/README: + * tools/maps/tis-620: + Remove some old files. + +2009-01-06 Behdad Esfahbod + * tools/Makefile.am: * tools/gen-script-for-lang.c: * tools/gen-script-for-lang-new.c: diff --git a/tools/Makefile.am b/tools/Makefile.am index ddbbd00..45abd58 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -11,11 +11,7 @@ EXTRA_PROGRAMS = \ gen-script-for-lang EXTRA_DIST= \ - add-copyright \ - compress-table.pl \ - gen-color-table.pl \ - maps/README \ - maps/tis-620 + gen-color-table.pl gen_script_for_lang_SOURCES = gen-script-for-lang.c gen_script_for_lang_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la diff --git a/tools/add-copyright b/tools/add-copyright deleted file mode 100755 index 201d887..0000000 --- a/tools/add-copyright +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/local/bin/perl -w - -# Spit the copyright - -# If there is a leading block comment that looks like this -# license, don't add the license. - -$ARGV[0] =~ s!^\./!!; - -open IN, "<$ARGV[0]" or die "Cannot open $ARGV[0]: $!"; -open OUT, ">$ARGV[0].new" or die "Cannot open $ARGV[0].new: $!"; - -$old = ""; -while () { - $old .= $_; - m!^(/| )\*! or last; -} - -if ($old !~ /Free Software Foundation/) { - while () { - s/\@NAME\@/$ARGV[0]/; - print OUT; - } -} - -print OUT $old; -while () { - print OUT; -} - -close IN; -close OUT; - -if (system("diff $ARGV[0] $ARGV[0].new > /dev/null") != 0) { - system ("mv $ARGV[0] $ARGV[0].bak"); - system ("mv $ARGV[0].new $ARGV[0]"); -} else { - system ("rm $ARGV[0].new"); -} - -__DATA__ -/* Pango - * @NAME@: - * - * Copyright (C) 1999 Red Hat Software - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - diff --git a/tools/compress-table.pl b/tools/compress-table.pl deleted file mode 100755 index 5512965..0000000 --- a/tools/compress-table.pl +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/perl -w - -sub convert { - $s = shift; - $s = "ENC_".uc($s); - $s =~ s/-/_/g; - return $s; -} - -$combo_index = 1; - -sub add { - my $combo = shift; - if (!exists($combos{$combo})) { - $combos{$combo} = $combo_index++; - printf " $combo,\n", $combos{$combo}; - } -} - -my $col = 0; - -sub output { - my ($start,$u,$index) = @_; - - for (my $i = $start; $i < $u; $i++) { - print " 0,"; - $col = ($col + 1) % 16; - if ($col == 0) { - print "\n"; - } - } - printf " %2d,", $index; - $col = ($col + 1) % 16; - if ($col == 0) { - print "\n"; - } -} - -# -# Read in the maps -# -my @codepoints = (); - -opendir (MAPS, "maps") || die "Cannot open maps/ subdirectory: $!\n"; -while (defined (my $map = readdir (MAPS))) { - next if ($map =~ /^\./); - next if ($map =~ /~$/); - next if ($map =~ /^CVS|README$/); - - open (MAP, "maps/$map") || die "Cannot open map '$map:!\n"; - - $encoding = convert($map); - while () { - s/\s*#.*//; - s/\s*$//; - next if /^$/; - if (!/^\s*(0x[A-Fa-f0-9]+)\s+(0x[A-Fa-f0-9]+)$/) { - die "Cannot parse line '%s' in map '$map'\n"; - } - push @codepoints, [hex($2), $encoding]; - } - close (MAP); -} - -# -# And sort them -# -@codepoints = sort { $a->[0] <=> $b->[0] } @codepoints; - -print "const guint32 char_mask_map[] = {\n 0,\n"; - -$encodings = ""; - -for $cp (@codepoints) { - $u = $cp->[0]; $e = $cp->[1]; - - if (!defined $old_u) { - $old_u = $u; - $encodings = $e; - } elsif ($old_u ne $u) { - add($encodings); - $old_u = $u; - $encodings = $e; - } else { - $encodings .= "|".$e; - } -} - -if (defined $old_u) { - add($encodings); -} - -print <[0]; $e = $cp->[1]; - - if (!defined $old_u) { - $old_u = $u; - $encodings = $e; - } elsif ($old_u ne $u) { - output($start, $old_u, $combos{$encodings}); - $start = $old_u + 1; - $old_u = $u; - $encodings = $e; - } else { - $encodings .= "|".$e; - } -} - -if (defined $old_u) { - output($start, $old_u, $combos{$encodings}); -} - -print "\n};\n"; diff --git a/tools/maps/README b/tools/maps/README deleted file mode 100644 index 036fc5b..0000000 --- a/tools/maps/README +++ /dev/null @@ -1,12 +0,0 @@ -This directory is intentionally empty. It is located -here so that mapping tables can be put here when -running the make-table.sh script in the parent directory. - -However, the mapping tables that I've used are those -provided by the Unicode consortium, which can't be -distributed in their original form, though the data -is freely useable. - -Owen Taylor -otaylor@redhat.com -10 Jul 1999 \ No newline at end of file diff --git a/tools/maps/tis-620 b/tools/maps/tis-620 deleted file mode 100644 index 2a8bbd8..0000000 --- a/tools/maps/tis-620 +++ /dev/null @@ -1,185 +0,0 @@ -# This table was created by Owen Taylor . -# You may use, modify and redistribute it without restriction. - -0x20 0x0020 -0x21 0x0021 -0x22 0x0022 -0x23 0x0023 -0x24 0x0024 -0x25 0x0025 -0x26 0x0026 -0x27 0x0027 -0x28 0x0028 -0x29 0x0029 -0x2A 0x002A -0x2B 0x002B -0x2C 0x002C -0x2D 0x002D -0x2E 0x002E -0x2F 0x002F -0x30 0x0030 -0x31 0x0031 -0x32 0x0032 -0x33 0x0033 -0x34 0x0034 -0x35 0x0035 -0x36 0x0036 -0x37 0x0037 -0x38 0x0038 -0x39 0x0039 -0x3A 0x003A -0x3B 0x003B -0x3C 0x003C -0x3D 0x003D -0x3E 0x003E -0x3F 0x003F -0x40 0x0040 -0x41 0x0041 -0x42 0x0042 -0x43 0x0043 -0x44 0x0044 -0x45 0x0045 -0x46 0x0046 -0x47 0x0047 -0x48 0x0048 -0x49 0x0049 -0x4A 0x004A -0x4B 0x004B -0x4C 0x004C -0x4D 0x004D -0x4E 0x004E -0x4F 0x004F -0x50 0x0050 -0x51 0x0051 -0x52 0x0052 -0x53 0x0053 -0x54 0x0054 -0x55 0x0055 -0x56 0x0056 -0x57 0x0057 -0x58 0x0058 -0x59 0x0059 -0x5A 0x005A -0x5B 0x005B -0x5C 0x005C -0x5D 0x005D -0x5E 0x005E -0x5F 0x005F -0x60 0x0060 -0x61 0x0061 -0x62 0x0062 -0x63 0x0063 -0x64 0x0064 -0x65 0x0065 -0x66 0x0066 -0x67 0x0067 -0x68 0x0068 -0x69 0x0069 -0x6A 0x006A -0x6B 0x006B -0x6C 0x006C -0x6D 0x006D -0x6E 0x006E -0x6F 0x006F -0x70 0x0070 -0x71 0x0071 -0x72 0x0072 -0x73 0x0073 -0x74 0x0074 -0x75 0x0075 -0x76 0x0076 -0x77 0x0077 -0x78 0x0078 -0x79 0x0079 -0x7A 0x007A -0x7B 0x007B -0x7C 0x007C -0x7D 0x007D -0x7E 0x007E -0xA1 0x0E01 -0xA2 0x0E02 -0xA3 0x0E03 -0xA4 0x0E04 -0xA5 0x0E05 -0xA6 0x0E06 -0xA7 0x0E07 -0xA8 0x0E08 -0xA9 0x0E09 -0xAA 0x0E0A -0xAB 0x0E0B -0xAC 0x0E0C -0xAD 0x0E0D -0xAE 0x0E0E -0xAF 0x0E0F -0xB0 0x0E10 -0xB1 0x0E11 -0xB2 0x0E12 -0xB3 0x0E13 -0xB4 0x0E14 -0xB5 0x0E15 -0xB6 0x0E16 -0xB7 0x0E17 -0xB8 0x0E18 -0xB9 0x0E19 -0xBA 0x0E1A -0xBB 0x0E1B -0xBC 0x0E1C -0xBD 0x0E1D -0xBE 0x0E1E -0xBF 0x0E1F -0xC0 0x0E20 -0xC1 0x0E21 -0xC2 0x0E22 -0xC3 0x0E23 -0xC4 0x0E24 -0xC5 0x0E25 -0xC6 0x0E26 -0xC7 0x0E27 -0xC8 0x0E28 -0xC9 0x0E29 -0xCA 0x0E2A -0xCB 0x0E2B -0xCC 0x0E2C -0xCD 0x0E2D -0xCE 0x0E2E -0xCF 0x0E2F -0xD0 0x0E30 -0xD1 0x0E31 -0xD2 0x0E32 -0xD3 0x0E33 -0xD4 0x0E34 -0xD5 0x0E35 -0xD6 0x0E36 -0xD7 0x0E37 -0xD8 0x0E38 -0xD9 0x0E39 -0xDA 0x0E3A -0xDF 0x0E3F -0xE0 0x0E40 -0xE1 0x0E41 -0xE2 0x0E42 -0xE3 0x0E43 -0xE4 0x0E44 -0xE5 0x0E45 -0xE6 0x0E46 -0xE7 0x0E47 -0xE8 0x0E48 -0xE9 0x0E49 -0xEA 0x0E4A -0xEB 0x0E4B -0xEC 0x0E4C -0xED 0x0E4D -0xEE 0x0E4E -0xEF 0x0E4F -0xF0 0x0E50 -0xF1 0x0E51 -0xF2 0x0E52 -0xF3 0x0E53 -0xF4 0x0E54 -0xF5 0x0E55 -0xF6 0x0E56 -0xF7 0x0E57 -0xF8 0x0E58 -0xF9 0x0E59 -0xFA 0x0E5A -0xFB 0x0E5B -- 2.7.4