From ihatchondo at common-lisp.net Fri Nov 18 14:52:19 2005 From: ihatchondo at common-lisp.net (Iban Hatchondo) Date: Fri, 18 Nov 2005 15:52:19 +0100 (CET) Subject: [cldoc-cvs] CVS update: Module imported: cldoc Message-ID: <20051118145219.9F5E788554@common-lisp.net> Update of /project/cldoc/cvsroot/cldoc In directory common-lisp.net:/tmp/cvs-serv29061 Log Message: Initial import Status: Vendor Tag: CLDOC Release Tags: HEAD N cldoc/COPYING N cldoc/INSTALL N cldoc/README N cldoc/src/cache-system.lisp N cldoc/src/cludg.lisp N cldoc/src/doc-cludg.lisp N cldoc/src/html.lisp N cldoc/src/package.lisp N cldoc/src/string-parser.lisp N cldoc/src/cludg.css N cldoc/src/cldoc.asd No conflicts created by this import Date: Fri Nov 18 15:52:18 2005 Author: ihatchondo New module cldoc added From ihatchondo at common-lisp.net Sat Nov 19 18:45:40 2005 From: ihatchondo at common-lisp.net (Iban Hatchondo) Date: Sat, 19 Nov 2005 19:45:40 +0100 (CET) Subject: [cldoc-cvs] CVS update: Directory change: cldoc/public_html Message-ID: <20051119184540.52CA2880D7@common-lisp.net> Update of /project/cldoc/cvsroot/cldoc/public_html In directory common-lisp.net:/tmp/cvs-serv24681/public_html Log Message: Directory /project/cldoc/cvsroot/cldoc/public_html added to the repository Date: Sat Nov 19 19:45:31 2005 Author: ihatchondo New directory cldoc/public_html added From ihatchondo at common-lisp.net Sat Nov 19 18:46:15 2005 From: ihatchondo at common-lisp.net (Iban Hatchondo) Date: Sat, 19 Nov 2005 19:46:15 +0100 (CET) Subject: [cldoc-cvs] CVS update: Directory change: cldoc/public_html/images Message-ID: <20051119184615.2FE17880D7@common-lisp.net> Update of /project/cldoc/cvsroot/cldoc/public_html/images In directory common-lisp.net:/tmp/cvs-serv25250/public_html/images Log Message: Directory /project/cldoc/cvsroot/cldoc/public_html/images added to the repository Date: Sat Nov 19 19:46:14 2005 Author: ihatchondo New directory cldoc/public_html/images added From ihatchondo at common-lisp.net Sat Nov 19 18:46:34 2005 From: ihatchondo at common-lisp.net (Iban Hatchondo) Date: Sat, 19 Nov 2005 19:46:34 +0100 (CET) Subject: [cldoc-cvs] CVS update: Directory change: cldoc/public_html/css Message-ID: <20051119184634.395A3880D7@common-lisp.net> Update of /project/cldoc/cvsroot/cldoc/public_html/css In directory common-lisp.net:/tmp/cvs-serv25346/public_html/css Log Message: Directory /project/cldoc/cvsroot/cldoc/public_html/css added to the repository Date: Sat Nov 19 19:46:33 2005 Author: ihatchondo New directory cldoc/public_html/css added From ihatchondo at common-lisp.net Sat Nov 19 18:48:09 2005 From: ihatchondo at common-lisp.net (Iban Hatchondo) Date: Sat, 19 Nov 2005 19:48:09 +0100 (CET) Subject: [cldoc-cvs] CVS update: cldoc/public_html/documentation.html cldoc/public_html/downloads.html cldoc/public_html/index.html cldoc/public_html/resources.html Message-ID: <20051119184809.0B99F880D7@common-lisp.net> Update of /project/cldoc/cvsroot/cldoc/public_html In directory common-lisp.net:/tmp/cvs-serv25371/public_html Added Files: documentation.html downloads.html index.html resources.html Log Message: Initial import. Date: Sat Nov 19 19:48:07 2005 Author: ihatchondo From ihatchondo at common-lisp.net Sat Nov 19 18:48:10 2005 From: ihatchondo at common-lisp.net (Iban Hatchondo) Date: Sat, 19 Nov 2005 19:48:10 +0100 (CET) Subject: [cldoc-cvs] CVS update: cldoc/public_html/css/screen_aqua.css cldoc/public_html/css/screen_yellow.css Message-ID: <20051119184810.96E72880D7@common-lisp.net> Update of /project/cldoc/cvsroot/cldoc/public_html/css In directory common-lisp.net:/tmp/cvs-serv25371/public_html/css Added Files: screen_aqua.css screen_yellow.css Log Message: Initial import. Date: Sat Nov 19 19:48:08 2005 Author: ihatchondo From ihatchondo at common-lisp.net Sat Nov 19 18:48:17 2005 From: ihatchondo at common-lisp.net (Iban Hatchondo) Date: Sat, 19 Nov 2005 19:48:17 +0100 (CET) Subject: [cldoc-cvs] CVS update: cldoc/public_html/images/corner_bl.gif cldoc/public_html/images/corner_br.gif cldoc/public_html/images/corner_sub_bl.gif cldoc/public_html/images/corner_sub_br.gif cldoc/public_html/images/corner_sub_tl.gif cldoc/public_html/images/corner_sub_tr.gif cldoc/public_html/images/corner_tl.gif cldoc/public_html/images/corner_tr.gif cldoc/public_html/images/hdr.jpg cldoc/public_html/images/icn_plus.gif cldoc/public_html/images/icn_plus_on.gif cldoc/public_html/images/li_bullet.gif Message-ID: <20051119184817.3C581880D7@common-lisp.net> Update of /project/cldoc/cvsroot/cldoc/public_html/images In directory common-lisp.net:/tmp/cvs-serv25371/public_html/images Added Files: corner_bl.gif corner_br.gif corner_sub_bl.gif corner_sub_br.gif corner_sub_tl.gif corner_sub_tr.gif corner_tl.gif corner_tr.gif hdr.jpg icn_plus.gif icn_plus_on.gif li_bullet.gif Log Message: Initial import. Date: Sat Nov 19 19:48:10 2005 Author: ihatchondo From ihatchondo at common-lisp.net Sat Nov 19 18:53:53 2005 From: ihatchondo at common-lisp.net (Iban Hatchondo) Date: Sat, 19 Nov 2005 19:53:53 +0100 (CET) Subject: [cldoc-cvs] CVS update: Module imported: public_html Message-ID: <20051119185353.41F54880D7@common-lisp.net> Update of /project/cldoc/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv25491 Log Message: Initial import Status: Vendor Tag: CLDOC Release Tags: HEAD N public_html/documentation.html N public_html/downloads.html N public_html/index.html N public_html/resources.html N public_html/css/screen_aqua.css N public_html/css/screen_yellow.css N public_html/images/corner_bl.gif N public_html/images/corner_br.gif N public_html/images/corner_sub_bl.gif N public_html/images/corner_sub_br.gif N public_html/images/corner_sub_tl.gif N public_html/images/corner_sub_tr.gif N public_html/images/corner_tl.gif N public_html/images/corner_tr.gif N public_html/images/hdr.jpg N public_html/images/icn_plus.gif N public_html/images/icn_plus_on.gif N public_html/images/li_bullet.gif No conflicts created by this import Date: Sat Nov 19 19:53:52 2005 Author: ihatchondo New module public_html added From ihatchondo at common-lisp.net Sat Nov 19 19:04:13 2005 From: ihatchondo at common-lisp.net (Iban Hatchondo) Date: Sat, 19 Nov 2005 20:04:13 +0100 (CET) Subject: [cldoc-cvs] CVS update: public_html/documentation.html public_html/downloads.html public_html/index.html public_html/resources.html Message-ID: <20051119190413.1B21E880D7@common-lisp.net> Update of /project/cldoc/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv26658 Modified Files: documentation.html downloads.html index.html resources.html Log Message: links update Date: Sat Nov 19 20:04:11 2005 Author: ihatchondo Index: public_html/documentation.html diff -u public_html/documentation.html:1.1.1.1 public_html/documentation.html:1.2 --- public_html/documentation.html:1.1.1.1 Sat Nov 19 19:53:52 2005 +++ public_html/documentation.html Sat Nov 19 20:04:11 2005 @@ -82,7 +82,7 @@

- CVSWeb - \ No newline at end of file + Index: public_html/downloads.html diff -u public_html/downloads.html:1.1.1.1 public_html/downloads.html:1.2 --- public_html/downloads.html:1.1.1.1 Sat Nov 19 19:53:52 2005 +++ public_html/downloads.html Sat Nov 19 20:04:11 2005 @@ -83,7 +83,7 @@

- CVSWeb

Browse cvs - + cvsweb

@@ -168,4 +168,4 @@ - \ No newline at end of file + Index: public_html/index.html diff -u public_html/index.html:1.1.1.1 public_html/index.html:1.2 --- public_html/index.html:1.1.1.1 Sat Nov 19 19:53:52 2005 +++ public_html/index.html Sat Nov 19 20:04:11 2005 @@ -82,7 +82,7 @@

- CVSWeb - \ No newline at end of file + Index: public_html/resources.html diff -u public_html/resources.html:1.1.1.1 public_html/resources.html:1.2 --- public_html/resources.html:1.1.1.1 Sat Nov 19 19:53:52 2005 +++ public_html/resources.html Sat Nov 19 20:04:11 2005 @@ -83,7 +83,7 @@

- CVSWeb - \ No newline at end of file + From ihatchondo at common-lisp.net Sun Nov 20 22:33:25 2005 From: ihatchondo at common-lisp.net (Iban Hatchondo) Date: Sun, 20 Nov 2005 23:33:25 +0100 (CET) Subject: [cldoc-cvs] CVS update: cldoc/src/cludg.lisp Message-ID: <20051120223325.EA48088554@common-lisp.net> Update of /project/cldoc/cvsroot/cldoc/src In directory common-lisp.net:/tmp/cvs-serv18061 Modified Files: cludg.lisp Log Message: Fix string documentation finding. Declaration forms can appear before the doc string in many lambda type. This case was not handled at all. The defstef-short-descriptor was not defining its lambda list. Date: Sun Nov 20 23:33:25 2005 Author: ihatchondo Index: cldoc/src/cludg.lisp diff -u cldoc/src/cludg.lisp:1.1.1.1 cldoc/src/cludg.lisp:1.2 --- cldoc/src/cludg.lisp:1.1.1.1 Fri Nov 18 15:52:18 2005 +++ cldoc/src/cludg.lisp Sun Nov 20 23:33:24 2005 @@ -1,5 +1,5 @@ ;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: CLUDG; -*- -;;; $Id: cludg.lisp,v 1.1.1.1 2005/11/18 14:52:18 ihatchondo Exp $ +;;; $Id: cludg.lisp,v 1.2 2005/11/20 22:33:24 ihatchondo Exp $ ;;; --------------------------------------------------------------------------- ;;; Title: Common Lisp Universal Documentation Generator ;;; Created: 2005 10 23 12:30 @@ -100,9 +100,12 @@ (defun extract-doc (forms) "Returns the first string found in the given list of forms. - NIL is returned if no string is found." - (loop for sub-form in forms until (stringp sub-form) - finally (return (and (stringp sub-form) sub-form)))) + NIL is returned if no string is found before the first non + declare form." + (flet ((declare-p (form) (eq (car form) 'DECLARE))) + (loop for sub-form in forms + until (or (stringp sub-form) (not (declare-p sub-form))) + finally (return (and (stringp sub-form) sub-form))))) (defun grok-new-lines (string) "Returns a list of the string lines contained in the given string." @@ -368,7 +371,8 @@ (:documentation "This descriptor is made for: defsetf.")) (defclass defsetf-short-descriptor (defsetf-descriptor) - ((update-fn :initarg :update-fn :initform nil :reader update-fn)) + ((update-fn :initarg :update-fn :initform nil :reader update-fn) + (lambda-list :initform nil)) (:documentation "This descriptor handles the short form of defsetf: (defsetf foo update-fn docstring)")) @@ -518,7 +522,7 @@ :type (format nil "~s" (first form)) :name (format nil "~s" (second form)) :lambda-list (third form) - :doc (when (stringp (fourth form)) (fourth form)))) + :doc (extract-doc (cdddr form)))) (define-descriptor-handler DEFMACRO (form) "macro" @@ -526,7 +530,7 @@ :type (format nil "~s" (first form)) :name (format nil "~s" (second form)) :lambda-list (third form) - :doc (when (stringp (fourth form)) (fourth form)))) + :doc (extract-doc (cdddr form)))) (define-descriptor-handler DEFSETF (form) "setf mapping" @@ -540,7 +544,7 @@ :name (format nil "(setf ~s)" (second form)) :extra-args (third form) :lambda-list (fourth form) - :doc (let ((d (fifth form))) (and (stringp d) d))) + :doc (extract-doc (cddddr form))) (make-instance 'defsetf-short-descriptor :type (format nil "~s" (first form)) :name (format nil "(setf ~s)" (second form)) @@ -809,7 +813,7 @@ :name (format nil "~s" (second form)) :qualifiers qualifiers :lambda-list lambda-list - :doc (extract-doc (cddr form))))) + :doc (extract-doc (if qualifiers (cddddr form) (cdddr form)))))) (define-descriptor-handler DEFGENERIC (form) "generic function"