Revision: 943
http://vcs.pcre.org/viewvc?view=rev&revision=943
Author: ph10
Date: 2012-02-28 15:02:51 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Update ucptest maintenance program for Unicode 6.1.0.
Modified Paths:
--------------
code/trunk/maint/ucptest.c
code/trunk/maint/ucptestdata/testinput1
code/trunk/maint/ucptestdata/testoutput1
Modified: code/trunk/maint/ucptest.c
===================================================================
--- code/trunk/maint/ucptest.c 2012-02-28 14:50:31 UTC (rev 942)
+++ code/trunk/maint/ucptest.c 2012-02-28 15:02:51 UTC (rev 943)
@@ -18,6 +18,10 @@
#include "../config.h"
#endif
+#ifndef SUPPORT_UCP
+#define SUPPORT_UCP
+#endif
+
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
@@ -52,9 +56,9 @@
int script = UCD_SCRIPT(c);
int othercase = UCD_OTHERCASE(c);
-uschar *fulltypename = US"??";
-uschar *typename = US"??";
-uschar *scriptname = US"??";
+unsigned char *fulltypename = US"??";
+unsigned char *typename = US"??";
+unsigned char *scriptname = US"??";
switch (type)
{
@@ -227,11 +231,11 @@
int
main(void)
{
-uschar buffer[1024];
+unsigned char buffer[1024];
while (fgets(CS buffer, sizeof(buffer), stdin) != NULL)
{
- uschar name[24];
- uschar *s, *t;
+ unsigned char name[24];
+ unsigned char *s, *t;
printf("%s", buffer);
s = buffer;
@@ -246,7 +250,7 @@
{
while (*s != 0)
{
- uschar *endptr;
+ unsigned char *endptr;
int c = strtoul(CS s, CSS(&endptr), 16);
print_prop(c);
s = endptr;
Modified: code/trunk/maint/ucptestdata/testinput1
===================================================================
--- code/trunk/maint/ucptestdata/testinput1 2012-02-28 14:50:31 UTC (rev 942)
+++ code/trunk/maint/ucptestdata/testinput1 2012-02-28 15:02:51 UTC (rev 943)
@@ -28,3 +28,5 @@
findprop 0800 083e a4d0 a4f7 aa80 aadf
findprop 10b00 10b35 13000 1342e 10840 10855
+
+findprop 11100 1113c 11680 116c0
Modified: code/trunk/maint/ucptestdata/testoutput1
===================================================================
--- code/trunk/maint/ucptestdata/testoutput1 2012-02-28 14:50:31 UTC (rev 942)
+++ code/trunk/maint/ucptestdata/testoutput1 2012-02-28 15:02:51 UTC (rev 943)
@@ -177,10 +177,10 @@
00a4 Symbol: Currency symbol Common
00a5 Symbol: Currency symbol Common
00a6 Symbol: Other symbol Common
-00a7 Symbol: Other symbol Common
+00a7 Punctuation: Other punctuation Common
00a8 Symbol: Modifier symbol Common
00a9 Symbol: Other symbol Common
-00aa Letter: Lower case letter Latin
+00aa Letter: Other letter Latin
00ab Punctuation: Initial punctuation Common
00ac Symbol: Mathematical symbol Common
00ad Control: Format Common
@@ -193,11 +193,11 @@
00b3 Number: Other number Common
00b4 Symbol: Modifier symbol Common
00b5 Letter: Lower case letter Common 039c
-00b6 Symbol: Other symbol Common
+00b6 Punctuation: Other punctuation Common
00b7 Punctuation: Other punctuation Common
00b8 Symbol: Modifier symbol Common
00b9 Number: Other number Common
-00ba Letter: Lower case letter Latin
+00ba Letter: Other letter Latin
00bb Punctuation: Final punctuation Common
00bc Number: Other number Common
00bd Number: Other number Common
@@ -339,3 +339,9 @@
1342e Letter: Other letter Egyptian_Hieroglyphs
10840 Letter: Other letter Imperial_Aramaic
10855 Letter: Other letter Imperial_Aramaic
+
+findprop 11100 1113c 11680 116c0
+11100 Mark: Non-spacing mark Chakma
+1113c Number: Decimal number Chakma
+11680 Letter: Other letter Takri
+116c0 Number: Decimal number Takri
