--- live-comment-preview.php.save	2005-10-08 05:28:07.018967456 -0400
+++ live-comment-preview.php	2005-10-08 05:35:29.987753325 -0400
@@ -27,51 +27,90 @@
 	header('Content-type: text/javascript');
 	?>
 
-function wptexturize(text) {
-	text = ' '+text+' ';
-	var next 	= true;
-	var output 	= '';
-	var prev 	= 0;
-	var length 	= text.length;
-	while ( prev < length ) {
-		var index = text.indexOf('<', prev);
-		if ( index > -1 ) {
-			if ( index == prev ) {
-				index = text.indexOf('>', prev);
-			}
-			index++;
-		} else {
-			index = length;
+function wptexturize(s) {
+    var r = s;
+    // quick tags first
+    qtags = [['\\*', 'strong'],
+             ['\\?\\?', 'cite'],
+             ['\\+', 'ins'],  //fixed
+             ['~', 'sub'],   
+             ['\\^', 'sup'], // me
+             ['@', 'code']];
+    for (var i=0;i<qtags.length;i++) {
+        ttag = qtags[i][0]; htag = qtags[i][1];
+        re = new RegExp(ttag+'\\b(.+?)\\b'+ttag,'g');
+        r = r.replace(re,'<'+htag+'>'+'$1'+'</'+htag+'>');
+    }
+    // underscores count as part of a word, so do them separately
+    re = new RegExp('\\b_(.+?)_\\b','g');
+    r = r.replace(re,'<em>$1</em>');
+	
+	//jeff: so do dashes
+    re = new RegExp('[\s\n]-(.+?)-[\s\n]','g');
+    r = r.replace(re,'<del>$1</del>');
+
+    // links
+    re = new RegExp('"\\b(.+?)\\(\\b(.+?)\\b\\)":([^\\s]+)','g');
+    r = r.replace(re,'<a href="$3" title="$2">$1</a>');
+    re = new RegExp('"\\b(.+?)\\b":([^\\s]+)','g');
+    r = r.replace(re,'<a href="$2">$1</a>');
+
+    // images
+    re = new RegExp('!\\b(.+?)\\(\\b(.+?)\\b\\)!','g');
+    r = r.replace(re,'<img src="$1" alt="$2">');
+    re = new RegExp('!\\b(.+?)\\b!','g');
+    r = r.replace(re,'<img src="$1">');
+    
+    // block level formatting
+	
+		// Jeff's hack to show single line breaks as they should.
+		// insert breaks - but you get some....stupid ones
+	    re = new RegExp('(.*)\n([^#\*\n].*)','g');
+	    r = r.replace(re,'$1<br />$2');
+		// remove the stupid breaks.
+	    re = new RegExp('\n<br />','g');
+	    r = r.replace(re,'\n');
+	
+    lines = r.split('\n');
+    nr = '';
+    for (var i=0;i<lines.length;i++) {
+        line = lines[i].replace(/\s*$/,'');
+        changed = 0;
+        if (line.search(/^\s*bq\.\s+/) != -1) { 
+			line = line.replace(/^\s*bq\.\s+/,'\t<blockquote>')+'</blockquote>'; 
+			changed = 1; 
 		}
-		var s = text.substring(prev, index);
-		prev = index;
-		if ( s.substr(0,1) != '<' && next == true ) {
-			s = s.replace(/---/g, '&#8212;');
-			s = s.replace(/--/g, '&#8211;');
-			s = s.replace(/\.{3}/g, '&#8230;');
-			s = s.replace(/``/g, '&#8220;');
-			s = s.replace(/'s/g, '&#8217;s');
-			s = s.replace(/'(\d\d(?:&#8217;|')?s)/g, '&#8217;$1');
-			s = s.replace(/([\s"])'/g, '$1&#8216;');
-			s = s.replace(/(\d+)"/g, '$1&Prime;');
-			s = s.replace(/(\d+)'/g, '$1&prime;');
-			s = s.replace(/([^\s])'([^'\s])/g, '$1&#8217;$2');
-			s = s.replace(/(\s)"([^\s])/g, '$1&#8220;$2');
-			s = s.replace(/"(\s)/g, '&#8221;$1');
-			s = s.replace(/'(\s|.)/g, '&#8217;$1');
-			s = s.replace(/\(tm\)/ig, '&#8482;');
-			s = s.replace(/\(c\)/ig, '&#169;');
-			s = s.replace(/\(r\)/ig, '&#174;');
-			s = s.replace(/''/g, '&#8221;');
-			s = s.replace(/(\d+)x(\d+)/g, '$1&#215;$2');
-		} else if ( s.substr(0,5) == '<code' ) {
-			next = false;
-		} else {
-			next = true;
+		
+		// jeff adds h#.
+        if (line.search(/^\s*h[1|2|3|4|5|6]\.\s+/) != -1) { 
+	    	re = new RegExp('h([1|2|3|4|5|6])\.(.+)','g');
+	    	line = line.replace(re,'<h$1>$2</h$1>');
+			changed = 1; 
 		}
-		output += s; 
-	}
-	return output.substr(1, output.length-2);	
+		
+		if (line.search(/^\s*\*\s+/) != -1) { line = line.replace(/^\s*\*\s+/,'\t<liu>') + '</liu>'; changed = 1; } // * for bullet list; make up an liu tag to be fixed later
+        if (line.search(/^\s*#\s+/) != -1) { line = line.replace(/^\s*#\s+/,'\t<lio>') + '</lio>'; changed = 1; } // # for numeric list; make up an lio tag to be fixed later
+        if (!changed && (line.replace(/\s/g,'').length > 0)) line = '<p>'+line+'</p>';
+        lines[i] = line + '\n';
+    }
+	
+    // Second pass to do lists
+    inlist = 0; 
+	listtype = '';
+    for (var i=0;i<lines.length;i++) {
+        line = lines[i];
+        if (inlist && listtype == 'ul' && !line.match(/^\t<liu/)) { line = '</ul>\n' + line; inlist = 0; }
+        if (inlist && listtype == 'ol' && !line.match(/^\t<lio/)) { line = '</ol>\n' + line; inlist = 0; }
+        if (!inlist && line.match(/^\t<liu/)) { line = '<ul>' + line; inlist = 1; listtype = 'ul'; }
+        if (!inlist && line.match(/^\t<lio/)) { line = '<ol>' + line; inlist = 1; listtype = 'ol'; }
+        lines[i] = line;
+    }
+
+    r = lines.join('\n');
+	// jeff added : will correctly replace <li(o|u)> AND </li(o|u)>
+    r = r.replace(/li[o|u]>/g,'li>');
+
+    return r;
 }
 
 function wpautop(p) {