--- parser3/src/include/pa_string.h	2001/04/23 08:52:20	1.82
+++ parser3/src/include/pa_string.h	2001/04/28 13:38:12	1.85
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_string.h,v 1.82 2001/04/23 08:52:20 paf Exp $
+	$Id: pa_string.h,v 1.85 2001/04/28 13:38:12 paf Exp $
 */
 
 #ifndef PA_STRING_H
@@ -46,14 +46,17 @@ class Table;
 #	define APPEND(src, size, lang, file, line) \
 		real_append(src, size, lang)
 #endif
-/// appends clean piece to String  @see String::real_append
+/// appends clean piece to String @see String::real_append
 #define APPEND_CLEAN(src, size, file, line) \
 	APPEND(src, size, String::UL_CLEAN, file, line)
+/// appends piece to String as-is @see String::real_append
+#define APPEND_AS_IS(src, size, file, line) \
+	APPEND(src, size, String::UL_AS_IS, file, line)
 /// appends tainted piece to String  @see String::real_append
 #define APPEND_TAINTED(src, size, file, line) \
 	APPEND(src, size, String::UL_TAINTED, file, line)
 /// handy: appends const char* piece to String  @see String::real_append
-#define	APPEND_CONST(src) APPEND_CLEAN(src, 0, 0, 0)
+#define	APPEND_CONST(src) APPEND_AS_IS(src, 0, 0, 0)
 
 class Array;
 class SQL_Connection;
@@ -106,7 +109,7 @@ public:
 		UL_SQL,       ///< ^table:sql body
 		UL_JS,        ///< JavaScript code
 		UL_HTML,      ///< HTML code (for editing)
-		UL_HTML_TYPO  ///< HTML code with TYPOgraphic replacements (for showing)
+		UL_USER_HTML  ///< HTML code with USER chars
 	};
 
 public:
@@ -124,7 +127,7 @@ public:
 		return result;
 	}
 	/** append fragment
-		@see APPEND_CLEAN, APPEND_TAINTED, APPEND_CONST
+		@see APPEND_AS_IS, APPEND_CLEAN, APPEND_TAINTED, APPEND_CONST
 	*/
 	String& real_append(STRING_APPEND_PARAMS);
 	/// @return <0 ==0 or >0 depending on comparison result
@@ -212,31 +215,32 @@ public:
 
 private:
 
+	/// several String fragments
 	struct Chunk {
-		// the number of rows in chunk
-		size_t count;
+		size_t count; ///< the number of rows in chunk
+		/// string fragment or a link to next chunk union
 		union Row {
-			// fragment
+			/// fragment
 			struct { 
-				const char *ptr;  // pointer to the start
-				size_t size;  // length
-				Untaint_lang lang; // untaint flag, later untaint language
+				const char *ptr;  ///< pointer to the start
+				size_t size;  ///< length
+				Untaint_lang lang; ///< untaint flag, later untaint language
 #ifndef NO_STRING_ORIGIN
-				Origin origin;  // origin
+				Origin origin;  ///< origin
 #endif
 			} item;
-			Chunk *link;  // link to the next chunk in chain
+			Chunk *link;  ///< link to the next chunk in chain
 		} rows[CR_PREALLOCATED_COUNT];
-		// next rows are here
-		Chunk *preallocated_link;
+		Chunk *preallocated_link; ///< next rows are here
 	}
-		head;  // the head chunk of the chunk chain
+		head;  ///< the head chunk of the chunk chain
 
-	// next append would write to this record
+	/// next append would write to this record
 	Chunk::Row *append_here;
 	
-	// the address of place where lies address 
-	// of the link to the next chunk to allocate
+	/** the address of place where lies address 
+		of the link to the next chunk to allocate
+	*/
 	Chunk::Row *link_row;
 
 private: