Update for Unicode 7.0.0

git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@14 6239d852-aaf2-0410-a92c-79f79f948069

1 files changed, 12 insertions, 6 deletions

diff --git a/maint/MultiStage2.py b/maint/MultiStage2.py
index 726fcb6..5289d67 100755
--- a/maint/MultiStage2.py
+++ b/maint/MultiStage2.py
@@ -33,7 +33,7 @@
 #    removed completely in 2012.
 #  Corrected size calculation
 #  Add #ifndef SUPPORT_UCP to use dummy tables when no UCP support is needed.
-#  Update for PCRE2: name changes and SUPPORT_UCP is abolished.
+#  Update for PCRE2: name changes, and SUPPORT_UCP is abolished.
 #
 # Major modifications made to this script:
 #  Added code to add a grapheme break property field to records.
@@ -119,6 +119,7 @@
 # 30-September-2012: Added RegionalIndicator break property from Unicode 6.2.0
 # 13-May-2014:       Updated for PCRE2
 # 03-June-2014:      Updated for Python 3
+# 20-June-2014:      Updated for Unicode 7.0.0
 ##############################################################################
 
 
@@ -310,7 +311,12 @@ script_names = ['Arabic', 'Armenian', 'Bengali', 'Bopomofo', 'Braille', 'Bugines
 # New for Unicode 6.0.0
  'Batak', 'Brahmi', 'Mandaic', \
 # New for Unicode 6.1.0
- 'Chakma', 'Meroitic_Cursive', 'Meroitic_Hieroglyphs', 'Miao', 'Sharada', 'Sora_Sompeng', 'Takri'
+ 'Chakma', 'Meroitic_Cursive', 'Meroitic_Hieroglyphs', 'Miao', 'Sharada', 'Sora_Sompeng', 'Takri',
+# New for Unicode 7.0.0
+ 'Bassa_Vah', 'Caucasian_Albanian', 'Duployan', 'Elbasan', 'Grantha', 'Khojki', 'Khudawadi',
+ 'Linear_A', 'Mahajani', 'Manichaean', 'Mende_Kikakui', 'Modi', 'Mro', 'Nabataean',
+ 'Old_North_Arabian', 'Old_Permic', 'Pahawh_Hmong', 'Palmyrene', 'Psalter_Pahlavi',
+ 'Pau_Cin_Hau', 'Siddham', 'Tirhuta', 'Warang_Citi'
  ]
  
 category_names = ['Cc', 'Cf', 'Cn', 'Co', 'Cs', 'Ll', 'Lm', 'Lo', 'Lt', 'Lu',
@@ -427,7 +433,7 @@ print("table names from _pcre2_xxx to xxxx, thereby avoiding name clashes")
 print("with the library. At present, just one of these tables is actually")
 print("needed. */")
 print()
-print("#ifndef PCRE2_INCLUDED")
+print("#ifndef PCRE2_PCRE2TEST")
 print()
 print("#ifdef HAVE_CONFIG_H")
 print("#include \"config.h\"")
@@ -435,7 +441,7 @@ print("#endif")
 print()
 print("#include \"pcre2_internal.h\"")
 print()
-print("#endif /* PCRE2_INCLUDED */")
+print("#endif /* PCRE2_PCRE2TEST */")
 print()
 print("/* Unicode character database. */")
 print("/* This file was autogenerated by the MultiStage2.py script. */")
@@ -476,7 +482,7 @@ print()
 
 print("/* When #included in pcre2test, we don't need this large table. */")
 print()
-print("#ifndef PCRE2_INCLUDED")
+print("#ifndef PCRE2_PCRE2TEST")
 print()
 print_records(records, record_size)
 print_table(min_stage1, 'PRIV(ucd_stage1)')
@@ -486,7 +492,7 @@ print("#error Please correct UCD_BLOCK_SIZE in pcre2_internal.h")
 print("#endif")
 print("#endif  /* SUPPORT_UTF */")
 print()
-print("#endif  /* PCRE2_INCLUDED */")
+print("#endif  /* PCRE2_PCRE2TEST */")
 
 """