r3276: *** empty log message ***

[kmrcl.git] / package.lisp

diff --git a/package.lisp b/package.lisp
index fb964605b7dd15e9566152bce548a91f387a408f..b8c5582853efc294479ebe51f64290d9af21a1a6 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -7,12 +7,13 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.1 2002/10/06 13:21:47 kevin Exp $
+;;;; $Id: package.lisp,v 1.10 2002/11/02 18:00:45 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
 ;;;; KMRCL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the GNU General Public License.
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
@@ -20,7 +21,7 @@
 (in-package :cl-user)
 
 (defpackage #:kmrcl
-  (:nicknames :k)
+  (:nicknames :kl)
   (:use :common-lisp
        #+(or aserve allegro) :net.html.generator 
        #+(or aserve allegro) :net.aserve
@@ -103,31 +104,17 @@
          #:seed-random-generator
          #:random-choice
 
-
-         ;; From pipes.lisp
-         #:+empty-pipe+
-         #:make-pipe
-         #:pipe-tail
-         #:pipe-head
-         #:pipe-elt
-         #:enumerate
-         #:pipe-display
-         #:pipe-force
-         #:pipe-filter
-         #:pipe-map
-         #:pipe-map-filtering
-         #:pipe-append
-         #:pipe-mappend
-         #:pipe-mappend-filtering
-
          ;; From telnet-server.lisp
          #:start-telnet-server   
 
          ;; From web-utils
-         #:std-xml-header
+         #:*standard-html-header*
+         #:*standard-xhtml-header*
+         #:*standard-xml-header*
          #:xml-cdata
-
-         ;; From web-utils-allegro
+         #:user-agent-ie-p
+         
+         ;; From web-utils-aserve
          #:cgi-var
          #:print-http
          #:princ-http
@@ -140,8 +127,7 @@
          #:with-link
          #:home-link
          #:head
-         #:with-xml-page
-         #:with-trans-page
+         #:with-page
          #:wrap-with-xml
          #:parse-xml-no-ws
          #:positions-xml-tag-contents
@@ -153,6 +139,7 @@
          #:ml-class-title
          #:load-all-subobjects
          #:display-ml-class
+         #:xml-cdata
          ))