[PATCH 3/3] make_unicode: Use VerticalOrientation.txt from UCD.
Jens Reyer
jre.winesim at gmail.com
Sat Jul 8 08:45:52 CDT 2017
Since Unicode 10.0.0 VerticalOrientation.txt is also available
directly in the Unicode Character Database (UCD), so use this
instead of the TR50 version.
Signed-off-by: Jens Reyer <jre.winesim at gmail.com>
---
The bulk difference to Unicode Technical Report (TR) #50 seems to
be omitted comments and merged single entries to ranges.
I'm not sure about the exact implications of this change, but it
reduces the specified sources for downloads by one (no more
$VERTICALDATA), and simplifies the code (no hardcoded versions in
VerticalOrientation-NN.txt).
Finally it simplifies packaging in Debian, where we regenerate the
unicode files.
dlls/gdi32/vertical.c | 24 +++++++++++++-----------
dlls/wineps.drv/vertical.c | 24 +++++++++++++-----------
tools/make_unicode | 5 ++---
3 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/dlls/gdi32/vertical.c b/dlls/gdi32/vertical.c
index db8fd092ea..05737604b8 100644
--- a/dlls/gdi32/vertical.c
+++ b/dlls/gdi32/vertical.c
@@ -1,10 +1,10 @@
/* Unicode Vertical Orientation */
-/* generated from http://www.unicode.org/Public/vertical/revision-17/VerticalOrientation-17.txt */
+/* generated from http://www.unicode.org/Public/10.0.0/ucd/VerticalOrientation.txt */
/* DO NOT EDIT!! */
#include "wine/unicode.h"
-const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] =
+const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] =
{
/* level 1 offsets */
0x0100, 0x0110, 0x0120, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110,
@@ -71,23 +71,23 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] =
0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0480, 0x0490,
0x02d0, 0x04a0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280,
0x0280, 0x0450, 0x02d0, 0x0280, 0x0280, 0x0470, 0x0280, 0x0280,
- 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x02d0, 0x04c0, 0x02d0,
+ 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x04c0, 0x04d0, 0x02d0,
0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280,
0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0,
- 0x04d0, 0x04e0, 0x02d0, 0x04f0, 0x0500, 0x02d0, 0x0510, 0x02d0,
- 0x0520, 0x0530, 0x0540, 0x02d0, 0x0510, 0x02d0, 0x0520, 0x0550,
- 0x02d0, 0x02d0, 0x0560, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0,
- 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0570,
- 0x0570, 0x0570, 0x0570, 0x0570, 0x0570, 0x0580, 0x02d0, 0x0590,
+ 0x04e0, 0x04f0, 0x02d0, 0x0500, 0x0510, 0x02d0, 0x0520, 0x02d0,
+ 0x0530, 0x0540, 0x0550, 0x02d0, 0x0520, 0x02d0, 0x0530, 0x0560,
+ 0x02d0, 0x02d0, 0x0570, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0,
+ 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0580,
+ 0x0580, 0x0580, 0x0580, 0x0580, 0x0580, 0x0590, 0x02d0, 0x05a0,
0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0,
0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0,
0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0280, 0x0280, 0x0280,
0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0,
0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280,
- 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05a0, 0x05b0, 0x05c0, 0x0280,
+ 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05b0, 0x05c0, 0x05d0, 0x0280,
0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280,
- 0x05d0, 0x05e0, 0x02d0, 0x05f0, 0x02d0, 0x0600, 0x0610, 0x0280,
- 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0620, 0x0630,
+ 0x05e0, 0x05f0, 0x02d0, 0x0600, 0x02d0, 0x0610, 0x0620, 0x0280,
+ 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0630, 0x0640,
/* values */
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -161,6 +161,8 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] =
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+ 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+ 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000,
0x0001, 0x0003, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c
index db8fd092ea..05737604b8 100644
--- a/dlls/wineps.drv/vertical.c
+++ b/dlls/wineps.drv/vertical.c
@@ -1,10 +1,10 @@
/* Unicode Vertical Orientation */
-/* generated from http://www.unicode.org/Public/vertical/revision-17/VerticalOrientation-17.txt */
+/* generated from http://www.unicode.org/Public/10.0.0/ucd/VerticalOrientation.txt */
/* DO NOT EDIT!! */
#include "wine/unicode.h"
-const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] =
+const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1616] =
{
/* level 1 offsets */
0x0100, 0x0110, 0x0120, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110,
@@ -71,23 +71,23 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] =
0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0480, 0x0490,
0x02d0, 0x04a0, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280,
0x0280, 0x0450, 0x02d0, 0x0280, 0x0280, 0x0470, 0x0280, 0x0280,
- 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x02d0, 0x04c0, 0x02d0,
+ 0x0280, 0x0280, 0x0280, 0x04b0, 0x02d0, 0x04c0, 0x04d0, 0x02d0,
0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280,
0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0,
- 0x04d0, 0x04e0, 0x02d0, 0x04f0, 0x0500, 0x02d0, 0x0510, 0x02d0,
- 0x0520, 0x0530, 0x0540, 0x02d0, 0x0510, 0x02d0, 0x0520, 0x0550,
- 0x02d0, 0x02d0, 0x0560, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0,
- 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0570,
- 0x0570, 0x0570, 0x0570, 0x0570, 0x0570, 0x0580, 0x02d0, 0x0590,
+ 0x04e0, 0x04f0, 0x02d0, 0x0500, 0x0510, 0x02d0, 0x0520, 0x02d0,
+ 0x0530, 0x0540, 0x0550, 0x02d0, 0x0520, 0x02d0, 0x0530, 0x0560,
+ 0x02d0, 0x02d0, 0x0570, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0,
+ 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0580,
+ 0x0580, 0x0580, 0x0580, 0x0580, 0x0580, 0x0590, 0x02d0, 0x05a0,
0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0,
0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0,
0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x02d0, 0x0280, 0x0280, 0x0280,
0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x02d0, 0x02d0,
0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280,
- 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05a0, 0x05b0, 0x05c0, 0x0280,
+ 0x0280, 0x02d0, 0x0280, 0x02d0, 0x05b0, 0x05c0, 0x05d0, 0x0280,
0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280,
- 0x05d0, 0x05e0, 0x02d0, 0x05f0, 0x02d0, 0x0600, 0x0610, 0x0280,
- 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0620, 0x0630,
+ 0x05e0, 0x05f0, 0x02d0, 0x0600, 0x02d0, 0x0610, 0x0620, 0x0280,
+ 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0280, 0x0630, 0x0640,
/* values */
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -161,6 +161,8 @@ const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1600] =
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+ 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
+ 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000,
0x0001, 0x0003, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
diff --git a/tools/make_unicode b/tools/make_unicode
index 5b96cf3594..92b0b64a94 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -26,7 +26,6 @@ my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS";
my $UNIDATA = "http://www.unicode.org/Public/10.0.0/ucd";
my $REPORTS = "http://www.unicode.org/reports";
my $RFCS = "http://www.rfc-editor.org/rfc";
-my $VERTICALDATA = "http://www.unicode.org/Public/vertical/revision-17";
# Sort keys file
my $SORTKEYS = "tr10/allkeys.txt";
@@ -1673,7 +1672,7 @@ sub dump_vertical($)
my $filename = shift;
my @vertical_table;
- my $INPUT = open_data_file( $VERTICALDATA, "VerticalOrientation-17.txt" );
+ my $INPUT = open_data_file( $UNIDATA, "VerticalOrientation.txt" );
while (<$INPUT>)
{
next if /^\#/; # skip comments
@@ -1706,7 +1705,7 @@ sub dump_vertical($)
open OUTPUT,">$filename.new" or die "Cannot create $filename";
print "Building $filename\n";
print OUTPUT "/* Unicode Vertical Orientation */\n";
- print OUTPUT "/* generated from $VERTICALDATA/VerticalOrientation-17.txt */\n";
+ print OUTPUT "/* generated from $UNIDATA/VerticalOrientation.txt */\n";
print OUTPUT "/* DO NOT EDIT!! */\n\n";
print OUTPUT "#include \"wine/unicode.h\"\n\n";
--
2.13.2
More information about the wine-patches
mailing list