X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=2%2Fhtmlgen.lisp;h=62c45dda378ed206a6b14a038ba2e075cf7f78b0;hb=6e487992b3804be00a48a45c150dc678e2add3ff;hp=fdb76f1c35b1a5745ca8da79ff638592e75b1566;hpb=096b456fe920373f3b54fbe47f10f3e41c4fe925;p=lml.git

diff --git a/2/htmlgen.lisp b/2/htmlgen.lisp
index fdb76f1..62c45dd 100644
--- a/2/htmlgen.lisp
+++ b/2/htmlgen.lisp
@@ -1,26 +1,24 @@
 ;; -*- mode: common-lisp; package: lml2 -*-
 ;;
-;; $Id: htmlgen.lisp,v 1.1 2003/06/20 04:12:29 kevin Exp $
+;; $Id: htmlgen.lisp,v 1.6 2003/06/24 17:48:41 kevin Exp $
 ;;
 ;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA 
 ;; copyright (c) 2003 Kevin Rosenberg
 ;;
 ;; Main changes from Allegro version:
-;;    - Support XHTML
-;;    - lowercase symbol names
+;;    - Support XHTML end tags
+;;    - lowercase symbol names for attributes
+;;    - Add custom tags such as :jscript, :insert-file, :nbsp
 ;;
 ;; This code is free software; you can redistribute it and/or
 ;; modify it under the terms of the version 2.1 of
 ;; the GNU Lesser General Public License as published by 
-;; the Free Software Foundation, as clarified by the AllegroServe
-;; prequel found in license-allegroserve.txt.
+;; the Free Software Foundation, as clarified by the LLGPL
 
 
 (in-package #:lml2)
 
 
-;; html generation
-
 (defstruct (html-process (:type list) (:constructor
 				       make-html-process (key has-inverse
 							      macro special
@@ -727,12 +725,48 @@
       (lambda (ent args argsp body)
 	;; must use <!--   --> syntax
 	(declare (ignore ent args argsp))
-	`(progn (write-string "<script language=\"JavasSript\" type=\"text/javascript\">"
-		 *html-stream*)
-		(html ,@body)
-		(write-string "</script>" *html-stream*))))
+	`(progn
+	  (write-string "<script language=\"JavasSript\" type=\"text/javascript\">" *html-stream*)
+	  (write-char #\newline *html-stream*)
+	  (write-string "//![CDATA[" *html-stream*)
+	  (write-char #\newline *html-stream*)
+	  (html ,@body)
+	  (write-char #\newline *html-stream*)
+	  (write-string "//]]>" *html-stream*)
+	  (write-char #\newline *html-stream*)
+	  (write-string "</script>" *html-stream*))))
   (named-function html-comment-print-function
     (lambda (ent cmd args form subst unknown stream)
       (declare (ignore ent cmd args subst unknown))
-      (format stream "<script language=\"JavaScript\" type=\"text/javascript\">~A</script>"
+      (format stream "<script language=\"JavaScript\" type=\"text/javascript\">~%//![CDATA[~%~A~%//]]>~%</script>"
 	      (cadr form)))))
+
+(def-special-html :nbsp 
+    (named-function html-nbsp-function
+      (lambda (ent args argsp body)
+	(declare (ignore ent args argsp))
+	(when body
+	  (error "can't have a body with :nbsp -- body is ~s" body))
+	`(write-string "&nbsp;" *html-stream*)))
+  
+  (named-function html-nbsp-print-function
+    (lambda (ent cmd args form subst unknown stream)
+      (declare (ignore args ent unknown subst))
+      (if* (eq cmd :set)
+	 then (write-string "&nbsp;" stream)
+	 else (error ":nbsp in an illegal place: ~s" form)))))
+
+(def-special-html :insert-file
+    (named-function html-nbsp-function
+      (lambda (ent args argsp body)
+	(declare (ignore ent argsp))
+	(unless body
+	  (error "must have a body with :insert-file"))
+	`(lml-load-path (car ',body))))
+  
+  (named-function html-nbsp-print-function
+    (lambda (ent cmd args form subst unknown stream)
+      (declare (ignore ent unknown subst stream form))
+      (if* (eq cmd :full)
+	   then (lml-load-path (cadr form))
+	   else (error ":insert-file must be given an argument")))))