--- parser3/src/include/pa_globals.h	2001/09/26 10:32:25	1.65
+++ parser3/src/include/pa_globals.h	2001/12/14 13:02:32	1.70
@@ -2,9 +2,9 @@
 	Parser: global decls.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_globals.h,v 1.65 2001/09/26 10:32:25 parser Exp $
+	$Id: pa_globals.h,v 1.70 2001/12/14 13:02:32 paf Exp $
 */
 
 #ifndef PA_GLOBALS_H
@@ -22,8 +22,6 @@ class Dictionary;
 #define CONFIG_FILE_NAME "parser3.conf"
 #define AUTO_FILE_NAME "auto.p"
 
-#define USER_HTML_NAME "user-html"
-
 #define CONTENT_TYPE_NAME "content-type"
 #define CHARSET_NAME "charset"
 #define BODY_NAME "body"
@@ -46,13 +44,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"
@@ -88,7 +80,7 @@ extern short hex_value[0x100];
 
 //@{
 /// global string
-extern String *user_html_name;
+extern String *optimized_html_name;
 extern String *content_type_name;
 extern String *charset_name;
 extern String *body_name;
@@ -103,7 +95,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,14 +102,7 @@ extern String *main_method_name;
 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;