--- parser3/src/include/pa_globals.h	2001/09/20 14:25:06	1.63
+++ parser3/src/include/pa_globals.h	2002/02/08 08:30:13	1.78
@@ -1,30 +1,27 @@
 /** @file
 	Parser: global decls.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_globals.h,v 1.63 2001/09/20 14:25:06 parser Exp $
+	$Id: pa_globals.h,v 1.78 2002/02/08 08:30:13 paf Exp $
 */
 
 #ifndef PA_GLOBALS_H
 #define PA_GLOBALS_H
 
-#include "pa_config_includes.h"
 #include "pa_pool.h"
 
 class String;
 class Hash;
 class Dictionary;
+class Charset;
 
 //@{
 /// constant string. class name, predefined method & co
 #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"
@@ -47,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"
@@ -77,6 +68,8 @@ class Dictionary;
 #define SQL_OFFSET_NAME "offset"
 #define SQL_DEFAULT_NAME "default"
 
+#define CHARSET_UTF8_NAME "UTF-8"
+
 #define HASH_DEFAULT_ELEMENT_NAME "_default"
 
 //@}
@@ -89,7 +82,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;
@@ -104,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;
@@ -112,14 +104,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;
@@ -145,14 +130,27 @@ extern String *sql_limit_name;
 extern String *sql_offset_name;
 extern String *sql_default_name;
 
+extern String *charset_UTF8_name;
+
 extern String *hash_default_element_name;
 
 //@}
 
-/// global hash
+/// name to enum language table
 extern Hash *untaint_lang_name2enum;
 
-/// global table
-extern Dictionary *default_typo_dict;
+
+/// UTF8 charset
+extern Charset *utf8_charset;
+
+#ifdef XML
+/// DOMImplementation
+extern GdomeDOMImplementation *domimpl;
+
+/// flag whether there were some xml generic errors on current thread
+bool xmlHaveGenericErrors();
+/// get xml generic error accumulated for current thread. WARNING: it is up to caller to free up
+const char *xmlGenericErrors();
+#endif
 
 #endif