") - (lml-format "

Browse ~A FTP Site

" name) + (lml-format "

Browse ~A Download Site

" name) (lml-format "~A" url url)) (defun display-footer () @@ -121,29 +121,29 @@ (decf *section-indent*)) (display-one-section title value)))))) -(defun display-page (pkg-name pkg-base ftp-base ftp-url sects) +(defun display-page (pkg-name pkg-base dl-base dl-url sects) (let ((*section-indent* 3) - (*ftp-base* ftp-base) - (*ftp-url* ftp-url) + (*dl-base* dl-base) + (*dl-url* dl-url) (*base-name* pkg-base) (*signed* nil)) - (display-header pkg-name ftp-url) + (display-header pkg-name dl-url) (map nil #'display-sections sects) (display-footer))) -(defun std-dl-page (pkg-name pkg-base ftp-base ftp-url) - (let ((base (parse-namestring ftp-base))) +(defun std-dl-page (pkg-name pkg-base dl-base dl-url) + (let ((base (parse-namestring dl-base))) (let ((tgz-path (make-pathname :defaults base :type "gz" :name :wild)) (zip-path (make-pathname :defaults base :type "zip" :name :wild)) (doc-path (make-pathname :defaults base :type "pdf" :name :wild))) - (display-page pkg-name pkg-base ftp-base ftp-url + (display-page pkg-name pkg-base dl-base dl-url `(("Manual" ,doc-path) ("Source Code" (("Unix (.tar.gz)" ,tgz-path) ("Windows (.zip)" ,zip-path)))))))) -(defun full-dl-page (pkg-name pkg-base ftp-base ftp-url) - (let ((base (parse-namestring ftp-base))) +(defun full-dl-page (pkg-name pkg-base dl-base dl-url) + (let ((base (parse-namestring dl-base))) (let ((tgz-path (make-pathname :defaults base :type "gz" :name :wild)) (zip-path (make-pathname :defaults base :type "zip" :name :wild)) (doc-path (make-pathname :defaults base :type "pdf" :name :wild)) @@ -159,7 +159,7 @@ (make-pathname :directory '(:relative "win32") :type :wild :name :wild) base))) - (display-page pkg-name pkg-base ftp-base ftp-url + (display-page pkg-name pkg-base dl-base dl-url `(("Manual" ,doc-path) ("Source Code" (("Unix (.tar.gz)" ,tgz-path) -- 2.34.1 From 4cf004c41a51e8ecad9974fa567b9abd503ac82b Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 6 Feb 2003 23:25:52 +0000 Subject: [PATCH 02/16] r3972: Auto commit for Debian build --- debian/changelog | 6 ++++++ utils.lisp | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0ee5be..d92c054 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-lml (2.2.1-1) unstable; urgency=low + + * Upstream change + + -- Kevin M. Rosenberg Thu, 6 Feb 2003 16:25:29 -0700 + cl-lml (2.2.0-1) unstable; urgency=low * downloads.lisp: Change from FTP to more general Download term to better diff --git a/utils.lisp b/utils.lisp index a183045..e00abb7 100644 --- a/utils.lisp +++ b/utils.lisp @@ -1,4 +1,4 @@ -;;; $Id: utils.lisp,v 1.4 2002/12/08 22:38:06 kevin Exp $ +;;; $Id: utils.lisp,v 1.5 2003/02/06 23:25:52 kevin Exp $ ;;;; ;;;; General purpose utilities @@ -19,7 +19,8 @@ (string-equal "keyword" (package-name (symbol-package x))))) (defun list-to-spaced-string (list) - (format nil "~{ ~A~}" list)) + (when (consp list) + (format nil "~A~{ ~A~}" (first list) (rest list)))) (defun indent-spaces (n &optional (stream *standard-output*)) "Indent n*2 spaces to output stream" -- 2.34.1 From dc3d60708af336b85c4766dc5a3aefd1a82b278d Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 7 Feb 2003 02:37:18 +0000 Subject: [PATCH 03/16] r3973: Auto commit for Debian build --- base.lisp | 10 +++++----- debian/changelog | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/base.lisp b/base.lisp index 577622c..167082f 100644 --- a/base.lisp +++ b/base.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: base.lisp,v 1.6 2003/01/26 21:35:27 kevin Exp $ +;;;; $Id: base.lisp,v 1.7 2003/02/07 02:37:18 kevin Exp $ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -189,10 +189,10 @@ (lml-format "~A~%" (xml-prologue-string)) (lml-format "~A~%" (xhtml-prologue-string)))) -(defmacro link (dest &body body) +(defmacro alink (dest &body body) `(with a :href ,dest ,@body)) -(defmacro link-c (class dest &body body) +(defmacro alink-c (class dest &body body) `(with a :href ,dest :class (quote ,class) ,@body)) (defmacro img (dest &rest args) @@ -229,8 +229,8 @@ (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)) - (export '(link link-c br hr img input meta meta-key)) + html title pre tt u dl dt dd kbd code form textarea link)) + (export '(alink alink-c br hr img input meta meta-key)) (export *macro-list*)) (loop for i in *macro-list* diff --git a/debian/changelog b/debian/changelog index d92c054..ba29276 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-lml (2.2.2-1) unstable; urgency=low + + * Rename link to alink and add new link macro that produces a + + -- Kevin M. Rosenberg Thu, 6 Feb 2003 19:36:42 -0700 + cl-lml (2.2.1-1) unstable; urgency=low * Upstream change -- 2.34.1 From a9d2317b140c0709db1837922c8ec9528e6d8b76 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 7 Feb 2003 04:20:25 +0000 Subject: [PATCH 04/16] r3977: Auto commit for Debian build --- base.lisp | 6 +++--- debian/changelog | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/base.lisp b/base.lisp index 167082f..dfc1162 100644 --- a/base.lisp +++ b/base.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: base.lisp,v 1.7 2003/02/07 02:37:18 kevin Exp $ +;;;; $Id: base.lisp,v 1.8 2003/02/07 04:20:25 kevin Exp $ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -73,7 +73,7 @@ (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) "")) @@ -85,7 +85,7 @@ (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) ""))))) diff --git a/debian/changelog b/debian/changelog index ba29276..6c4c9f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-lml (2.2.3-1) unstable; urgency=low + + * Add missing space character to output + + -- Kevin M. Rosenberg Thu, 6 Feb 2003 21:20:06 -0700 + cl-lml (2.2.2-1) unstable; urgency=low * Rename link to alink and add new link macro that produces a -- 2.34.1 From b581046a8dfc4ffb43167f11da558834a18bf1c3 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 7 Feb 2003 04:31:48 +0000 Subject: [PATCH 05/16] r3978: Auto commit for Debian build --- base.lisp | 4 ++-- debian/changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/base.lisp b/base.lisp index dfc1162..685382e 100644 --- a/base.lisp +++ b/base.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: base.lisp,v 1.8 2003/02/07 04:20:25 kevin Exp $ +;;;; $Id: base.lisp,v 1.9 2003/02/07 04:31:48 kevin Exp $ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -196,7 +196,7 @@ `(with a :href ,dest :class (quote ,class) ,@body)) (defmacro img (dest &rest args) - `(with-no-endtag :src ,dest ,@args)) + `(with-no-endtag img :src ,dest ,@args)) (defmacro input (&rest args) `(with-no-endtag input ,@args)) diff --git a/debian/changelog b/debian/changelog index 6c4c9f3..ab61691 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ cl-lml (2.2.3-1) unstable; urgency=low * Add missing space character to output + * Fix bug in img macro -- Kevin M. Rosenberg Thu, 6 Feb 2003 21:20:06 -0700 -- 2.34.1 From 22349b221935083a412f121e1e91044973e2e238 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 7 Feb 2003 04:33:28 +0000 Subject: [PATCH 06/16] r3979: Automatic commit for debian_version_2_2_3-1 --- doc/readme.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/readme.html b/doc/readme.html index 4cc97b9..04c09d7 100644 --- a/doc/readme.html +++ b/doc/readme.html @@ -1,16 +1,16 @@ -LML README

LML Documentation

Overview

LML is a Common Lisp package for generating HTML and XHTML documents. +LML README

LML Documentation

Overview

LML is a Common Lisp package for generating HTML and XHTML documents. LML is authored by - Kevin Rosenberg. The home page for LML is - http://lml.b9.com/.

Installation

The easiest way to install LML is to use the Debian + Kevin Rosenberg. The home page for LML is + http://lml.b9.com/.

Installation

The easiest way to install LML is to use the Debian GNU/Linux operating system. You can then use the command apt-get install cl-lml - to automatically download and install the LML package.

On a non-Debian system, you need to have either ASDF - or mk-defsystem + to automatically download and install the LML package.

On a non-Debian system, you need to have either ASDF + or mk-defsystem installed to load the system definition file. You will need to change the source pathname in the system file to match the location where you have installed LML.

Usage

Currently, there is no documentation on the functions provided by LML. However, the source code is - instructive and there are example files included in the LML package.

Examples

Iteration

(i "The square of the first five integers are)" + instructive and there are example files included in the LML package.

Examples

(i "The square of the first five integers are)"
  (b
    (loop as x from 1 to 5 
      doing
-     (lml-format " ~D" (* x x))))

The square of the first five integers are 1 4 9 16 25

View this page's LML source.

\ No newline at end of file + (lml-format " ~D" (* x x))))The square of the first five integers are 1 4 9 16 25

View this page's LML source.

\ No newline at end of file -- 2.34.1 From 73c3dbb27aee548be503dc0f8e4344d920d043c9 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 7 Feb 2003 04:36:43 +0000 Subject: [PATCH 07/16] r3980: *** empty log message *** --- debian/upload.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/upload.sh b/debian/upload.sh index 1b922b7..f030592 100755 --- a/debian/upload.sh +++ b/debian/upload.sh @@ -1,4 +1,4 @@ #!/bin/bash -e -dup lml -Uftp.med-info.com -D/home/ftp/lml -C"(cd /opt/apache/htdocs/lml; make install-doc)" -su $* +dup lml -Uftp.med-info.com -D/home/ftp/lml -C"(cd /opt/apache/htdocs/lml; make install)" -su $* -- 2.34.1 From 2aba65a90adb2811a06ba3bbb5151b9f47a35252 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 10 Feb 2003 19:54:15 +0000 Subject: [PATCH 08/16] r4003: *** empty log message *** --- base.lisp | 4 ++-- debian/changelog | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/base.lisp b/base.lisp index 685382e..3e59034 100644 --- a/base.lisp +++ b/base.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: base.lisp,v 1.9 2003/02/07 04:31:48 kevin Exp $ +;;;; $Id: base.lisp,v 1.10 2003/02/10 19:49:18 kevin Exp $ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -26,7 +26,7 @@ "") (defun xhtml-prologue-string () - "") + "") (defvar *print-spaces* nil) (defvar *indent* 0) diff --git a/debian/changelog b/debian/changelog index ab61691..d7756cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-lml (2.2.4-1) unstable; urgency=low + + * Move XHTML to version 1.1 + + -- Kevin M. Rosenberg Mon, 10 Feb 2003 12:49:10 -0700 + cl-lml (2.2.3-1) unstable; urgency=low * Add missing space character to output -- 2.34.1 From d37adbea3308d1729d6cf7b23b51dd5d081dc43d Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 15 Feb 2003 03:00:22 +0000 Subject: [PATCH 09/16] r4048: *** empty log message *** --- utils.lisp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils.lisp b/utils.lisp index e00abb7..8ebcefc 100644 --- a/utils.lisp +++ b/utils.lisp @@ -1,4 +1,4 @@ -;;; $Id: utils.lisp,v 1.5 2003/02/06 23:25:52 kevin Exp $ +;;; $Id: utils.lisp,v 1.6 2003/02/15 03:00:22 kevin Exp $ ;;;; ;;;; General purpose utilities @@ -19,8 +19,9 @@ (string-equal "keyword" (package-name (symbol-package x))))) (defun list-to-spaced-string (list) - (when (consp list) - (format nil "~A~{ ~A~}" (first list) (rest list)))) + (if (consp list) + (format nil "~A~{ ~A~}" (first list) (rest list)) + "")) (defun indent-spaces (n &optional (stream *standard-output*)) "Indent n*2 spaces to output stream" -- 2.34.1 From b2d601fcc40acb08a61cb3607f4455bfbd3126fc Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 17 Feb 2003 06:48:46 +0000 Subject: [PATCH 10/16] r4056: Auto commit for Debian build --- base.lisp | 14 +++++++------- debian/changelog | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/base.lisp b/base.lisp index 3e59034..4a03e71 100644 --- a/base.lisp +++ b/base.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: base.lisp,v 1.10 2003/02/10 19:49:18 kevin Exp $ +;;;; $Id: base.lisp,v 1.11 2003/02/17 06:48:46 kevin Exp $ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -201,11 +201,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)) @@ -229,8 +229,8 @@ (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)) + html title pre tt u dl dt dd kbd code form textarea)) + (export '(alink alink br hr img input meta link meta-key)) (export *macro-list*)) (loop for i in *macro-list* diff --git a/debian/changelog b/debian/changelog index d7756cb..0a04c70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-lml (2.3.0-1) unstable; urgency=low + + * Change definition of link/meta + + -- Kevin M. Rosenberg Sun, 16 Feb 2003 23:46:37 -0700 + cl-lml (2.2.4-1) unstable; urgency=low * Move XHTML to version 1.1 -- 2.34.1 From d415678930d834dd318bc7f5e29caf95b9a76716 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 17 Feb 2003 07:06:29 +0000 Subject: [PATCH 11/16] r4058: Auto commit for Debian build --- debian/changelog | 6 ++++++ doc/readme.lml | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a04c70..7e3c3fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-lml (2.3.1-1) unstable; urgency=low + + * doc/readme.lml: Update with new meta arguents + + -- Kevin M. Rosenberg Mon, 17 Feb 2003 00:04:52 -0700 + cl-lml (2.3.0-1) unstable; urgency=low * Change definition of link/meta diff --git a/doc/readme.lml b/doc/readme.lml index 5e15371..70a3b35 100644 --- a/doc/readme.lml +++ b/doc/readme.lml @@ -5,11 +5,11 @@ (page readme (head (title "LML README") - (meta-key :http-equiv "Content-Type" :content "text/html; charset=iso-8859-1") - (meta "Copyright" "Kevin Rosenberg 2002 ") - (meta "description" "Lisp Markup Language Documentation") - (meta "author" "Kevin Rosenberg") - (meta "keywords" "Common Lisp, HTML, Markup Langauge")) + (meta :http-equiv "Content-Type" :content "text/html; charset=iso-8859-1") + (meta :name "Copyright" :content "Kevin Rosenberg 2002 ") + (meta :name "description" :content "Lisp Markup Language Documentation") + (meta :name "author" :content "Kevin Rosenberg") + (meta :name "keywords" :content "Common Lisp, HTML, Markup Langauge")) (body (h1 "LML Documentation") -- 2.34.1 From 8678e687343db77d30ece4df99a1c03c529a0c0c Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 5 Mar 2003 04:25:16 +0000 Subject: [PATCH 12/16] r4160: Auto commit for Debian build --- base.lisp | 4 ++-- debian/changelog | 6 ++++++ doc/readme.html | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/base.lisp b/base.lisp index 4a03e71..20a1677 100644 --- a/base.lisp +++ b/base.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: base.lisp,v 1.11 2003/02/17 06:48:46 kevin Exp $ +;;;; $Id: base.lisp,v 1.12 2003/03/05 04:25:09 kevin Exp $ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -49,7 +49,7 @@ (format *html-output* "~A~%" s)) (defun lml-write-char (char) - (write-char char *html-output)) + (write-char char *html-output*)) (defun lml-print-date (date) (lml-princ (date-string date))) diff --git a/debian/changelog b/debian/changelog index 7e3c3fd..f35ec77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-lml (2.3.2-1) unstable; urgency=low + + * Fix typo in lml-write-char + + -- Kevin M. Rosenberg Tue, 4 Mar 2003 21:24:53 -0700 + cl-lml (2.3.1-1) unstable; urgency=low * doc/readme.lml: Update with new meta arguents diff --git a/doc/readme.html b/doc/readme.html index 04c09d7..5e3bb2c 100644 --- a/doc/readme.html +++ b/doc/readme.html @@ -1,16 +1,16 @@ - -LML README

LML Documentation

Overview

LML is a Common Lisp package for generating HTML and XHTML documents. + +LML README

LML Documentation

Overview

LML is a Common Lisp package for generating HTML and XHTML documents. LML is authored by - Kevin Rosenberg. The home page for LML is - http://lml.b9.com/.

Installation

The easiest way to install LML is to use the Debian - GNU/Linux operating system. You can then use the command apt-get install cl-lml - to automatically download and install the LML package.

On a non-Debian system, you need to have either ASDF - or mk-defsystem + Kevin Rosenberg. The home page for LML is + http://lml.b9.com/.

Installation

The easiest way to install LML is to use the Debian + GNU/Linux operating system. You can then use the command apt-get install cl-lml + to automatically download and install the LML package.

On a non-Debian system, you need to have either ASDF + or mk-defsystem installed to load the system definition file. You will need to change the source - pathname in the system file to match the location where you have installed LML.

Usage

Currently, there is no documentation on the functions provided by LML. However, the source code is - instructive and there are example files included in the LML package.

Examples

Iteration

(i "The square of the first five integers are)"
+       pathname in the system file to match the location where you have installed LML.
Usage
Currently, there is no documentation on the functions provided by LML. However, the source code is
+		   instructive and there are example files included in the LML package.
Examples
Iteration
(i "The square of the first five integers are)"
  (b
    (loop as x from 1 to 5 
      doing
-     (lml-format " ~D" (* x x)))) The square of the first five integers are 1 4 9 16 25
View this page's LML source.
\ No newline at end of file
+     (lml-format " ~D" (* x x))))

The square of the first five integers are 1 4 9 16 25

View this page's LML source.

\ No newline at end of file -- 2.34.1 From 7f3cd207cac41ffb53fa8ca0d4563554e4ef16fa Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 12 Mar 2003 17:01:48 +0000 Subject: [PATCH 13/16] r4186: Auto commit for Debian build --- debian/changelog | 6 ++++++ utils.lisp | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f35ec77..89b5604 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-lml (2.3.3-1) unstable; urgency=low + + * New upstream [fixes mcl issue] + + -- Kevin M. Rosenberg Wed, 12 Mar 2003 10:01:25 -0700 + cl-lml (2.3.2-1) unstable; urgency=low * Fix typo in lml-write-char diff --git a/utils.lisp b/utils.lisp index 8ebcefc..dcd0995 100644 --- a/utils.lisp +++ b/utils.lisp @@ -1,4 +1,4 @@ -;;; $Id: utils.lisp,v 1.6 2003/02/15 03:00:22 kevin Exp $ +;;; $Id: utils.lisp,v 1.7 2003/03/12 17:01:48 kevin Exp $ ;;;; ;;;; General purpose utilities @@ -59,7 +59,9 @@ #+lispworks (lw:quit :status code) #+lucid (lcl:quit code) #+sbcl (sb-ext:quit :unix-status (typecase code (number code) (null 0) (t 1))) - #+mcl (ccl:quit code) + #+openmcl (ccl:quit code) + #+(and mcl (not openmcl)) (declare (ignore code)) + #+(and mcl (not openmcl)) (ccl:quit) #-(or allegro clisp cmu scl cormanlisp gcl lispworks lucid sbcl mcl) (error 'not-implemented :proc (list 'quit code))) -- 2.34.1 From f87e936240074170daa279652ab259909f967a4e Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 12 Mar 2003 17:02:10 +0000 Subject: [PATCH 14/16] r4187: Automatic commit for debian_version_2_3_3-1 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a805a73..20cd8bb 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Kevin M. Rosenberg Build-Depends-Indep: debhelper (>> 4.0.0) -Standards-Version: 3.5.8.0 +Standards-Version: 3.5.9.0 Package: cl-lml Architecture: all -- 2.34.1 From 5559792b52819370c47ec865053216ec91ae81e2 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 23 Mar 2003 18:41:50 +0000 Subject: [PATCH 15/16] r4229: *** empty log message *** --- base.lisp | 8 ++++---- debian/changelog | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/base.lisp b/base.lisp index 20a1677..ac32af8 100644 --- a/base.lisp +++ b/base.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: base.lisp,v 1.12 2003/03/05 04:25:09 kevin Exp $ +;;;; $Id: base.lisp,v 1.13 2003/03/23 18:38:16 kevin Exp $ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -85,10 +85,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" diff --git a/debian/changelog b/debian/changelog index 89b5604..d3ded6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-lml (2.3.4-1) unstable; urgency=low + + * Minor upstream change + + -- Kevin M. Rosenberg Sat, 22 Mar 2003 23:30:29 -0700 + cl-lml (2.3.3-1) unstable; urgency=low * New upstream [fixes mcl issue] -- 2.34.1 From d5efacf3fe09226f7945730a433f5931c95b709c Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 19 Apr 2003 03:50:12 +0000 Subject: [PATCH 16/16] r4534: Auto commit for Debian build --- base.lisp | 64 +++--------------------------------------------- debian/changelog | 6 +++++ debian/rules | 6 ++--- lml.asd | 20 ++++++--------- 4 files changed, 19 insertions(+), 77 deletions(-) diff --git a/base.lisp b/base.lisp index ac32af8..2939200 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.13 2003/03/23 18:38:16 kevin Exp $ +;;;; $Id: base.lisp,v 1.14 2003/04/19 03:50:12 kevin Exp $ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -256,64 +256,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))))) + diff --git a/debian/changelog b/debian/changelog index d3ded6b..8d2b90c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-lml (2.4.0-1) unstable; urgency=low + + * Create lml-base system that loads without the read macro. + + -- Kevin M. Rosenberg Fri, 18 Apr 2003 21:47:19 -0600 + cl-lml (2.3.4-1) unstable; urgency=low * Minor upstream change diff --git a/debian/rules b/debian/rules index 36fca29..d1abbd5 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,6 @@ configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. - touch configure-stamp @@ -25,9 +24,7 @@ build: build-stamp build-stamp: configure-stamp dh_testdir - # Add here commands to compile the package. - touch build-stamp clean: @@ -44,8 +41,9 @@ install: build dh_clean -k # Add here commands to install the package into debian/lml. dh_installdirs $(clc-systems) $(clc-lml) $(doc-dir) - dh_install lml.asd $(shell echo *.lisp) $(clc-lml) + dh_install lml.asd lml-base.asd $(shell echo *.lisp) $(clc-lml) dh_install $(shell echo doc/*.html) $(doc-dir) + dh_link $(clc-lml)/lml-base.asd $(clc-systems)/lml-base.asd dh_link $(clc-lml)/lml.asd $(clc-systems)/lml.asd # Build architecture-independent files here. diff --git a/lml.asd b/lml.asd index 6efe339..63160b4 100644 --- a/lml.asd +++ b/lml.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: lml.asd,v 1.12 2002/12/29 09:10:41 kevin Exp $ +;;;; $Id: lml.asd,v 1.13 2003/04/19 03:50:12 kevin Exp $ ;;;; ;;;; This file, part of LML, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -20,22 +20,18 @@ (defsystem :lml :name "cl-lml" - :author "Kevin M. Rosenberg " - :version "1.0.7" + :author "Kevin M. Rosenberg " + :version "2.4.0" :maintainer "Kevin M. Rosenberg " :licence "GNU General Public License" :description "Lisp Markup Language" :long-description "LML provides creation of XHTML for Lisp programs." - :perform (load-op :after (op lml) - (pushnew :lml cl:*features*)) + :depends-on (:lml-base) :components - ((:file "package") - (:file "utils" :depends-on ("package")) - (:file "files" :depends-on ("utils")) - (:file "base" :depends-on ("files")) - (:file "stdsite" :depends-on ("base")) - (:file "downloads" :depends-on ("base")) - )) + ((:file "read-macro")) + ) + + -- 2.34.1