Adapted to new unicode includes.

[libucw.git] / lib / chartype.h

diff --git a/lib/chartype.h b/lib/chartype.h
index 16118b9fa64c730a710a9060181ada4ce2f0060d..4eea477dcada8f1c5ed9edf53d08f0f627e4f26c 100644 (file)
--- a/lib/chartype.h
+++ b/lib/chartype.h
@@ -1,7 +1,10 @@
 /*
  *     Sherlock Library -- Character Types
  *
- *     (c) 1997 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
+ *     (c) 1997--2004 Martin Mares <mj@ucw.cz>
+ *
+ *     This software may be freely distributed and used according to the terms
+ *     of the GNU Lesser General Public License.
  */
 
 #ifndef _SHERLOCK_CHARTYPE_H
@@ -13,7 +16,7 @@
 #define _C_DIGIT 8                     /* Digits */
 #define _C_CTRL 16                     /* Control characters */
 #define _C_XDIGIT 32                   /* Hexadecimal digits */
-#define _C_BLANK 64                    /* Blanks */
+#define _C_BLANK 64                    /* White spaces (spaces, tabs, newlines) */
 #define _C_INNER 128                   /* `inner punctuation' -- underscore etc. */
 
 #define _C_ALPHA (_C_UPPER | _C_LOWER)
@@ -21,7 +24,7 @@
 #define _C_WORD (_C_ALNUM | _C_INNER)
 #define _C_WSTART (_C_ALPHA | _C_INNER)
 
-extern unsigned char _c_cat[256], _c_upper[256], _c_collate[256], _c_order[256];
+extern const unsigned char _c_cat[256], _c_upper[256], _c_lower[256];
 
 #define Category(x) (_c_cat[(unsigned char)(x)])
 #define Ccat(x,y) (Category(x) & y)
@@ -39,6 +42,7 @@ extern unsigned char _c_cat[256], _c_upper[256], _c_collate[256], _c_order[256];
 #define Cspace(x) Cblank(x)
 
 #define Cupcase(x) _c_upper[(unsigned char)(x)]
+#define Clocase(x) _c_lower[(unsigned char)(x)]
 
 #define Cxvalue(x) (((x)<'A')?((x)-'0'):(((x)&0xdf)-'A'+10))