From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Mon, 26 May 2003 21:43:05 +0000 (+0000)
Subject: r5036: *** empty log message ***
X-Git-Tag: v1.96~196
X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=commitdiff_plain;h=45326a2fd9e7761899d593d7f528abf455453b0b

r5036: *** empty log message ***
---

diff --git a/debian/changelog b/debian/changelog
index a750fbb..ca4b260 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
+cl-kmrcl (1.47-2) unstable; urgency=low
+
+  * New upstring
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 26 May 2003 15:24:45 -0600
+
 cl-kmrcl (1.47-1) unstable; urgency=low
 
   * New upstream
 
- -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 17 May 2003 01:45:19 -0600
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 26 May 2003 15:24:37 -0600
 
 cl-kmrcl (1.46-1) unstable; urgency=low
 
diff --git a/package.lisp b/package.lisp
index a265525..3eb7b1d 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.32 2003/05/16 08:32:10 kevin Exp $
+;;;; $Id: package.lisp,v 1.33 2003/05/26 21:43:05 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -157,6 +157,7 @@
    #:xml-tag-contents
    #:positions-xml-tag-contents
    #:xml-cdata
+   #:write-xml-cdata
    
    ;; From console
    *console-msgs*
diff --git a/strings.lisp b/strings.lisp
index e735640..9d8620e 100644
--- a/strings.lisp
+++ b/strings.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: strings.lisp,v 1.33 2003/05/17 07:34:45 kevin Exp $
+;;;; $Id: strings.lisp,v 1.34 2003/05/26 21:43:05 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -201,9 +201,7 @@ list of characters and replacement strings."
 
 (defun escape-xml-string (string)
   "Escape invalid XML characters"
-  (substitute-chars-strings 
-   string '((#\& . "&amp;") (#\> . "&gt;") (#\< . "&lt;") (#\" . "&quot;"))))
-
+  (substitute-chars-strings string '((#\& . "&amp;") (#\< . "&lt;"))))
 
 (defun make-usb8-array (len)
   (make-array len :adjustable nil
diff --git a/xml-utils.lisp b/xml-utils.lisp
index 20029fe..be7952b 100644
--- a/xml-utils.lisp
+++ b/xml-utils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: xml-utils.lisp,v 1.6 2002/12/04 16:49:23 kevin Exp $
+;;;; $Id: xml-utils.lisp,v 1.7 2003/05/26 21:43:05 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -91,3 +91,15 @@ and position of character following end tag."
 (defun xml-cdata (str)
   (concatenate 'string "<![CDATA[" str "]]>"))
 
+(defun write-xml-cdata (str s)
+  (declare (simple-string str) (optimize (speed 3) (safety 0)))
+  (do* ((len (length str))
+	(i 0 (1+ i)))
+       ((= i len) str)
+    (declare (fixnum i len))
+    (let ((c (schar str i)))
+      (case c
+	(#\< (write-string "&lt;" s))
+	(#\& (write-string "&amp;" s))
+	(t   (write-char c s))))))
+