November 2003 - clhp-cvs@common-lisp.net - mailman3.common-lisp.net

[clhp-cvs] CVS update: public_html/view-source.clhp public_html/style.css public_html/index.clhp public_html/funcs.lisp
by Anthony Ventimiglia 25 Nov '03

25 Nov '03

Update of /project/clhp/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv4859 Modified Files: view-source.clhp style.css index.clhp funcs.lisp Log Message: Modified to be used as static page until clhp is allowed to run on common-lisp.net Date: Tue Nov 25 14:46:09 2003 Author: aventimiglia Index: public_html/view-source.clhp diff -u public_html/view-source.clhp:1.2 public_html/view-source.clhp:1.3 --- public_html/view-source.clhp:1.2 Thu Nov 13 15:40:51 2003 +++ public_html/view-source.clhp Tue Nov 25 14:46:09 2003 @@ -7,7 +7,8 @@ (defun real-path (page) "Return the true path of URI" (concatenate 'string (gethash :DOCUMENT_ROOT *SERVER-ENV*) - page)) + (if (search "../" page) "/index.clhp" + page))) (defun webify (string) "This converts the offending characters in STRING to characters that @@ -18,8 +19,10 @@ (case char (#\< '(#\& #\l #\t #\;)) (#\& '(#\& #\a #\m #\p #\;)) - (otherwise (list char)))) - " ")) + (otherwise (list char)))))) +(defun fontify (string) + "Syntax Highlighting function" + string) (echon +doctype+) ?> @@ -32,9 +35,10 @@ <pre> <?clhp (with-open-file (str (real-path (gethash "page" *query-vars*))) + (echo (tag '|h1| (real-path (gethash "page" *query-vars*)))) (loop for line = (read-line str nil 'eof) while (not (eq 'eof line)) - do (princ (webify line)))) + do (echo (fontify (webify line)) (tag '|br|)))) ?> </pre> Index: public_html/style.css diff -u public_html/style.css:1.2 public_html/style.css:1.3 --- public_html/style.css:1.2 Thu Nov 13 12:24:40 2003 +++ public_html/style.css Tue Nov 25 14:46:09 2003 @@ -1,9 +1,7 @@ -/* Style code taken from oswd.net, this design originally by haran. -/* original header: -/* TITLE: Stylesheet for Purple Haze -/* URI : /purplehaze/purplehaze.css -/* MODIF: 2002-12-15 17:34 +0800 - +/* c + * $Id: style.css,v 1.3 2003/11/25 19:46:09 aventimiglia Exp $ + * + * This is a modification of the common-lisp.net stylesheet */ /* ###### Color Scheme ###### */ @@ -17,18 +15,18 @@ */ .headerSubTitle, .topOfPage, q, h1, h2, h3, .headerTitle, .siteMap, .siteMap *, .headerLinks, .headerLinks *, .sideBox div, #footer * -{ /* Text Color: */ color: /* #a0a0ff; */ #1111ff; } +{ /* Text Color: */ color: #3121c3; } q, h2, #header, .sideBox, .sideBox div, #footer -{ /* Border Color: */ border-color: #c0c0ff; } +{ /* Border Color: */ border-color: #21752c; } #header, .sideBox div, .sideBox a:hover -{ /* Background Color (darker): */ background-color: #f0f0ff; } +{ /* Background Color (darker): */ background-color: #8fc371; } -q, .sideBox a, .sideBox span, #footer +q, .sideBox a, .sideBox span, #footer, body /* Background Color (lighter): */ - { background-color: #fcfcff; } + { background-color: #fbffb1; } @@ -85,7 +83,6 @@ } .topOfPage { - font-size: 90%; font-weight: bold; font-variant: small-caps; text-decoration: none; @@ -99,21 +96,19 @@ } body { - background-color: white; - color: black; - font-family: "arial"; /* verdana, tahoma, helvetica, arial, sans-serif;*/ - font-size: 100%; + font-family: "verdana"; + font-size: 110%; margin: 0; } h1, h2, h3 { - font-family: "arial"; /* , sans-serif; */ + font-family: "verdana"; } h1 { font-weight: bold; font-size: 150%; - font-family: "arial"; + font-family: "verdana"; border-bottom: 1px solid; padding-bottom: 0.5ex; } @@ -121,7 +116,7 @@ h2 { font-weight: bold; font-size: 100%; - font-family: "arial"; + font-family: "verdana"; padding-bottom: 0.5ex; } @@ -142,7 +137,7 @@ } q { - font-family: "arial"; /* , verdana, helvetica, arial, sans-serif; */ + font-family: "verdane"; /* , verdana, helvetica, arial, sans-serif; */ font-weight: bold; border: 2px dotted; margin: 0 1em 1ex 1em; @@ -156,17 +151,17 @@ #header { border-bottom: 2px solid; - height: 6em; + height: 6.6em; margin-bottom: 5mm; padding: 2em 2.5mm 0 5mm; } .headerTitle { - font-size: 370%; + font-size: 390%; } .headerSubTitle { - font-size: 180%; + font-size: 220%; } .headerLinks { @@ -198,7 +193,6 @@ .siteMap * { text-decoration: none; -/* font-weight: bold; */ padding-right: 1ex; } @@ -210,8 +204,6 @@ /* ###### Side Box ###### */ .sideBox { - border-top: 2px solid; - border-bottom: 2px solid; margin-top: 5mm; } Index: public_html/index.clhp diff -u public_html/index.clhp:1.8 public_html/index.clhp:1.9 --- public_html/index.clhp:1.8 Thu Nov 13 15:40:51 2003 +++ public_html/index.clhp Tue Nov 25 14:46:09 2003 @@ -47,12 +47,13 @@ <li><a href=\"http://common-lisp.net/mailman/listinfo/clhp-cvs\"> clhp-cvs</a> Reports on CVS activity.</li> </ul>") - ("Documentation" - "Sorry, right now you're left to reading the source on how -CLHP specific functions and variables work, but I'll have some basic -documentation coming soon. If you want to see examples of CLHP in -action, click the View-Source link at the top of any of the -pages on this site."))) +; ("Documentation" +; "Sorry, right now you're left to reading the source on how +;CLHP specific functions and variables work, but I'll have some basic +;documentation coming soon. If you want to see examples of CLHP in +;action, click the View-Source link at the top of any of the +;pages on this site.") + )) @@ -67,7 +68,7 @@ <body> <?clhp -(loop for tag in (page-body "$Date: 2003/11/13 20:40:51 $") +(loop for tag in (page-body "$Date: 2003/11/25 19:46:09 $") do (echon tag)) ?> Index: public_html/funcs.lisp diff -u public_html/funcs.lisp:1.5 public_html/funcs.lisp:1.6 --- public_html/funcs.lisp:1.5 Thu Nov 13 15:06:14 2003 +++ public_html/funcs.lisp Tue Nov 25 14:46:09 2003 @@ -1,4 +1,4 @@ -;; $Id: funcs.lisp,v 1.5 2003/11/13 20:06:14 aventimiglia Exp $ +;; $Id: funcs.lisp,v 1.6 2003/11/25 19:46:09 aventimiglia Exp $ ;; ;; Functions used on clhp website ;; at http://common-lisp.net/project/clhp @@ -13,7 +13,9 @@ (in-package :www) (defconstant +doctype+ "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"xhtml1-strict.dtd\">") + (defconstant +stylesheet+ "style.css") + (defconstant +header-links+ '(("http://common-lisp.net/" "Common-Lisp.net"))) @@ -29,8 +31,6 @@ list, where the CAR is the Section name and the CDR is the content.") -(declaim (inline echon head)) - (defun echon (&rest args) (apply #'echo (nconc args '(#\NewLine)))) @@ -56,11 +56,11 @@ (tag '|span| '|class| "headerSubTitle" subtitle) (tag '|div| '|class| "headerLinks" (make-links +header-links+)) (tag '|div| '|class| "siteMap" - (make-links - (append +site-links+ - (list (list (format nil "/view-source.clhp?page=~A" - (gethash :script_name *server-env*)) - "View-Source")))))))) + (make-links +site-links+))))) +; (append +site-links+ +; (list (list (format nil "/view-source.clhp?page=~A" +; (gethash :script_name *server-env*)) +; "View-Source")))))))) (defun page-body (cvs-date) (list @@ -93,7 +93,7 @@ (defun page-menu () (if *page-sections* - (tag '|div| '|class| "sideBox LHS" + (tag '|div| '|class| "sideBox RHS" (make-links (loop for section in *page-sections* collect (let ((name (car section))) (list (format nil "#~A" name) name)))))

1 0

[clhp-cvs] CVS update: clhp/clhp.lisp clhp/clhp.asd clhp/Makefile
by Anthony Ventimiglia 14 Nov '03

14 Nov '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv4958 Modified Files: clhp.lisp clhp.asd Makefile Log Message: Versioning changes post release Date: Fri Nov 14 17:45:40 2003 Author: aventimiglia Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.22 clhp/clhp.lisp:1.23 --- clhp/clhp.lisp:1.22 Fri Nov 14 17:32:10 2003 +++ clhp/clhp.lisp Fri Nov 14 17:45:39 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.22 2003/11/14 22:32:10 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.23 2003/11/14 22:45:39 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -28,8 +28,8 @@ ;; by changing the NIL in the first part of the OR, a release number ;; will override the CVS keyword (defconstant *CLHP-VERSION* - #.(or "0.2.1alpha" ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/14 22:32:10 $")) + #.(or nil ; Set this for releases + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/14 22:45:39 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) Index: clhp/clhp.asd diff -u clhp/clhp.asd:1.5 clhp/clhp.asd:1.6 --- clhp/clhp.asd:1.5 Fri Nov 14 17:32:10 2003 +++ clhp/clhp.asd Fri Nov 14 17:45:39 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: clhp.asd,v 1.5 2003/11/14 22:32:10 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: clhp.asd,v 1.6 2003/11/14 22:45:39 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -30,8 +30,8 @@ :name "net.common-lisp.aventimiglia.clhp" :author "Anthony Ventimiglia <anthony(a)ventimiglia.org>" :maintainer "Anthony Ventimiglia <anthony(a)ventimiglia.org>" - :version #.(or "0.2.1alpha" - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/14 22:32:10 $")) + :version #.(or nil + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/14 22:45:39 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) Index: clhp/Makefile diff -u clhp/Makefile:1.23 clhp/Makefile:1.24 --- clhp/Makefile:1.23 Fri Nov 14 17:32:13 2003 +++ clhp/Makefile Fri Nov 14 17:45:39 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.23 2003/11/14 22:32:13 aventimiglia Exp $ +# $Id: Makefile,v 1.24 2003/11/14 22:45:39 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -84,11 +84,11 @@ # makefile most likeley will not match the cvs version ID in # clhp.lisp, since they depend on their own file's cvs date keyword. -CVSID=$(shell echo $Date: 2003/11/14 22:32:13 $ | \ +CVSID=$(shell echo $Date: 2003/11/14 22:45:39 $ | \ awk '{print $$2}'| sed s/\\///g )cvs -#VERSION=$(CVSID) -VERSION=0.2.1alpha +VERSION=$(CVSID) +#VERSION=0.2.1alpha TARROOT=clhp-$(VERSION) TARBALL=$(TARROOT).tar.gz

1 0

[clhp-cvs] CVS update: clhp/clhp.lisp clhp/clhp.asd clhp/TODO clhp/NEWS clhp/Makefile
by Anthony Ventimiglia 14 Nov '03

14 Nov '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv31678 Modified Files: clhp.lisp clhp.asd TODO NEWS Makefile Log Message: Changes for 0.2.1alpha release Date: Fri Nov 14 17:32:20 2003 Author: aventimiglia Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.21 clhp/clhp.lisp:1.22 --- clhp/clhp.lisp:1.21 Thu Nov 13 14:37:41 2003 +++ clhp/clhp.lisp Fri Nov 14 17:32:10 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.21 2003/11/13 19:37:41 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.22 2003/11/14 22:32:10 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -28,8 +28,8 @@ ;; by changing the NIL in the first part of the OR, a release number ;; will override the CVS keyword (defconstant *CLHP-VERSION* - #.(or nil ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/13 19:37:41 $")) + #.(or "0.2.1alpha" ; Set this for releases + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/14 22:32:10 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) Index: clhp/clhp.asd diff -u clhp/clhp.asd:1.4 clhp/clhp.asd:1.5 --- clhp/clhp.asd:1.4 Thu Nov 13 00:10:40 2003 +++ clhp/clhp.asd Fri Nov 14 17:32:10 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: clhp.asd,v 1.4 2003/11/13 05:10:40 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: clhp.asd,v 1.5 2003/11/14 22:32:10 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -30,8 +30,8 @@ :name "net.common-lisp.aventimiglia.clhp" :author "Anthony Ventimiglia <anthony(a)ventimiglia.org>" :maintainer "Anthony Ventimiglia <anthony(a)ventimiglia.org>" - :version #.(or nil - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/13 05:10:40 $")) + :version #.(or "0.2.1alpha" + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/14 22:32:10 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) Index: clhp/TODO diff -u clhp/TODO:1.13 clhp/TODO:1.14 --- clhp/TODO:1.13 Wed Nov 12 23:57:44 2003 +++ clhp/TODO Fri Nov 14 17:32:11 2003 @@ -1,4 +1,6 @@ -$Id: TODO,v 1.13 2003/11/13 04:57:44 aventimiglia Exp $ -*- outline -*- +$Id: TODO,v 1.14 2003/11/14 22:32:11 aventimiglia Exp $ -*- outline -*- + +* Turn Header printing over to CLHP * Make a new installation method, more lisp based. part of this should do automatic versioning, or at least make Index: clhp/NEWS diff -u clhp/NEWS:1.4 clhp/NEWS:1.5 --- clhp/NEWS:1.4 Wed Nov 12 23:57:44 2003 +++ clhp/NEWS Fri Nov 14 17:32:12 2003 @@ -1,4 +1,11 @@ -$Id: NEWS,v 1.4 2003/11/13 04:57:44 aventimiglia Exp $ -*- outline -*- +$Id: NEWS,v 1.5 2003/11/14 22:32:12 aventimiglia Exp $ -*- outline -*- + +* Fri Nov 14 17:27:53 EST 2003 -- 0.2.1alpha release +** Fixed a Header problem + In the last release CLHP was generating Headers improperly. Now + Apache generates and sends the headers, which means that you can't + control the headers from inside a CLHP program. This will be fixed + in a later version. * Wed Nov 12 23:52:02 EST 2003 -- 0.2.0alpha release ** mod_clhp Index: clhp/Makefile diff -u clhp/Makefile:1.22 clhp/Makefile:1.23 --- clhp/Makefile:1.22 Thu Nov 13 00:10:40 2003 +++ clhp/Makefile Fri Nov 14 17:32:13 2003 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.22 2003/11/13 05:10:40 aventimiglia Exp $ +# $Id: Makefile,v 1.23 2003/11/14 22:32:13 aventimiglia Exp $ # # CLHP the Common Lisp Hypertext Preprocessor # (C) 2003 Anthony J Ventimiglia @@ -84,11 +84,11 @@ # makefile most likeley will not match the cvs version ID in # clhp.lisp, since they depend on their own file's cvs date keyword. -CVSID=$(shell echo $Date: 2003/11/13 05:10:40 $ | \ +CVSID=$(shell echo $Date: 2003/11/14 22:32:13 $ | \ awk '{print $$2}'| sed s/\\///g )cvs -VERSION=$(CVSID) -#VERSION=0.2.0alpha +#VERSION=$(CVSID) +VERSION=0.2.1alpha TARROOT=clhp-$(VERSION) TARBALL=$(TARROOT).tar.gz

1 0

[clhp-cvs] CVS update: public_html/view-source.clhp public_html/index.clhp
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv7957 Modified Files: view-source.clhp index.clhp Log Message: Ok here's a working source viewer, next up we work on making it pretty. Date: Thu Nov 13 15:40:51 2003 Author: aventimiglia Index: public_html/view-source.clhp diff -u public_html/view-source.clhp:1.1 public_html/view-source.clhp:1.2 --- public_html/view-source.clhp:1.1 Thu Nov 13 15:06:14 2003 +++ public_html/view-source.clhp Thu Nov 13 15:40:51 2003 @@ -1,21 +1,43 @@ -<?xml versio="1.0"?> +<?xml version="1.0"?> <?clhp (unless (find-package :www) (require "funcs.lisp")) (use-package :www) +(defun real-path (page) + "Return the true path of URI" + (concatenate 'string (gethash :DOCUMENT_ROOT *SERVER-ENV*) + page)) + +(defun webify (string) + "This converts the offending characters in STRING to characters that +will allow for clean HTML output" + (concatenate 'string + (loop for char in (coerce string 'list) + appending + (case char + (#\< '(#\& #\l #\t #\;)) + (#\& '(#\& #\a #\m #\p #\;)) + (otherwise (list char)))) + " ")) + (echon +doctype+) ?> <html> <?clhp (echon (head "CLHP -- View Page Source")) ?> <body> +<?clhp (echon (page-header "CLHP" ".clhp source viewer")) ?> + +<pre> <?clhp -(echon (page-header "CLHP" ".clhp source viewer")) -(echon (tag '|p| (list - "view page: " - (gethash "page" *query-vars*)))) +(with-open-file (str (real-path (gethash "page" *query-vars*))) + (loop for line = (read-line str nil 'eof) + while (not (eq 'eof line)) + do (princ (webify line)))) + ?> +</pre> </body> </html> Index: public_html/index.clhp diff -u public_html/index.clhp:1.7 public_html/index.clhp:1.8 --- public_html/index.clhp:1.7 Thu Nov 13 15:06:14 2003 +++ public_html/index.clhp Thu Nov 13 15:40:51 2003 @@ -1,16 +1,11 @@ <?xml version="1.0"?> <?clhp -;; Since the server is not yet equipped with CLHP, I will build run -;; these pages through the CLHP parser, and use the resulting pages -;; for the web site with the following command: +;; This loads an auxilary file, which contains common functions used +;; throughtout this site, the REQUIRE name is probably a bad function +;; name, but at the time INCLUDE was taken, now I can rename it. ;; -#| -$ lisp -core /usr/lib/cmucl/clhp.core \ - -eval '(clhp:parse "index.clhp")(quit)' > index.html && \ - echo -e "1,3d\nwq\n" | ed index.html -|# -;; The HTTP Headers will have to be deleted from the resulting file. - +;; If you want to see the contents of "funcs.lisp" goto +;; http://common-lisp.net/project/clhp/view-source.clhp?page=/funcs.lisp (unless (find-package :www) (require "funcs.lisp")) (use-package :www) @@ -19,19 +14,45 @@ ;; CAR as the section name and the CDR as the section contents. (setq *page-sections* '(("Introduction" - "CLHP combines the joys of common Lisp with the ease of PHP for web development. Just as with PHP, you embed code into an XML or HTML document using XML processing instructions <?clhp :like-this ?>. By using XML processing instructions, lisp code can be embedded in any valid XML document and still result in a valid XML document" - "The CLHP parser is integrated into the <a href='http://www.apache.org/'>Apache</a> web server as a module. When Apache recieves a request for a clhp page, Apache passes it on to a Lisp process which simply looks for the <?clhp processing instructions. The Lisp code inside the processing instructions is evaluated, all output through *STANDARD-OUTPUT* is printed in place of the processing instruction block. All other text outside of the processing instructions is passed on as is." - "The langauge inside CLHP is Common-Lisp, so CLHP itself defines very few functions. It allows you to build Web programs the same way you would write a Lisp program. You can define functions, structures etc inside your page, or you could load external precompiled files with utility functions in them.") + "CLHP combines the joys of common Lisp with the ease of PHP +for web development. Just as with PHP, you embed code into an XML or +HTML document using XML processing instructions <?clhp +:like-this ?>. By using XML processing instructions, lisp code +can be embedded in any valid XML document and still result in a valid +XML document" + "The CLHP parser is integrated into the <a +href='http://www.apache.org/'>Apache</a> web server as a module. When +Apache recieves a request for a clhp page, Apache passes it on to a +Lisp process which simply looks for the <?clhp processing +instructions. The Lisp code inside the processing instructions is +evaluated, all output through *STANDARD-OUTPUT* is printed in place of +the processing instruction block. All other text outside of the +processing instructions is passed on as is." + "The langauge inside CLHP is Common-Lisp, so CLHP itself +defines very few functions. It allows you to build Web programs the +same way you would write a Lisp program. You can define functions, +structures etc inside your page, or you could load external +precompiled files with utility functions in them.") ("Current version" - "The latest version is 0.2.0alpha, it brings the Apache module, asdf package building, and a few small enhancements to the CLHP package.") + "The latest version is 0.2.0alpha, it brings the Apache +module, asdf package building, and a few small enhancements to the +CLHP package.") ("Mailing Lists" "<ul> - <li><a href=\"http://common-lisp.net/mailman/listinfo/clhp-devel\">clhp-devel</a> List for Developer discussion and bug reports.</li> - <li><a href=\"http://common-lisp.net/mailman/listinfo/clhp-announce\">clhp-devel</a> Announcements on Releases, patches, bug-fixes and general news.</li> - <li><a href=\"http://common-lisp.net/mailman/listinfo/clhp-cvs\">clhp-cvs</a> Reports on CVS activity.</li> +<li><a href=\"http://common-lisp.net/mailman/listinfo/clhp-devel\"> + clhp-devel</a> List for Developer discussion and bug reports.</li> +<li><a href=\"http://common-lisp.net/mailman/listinfo/clhp-announce\"> + clhp-announce</a> Announcements on Releases, patches, bug-fixes +and general news.</li> +<li><a href=\"http://common-lisp.net/mailman/listinfo/clhp-cvs\"> + clhp-cvs</a> Reports on CVS activity.</li> </ul>") ("Documentation" - "Sorry, right now you're left to reading the source on how CLHP specific functions and variables work, but I'll have some basic documentation coming soon. If you want to see examples of CLHP in action, click the View-Source link at the top of any of the pages on this site."))) + "Sorry, right now you're left to reading the source on how +CLHP specific functions and variables work, but I'll have some basic +documentation coming soon. If you want to see examples of CLHP in +action, click the View-Source link at the top of any of the +pages on this site."))) @@ -46,7 +67,7 @@ <body> <?clhp -(loop for tag in (page-body "$Date: 2003/11/13 20:06:14 $") +(loop for tag in (page-body "$Date: 2003/11/13 20:40:51 $") do (echon tag)) ?>

1 0

[clhp-cvs] CVS update: public_html/view-source.clhp public_html/index.clhp public_html/funcs.lisp
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv24505 Modified Files: index.clhp funcs.lisp Added Files: view-source.clhp Log Message: Beginning work on View-Source page. Date: Thu Nov 13 15:06:15 2003 Author: aventimiglia Index: public_html/index.clhp diff -u public_html/index.clhp:1.6 public_html/index.clhp:1.7 --- public_html/index.clhp:1.6 Thu Nov 13 12:24:40 2003 +++ public_html/index.clhp Thu Nov 13 15:06:14 2003 @@ -31,62 +31,24 @@ <li><a href=\"http://common-lisp.net/mailman/listinfo/clhp-cvs\">clhp-cvs</a> Reports on CVS activity.</li> </ul>") ("Documentation" - "Sorry, right now you're left to reading the source on how CLHP specific functions and variables work, but I'll have some basic documentation coming soon"))) + "Sorry, right now you're left to reading the source on how CLHP specific functions and variables work, but I'll have some basic documentation coming soon. If you want to see examples of CLHP in action, click the View-Source link at the top of any of the pages on this site."))) ;; Start of page output (echon +doctype+) +?> -(echon - (tag '|html| - (list - (head "CLHP the Common Lisp Hypertext Preprocessor") - (tag '|body| - (page-body "$Date: 2003/11/13 17:24:40 $"))))) - - -;(defvar *title* "CLHP the Common Lisp Hypertext Preprocessor") -;(defvar *readme* "/home/ant/src/clhp/README") -;(defvar *links* '(("Download" "ftp://common-lisp.net/pub/project/clhp"))) -; -; -;(defun dump-text-file (file-name) -; (with-open-file -; (stream file-name :direction :input :if-does-not-exist :error) -; (let* ((buffer-size (file-length stream)) -; (buffer (make-array buffer-size :element-type 'character))) -; (read-sequence buffer stream) -; buffer))) -; -;(defun link (pair) -; "Takes a cons pair (CONTENT URI) and forms a link." -; (tag "a" "href" (cadr pair) (car pair))) -; -;(echo -; (tag "html" -; (list -; (tag "head" -; (tag "title" *title*)) -; (tag "body" -; (list -; (tag "h1" *title*) -; (tag "hr") -; (tag "p" (list -; "I apologize for the lack of content on this site, " -; "CLHP is still in it's early stages, so this simply " -; "contains the README file, with the addition of some " -; "extra links")) -; (tag "p" -; (list -; "To get the latest version, click the " -; (link (assoc "Download" *links* :test #'string=)) -; " link. To checkout the CVS via anonymous pserver cvs, use " -; (tag "b" (list -; "anonymous@common-lisp.net:/project/clhp/cvsroot " -; "co clhp")))) -; (tag "h3" "README") -; (tag "hr") -; (tag "pre" (dump-text-file *readme*))))))) -;(format t "~&") -?> \ No newline at end of file +<html> + +<?clhp (echon (head "CLHP the Common Lisp Hypertext Preprocessor")) ?> + +<body> + +<?clhp +(loop for tag in (page-body "$Date: 2003/11/13 20:06:14 $") + do (echon tag)) +?> + +</body> +</html> Index: public_html/funcs.lisp diff -u public_html/funcs.lisp:1.4 public_html/funcs.lisp:1.5 --- public_html/funcs.lisp:1.4 Thu Nov 13 12:27:05 2003 +++ public_html/funcs.lisp Thu Nov 13 15:06:14 2003 @@ -1,4 +1,4 @@ -;; $Id: funcs.lisp,v 1.4 2003/11/13 17:27:05 aventimiglia Exp $ +;; $Id: funcs.lisp,v 1.5 2003/11/13 20:06:14 aventimiglia Exp $ ;; ;; Functions used on clhp website ;; at http://common-lisp.net/project/clhp @@ -7,8 +7,8 @@ (defpackage :net.common-lisp.aventimiglia.clhp.www (:nicknames #:www) (:use #:cl #:clhp) - (:export #:+doctype+ #:echon #:head #:*page-sections* - #:page-body)) + (:export #:+doctype+ #:echon #:head #:*page-sections* #:page-body + #:page-header)) (in-package :www) @@ -18,9 +18,11 @@ '(("http://common-lisp.net/" "Common-Lisp.net"))) (defconstant +site-links+ - '(("http://common-lisp.net/cgi-bin/viewcvs.cgi/clhp/?cvsroot=clhp" + '(("/" "Home") + ("http://common-lisp.net/cgi-bin/viewcvs.cgi/clhp/?cvsroot=clhp" "ViewCVS") ("ftp://common-lisp.net/pub/project/clhp/" "Downloads"))) + (defvar *page-sections* nil "These are the text sections of the page. Each section is a element @@ -53,7 +55,12 @@ (list caption " ")) (tag '|span| '|class| "headerSubTitle" subtitle) (tag '|div| '|class| "headerLinks" (make-links +header-links+)) - (tag '|div| '|class| "siteMap" (make-links +site-links+))))) + (tag '|div| '|class| "siteMap" + (make-links + (append +site-links+ + (list (list (format nil "/view-source.clhp?page=~A" + (gethash :script_name *server-env*)) + "View-Source")))))))) (defun page-body (cvs-date) (list

1 0

[clhp-cvs] CVS update: clhp/package.lisp clhp/mod_clhp.c clhp/clhp.lisp clhp/cgi.lisp clhp/ChangeLog
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/clhp In directory common-lisp.net:/tmp/cvs-serv10767 Modified Files: package.lisp mod_clhp.c clhp.lisp cgi.lisp ChangeLog Log Message: Removed HEADER and INCLUDE functions, because they were not working properly. mod_clhp generates a simple header. In the future, CLHP will have to get control of this again, for doing things like setting cookies and redirections. Date: Thu Nov 13 14:37:41 2003 Author: aventimiglia Index: clhp/package.lisp diff -u clhp/package.lisp:1.3 clhp/package.lisp:1.4 --- clhp/package.lisp:1.3 Wed Nov 12 17:41:55 2003 +++ clhp/package.lisp Thu Nov 13 14:37:41 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: package.lisp,v 1.3 2003/11/12 22:41:55 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: package.lisp,v 1.4 2003/11/13 19:37:41 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -25,8 +25,8 @@ (defpackage #:net.common-lisp.aventimiglia.clhp (:nicknames #:clhp #:cgi) ; The CGI will go away eventually (:use #:cl #:ext) - (:export #:*server-env* #:*query-vars* #:header #:debug #:init - #:parse #:*clhp-version* #:echo #:include #:xml-element + (:export #:*server-env* #:*query-vars* #:debug #:init + #:parse #:*clhp-version* #:echo #:xml-element #:make-xml-element #:copy-xml-element #:xml-element-attributes #:xml-element-name #:xml-element-contents #:xml-element-p #:tag #:require Index: clhp/mod_clhp.c diff -u clhp/mod_clhp.c:1.4 clhp/mod_clhp.c:1.5 --- clhp/mod_clhp.c:1.4 Wed Nov 12 16:57:40 2003 +++ clhp/mod_clhp.c Thu Nov 13 14:37:41 2003 @@ -1,4 +1,4 @@ -/* $Id: mod_clhp.c,v 1.4 2003/11/12 21:57:40 aventimiglia Exp $ +/* $Id: mod_clhp.c,v 1.5 2003/11/13 19:37:41 aventimiglia Exp $ CLHP the Common Lisp Hypertext Preprocessor (C) 2003 Anthony J Ventimiglia @@ -82,6 +82,13 @@ ap_add_common_vars ( req ); ap_add_cgi_vars ( req ); child.req = req; + + // First we should check if the document exists + // But for now... + req->content_type = "text/html"; + ap_table_set ( req->headers_out, "X-Powered-By", + "CLHP Common Lisp Hypertext Preprocessor" ); + ap_send_http_header ( req ); if ( ! ap_bspawn_child ( req->pool, run_lisp, (void *) &child, kill_always, &lisp_out, &lisp_in, NULL )) Index: clhp/clhp.lisp diff -u clhp/clhp.lisp:1.20 clhp/clhp.lisp:1.21 --- clhp/clhp.lisp:1.20 Thu Nov 13 00:10:40 2003 +++ clhp/clhp.lisp Thu Nov 13 14:37:41 2003 @@ -1,5 +1,5 @@ (ext:file-comment - "$Id: clhp.lisp,v 1.20 2003/11/13 05:10:40 aventimiglia Exp $") + "$Id: clhp.lisp,v 1.21 2003/11/13 19:37:41 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -29,7 +29,7 @@ ;; will override the CVS keyword (defconstant *CLHP-VERSION* #.(or nil ; Set this for releases - (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/13 05:10:40 $")) + (let* ((trimmed (string-trim "$ Date:" "$Date: 2003/11/13 19:37:41 $")) (date (subseq trimmed 0 (search " " trimmed)))) (concatenate 'string (subseq date 0 4) @@ -72,18 +72,6 @@ (use-package :cgi) (use-package :clhp) (init) - (header :content-type - :text/html - :extra - '(#.(format - nil - "X-Powered-By: CLHP/~a Common Lisp Hypertext Preprocessor" - *CLHP-VERSION*))) - (include file-name)) - -(defun include (file-name) - "parse FILE-NAME as a CLHP file, this is essentially the same as -PARSE, only it does not output headers." ;; We'll read the whole thing here into a buffer, then send it to ;; PARSE-BUFFER to recursively process it (handler-bind Index: clhp/cgi.lisp diff -u clhp/cgi.lisp:1.14 clhp/cgi.lisp:1.15 --- clhp/cgi.lisp:1.14 Tue Oct 21 12:57:27 2003 +++ clhp/cgi.lisp Thu Nov 13 14:37:41 2003 @@ -1,4 +1,4 @@ -#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.14 2003/10/21 16:57:27 aventimiglia Exp $") +#+cmu (ext:file-comment "$Id: cgi.lisp,v 1.15 2003/11/13 19:37:41 aventimiglia Exp $") ;; ;; CLHP the Common Lisp Hypertext Preprocessor ;; (C) 2003 Anthony J Ventimiglia @@ -42,28 +42,6 @@ "A hash-table of all variables passed through a GET or POST method, the key is a string, and all values are stored in string form.") -;; This will obviously be improved upon to handle different content -;; types, but for now it's just a stub to print plain text pages. It -;; is set up so it will only work the first time it is called, any -;; furthur calls will not do a thing -(let ((done nil)) - (defun header (&key (content-type 'text/plain) extra) - "This is the first output function that should be called by a CGI -program, it print the proper CGI header. The :CONTENT-TYPE field can -be a symbol, or a string, if whitespace is required. - -The :EXTRA key is used for any additional headers, it should be an a -list of strings, where each string will be printed on it's own line -exactly as it is passed, for example (HEADER :EXTRA -\"Content-Language: en\"). - -See RFC 2616 for more info" - (when (not done) - (dolist (header extra) - (format t "~a~%" header)) - (format t "Content-type: ~a~%~%" content-type) - (setf done t)))) - ;; This sets the main variables, since the library is already part of the lisp ;; core, we can't use an eval-when, I may eventually make a cgi:init that also ;; prints the header. @@ -217,7 +195,6 @@ (defun handle-general-error (condition) "A generic error handler function, this will basicall just print a text header, echoing the error-message." - (header :content-type :text/plain) (format t "CL-CGI: ~A~%" (error-message condition)) (quit)) Index: clhp/ChangeLog diff -u clhp/ChangeLog:1.27 clhp/ChangeLog:1.28 --- clhp/ChangeLog:1.27 Wed Nov 12 23:57:44 2003 +++ clhp/ChangeLog Thu Nov 13 14:37:41 2003 @@ -1,4 +1,17 @@ -2003-11-12 Anthony Ventimiglia <ant(a)afghan.dogpound> +2003-11-13 Anthony Ventimiglia <aventimiglia(a)common-lisp.net> + + * cgi.lisp, clhp.lisp, package.lisp: Removed HEADER, since it is + no longer used. Removed INCLUDE, moved it's functionality into + PARSE, since HEADER no longer exists, there's no need for the two + of them. + + * mod_clhp.c: module generates the headers, since CLHP was not + doing it properly, For now this works, but eventually we'll need + to have clhp do it since we may want to modify headers or set + cookies using CLHP. I guess Apache will have to pass + req->headers_out to Lisp and CLHP will have to send them. + +2003-11-12 Anthony Ventimiglia <aventimiglia(a)common-lisp.net> * Makefile: Removed pretty much all traces of old cgi based clhp @@ -289,9 +302,9 @@ 2003-09-17 16:21 <aventimiglia(a)common-lisp.net> * clhp.lisp: Wrote a nice little reader macro to make cvs - versioning automatic, the $Date: 2003/11/13 04:57:44 $ keyword is parsed to make a 8 + versioning automatic, the $Date: 2003/11/13 19:37:41 $ keyword is parsed to make a 8 digit number YYYYMMDD with the suffix "cvs" addedd, so a CVS - release with a $Date: 2003/11/13 04:57:44 $ of 2003/09/15 ends up with a + release with a $Date: 2003/11/13 19:37:41 $ of 2003/09/15 ends up with a *CLHP-VERSION* of "20030915cvs" 2003-09-17 14:47 <aventimiglia(a)common-lisp.net> @@ -300,4 +313,4 @@ that will aide in compiling lisp in a mkae freindly way by passing a non-zero exit code when compilation fails -$Id: ChangeLog,v 1.27 2003/11/13 04:57:44 aventimiglia Exp $ \ No newline at end of file +$Id: ChangeLog,v 1.28 2003/11/13 19:37:41 aventimiglia Exp $ \ No newline at end of file

1 0

[clhp-cvs] CVS update: public_html/funcs.lisp
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv14058 Modified Files: funcs.lisp Log Message: Finished footer function Date: Thu Nov 13 12:27:06 2003 Author: aventimiglia Index: public_html/funcs.lisp diff -u public_html/funcs.lisp:1.3 public_html/funcs.lisp:1.4 --- public_html/funcs.lisp:1.3 Thu Nov 13 12:24:40 2003 +++ public_html/funcs.lisp Thu Nov 13 12:27:05 2003 @@ -1,4 +1,4 @@ -;; $Id: funcs.lisp,v 1.3 2003/11/13 17:24:40 aventimiglia Exp $ +;; $Id: funcs.lisp,v 1.4 2003/11/13 17:27:05 aventimiglia Exp $ ;; ;; Functions used on clhp website ;; at http://common-lisp.net/project/clhp @@ -65,11 +65,12 @@ (page-footer cvs-date))) (defun page-footer (cvs-date) - (tag '|div| '|id| "footer" - (tag '|div| - (list - (tag '|b| "Modified: ") - (tag '|span| '|class| "footerCol2" cvs-date))))) + (let ((date (string-trim "$ Date:" cvs-date))) + (tag '|div| '|id| "footer" + (tag '|div| + (list + (tag '|b| "Modified: ") + (tag '|span| '|class| "footerCol2" date))))))

1 0

[clhp-cvs] CVS update: public_html/style.css public_html/index.clhp public_html/funcs.lisp
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv13141 Modified Files: style.css index.clhp funcs.lisp Log Message: Addedd the footer and finished main page text. Date: Thu Nov 13 12:24:40 2003 Author: aventimiglia Index: public_html/style.css diff -u public_html/style.css:1.1 public_html/style.css:1.2 --- public_html/style.css:1.1 Thu Nov 13 10:33:14 2003 +++ public_html/style.css Thu Nov 13 12:24:40 2003 @@ -67,7 +67,7 @@ #bodyText { line-height: 1.5em; margin: 10mm 14em 0 12em; - padding: 0 1em 1ex 1em; + padding: 0 1em 3.25ex 1em; } #bodyTextWide { Index: public_html/index.clhp diff -u public_html/index.clhp:1.5 public_html/index.clhp:1.6 --- public_html/index.clhp:1.5 Thu Nov 13 11:21:40 2003 +++ public_html/index.clhp Thu Nov 13 12:24:40 2003 @@ -19,9 +19,21 @@ ;; CAR as the section name and the CDR as the section contents. (setq *page-sections* '(("Introduction" - "CLHP combines the joys of common Lisp with the ease of PHP for web development") - ("Current version" - "The latest version is 0.2.0alpha"))) + "CLHP combines the joys of common Lisp with the ease of PHP for web development. Just as with PHP, you embed code into an XML or HTML document using XML processing instructions <?clhp :like-this ?>. By using XML processing instructions, lisp code can be embedded in any valid XML document and still result in a valid XML document" + "The CLHP parser is integrated into the <a href='http://www.apache.org/'>Apache</a> web server as a module. When Apache recieves a request for a clhp page, Apache passes it on to a Lisp process which simply looks for the <?clhp processing instructions. The Lisp code inside the processing instructions is evaluated, all output through *STANDARD-OUTPUT* is printed in place of the processing instruction block. All other text outside of the processing instructions is passed on as is." + "The langauge inside CLHP is Common-Lisp, so CLHP itself defines very few functions. It allows you to build Web programs the same way you would write a Lisp program. You can define functions, structures etc inside your page, or you could load external precompiled files with utility functions in them.") + ("Current version" + "The latest version is 0.2.0alpha, it brings the Apache module, asdf package building, and a few small enhancements to the CLHP package.") + ("Mailing Lists" + "<ul> + <li><a href=\"http://common-lisp.net/mailman/listinfo/clhp-devel\">clhp-devel</a> List for Developer discussion and bug reports.</li> + <li><a href=\"http://common-lisp.net/mailman/listinfo/clhp-announce\">clhp-devel</a> Announcements on Releases, patches, bug-fixes and general news.</li> + <li><a href=\"http://common-lisp.net/mailman/listinfo/clhp-cvs\">clhp-cvs</a> Reports on CVS activity.</li> +</ul>") + ("Documentation" + "Sorry, right now you're left to reading the source on how CLHP specific functions and variables work, but I'll have some basic documentation coming soon"))) + + ;; Start of page output (echon +doctype+) @@ -31,7 +43,7 @@ (list (head "CLHP the Common Lisp Hypertext Preprocessor") (tag '|body| - (page-body))))) + (page-body "$Date: 2003/11/13 17:24:40 $"))))) ;(defvar *title* "CLHP the Common Lisp Hypertext Preprocessor") Index: public_html/funcs.lisp diff -u public_html/funcs.lisp:1.2 public_html/funcs.lisp:1.3 --- public_html/funcs.lisp:1.2 Thu Nov 13 11:21:40 2003 +++ public_html/funcs.lisp Thu Nov 13 12:24:40 2003 @@ -1,4 +1,4 @@ -;; $Id: funcs.lisp,v 1.2 2003/11/13 16:21:40 aventimiglia Exp $ +;; $Id: funcs.lisp,v 1.3 2003/11/13 17:24:40 aventimiglia Exp $ ;; ;; Functions used on clhp website ;; at http://common-lisp.net/project/clhp @@ -49,25 +49,39 @@ web links" (tag '|div| '|id| "header" (list - (tag '|span| '|class| "headerTitle" (list caption " ")) + (tag '|span| '|class| "headerTitle" '|id| "top" + (list caption " ")) (tag '|span| '|class| "headerSubTitle" subtitle) (tag '|div| '|class| "headerLinks" (make-links +header-links+)) (tag '|div| '|class| "siteMap" (make-links +site-links+))))) -(defun page-body () +(defun page-body (cvs-date) (list (page-header "CLHP" "the Common Lisp Hypertext Preprocessor") (page-menu) (tag '|div| '|id| "bodyText" (loop for section in *page-sections* - nconcing (make-page-section section))))) + nconcing (make-page-section section))) + (page-footer cvs-date))) + +(defun page-footer (cvs-date) + (tag '|div| '|id| "footer" + (tag '|div| + (list + (tag '|b| "Modified: ") + (tag '|span| '|class| "footerCol2" cvs-date))))) + + (defun make-page-section (section) (let ((name (car section))) - (cons - (tag '|h1| '|id| name name) - (loop for p in (cdr section) - collect (tag '|p| p))))) + (nconc + (cons + (tag '|h1| '|id| name name) + (loop for p in (cdr section) + collect (tag '|p| p))) + (list (tag '|a| '|class| "topOfPage" '|href| "#top" + '|title| "Go to Top of Page" "top"))))) (defun page-menu () (if *page-sections*

1 0

[clhp-cvs] CVS update: public_html/index.clhp public_html/funcs.lisp
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv16152 Modified Files: index.clhp funcs.lisp Log Message: Got most of the functions that will be used to make thesite working Date: Thu Nov 13 11:21:41 2003 Author: aventimiglia Index: public_html/index.clhp diff -u public_html/index.clhp:1.4 public_html/index.clhp:1.5 --- public_html/index.clhp:1.4 Thu Nov 13 10:33:14 2003 +++ public_html/index.clhp Thu Nov 13 11:21:40 2003 @@ -15,6 +15,14 @@ (require "funcs.lisp")) (use-package :www) +;; Page sections are all defined here each section is a list, with the +;; CAR as the section name and the CDR as the section contents. +(setq *page-sections* + '(("Introduction" + "CLHP combines the joys of common Lisp with the ease of PHP for web development") + ("Current version" + "The latest version is 0.2.0alpha"))) + ;; Start of page output (echon +doctype+) @@ -23,12 +31,8 @@ (list (head "CLHP the Common Lisp Hypertext Preprocessor") (tag '|body| - (list - (page-header "CLHP" "the Common Lisp Hypertext Preprocessor")))))) + (page-body))))) - - - ;(defvar *title* "CLHP the Common Lisp Hypertext Preprocessor") ;(defvar *readme* "/home/ant/src/clhp/README") Index: public_html/funcs.lisp diff -u public_html/funcs.lisp:1.1 public_html/funcs.lisp:1.2 --- public_html/funcs.lisp:1.1 Thu Nov 13 10:33:14 2003 +++ public_html/funcs.lisp Thu Nov 13 11:21:40 2003 @@ -1,4 +1,4 @@ -;; $Id: funcs.lisp,v 1.1 2003/11/13 15:33:14 aventimiglia Exp $ +;; $Id: funcs.lisp,v 1.2 2003/11/13 16:21:40 aventimiglia Exp $ ;; ;; Functions used on clhp website ;; at http://common-lisp.net/project/clhp @@ -7,7 +7,8 @@ (defpackage :net.common-lisp.aventimiglia.clhp.www (:nicknames #:www) (:use #:cl #:clhp) - (:export #:+doctype+ #:echon #:head #:page-header)) + (:export #:+doctype+ #:echon #:head #:*page-sections* + #:page-body)) (in-package :www) @@ -16,11 +17,16 @@ (defconstant +header-links+ '(("http://common-lisp.net/" "Common-Lisp.net"))) -(defvar *site-links* +(defconstant +site-links+ '(("http://common-lisp.net/cgi-bin/viewcvs.cgi/clhp/?cvsroot=clhp" "ViewCVS") ("ftp://common-lisp.net/pub/project/clhp/" "Downloads"))) +(defvar *page-sections* nil + "These are the text sections of the page. Each section is a element +list, where the CAR is the Section name and the CDR is the content.") + + (declaim (inline echon head)) (defun echon (&rest args) @@ -46,7 +52,31 @@ (tag '|span| '|class| "headerTitle" (list caption " ")) (tag '|span| '|class| "headerSubTitle" subtitle) (tag '|div| '|class| "headerLinks" (make-links +header-links+)) - (tag '|div| '|class| "siteMap" (make-links *site-links*))))) - + (tag '|div| '|class| "siteMap" (make-links +site-links+))))) + +(defun page-body () + (list + (page-header "CLHP" "the Common Lisp Hypertext Preprocessor") + (page-menu) + (tag '|div| '|id| "bodyText" + (loop for section in *page-sections* + nconcing (make-page-section section))))) + +(defun make-page-section (section) + (let ((name (car section))) + (cons + (tag '|h1| '|id| name name) + (loop for p in (cdr section) + collect (tag '|p| p))))) + +(defun page-menu () + (if *page-sections* + (tag '|div| '|class| "sideBox LHS" + (make-links (loop for section in *page-sections* + collect (let ((name (car section))) + (list (format nil "#~A" name) name))))) + "")) + +

1 0

[clhp-cvs] CVS update: public_html/style.css public_html/funcs.lisp public_html/index.clhp
by Anthony Ventimiglia 13 Nov '03

13 Nov '03

Update of /project/clhp/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv25925 Modified Files: index.clhp Added Files: style.css funcs.lisp Log Message: Working on the new, nice page. Date: Thu Nov 13 10:33:14 2003 Author: aventimiglia Index: public_html/index.clhp diff -u public_html/index.clhp:1.3 public_html/index.clhp:1.4 --- public_html/index.clhp:1.3 Mon Sep 29 13:21:11 2003 +++ public_html/index.clhp Thu Nov 13 10:33:14 2003 @@ -1,7 +1,5 @@ <?xml version="1.0"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "xhtml1-strict.dtd"> <?clhp - ;; Since the server is not yet equipped with CLHP, I will build run ;; these pages through the CLHP parser, and use the resulting pages ;; for the web site with the following command: @@ -13,47 +11,66 @@ |# ;; The HTTP Headers will have to be deleted from the resulting file. -(defvar *title* "CLHP the Common Lisp Hypertext Preprocessor") -(defvar *readme* "/home/ant/src/clhp/README") -(defvar *links* '(("Download" "ftp://common-lisp.net/pub/project/clhp"))) - - -(defun dump-text-file (file-name) - (with-open-file - (stream file-name :direction :input :if-does-not-exist :error) - (let* ((buffer-size (file-length stream)) - (buffer (make-array buffer-size :element-type 'character))) - (read-sequence buffer stream) - buffer))) +(unless (find-package :www) + (require "funcs.lisp")) +(use-package :www) -(defun link (pair) - "Takes a cons pair (CONTENT URI) and forms a link." - (tag "a" "href" (cadr pair) (car pair))) +;; Start of page output +(echon +doctype+) -(echo - (tag "html" +(echon + (tag '|html| (list - (tag "head" - (tag "title" *title*)) - (tag "body" + (head "CLHP the Common Lisp Hypertext Preprocessor") + (tag '|body| (list - (tag "h1" *title*) - (tag "hr") - (tag "p" (list - "I apologize for the lack of content on this site, " - "CLHP is still in it's early stages, so this simply " - "contains the README file, with the addition of some " - "extra links")) - (tag "p" - (list - "To get the latest version, click the " - (link (assoc "Download" *links* :test #'string=)) - " link. To checkout the CVS via anonymous pserver cvs, use " - (tag "b" (list - "anonymous@common-lisp.net:/project/clhp/cvsroot " - "co clhp")))) - (tag "h3" "README") - (tag "hr") - (tag "pre" (dump-text-file *readme*))))))) -(format t "~&") + (page-header "CLHP" "the Common Lisp Hypertext Preprocessor")))))) + + + + + +;(defvar *title* "CLHP the Common Lisp Hypertext Preprocessor") +;(defvar *readme* "/home/ant/src/clhp/README") +;(defvar *links* '(("Download" "ftp://common-lisp.net/pub/project/clhp"))) +; +; +;(defun dump-text-file (file-name) +; (with-open-file +; (stream file-name :direction :input :if-does-not-exist :error) +; (let* ((buffer-size (file-length stream)) +; (buffer (make-array buffer-size :element-type 'character))) +; (read-sequence buffer stream) +; buffer))) +; +;(defun link (pair) +; "Takes a cons pair (CONTENT URI) and forms a link." +; (tag "a" "href" (cadr pair) (car pair))) +; +;(echo +; (tag "html" +; (list +; (tag "head" +; (tag "title" *title*)) +; (tag "body" +; (list +; (tag "h1" *title*) +; (tag "hr") +; (tag "p" (list +; "I apologize for the lack of content on this site, " +; "CLHP is still in it's early stages, so this simply " +; "contains the README file, with the addition of some " +; "extra links")) +; (tag "p" +; (list +; "To get the latest version, click the " +; (link (assoc "Download" *links* :test #'string=)) +; " link. To checkout the CVS via anonymous pserver cvs, use " +; (tag "b" (list +; "anonymous@common-lisp.net:/project/clhp/cvsroot " +; "co clhp")))) +; (tag "h3" "README") +; (tag "hr") +; (tag "pre" (dump-text-file *readme*))))))) +;(format t "~&") ?>

1 0