--- parser3/src/main/untaint.C	2001/03/25 09:57:11	1.19
+++ parser3/src/main/untaint.C	2001/03/29 15:00:22	1.27
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: untaint.C,v 1.19 2001/03/25 09:57:11 paf Exp $
+	$Id: untaint.C,v 1.27 2001/03/29 15:00:22 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -71,15 +71,16 @@ static bool typo_present(Array::Item *va
 		partial==1; // typo left column starts 'src'
 }
 
-/// @todo optimize whitespaces for all but 'html'
+/// @todo @b now: optimize whitespaces for all but 'html'
 char *String::store_to(char *dest) const {
 	// $MAIN:html-typo table
-	Table *typo_table=static_cast<Table *>(pool().tag());
+	Table *user_typo_table=static_cast<Table *>(pool().tag());
+	Table *typo_table=user_typo_table?user_typo_table:default_typo_table;
 
 	const Chunk *chunk=&head; 
 	do {
 		const Chunk::Row *row=chunk->rows;
-		for(int i=0; i<chunk->count; i++) {
+		for(int i=0; i<chunk->count; i++, row++) {
 			if(row==append_here)
 				goto break2;
 
@@ -90,7 +91,7 @@ char *String::store_to(char *dest) const
 				// clean piece
 			case UL_YES:
 				// tainted piece, but undefined untaint language
-				// for VString.get_double of tainted values
+				// for VString.as_double of tainted values
 				// for ^process{body} evaluation
 			case UL_AS_IS:
 				// tainted, untaint language: as-is
@@ -169,8 +170,9 @@ char *String::store_to(char *dest) const
 						case '\r': 
 							if(typo_table) {
 								*dest++='\\';  *dest++='n'; // \r -> \n
-								if(src[1]=='\n') // \r\n -> remove \n
-									src++;
+								if(src[1]=='\n') { // \r\n -> remove \n
+									size--; src++;
+								}
 							}
 							break;
 						case '\n': 
@@ -184,46 +186,41 @@ char *String::store_to(char *dest) const
 					html_for_typo_size=dest-html_for_typo;
 				}
 				// typo table replacements
-				if(typo_table) {
-					const char *src=html_for_typo;
-					do {
-						// there is a row where first column starts 'src'
-						if(Table::Item *item=typo_table->first_that(typo_present, src)) {
-							// get a=>b values
-							const String& a=*static_cast<Array *>(item)->get_string(0);
-							const String& b=*static_cast<Array *>(item)->get_string(1);
-							// empty 'a' | 'b' checks
-							if(a.size()==0 || b.size()==0) {
-								pool().set_tag(0); // avoid recursion
-								THROW(0, 0, 
-									typo_table->origin_string(), 
-									"typo table column elements must not be empty");
-							}
-							// overflow check:
-							//   b allowed to be max UNTAINT_TIMES_BIGGER then a
-							if(b.size()>UNTAINT_TIMES_BIGGER*a.size()) {
-								pool().set_tag(0); // avoid recursion
-								THROW(0, 0, 
-									&b, 
-									"is %g times longer then '%s', "
-									"while maximum, handled by Parser, is %d", 
-										((double)b.size())/a.size(), 
-										a.cstr(), 
-										UNTAINT_TIMES_BIGGER);
-							}
-
-							// skip 'a' in 'src'
-							src+=a.size();
-							// write 'b' to 'dest'
-							b.store_to(dest);
-							dest+=b.size();
-						} else
-							*dest++=*src++;
-					} while(*src);
-				} else {
-					memcpy(dest, html_for_typo, html_for_typo_size);
-					dest+=html_for_typo_size;
-				}
+				const char *src=html_for_typo;
+				do {
+					// there is a row where first column starts 'src'
+					if(Table::Item *item=typo_table->first_that(typo_present, src)) {
+						// get a=>b values
+						const String& a=*static_cast<Array *>(item)->get_string(0);
+						const String& b=*static_cast<Array *>(item)->get_string(1);
+						// empty 'a' | 'b' checks
+						if(a.size()==0 || b.size()==0) {
+							pool().set_tag(default_typo_table); // avoid recursion
+							THROW(0, 0, 
+								typo_table->origin_string(), 
+								"typo table column elements must not be empty");
+						}
+						// overflow check:
+						//   b allowed to be max UNTAINT_TIMES_BIGGER then a
+						if(b.size()>UNTAINT_TIMES_BIGGER*a.size()) {
+							pool().set_tag(default_typo_table); // avoid recursion
+							THROW(0, 0, 
+								&b, 
+								"is %g times longer then '%s', "
+								"while maximum, handled by Parser, is %d", 
+								((double)b.size())/a.size(), 
+								a.cstr(), 
+								UNTAINT_TIMES_BIGGER);
+						}
+						
+						// skip 'a' in 'src'
+						src+=a.size();
+						// write 'b' to 'dest'
+						b.store_to(dest);
+						dest+=b.size();
+					} else
+						*dest++=*src++;
+				} while(*src);
 				break;
 				}
 			default:
@@ -233,7 +230,6 @@ char *String::store_to(char *dest) const
 						static_cast<int>(row->item.lang), 
 						i);
 			}
-			row++;
 		}
 		chunk=row->link;
 	} while(chunk);