X-Git-Url: http://git.kpe.io/?p=lml.git;a=blobdiff_plain;f=base.lisp;h=9465155a540846d134c1b413e9b5d0c5f4d450f1;hp=3e59034436a5132777e9a8c54449ef325915ffec;hb=2dcfda178f817bec62b9f51248d96799d254d686;hpb=2aba65a90adb2811a06ba3bbb5151b9f47a35252 diff --git a/base.lisp b/base.lisp index 3e59034..9465155 100644 --- a/base.lisp +++ b/base.lisp @@ -2,12 +2,12 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Name: lml.cl +;;;; Name: base.lisp ;;;; Purpose: Lisp Markup Language functions ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: base.lisp,v 1.10 2003/02/10 19:49:18 kevin Exp $ +;;;; $Id$ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -16,8 +16,7 @@ ;;;; (http://www.gnu.org/licenses/gpl.html) ;;;; ************************************************************************* -(declaim (optimize (debug 3) (speed 3) (safety 3) (compilation-speed 0))) -(in-package :lml) +(in-package #:lml) (defun html4-prologue-string () "") @@ -26,7 +25,7 @@ "") (defun xhtml-prologue-string () - "") + "") (defvar *print-spaces* nil) (defvar *indent* 0) @@ -38,9 +37,8 @@ (when *print-spaces* (indent-spaces *indent* *html-output*)) (if args (apply #'format *html-output* str args) - (princ str *html-output*)) - (when *print-spaces* (format *html-output* "~%")) - (values))) + (write-string str *html-output*)) + (when *print-spaces* (write-char #\newline *html-output*)))) (defun lml-princ (s) (princ s *html-output*)) @@ -49,10 +47,13 @@ (format *html-output* "~A~%" s)) (defun lml-write-char (char) - (write-char char *html-output)) + (write-char char *html-output*)) + +(defun lml-write-string (str) + (write-string str *html-output*)) (defun lml-print-date (date) - (lml-princ (date-string date))) + (lml-write-string (date-string date))) (defmacro lml-exec-body (&body forms) `(progn @@ -73,9 +74,9 @@ (defmacro with-attr-string (tag attr-string &body body) (let ((attr (gensym))) `(let ((,attr ,attr-string)) - (lml-format "<~(~A~) ~A>" ',tag + (lml-format "<~(~A~)~A>" ',tag (if (and (stringp ,attr) (plusp (length ,attr))) - (format nil "~A" ,attr) + (format nil " ~A" ,attr) "")) (incf *indent*) (lml-exec-body ,@body) @@ -85,10 +86,10 @@ (defmacro with-no-endtag-attr-string (tag attr-string) (let ((attr (gensym))) `(let ((,attr ,attr-string)) - (lml-format "<~(~A~) ~A />" ',tag + (lml-format "<~(~A~)~A />" ',tag (if (and (stringp ,attr) (plusp (length ,attr))) - (format nil "~A" ,attr) - ""))))) + (format nil " ~A" ,attr) + ""))))) (defun one-keyarg-string (key value) "Return attribute string for keys" @@ -184,6 +185,10 @@ `(let ((,bound-keyargs ,(macroexpand `(bind-all-keyargs ,keyargs)))) ,(macroexpand `(with-no-endtag-keyargs ,tag ,bound-keyargs))))) +(defmacro jscript (&body body) + `(with script :language "JavaScript" :type "text/javascript" + ,@body)) + (defmacro xhtml-prologue () `(progn (lml-format "~A~%" (xml-prologue-string)) @@ -201,11 +206,11 @@ (defmacro input (&rest args) `(with-no-endtag input ,@args)) -(defmacro meta (name content) - `(with meta :name ,name :content ,content)) +(defmacro link (&rest args) + `(with-no-endtag link ,@args)) -(defmacro meta-key (&key name content http-equiv) - `(with meta :name ,name :content ,content :http-equiv ,http-equiv)) +(defmacro meta (&rest args) + `(with-no-endtag meta ,@args)) (defmacro br (&rest args) `(with-no-endtag br ,@args)) @@ -228,9 +233,11 @@ (eval-when (:compile-toplevel :load-toplevel :execute) (defparameter *macro-list* - '(a div span h1 h2 h3 h4 h5 h6 i b p li ul ol table tbody td th tr body head - html title pre tt u dl dt dd kbd code form textarea link)) - (export '(alink alink-c br hr img input meta meta-key)) + '(a div span h1 h2 h3 h4 h5 h6 i b p li ul ol table tbody td th tr body + head html title pre tt u dl dt dd kbd code form textarea blockquote + var strong small samp big cite address dfn em q area del ins + object param caption col colgroup script noscript)) + (export '(jscript alink alink-c br hr img input meta link meta-key)) (export *macro-list*)) (loop for i in *macro-list* @@ -256,64 +263,6 @@ (defun new-string () (make-array 1024 :fill-pointer 0 :adjustable t :element-type 'character)) -(set-macro-character #\[ - #'(lambda (stream char) - (declare (ignore char)) - (let ((forms '()) - (curr-string (new-string)) - (paren-level 0) - (got-comma nil)) - (declare (type fixnum paren-level)) - (do ((ch (read-char stream t nil t) (read-char stream t nil t))) - ((eql ch #\])) - (if got-comma - (if (eql ch #\() - ;; Starting top-level ,( - (progn - #+cmu - (setf curr-string (coerce curr-string `(simple-array character (*)))) - - (push `(lml-princ ,curr-string) forms) - (setq curr-string (new-string)) - (setq got-comma nil) - (vector-push #\( curr-string) - (do ((ch (read-char stream t nil t) (Read-char stream t nil t))) - ((and (eql ch #\)) (zerop paren-level))) - (when (eql ch #\]) - (format *trace-output* "Syntax error reading #\]") - (return nil)) - (case ch - (#\( - (incf paren-level)) - (#\) - (decf paren-level))) - (vector-push-extend ch curr-string)) - (vector-push-extend #\) curr-string) - (let ((eval-string (read-from-string curr-string)) - (res (gensym))) - (push - `(let ((,res ,eval-string)) - (when ,res - (lml-princ ,res))) - forms)) - (setq curr-string (new-string))) - ;; read comma, then non #\( char - (progn - (unless (eql ch #\,) - (setq got-comma nil)) - (vector-push-extend #\, curr-string) ;; push previous command - (vector-push-extend ch curr-string))) - ;; previous character is not a comma - (if (eql ch #\,) - (setq got-comma t) - (progn - (setq got-comma nil) - (vector-push-extend ch curr-string))))) - - #+cmu - (setf curr-string (coerce curr-string `(simple-array character (*)))) - - (push `(lml-princ ,curr-string) forms) - `(progn ,@(nreverse forms))))) +