Update ucptest maintenance program for Unicode 6.1.0.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@943 2f5784b3-3f2a-0410-8824-cb99058d5e15

3 files changed, 23 insertions, 11 deletions

diff --git a/maint/ucptest.c b/maint/ucptest.c
index 99e256b..82d39a2 100644
--- a/maint/ucptest.c
+++ b/maint/ucptest.c
@@ -18,6 +18,10 @@ one. */
 #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 fulltype = UCD_CHARTYPE(c);
 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 @@ printf("\n");
 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 (fgets(CS buffer, sizeof(buffer), stdin) != NULL)
     {
     while (*s != 0)
       {
-      uschar *endptr;
+      unsigned char *endptr;
       int c = strtoul(CS s, CSS(&endptr), 16);
       print_prop(c);
       s = endptr;
diff --git a/maint/ucptestdata/testinput1 b/maint/ucptestdata/testinput1
index 66916e8..026ad78 100644
--- a/maint/ucptestdata/testinput1
+++ b/maint/ucptestdata/testinput1
@@ -28,3 +28,5 @@ findprop 1d79 a77d
 
 findprop  0800  083e  a4d0  a4f7  aa80  aadf
 findprop 10b00 10b35 13000 1342e 10840 10855
+
+findprop 11100 1113c 11680 116c0
diff --git a/maint/ucptestdata/testoutput1 b/maint/ucptestdata/testoutput1
index 0039b0d..295de9c 100644
--- a/maint/ucptestdata/testoutput1
+++ b/maint/ucptestdata/testoutput1
@@ -177,10 +177,10 @@ findprop a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af
 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 @@ findprop b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf
 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 @@ findprop 10b00 10b35 13000 1342e 10840 10855
 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