Module: wine Branch: master Commit: ebbbe85038a6fcaf8d0f24dd3f66d40af3c8d954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbbe85038a6fcaf8d0f24dd3f...
Author: Jens Reyer jre.winesim@gmail.com Date: Sat Jul 8 15:45:51 2017 +0200
make_unicode: Use VerticalOrientation.txt from UCD.
Signed-off-by: Jens Reyer jre.winesim@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 33309f9..0573760 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-15/VerticalOrientation-15.tx... */ +/* 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 33309f9..0573760 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-15/VerticalOrientation-15.tx... */ +/* 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 059c751..92b0b64 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-15";
# 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-15.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-15.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";