fixed missing '-' in block names, enhanced the hack for ABI aliasing.

* genUnicode.py, xmlunicode.c, include/libxml/xmlunicode.h:
  fixed missing '-' in block names, enhanced the hack for
  ABI aliasing.
diff --git a/xmlunicode.c b/xmlunicode.c
index 796edf2..4667636 100644
--- a/xmlunicode.c
+++ b/xmlunicode.c
@@ -6,7 +6,7 @@
  * http://www.unicode.org/Public/4.0-Update1/UCD-4.0.1d5b.html
  * using the genUnicode.py Python script.
  *
- * Generation date: Sun Nov  9 20:13:11 2003
+ * Generation date: Mon Nov 10 22:35:10 2003
  * Sources: Blocks-4.0.1d1b.txt UnicodeData-4.0.1d1b.txt
  * Daniel Veillard <veillard@redhat.com>
  */
@@ -40,8 +40,8 @@
   {"AegeanNumbers", xmlUCSIsAegeanNumbers},
   {"AlphabeticPresentationForms", xmlUCSIsAlphabeticPresentationForms},
   {"Arabic", xmlUCSIsArabic},
-  {"ArabicPresentationFormsA", xmlUCSIsArabicPresentationFormsA},
-  {"ArabicPresentationFormsB", xmlUCSIsArabicPresentationFormsB},
+  {"ArabicPresentationForms-A", xmlUCSIsArabicPresentationFormsA},
+  {"ArabicPresentationForms-B", xmlUCSIsArabicPresentationFormsB},
   {"Armenian", xmlUCSIsArmenian},
   {"Arrows", xmlUCSIsArrows},
   {"BasicLatin", xmlUCSIsBasicLatin},
@@ -106,9 +106,9 @@
   {"Khmer", xmlUCSIsKhmer},
   {"KhmerSymbols", xmlUCSIsKhmerSymbols},
   {"Lao", xmlUCSIsLao},
-  {"Latin1Supplement", xmlUCSIsLatin1Supplement},
-  {"LatinExtendedA", xmlUCSIsLatinExtendedA},
-  {"LatinExtendedB", xmlUCSIsLatinExtendedB},
+  {"Latin-1Supplement", xmlUCSIsLatin1Supplement},
+  {"LatinExtended-A", xmlUCSIsLatinExtendedA},
+  {"LatinExtended-B", xmlUCSIsLatinExtendedB},
   {"LatinExtendedAdditional", xmlUCSIsLatinExtendedAdditional},
   {"LetterlikeSymbols", xmlUCSIsLetterlikeSymbols},
   {"Limbu", xmlUCSIsLimbu},
@@ -118,8 +118,8 @@
   {"Malayalam", xmlUCSIsMalayalam},
   {"MathematicalAlphanumericSymbols", xmlUCSIsMathematicalAlphanumericSymbols},
   {"MathematicalOperators", xmlUCSIsMathematicalOperators},
-  {"MiscellaneousMathematicalSymbolsA", xmlUCSIsMiscellaneousMathematicalSymbolsA},
-  {"MiscellaneousMathematicalSymbolsB", xmlUCSIsMiscellaneousMathematicalSymbolsB},
+  {"MiscellaneousMathematicalSymbols-A", xmlUCSIsMiscellaneousMathematicalSymbolsA},
+  {"MiscellaneousMathematicalSymbols-B", xmlUCSIsMiscellaneousMathematicalSymbolsB},
   {"MiscellaneousSymbols", xmlUCSIsMiscellaneousSymbols},
   {"MiscellaneousSymbolsandArrows", xmlUCSIsMiscellaneousSymbolsandArrows},
   {"MiscellaneousTechnical", xmlUCSIsMiscellaneousTechnical},
@@ -142,11 +142,11 @@
   {"SpacingModifierLetters", xmlUCSIsSpacingModifierLetters},
   {"Specials", xmlUCSIsSpecials},
   {"SuperscriptsandSubscripts", xmlUCSIsSuperscriptsandSubscripts},
-  {"SupplementalArrowsA", xmlUCSIsSupplementalArrowsA},
-  {"SupplementalArrowsB", xmlUCSIsSupplementalArrowsB},
+  {"SupplementalArrows-A", xmlUCSIsSupplementalArrowsA},
+  {"SupplementalArrows-B", xmlUCSIsSupplementalArrowsB},
   {"SupplementalMathematicalOperators", xmlUCSIsSupplementalMathematicalOperators},
-  {"SupplementaryPrivateUseAreaA", xmlUCSIsSupplementaryPrivateUseAreaA},
-  {"SupplementaryPrivateUseAreaB", xmlUCSIsSupplementaryPrivateUseAreaB},
+  {"SupplementaryPrivateUseArea-A", xmlUCSIsSupplementaryPrivateUseAreaA},
+  {"SupplementaryPrivateUseArea-B", xmlUCSIsSupplementaryPrivateUseAreaB},
   {"Syriac", xmlUCSIsSyriac},
   {"Tagalog", xmlUCSIsTagalog},
   {"Tagbanwa", xmlUCSIsTagbanwa},
@@ -968,7 +968,7 @@
  */
 int
 xmlUCSIsAegeanNumbers(int code) {
-    return((code >= 0x10100) && (code <= 0x1013F));
+    return(((code >= 0x10100) && (code <= 0x1013F)));
 }
 
 /**
@@ -981,7 +981,7 @@
  */
 int
 xmlUCSIsAlphabeticPresentationForms(int code) {
-    return((code >= 0xFB00) && (code <= 0xFB4F));
+    return(((code >= 0xFB00) && (code <= 0xFB4F)));
 }
 
 /**
@@ -994,7 +994,7 @@
  */
 int
 xmlUCSIsArabic(int code) {
-    return((code >= 0x0600) && (code <= 0x06FF));
+    return(((code >= 0x0600) && (code <= 0x06FF)));
 }
 
 /**
@@ -1007,7 +1007,7 @@
  */
 int
 xmlUCSIsArabicPresentationFormsA(int code) {
-    return((code >= 0xFB50) && (code <= 0xFDFF));
+    return(((code >= 0xFB50) && (code <= 0xFDFF)));
 }
 
 /**
@@ -1020,7 +1020,7 @@
  */
 int
 xmlUCSIsArabicPresentationFormsB(int code) {
-    return((code >= 0xFE70) && (code <= 0xFEFF));
+    return(((code >= 0xFE70) && (code <= 0xFEFF)));
 }
 
 /**
@@ -1033,7 +1033,7 @@
  */
 int
 xmlUCSIsArmenian(int code) {
-    return((code >= 0x0530) && (code <= 0x058F));
+    return(((code >= 0x0530) && (code <= 0x058F)));
 }
 
 /**
@@ -1046,7 +1046,7 @@
  */
 int
 xmlUCSIsArrows(int code) {
-    return((code >= 0x2190) && (code <= 0x21FF));
+    return(((code >= 0x2190) && (code <= 0x21FF)));
 }
 
 /**
@@ -1059,7 +1059,7 @@
  */
 int
 xmlUCSIsBasicLatin(int code) {
-    return((code >= 0x0000) && (code <= 0x007F));
+    return(((code >= 0x0000) && (code <= 0x007F)));
 }
 
 /**
@@ -1072,7 +1072,7 @@
  */
 int
 xmlUCSIsBengali(int code) {
-    return((code >= 0x0980) && (code <= 0x09FF));
+    return(((code >= 0x0980) && (code <= 0x09FF)));
 }
 
 /**
@@ -1085,7 +1085,7 @@
  */
 int
 xmlUCSIsBlockElements(int code) {
-    return((code >= 0x2580) && (code <= 0x259F));
+    return(((code >= 0x2580) && (code <= 0x259F)));
 }
 
 /**
@@ -1098,7 +1098,7 @@
  */
 int
 xmlUCSIsBopomofo(int code) {
-    return((code >= 0x3100) && (code <= 0x312F));
+    return(((code >= 0x3100) && (code <= 0x312F)));
 }
 
 /**
@@ -1111,7 +1111,7 @@
  */
 int
 xmlUCSIsBopomofoExtended(int code) {
-    return((code >= 0x31A0) && (code <= 0x31BF));
+    return(((code >= 0x31A0) && (code <= 0x31BF)));
 }
 
 /**
@@ -1124,7 +1124,7 @@
  */
 int
 xmlUCSIsBoxDrawing(int code) {
-    return((code >= 0x2500) && (code <= 0x257F));
+    return(((code >= 0x2500) && (code <= 0x257F)));
 }
 
 /**
@@ -1137,7 +1137,7 @@
  */
 int
 xmlUCSIsBraillePatterns(int code) {
-    return((code >= 0x2800) && (code <= 0x28FF));
+    return(((code >= 0x2800) && (code <= 0x28FF)));
 }
 
 /**
@@ -1150,7 +1150,7 @@
  */
 int
 xmlUCSIsBuhid(int code) {
-    return((code >= 0x1740) && (code <= 0x175F));
+    return(((code >= 0x1740) && (code <= 0x175F)));
 }
 
 /**
@@ -1163,7 +1163,7 @@
  */
 int
 xmlUCSIsByzantineMusicalSymbols(int code) {
-    return((code >= 0x1D000) && (code <= 0x1D0FF));
+    return(((code >= 0x1D000) && (code <= 0x1D0FF)));
 }
 
 /**
@@ -1176,7 +1176,7 @@
  */
 int
 xmlUCSIsCJKCompatibility(int code) {
-    return((code >= 0x3300) && (code <= 0x33FF));
+    return(((code >= 0x3300) && (code <= 0x33FF)));
 }
 
 /**
@@ -1189,7 +1189,7 @@
  */
 int
 xmlUCSIsCJKCompatibilityForms(int code) {
-    return((code >= 0xFE30) && (code <= 0xFE4F));
+    return(((code >= 0xFE30) && (code <= 0xFE4F)));
 }
 
 /**
@@ -1202,7 +1202,7 @@
  */
 int
 xmlUCSIsCJKCompatibilityIdeographs(int code) {
-    return((code >= 0xF900) && (code <= 0xFAFF));
+    return(((code >= 0xF900) && (code <= 0xFAFF)));
 }
 
 /**
@@ -1215,7 +1215,7 @@
  */
 int
 xmlUCSIsCJKCompatibilityIdeographsSupplement(int code) {
-    return((code >= 0x2F800) && (code <= 0x2FA1F));
+    return(((code >= 0x2F800) && (code <= 0x2FA1F)));
 }
 
 /**
@@ -1228,7 +1228,7 @@
  */
 int
 xmlUCSIsCJKRadicalsSupplement(int code) {
-    return((code >= 0x2E80) && (code <= 0x2EFF));
+    return(((code >= 0x2E80) && (code <= 0x2EFF)));
 }
 
 /**
@@ -1241,7 +1241,7 @@
  */
 int
 xmlUCSIsCJKSymbolsandPunctuation(int code) {
-    return((code >= 0x3000) && (code <= 0x303F));
+    return(((code >= 0x3000) && (code <= 0x303F)));
 }
 
 /**
@@ -1254,7 +1254,7 @@
  */
 int
 xmlUCSIsCJKUnifiedIdeographs(int code) {
-    return((code >= 0x4E00) && (code <= 0x9FFF));
+    return(((code >= 0x4E00) && (code <= 0x9FFF)));
 }
 
 /**
@@ -1267,7 +1267,7 @@
  */
 int
 xmlUCSIsCJKUnifiedIdeographsExtensionA(int code) {
-    return((code >= 0x3400) && (code <= 0x4DBF));
+    return(((code >= 0x3400) && (code <= 0x4DBF)));
 }
 
 /**
@@ -1280,7 +1280,7 @@
  */
 int
 xmlUCSIsCJKUnifiedIdeographsExtensionB(int code) {
-    return((code >= 0x20000) && (code <= 0x2A6DF));
+    return(((code >= 0x20000) && (code <= 0x2A6DF)));
 }
 
 /**
@@ -1293,7 +1293,7 @@
  */
 int
 xmlUCSIsCherokee(int code) {
-    return((code >= 0x13A0) && (code <= 0x13FF));
+    return(((code >= 0x13A0) && (code <= 0x13FF)));
 }
 
 /**
@@ -1306,7 +1306,7 @@
  */
 int
 xmlUCSIsCombiningDiacriticalMarks(int code) {
-    return((code >= 0x0300) && (code <= 0x036F));
+    return(((code >= 0x0300) && (code <= 0x036F)));
 }
 
 /**
@@ -1319,7 +1319,7 @@
  */
 int
 xmlUCSIsCombiningDiacriticalMarksforSymbols(int code) {
-    return((code >= 0x20D0) && (code <= 0x20FF));
+    return(((code >= 0x20D0) && (code <= 0x20FF)));
 }
 
 /**
@@ -1332,7 +1332,20 @@
  */
 int
 xmlUCSIsCombiningHalfMarks(int code) {
-    return((code >= 0xFE20) && (code <= 0xFE2F));
+    return(((code >= 0xFE20) && (code <= 0xFE2F)));
+}
+
+/**
+ * xmlUCSIsCombiningMarksforSymbols:
+ * @code: UCS code point
+ *
+ * Check whether the character is part of CombiningMarksforSymbols UCS Block
+ *
+ * Returns 1 if true 0 otherwise
+ */
+int
+xmlUCSIsCombiningMarksforSymbols(int code) {
+    return(((code >= 0x20D0) && (code <= 0x20FF)));
 }
 
 /**
@@ -1345,7 +1358,7 @@
  */
 int
 xmlUCSIsControlPictures(int code) {
-    return((code >= 0x2400) && (code <= 0x243F));
+    return(((code >= 0x2400) && (code <= 0x243F)));
 }
 
 /**
@@ -1358,7 +1371,7 @@
  */
 int
 xmlUCSIsCurrencySymbols(int code) {
-    return((code >= 0x20A0) && (code <= 0x20CF));
+    return(((code >= 0x20A0) && (code <= 0x20CF)));
 }
 
 /**
@@ -1371,7 +1384,7 @@
  */
 int
 xmlUCSIsCypriotSyllabary(int code) {
-    return((code >= 0x10800) && (code <= 0x1083F));
+    return(((code >= 0x10800) && (code <= 0x1083F)));
 }
 
 /**
@@ -1384,7 +1397,7 @@
  */
 int
 xmlUCSIsCyrillic(int code) {
-    return((code >= 0x0400) && (code <= 0x04FF));
+    return(((code >= 0x0400) && (code <= 0x04FF)));
 }
 
 /**
@@ -1397,7 +1410,7 @@
  */
 int
 xmlUCSIsCyrillicSupplement(int code) {
-    return((code >= 0x0500) && (code <= 0x052F));
+    return(((code >= 0x0500) && (code <= 0x052F)));
 }
 
 /**
@@ -1410,7 +1423,7 @@
  */
 int
 xmlUCSIsDeseret(int code) {
-    return((code >= 0x10400) && (code <= 0x1044F));
+    return(((code >= 0x10400) && (code <= 0x1044F)));
 }
 
 /**
@@ -1423,7 +1436,7 @@
  */
 int
 xmlUCSIsDevanagari(int code) {
-    return((code >= 0x0900) && (code <= 0x097F));
+    return(((code >= 0x0900) && (code <= 0x097F)));
 }
 
 /**
@@ -1436,7 +1449,7 @@
  */
 int
 xmlUCSIsDingbats(int code) {
-    return((code >= 0x2700) && (code <= 0x27BF));
+    return(((code >= 0x2700) && (code <= 0x27BF)));
 }
 
 /**
@@ -1449,7 +1462,7 @@
  */
 int
 xmlUCSIsEnclosedAlphanumerics(int code) {
-    return((code >= 0x2460) && (code <= 0x24FF));
+    return(((code >= 0x2460) && (code <= 0x24FF)));
 }
 
 /**
@@ -1462,7 +1475,7 @@
  */
 int
 xmlUCSIsEnclosedCJKLettersandMonths(int code) {
-    return((code >= 0x3200) && (code <= 0x32FF));
+    return(((code >= 0x3200) && (code <= 0x32FF)));
 }
 
 /**
@@ -1475,7 +1488,7 @@
  */
 int
 xmlUCSIsEthiopic(int code) {
-    return((code >= 0x1200) && (code <= 0x137F));
+    return(((code >= 0x1200) && (code <= 0x137F)));
 }
 
 /**
@@ -1488,7 +1501,7 @@
  */
 int
 xmlUCSIsGeneralPunctuation(int code) {
-    return((code >= 0x2000) && (code <= 0x206F));
+    return(((code >= 0x2000) && (code <= 0x206F)));
 }
 
 /**
@@ -1501,7 +1514,7 @@
  */
 int
 xmlUCSIsGeometricShapes(int code) {
-    return((code >= 0x25A0) && (code <= 0x25FF));
+    return(((code >= 0x25A0) && (code <= 0x25FF)));
 }
 
 /**
@@ -1514,7 +1527,7 @@
  */
 int
 xmlUCSIsGeorgian(int code) {
-    return((code >= 0x10A0) && (code <= 0x10FF));
+    return(((code >= 0x10A0) && (code <= 0x10FF)));
 }
 
 /**
@@ -1527,7 +1540,20 @@
  */
 int
 xmlUCSIsGothic(int code) {
-    return((code >= 0x10330) && (code <= 0x1034F));
+    return(((code >= 0x10330) && (code <= 0x1034F)));
+}
+
+/**
+ * xmlUCSIsGreek:
+ * @code: UCS code point
+ *
+ * Check whether the character is part of Greek UCS Block
+ *
+ * Returns 1 if true 0 otherwise
+ */
+int
+xmlUCSIsGreek(int code) {
+    return(((code >= 0x0370) && (code <= 0x03FF)));
 }
 
 /**
@@ -1540,7 +1566,7 @@
  */
 int
 xmlUCSIsGreekExtended(int code) {
-    return((code >= 0x1F00) && (code <= 0x1FFF));
+    return(((code >= 0x1F00) && (code <= 0x1FFF)));
 }
 
 /**
@@ -1553,7 +1579,7 @@
  */
 int
 xmlUCSIsGreekandCoptic(int code) {
-    return((code >= 0x0370) && (code <= 0x03FF));
+    return(((code >= 0x0370) && (code <= 0x03FF)));
 }
 
 /**
@@ -1566,7 +1592,7 @@
  */
 int
 xmlUCSIsGujarati(int code) {
-    return((code >= 0x0A80) && (code <= 0x0AFF));
+    return(((code >= 0x0A80) && (code <= 0x0AFF)));
 }
 
 /**
@@ -1579,7 +1605,7 @@
  */
 int
 xmlUCSIsGurmukhi(int code) {
-    return((code >= 0x0A00) && (code <= 0x0A7F));
+    return(((code >= 0x0A00) && (code <= 0x0A7F)));
 }
 
 /**
@@ -1592,7 +1618,7 @@
  */
 int
 xmlUCSIsHalfwidthandFullwidthForms(int code) {
-    return((code >= 0xFF00) && (code <= 0xFFEF));
+    return(((code >= 0xFF00) && (code <= 0xFFEF)));
 }
 
 /**
@@ -1605,7 +1631,7 @@
  */
 int
 xmlUCSIsHangulCompatibilityJamo(int code) {
-    return((code >= 0x3130) && (code <= 0x318F));
+    return(((code >= 0x3130) && (code <= 0x318F)));
 }
 
 /**
@@ -1618,7 +1644,7 @@
  */
 int
 xmlUCSIsHangulJamo(int code) {
-    return((code >= 0x1100) && (code <= 0x11FF));
+    return(((code >= 0x1100) && (code <= 0x11FF)));
 }
 
 /**
@@ -1631,7 +1657,7 @@
  */
 int
 xmlUCSIsHangulSyllables(int code) {
-    return((code >= 0xAC00) && (code <= 0xD7AF));
+    return(((code >= 0xAC00) && (code <= 0xD7AF)));
 }
 
 /**
@@ -1644,7 +1670,7 @@
  */
 int
 xmlUCSIsHanunoo(int code) {
-    return((code >= 0x1720) && (code <= 0x173F));
+    return(((code >= 0x1720) && (code <= 0x173F)));
 }
 
 /**
@@ -1657,7 +1683,7 @@
  */
 int
 xmlUCSIsHebrew(int code) {
-    return((code >= 0x0590) && (code <= 0x05FF));
+    return(((code >= 0x0590) && (code <= 0x05FF)));
 }
 
 /**
@@ -1670,7 +1696,7 @@
  */
 int
 xmlUCSIsHighPrivateUseSurrogates(int code) {
-    return((code >= 0xDB80) && (code <= 0xDBFF));
+    return(((code >= 0xDB80) && (code <= 0xDBFF)));
 }
 
 /**
@@ -1683,7 +1709,7 @@
  */
 int
 xmlUCSIsHighSurrogates(int code) {
-    return((code >= 0xD800) && (code <= 0xDB7F));
+    return(((code >= 0xD800) && (code <= 0xDB7F)));
 }
 
 /**
@@ -1696,7 +1722,7 @@
  */
 int
 xmlUCSIsHiragana(int code) {
-    return((code >= 0x3040) && (code <= 0x309F));
+    return(((code >= 0x3040) && (code <= 0x309F)));
 }
 
 /**
@@ -1709,7 +1735,7 @@
  */
 int
 xmlUCSIsIPAExtensions(int code) {
-    return((code >= 0x0250) && (code <= 0x02AF));
+    return(((code >= 0x0250) && (code <= 0x02AF)));
 }
 
 /**
@@ -1722,7 +1748,7 @@
  */
 int
 xmlUCSIsIdeographicDescriptionCharacters(int code) {
-    return((code >= 0x2FF0) && (code <= 0x2FFF));
+    return(((code >= 0x2FF0) && (code <= 0x2FFF)));
 }
 
 /**
@@ -1735,7 +1761,7 @@
  */
 int
 xmlUCSIsKanbun(int code) {
-    return((code >= 0x3190) && (code <= 0x319F));
+    return(((code >= 0x3190) && (code <= 0x319F)));
 }
 
 /**
@@ -1748,7 +1774,7 @@
  */
 int
 xmlUCSIsKangxiRadicals(int code) {
-    return((code >= 0x2F00) && (code <= 0x2FDF));
+    return(((code >= 0x2F00) && (code <= 0x2FDF)));
 }
 
 /**
@@ -1761,7 +1787,7 @@
  */
 int
 xmlUCSIsKannada(int code) {
-    return((code >= 0x0C80) && (code <= 0x0CFF));
+    return(((code >= 0x0C80) && (code <= 0x0CFF)));
 }
 
 /**
@@ -1774,7 +1800,7 @@
  */
 int
 xmlUCSIsKatakana(int code) {
-    return((code >= 0x30A0) && (code <= 0x30FF));
+    return(((code >= 0x30A0) && (code <= 0x30FF)));
 }
 
 /**
@@ -1787,7 +1813,7 @@
  */
 int
 xmlUCSIsKatakanaPhoneticExtensions(int code) {
-    return((code >= 0x31F0) && (code <= 0x31FF));
+    return(((code >= 0x31F0) && (code <= 0x31FF)));
 }
 
 /**
@@ -1800,7 +1826,7 @@
  */
 int
 xmlUCSIsKhmer(int code) {
-    return((code >= 0x1780) && (code <= 0x17FF));
+    return(((code >= 0x1780) && (code <= 0x17FF)));
 }
 
 /**
@@ -1813,7 +1839,7 @@
  */
 int
 xmlUCSIsKhmerSymbols(int code) {
-    return((code >= 0x19E0) && (code <= 0x19FF));
+    return(((code >= 0x19E0) && (code <= 0x19FF)));
 }
 
 /**
@@ -1826,7 +1852,7 @@
  */
 int
 xmlUCSIsLao(int code) {
-    return((code >= 0x0E80) && (code <= 0x0EFF));
+    return(((code >= 0x0E80) && (code <= 0x0EFF)));
 }
 
 /**
@@ -1839,7 +1865,7 @@
  */
 int
 xmlUCSIsLatin1Supplement(int code) {
-    return((code >= 0x0080) && (code <= 0x00FF));
+    return(((code >= 0x0080) && (code <= 0x00FF)));
 }
 
 /**
@@ -1852,7 +1878,7 @@
  */
 int
 xmlUCSIsLatinExtendedA(int code) {
-    return((code >= 0x0100) && (code <= 0x017F));
+    return(((code >= 0x0100) && (code <= 0x017F)));
 }
 
 /**
@@ -1865,7 +1891,7 @@
  */
 int
 xmlUCSIsLatinExtendedB(int code) {
-    return((code >= 0x0180) && (code <= 0x024F));
+    return(((code >= 0x0180) && (code <= 0x024F)));
 }
 
 /**
@@ -1878,7 +1904,7 @@
  */
 int
 xmlUCSIsLatinExtendedAdditional(int code) {
-    return((code >= 0x1E00) && (code <= 0x1EFF));
+    return(((code >= 0x1E00) && (code <= 0x1EFF)));
 }
 
 /**
@@ -1891,7 +1917,7 @@
  */
 int
 xmlUCSIsLetterlikeSymbols(int code) {
-    return((code >= 0x2100) && (code <= 0x214F));
+    return(((code >= 0x2100) && (code <= 0x214F)));
 }
 
 /**
@@ -1904,7 +1930,7 @@
  */
 int
 xmlUCSIsLimbu(int code) {
-    return((code >= 0x1900) && (code <= 0x194F));
+    return(((code >= 0x1900) && (code <= 0x194F)));
 }
 
 /**
@@ -1917,7 +1943,7 @@
  */
 int
 xmlUCSIsLinearBIdeograms(int code) {
-    return((code >= 0x10080) && (code <= 0x100FF));
+    return(((code >= 0x10080) && (code <= 0x100FF)));
 }
 
 /**
@@ -1930,7 +1956,7 @@
  */
 int
 xmlUCSIsLinearBSyllabary(int code) {
-    return((code >= 0x10000) && (code <= 0x1007F));
+    return(((code >= 0x10000) && (code <= 0x1007F)));
 }
 
 /**
@@ -1943,7 +1969,7 @@
  */
 int
 xmlUCSIsLowSurrogates(int code) {
-    return((code >= 0xDC00) && (code <= 0xDFFF));
+    return(((code >= 0xDC00) && (code <= 0xDFFF)));
 }
 
 /**
@@ -1956,7 +1982,7 @@
  */
 int
 xmlUCSIsMalayalam(int code) {
-    return((code >= 0x0D00) && (code <= 0x0D7F));
+    return(((code >= 0x0D00) && (code <= 0x0D7F)));
 }
 
 /**
@@ -1969,7 +1995,7 @@
  */
 int
 xmlUCSIsMathematicalAlphanumericSymbols(int code) {
-    return((code >= 0x1D400) && (code <= 0x1D7FF));
+    return(((code >= 0x1D400) && (code <= 0x1D7FF)));
 }
 
 /**
@@ -1982,7 +2008,7 @@
  */
 int
 xmlUCSIsMathematicalOperators(int code) {
-    return((code >= 0x2200) && (code <= 0x22FF));
+    return(((code >= 0x2200) && (code <= 0x22FF)));
 }
 
 /**
@@ -1995,7 +2021,7 @@
  */
 int
 xmlUCSIsMiscellaneousMathematicalSymbolsA(int code) {
-    return((code >= 0x27C0) && (code <= 0x27EF));
+    return(((code >= 0x27C0) && (code <= 0x27EF)));
 }
 
 /**
@@ -2008,7 +2034,7 @@
  */
 int
 xmlUCSIsMiscellaneousMathematicalSymbolsB(int code) {
-    return((code >= 0x2980) && (code <= 0x29FF));
+    return(((code >= 0x2980) && (code <= 0x29FF)));
 }
 
 /**
@@ -2021,7 +2047,7 @@
  */
 int
 xmlUCSIsMiscellaneousSymbols(int code) {
-    return((code >= 0x2600) && (code <= 0x26FF));
+    return(((code >= 0x2600) && (code <= 0x26FF)));
 }
 
 /**
@@ -2034,7 +2060,7 @@
  */
 int
 xmlUCSIsMiscellaneousSymbolsandArrows(int code) {
-    return((code >= 0x2B00) && (code <= 0x2BFF));
+    return(((code >= 0x2B00) && (code <= 0x2BFF)));
 }
 
 /**
@@ -2047,7 +2073,7 @@
  */
 int
 xmlUCSIsMiscellaneousTechnical(int code) {
-    return((code >= 0x2300) && (code <= 0x23FF));
+    return(((code >= 0x2300) && (code <= 0x23FF)));
 }
 
 /**
@@ -2060,7 +2086,7 @@
  */
 int
 xmlUCSIsMongolian(int code) {
-    return((code >= 0x1800) && (code <= 0x18AF));
+    return(((code >= 0x1800) && (code <= 0x18AF)));
 }
 
 /**
@@ -2073,7 +2099,7 @@
  */
 int
 xmlUCSIsMusicalSymbols(int code) {
-    return((code >= 0x1D100) && (code <= 0x1D1FF));
+    return(((code >= 0x1D100) && (code <= 0x1D1FF)));
 }
 
 /**
@@ -2086,7 +2112,7 @@
  */
 int
 xmlUCSIsMyanmar(int code) {
-    return((code >= 0x1000) && (code <= 0x109F));
+    return(((code >= 0x1000) && (code <= 0x109F)));
 }
 
 /**
@@ -2099,7 +2125,7 @@
  */
 int
 xmlUCSIsNumberForms(int code) {
-    return((code >= 0x2150) && (code <= 0x218F));
+    return(((code >= 0x2150) && (code <= 0x218F)));
 }
 
 /**
@@ -2112,7 +2138,7 @@
  */
 int
 xmlUCSIsOgham(int code) {
-    return((code >= 0x1680) && (code <= 0x169F));
+    return(((code >= 0x1680) && (code <= 0x169F)));
 }
 
 /**
@@ -2125,7 +2151,7 @@
  */
 int
 xmlUCSIsOldItalic(int code) {
-    return((code >= 0x10300) && (code <= 0x1032F));
+    return(((code >= 0x10300) && (code <= 0x1032F)));
 }
 
 /**
@@ -2138,7 +2164,7 @@
  */
 int
 xmlUCSIsOpticalCharacterRecognition(int code) {
-    return((code >= 0x2440) && (code <= 0x245F));
+    return(((code >= 0x2440) && (code <= 0x245F)));
 }
 
 /**
@@ -2151,7 +2177,7 @@
  */
 int
 xmlUCSIsOriya(int code) {
-    return((code >= 0x0B00) && (code <= 0x0B7F));
+    return(((code >= 0x0B00) && (code <= 0x0B7F)));
 }
 
 /**
@@ -2164,7 +2190,7 @@
  */
 int
 xmlUCSIsOsmanya(int code) {
-    return((code >= 0x10480) && (code <= 0x104AF));
+    return(((code >= 0x10480) && (code <= 0x104AF)));
 }
 
 /**
@@ -2177,7 +2203,22 @@
  */
 int
 xmlUCSIsPhoneticExtensions(int code) {
-    return((code >= 0x1D00) && (code <= 0x1D7F));
+    return(((code >= 0x1D00) && (code <= 0x1D7F)));
+}
+
+/**
+ * xmlUCSIsPrivateUse:
+ * @code: UCS code point
+ *
+ * Check whether the character is part of PrivateUse UCS Block
+ *
+ * Returns 1 if true 0 otherwise
+ */
+int
+xmlUCSIsPrivateUse(int code) {
+    return(((code >= 0xE000) && (code <= 0xF8FF)) ||
+           ((code >= 0xF0000) && (code <= 0xFFFFF)) ||
+           ((code >= 0x100000) && (code <= 0x10FFFF)));
 }
 
 /**
@@ -2190,7 +2231,7 @@
  */
 int
 xmlUCSIsPrivateUseArea(int code) {
-    return((code >= 0xE000) && (code <= 0xF8FF));
+    return(((code >= 0xE000) && (code <= 0xF8FF)));
 }
 
 /**
@@ -2203,7 +2244,7 @@
  */
 int
 xmlUCSIsRunic(int code) {
-    return((code >= 0x16A0) && (code <= 0x16FF));
+    return(((code >= 0x16A0) && (code <= 0x16FF)));
 }
 
 /**
@@ -2216,7 +2257,7 @@
  */
 int
 xmlUCSIsShavian(int code) {
-    return((code >= 0x10450) && (code <= 0x1047F));
+    return(((code >= 0x10450) && (code <= 0x1047F)));
 }
 
 /**
@@ -2229,7 +2270,7 @@
  */
 int
 xmlUCSIsSinhala(int code) {
-    return((code >= 0x0D80) && (code <= 0x0DFF));
+    return(((code >= 0x0D80) && (code <= 0x0DFF)));
 }
 
 /**
@@ -2242,7 +2283,7 @@
  */
 int
 xmlUCSIsSmallFormVariants(int code) {
-    return((code >= 0xFE50) && (code <= 0xFE6F));
+    return(((code >= 0xFE50) && (code <= 0xFE6F)));
 }
 
 /**
@@ -2255,7 +2296,7 @@
  */
 int
 xmlUCSIsSpacingModifierLetters(int code) {
-    return((code >= 0x02B0) && (code <= 0x02FF));
+    return(((code >= 0x02B0) && (code <= 0x02FF)));
 }
 
 /**
@@ -2268,7 +2309,7 @@
  */
 int
 xmlUCSIsSpecials(int code) {
-    return((code >= 0xFFF0) && (code <= 0xFFFF));
+    return(((code >= 0xFFF0) && (code <= 0xFFFF)));
 }
 
 /**
@@ -2281,7 +2322,7 @@
  */
 int
 xmlUCSIsSuperscriptsandSubscripts(int code) {
-    return((code >= 0x2070) && (code <= 0x209F));
+    return(((code >= 0x2070) && (code <= 0x209F)));
 }
 
 /**
@@ -2294,7 +2335,7 @@
  */
 int
 xmlUCSIsSupplementalArrowsA(int code) {
-    return((code >= 0x27F0) && (code <= 0x27FF));
+    return(((code >= 0x27F0) && (code <= 0x27FF)));
 }
 
 /**
@@ -2307,7 +2348,7 @@
  */
 int
 xmlUCSIsSupplementalArrowsB(int code) {
-    return((code >= 0x2900) && (code <= 0x297F));
+    return(((code >= 0x2900) && (code <= 0x297F)));
 }
 
 /**
@@ -2320,7 +2361,7 @@
  */
 int
 xmlUCSIsSupplementalMathematicalOperators(int code) {
-    return((code >= 0x2A00) && (code <= 0x2AFF));
+    return(((code >= 0x2A00) && (code <= 0x2AFF)));
 }
 
 /**
@@ -2333,7 +2374,7 @@
  */
 int
 xmlUCSIsSupplementaryPrivateUseAreaA(int code) {
-    return((code >= 0xF0000) && (code <= 0xFFFFF));
+    return(((code >= 0xF0000) && (code <= 0xFFFFF)));
 }
 
 /**
@@ -2346,7 +2387,7 @@
  */
 int
 xmlUCSIsSupplementaryPrivateUseAreaB(int code) {
-    return((code >= 0x100000) && (code <= 0x10FFFF));
+    return(((code >= 0x100000) && (code <= 0x10FFFF)));
 }
 
 /**
@@ -2359,7 +2400,7 @@
  */
 int
 xmlUCSIsSyriac(int code) {
-    return((code >= 0x0700) && (code <= 0x074F));
+    return(((code >= 0x0700) && (code <= 0x074F)));
 }
 
 /**
@@ -2372,7 +2413,7 @@
  */
 int
 xmlUCSIsTagalog(int code) {
-    return((code >= 0x1700) && (code <= 0x171F));
+    return(((code >= 0x1700) && (code <= 0x171F)));
 }
 
 /**
@@ -2385,7 +2426,7 @@
  */
 int
 xmlUCSIsTagbanwa(int code) {
-    return((code >= 0x1760) && (code <= 0x177F));
+    return(((code >= 0x1760) && (code <= 0x177F)));
 }
 
 /**
@@ -2398,7 +2439,7 @@
  */
 int
 xmlUCSIsTags(int code) {
-    return((code >= 0xE0000) && (code <= 0xE007F));
+    return(((code >= 0xE0000) && (code <= 0xE007F)));
 }
 
 /**
@@ -2411,7 +2452,7 @@
  */
 int
 xmlUCSIsTaiLe(int code) {
-    return((code >= 0x1950) && (code <= 0x197F));
+    return(((code >= 0x1950) && (code <= 0x197F)));
 }
 
 /**
@@ -2424,7 +2465,7 @@
  */
 int
 xmlUCSIsTaiXuanJingSymbols(int code) {
-    return((code >= 0x1D300) && (code <= 0x1D35F));
+    return(((code >= 0x1D300) && (code <= 0x1D35F)));
 }
 
 /**
@@ -2437,7 +2478,7 @@
  */
 int
 xmlUCSIsTamil(int code) {
-    return((code >= 0x0B80) && (code <= 0x0BFF));
+    return(((code >= 0x0B80) && (code <= 0x0BFF)));
 }
 
 /**
@@ -2450,7 +2491,7 @@
  */
 int
 xmlUCSIsTelugu(int code) {
-    return((code >= 0x0C00) && (code <= 0x0C7F));
+    return(((code >= 0x0C00) && (code <= 0x0C7F)));
 }
 
 /**
@@ -2463,7 +2504,7 @@
  */
 int
 xmlUCSIsThaana(int code) {
-    return((code >= 0x0780) && (code <= 0x07BF));
+    return(((code >= 0x0780) && (code <= 0x07BF)));
 }
 
 /**
@@ -2476,7 +2517,7 @@
  */
 int
 xmlUCSIsThai(int code) {
-    return((code >= 0x0E00) && (code <= 0x0E7F));
+    return(((code >= 0x0E00) && (code <= 0x0E7F)));
 }
 
 /**
@@ -2489,7 +2530,7 @@
  */
 int
 xmlUCSIsTibetan(int code) {
-    return((code >= 0x0F00) && (code <= 0x0FFF));
+    return(((code >= 0x0F00) && (code <= 0x0FFF)));
 }
 
 /**
@@ -2502,7 +2543,7 @@
  */
 int
 xmlUCSIsUgaritic(int code) {
-    return((code >= 0x10380) && (code <= 0x1039F));
+    return(((code >= 0x10380) && (code <= 0x1039F)));
 }
 
 /**
@@ -2515,7 +2556,7 @@
  */
 int
 xmlUCSIsUnifiedCanadianAboriginalSyllabics(int code) {
-    return((code >= 0x1400) && (code <= 0x167F));
+    return(((code >= 0x1400) && (code <= 0x167F)));
 }
 
 /**
@@ -2528,7 +2569,7 @@
  */
 int
 xmlUCSIsVariationSelectors(int code) {
-    return((code >= 0xFE00) && (code <= 0xFE0F));
+    return(((code >= 0xFE00) && (code <= 0xFE0F)));
 }
 
 /**
@@ -2541,7 +2582,7 @@
  */
 int
 xmlUCSIsVariationSelectorsSupplement(int code) {
-    return((code >= 0xE0100) && (code <= 0xE01EF));
+    return(((code >= 0xE0100) && (code <= 0xE01EF)));
 }
 
 /**
@@ -2554,7 +2595,7 @@
  */
 int
 xmlUCSIsYiRadicals(int code) {
-    return((code >= 0xA490) && (code <= 0xA4CF));
+    return(((code >= 0xA490) && (code <= 0xA4CF)));
 }
 
 /**
@@ -2567,7 +2608,7 @@
  */
 int
 xmlUCSIsYiSyllables(int code) {
-    return((code >= 0xA000) && (code <= 0xA48F));
+    return(((code >= 0xA000) && (code <= 0xA48F)));
 }
 
 /**
@@ -2580,7 +2621,7 @@
  */
 int
 xmlUCSIsYijingHexagramSymbols(int code) {
-    return((code >= 0x4DC0) && (code <= 0x4DFF));
+    return(((code >= 0x4DC0) && (code <= 0x4DFF)));
 }
 
 /**
@@ -3127,55 +3168,5 @@
     return (func(code));
 }
 
-/*
-    The following routines are an UGLY HACK to provide aliases for block
-    names which are not in the current release, but are needed for ABI
-    compatibility.
-*/
-
-/**
- * xmlUCSIsCombiningMarksforSymbols:
- * @code: UCS code point
- *
- * Check whether the character is part of CombiningMarksforSymbols UCS Block
- *
- * Returns 1 if true 0 otherwise
- */
-int
-xmlUCSIsCombiningMarksforSymbols(int code) {
-    return((code >= 0x20D0) && (code <= 0x20FF));
-}
-
-/**
- * xmlUCSIsGreek:
- * @code: UCS code point
- *
- * Check whether the character is part of Greek UCS Block
- *
- * Returns 1 if true 0 otherwise
- */
-int
-xmlUCSIsGreek(int code) {
-    return((code >= 0x370) && (code <= 0x3FF));
-}
-
-/**
- * xmlUCSIsPrivateUse:
- * @code: UCS code point
- *
- * Check whether the character is part of PrivateUse UCS Block
- *
- * Returns 1 if true 0 otherwise
- */
-int
-xmlUCSIsPrivateUse(int code) {
-    if ( ((code >= 0xE000)  && (code <= 0xF8FF)) ||
-	 ((code >= 0xF0000) && (code <= 0xFFFFD))||
-	 ((code >= 0x100000)&& (code <= 0x10FFFD)) )
-	return (1);
-    else
-	return (0);
-}
-
 
 #endif /* LIBXML_UNICODE_ENABLED */