From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Mon, 21 Jul 2003 18:10:00 +0000 (+0000)
Subject: r5373: Auto commit for Debian build
X-Git-Tag: v1.6.2~33
X-Git-Url: http://git.kpe.io/?p=lml2.git;a=commitdiff_plain;h=0b515edd2b706c7f5780854667a81b2d75eb2f7b

r5373: Auto commit for Debian build
---

diff --git a/ChangeLog b/ChangeLog
index 1168561..db0c732 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
+2003-07-21  Kevin M. Rosenberg  <kevin@rosenberg.net>
+	* htmlgen.lisp: 
+	- Add code walker to combine sequential write-string
+ 	  calls
+	
 2003-07-15  Kevin M. Rosenberg  <kevin@rosenberg.net>
-
 	* htmlgen.lisp: 
 	  - Finished removal of if* macro
 	  - Added attribute processing tags 
diff --git a/debian/changelog b/debian/changelog
index c8f4007..1521f34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-lml2 (1.4.1-1) unstable; urgency=low
+
+  * Improve code walker
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 21 Jul 2003 12:01:34 -0600
+
 cl-lml2 (1.4-1) unstable; urgency=low
 
   * Add code walker to collapse sequential constant strings
diff --git a/htmlgen.lisp b/htmlgen.lisp
index b920ec0..39f979f 100644
--- a/htmlgen.lisp
+++ b/htmlgen.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: lml2 -*-
 ;;
-;; $Id: htmlgen.lisp,v 1.18 2003/07/21 16:36:22 kevin Exp $
+;; $Id: htmlgen.lisp,v 1.19 2003/07/21 18:10:00 kevin Exp $
 ;;
 ;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA 
 ;; copyright (c) 2003 Kevin Rosenberg
@@ -64,23 +64,21 @@
 	  ((atom form)
 	   (flush-strings)
 	   (push form res))
+	  ((and (eq (car form) 'cl:write-string)
+		(stringp (cadr form)))
+	   (if strs
+	       (if (eq last-stream (third form))
+		   (setq strs (concatenate 'string strs (second form)))
+		   (progn
+		     (flush-strings)
+		     (setq strs (second form))
+		     (setq last-stream (third form))))
+	       (progn
+		 (setq strs (second form))
+		 (setq last-stream (third form)))))
 	  (t
-	   (cond
-	     ((and (eq (car form) 'cl:write-string)
-		   (stringp (cadr form)))
-	      (if strs
-		  (if (eq last-stream (third form))
-		      (setq strs (concatenate 'string strs (second form)))
-		      (progn
-			(flush-strings)
-			(setq strs (second form))
-			(setq last-stream (third form))))
-		  (progn
-		    (setq strs (second form))
-		    (setq last-stream (third form)))))
-	     (t
-	      (flush-strings)
-	      (push form res)))))))))
+	   (flush-strings)
+	   (push (post-process-html-forms form) res)))))))
   
 
 (defmacro html-out-stream-check (stream)