--- parser3/src/include/pa_globals.h	2001/09/18 16:05:42	1.62
+++ parser3/src/include/pa_globals.h	2001/10/11 10:21:44	1.67
@@ -2,10 +2,9 @@
 	Parser: global decls.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_globals.h,v 1.62 2001/09/18 16:05:42 parser Exp $
+	$Id: pa_globals.h,v 1.67 2001/10/11 10:21:44 parser Exp $
 */
 
 #ifndef PA_GLOBALS_H
@@ -26,6 +25,7 @@ class Dictionary;
 #define USER_HTML_NAME "user-html"
 
 #define CONTENT_TYPE_NAME "content-type"
+#define CHARSET_NAME "charset"
 #define BODY_NAME "body"
 #define VALUE_NAME "value"
 #define EXPIRES_NAME "expires"
@@ -46,13 +46,7 @@ class Dictionary;
 #define MAIN_CLASS_NAME "MAIN"
 
 #define DEFAULTS_NAME "DEFAULTS"
-#define CTYPE_NAME "CTYPE"
-#	define CTYPE_WHITE_SPACE_NAME "white-space"
-#	define CTYPE_DIGIT_NAME "digit"
-#	define CTYPE_HEX_DIGIT_NAME "hex-digit"
-#	define CTYPE_LETTER_NAME "letter"
-#	define CTYPE_WORD_NAME "word"
-#	define CTYPE_LOWERCASE_NAME "lowercase"
+#define CHARSETS_NAME "CHARSETS"
 #define MIME_TYPES_NAME "MIME-TYPES"
 #define VFILE_MIME_TYPE_NAME "mime-type"
 #define ORIGINS_MODE_NAME "ORIGINS"
@@ -90,6 +84,7 @@ extern short hex_value[0x100];
 /// global string
 extern String *user_html_name;
 extern String *content_type_name;
+extern String *charset_name;
 extern String *body_name;
 extern String *value_name;
 extern String *expires_name;
@@ -102,7 +97,6 @@ extern String *exception_method_name;
 extern String *post_process_method_name;
 
 extern String *unnamed_name;
-extern String *empty_string;
 
 extern String *auto_method_name;
 extern String *main_method_name;
@@ -111,13 +105,7 @@ extern String *main_class_name;
 
 
 extern String *defaults_name;
-extern String *ctype_name;
-extern String *ctype_white_space_name;
-extern String *ctype_digit_name;
-extern String *ctype_hex_digit_name;
-extern String *ctype_letter_name;
-extern String *ctype_word_name;
-extern String *ctype_lowercase_name;
+extern String *charsets_name;
 
 extern String *mime_types_name;
 extern String *vfile_mime_type_name;