unicode database compression, step 2:

- fixed attributions
- moved decomposition data to a separate table, in preparation
  for step 3 (which won't happen before 2.0 final, promise!)
- use relative paths in the generator script

I have a lot more stuff in the works for 2.1, but let's leave
that for another day...

1 files changed, 6 insertions, 6 deletions

diff --git a/Modules/unicodedatabase.h b/Modules/unicodedatabase.h
index adba9ca..1c92e04 100644
--- a/Modules/unicodedatabase.h
+++ b/Modules/unicodedatabase.h
@@ -4,9 +4,10 @@
 
    Data was extracted from the Unicode 3.0 UnicodeData.txt file.
 
-Written by Marc-Andre Lemburg (mal@lemburg.com).
+   Written by Marc-Andre Lemburg (mal@lemburg.com).
+   Modified for Python 2.0 by Fredrik Lundh (fredrik@pythonware.com)
 
-Copyright (c) Corporation for National Research Initiatives.
+   Copyright (c) Corporation for National Research Initiatives.
 
    ------------------------------------------------------------------------ */
 
@@ -19,15 +20,14 @@ typedef struct {
     const unsigned char	bidirectional; 	/* index into
 					   _PyUnicode_BidirectionalNames */
     const unsigned char mirrored;	/* true if mirrored in bidir mode */
-    const char *decomposition;		/* pointer to the decomposition
-					   string or NULL */
 } _PyUnicode_DatabaseRecord;
 
 /* --- Unicode category names --------------------------------------------- */
 
-extern const char *_PyUnicode_CategoryNames[32];
-extern const char *_PyUnicode_BidirectionalNames[21];
+extern const char *_PyUnicode_CategoryNames[];
+extern const char *_PyUnicode_BidirectionalNames[];
 
 /* --- Unicode Database --------------------------------------------------- */
 
 extern const _PyUnicode_DatabaseRecord *_PyUnicode_Database_GetRecord(int ch);
+extern const char *_PyUnicode_Database_GetDecomposition(int ch);