summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2005-06-14 22:05:18 +0000
committerOwen Taylor <otaylor@src.gnome.org>2005-06-14 22:05:18 +0000
commit8c50a90a8ba708a84e3eaa29f9e7d5d0743b6088 (patch)
treea5825aef25dfaea9f47961261b5920888c5a8c75
parentaaad3d0913e05ff2f525e83b3188696d1e907c53 (diff)
downloadpango-8c50a90a8ba708a84e3eaa29f9e7d5d0743b6088.tar.gz
Hand edit to fix a bug in the 4.0.0 data tables. (#173096, Sukhjinder
2005-06-14 Owen Taylor <otaylor@redhat.com> * pango/pango-script-table.h (struct): Hand edit to fix a bug in the 4.0.0 data tables. (#173096, Sukhjinder Sidhu) * tools/gen-script-table.pl: Some updates to handle newer formats (not actually regenerating tables at the moment, since the changes are large)
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLog.pre-1-1010
-rw-r--r--pango/pango-script-table.h2
-rwxr-xr-xtools/gen-script-table.pl8
4 files changed, 25 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bc883123..f86a93ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2005-06-14 Owen Taylor <otaylor@redhat.com>
+ * pango/pango-script-table.h (struct): Hand edit
+ to fix a bug in the 4.0.0 data tables.
+ (#173096, Sukhjinder Sidhu)
+
+ * tools/gen-script-table.pl: Some updates to handle
+ newer formats (not actually regenerating tables at the
+ moment, since the changes are large)
+
+2005-06-14 Owen Taylor <otaylor@redhat.com>
+
#307433, Sebastien Bacher
* pango/Makefile.am (libpango_1_0_la_SOURCES): Add
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index bc883123..f86a93ce 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,5 +1,15 @@
2005-06-14 Owen Taylor <otaylor@redhat.com>
+ * pango/pango-script-table.h (struct): Hand edit
+ to fix a bug in the 4.0.0 data tables.
+ (#173096, Sukhjinder Sidhu)
+
+ * tools/gen-script-table.pl: Some updates to handle
+ newer formats (not actually regenerating tables at the
+ moment, since the changes are large)
+
+2005-06-14 Owen Taylor <otaylor@redhat.com>
+
#307433, Sebastien Bacher
* pango/Makefile.am (libpango_1_0_la_SOURCES): Add
diff --git a/pango/pango-script-table.h b/pango/pango-script-table.h
index ae9753bc..5145cce1 100644
--- a/pango/pango-script-table.h
+++ b/pango/pango-script-table.h
@@ -84,7 +84,7 @@ static const struct {
{ 0x09dc, 2, PANGO_SCRIPT_BENGALI },
{ 0x09df, 5, PANGO_SCRIPT_BENGALI },
{ 0x09e6, 12, PANGO_SCRIPT_BENGALI },
- { 0x0a02, 2, PANGO_SCRIPT_GURMUKHI },
+ { 0x0a01, 3, PANGO_SCRIPT_GURMUKHI },
{ 0x0a05, 6, PANGO_SCRIPT_GURMUKHI },
{ 0x0a0f, 2, PANGO_SCRIPT_GURMUKHI },
{ 0x0a13, 22, PANGO_SCRIPT_GURMUKHI },
diff --git a/tools/gen-script-table.pl b/tools/gen-script-table.pl
index 6b524ef7..a2f81f54 100755
--- a/tools/gen-script-table.pl
+++ b/tools/gen-script-table.pl
@@ -21,14 +21,14 @@ while (<IN>) {
s/#.*//;
next if /^\s*$/;
- if (!/^([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s+;\s+([A-Z_]+)\s+$/) {
- die "Cannot parse line: $_\n";
+ if (!/^([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s*;\s*([A-Za-z_]+)\s*$/) {
+ die "Cannot parse line: '$_'\n";
}
if (defined $2) {
- push @ranges, [ hex $1, hex $2, $3 ];
+ push @ranges, [ hex $1, hex $2, uc $3 ];
} else {
- push @ranges, [ hex $1, hex $1, $3 ];
+ push @ranges, [ hex $1, hex $1, uc $3 ];
}
}