From rjain at common-lisp.net Sat Feb 14 20:23:26 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sat, 14 Feb 2004 15:23:26 -0500 Subject: [defdoc-cvs] CVS update: Directory change: DefDoc/specified-types Message-ID: Update of /project/defdoc/cvsroot/DefDoc/specified-types In directory common-lisp.net:/tmp/cvs-serv23679/specified-types Log Message: Directory /project/defdoc/cvsroot/DefDoc/specified-types added to the repository Date: Sat Feb 14 15:23:25 2004 Author: rjain New directory DefDoc/specified-types added From rjain at common-lisp.net Sat Feb 14 20:25:44 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sat, 14 Feb 2004 15:25:44 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/specified-types/specified-types.asd DefDoc/specified-types/specified-types.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/specified-types In directory common-lisp.net:/tmp/cvs-serv15040/specified-types Added Files: specified-types.asd specified-types.lisp Log Message: add specified-types library this should be in an rjain-utils project or something, but put it here for now Date: Sat Feb 14 15:25:44 2004 Author: rjain From rjain at common-lisp.net Sat Feb 14 20:26:22 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sat, 14 Feb 2004 15:26:22 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/doc/overview.tex Message-ID: Update of /project/defdoc/cvsroot/DefDoc/doc In directory common-lisp.net:/tmp/cvs-serv20928/doc Modified Files: overview.tex Log Message: update email address Date: Sat Feb 14 15:26:22 2004 Author: rjain Index: DefDoc/doc/overview.tex diff -u DefDoc/doc/overview.tex:1.1.1.1 DefDoc/doc/overview.tex:1.2 --- DefDoc/doc/overview.tex:1.1.1.1 Sun Dec 7 18:27:05 2003 +++ DefDoc/doc/overview.tex Sat Feb 14 15:26:22 2004 @@ -19,7 +19,7 @@ \title{\doctitle \\ {\it\large\docsubtitle}} \author{by \myname} -\date{\texttt{$$Id: overview.tex,v 1.1.1.1 2003/12/07 23:27:05 rjain Exp $$}} +\date{\texttt{$$Id: overview.tex,v 1.2 2004/02/14 20:26:22 rjain Exp $$}} \begin{document} \maketitle @@ -28,7 +28,7 @@ \label{sec:notes} This is a work-in-progress. Please submit any corrections, -recommendations, or criticisms to Rahul Jain $<$rahul at rice.edu$>$. +recommendations, or criticisms to Rahul Jain $<$rjain at common-lisp.net$>$. \subsection{Trademarks} \label{sec:trademarks} @@ -38,7 +38,7 @@ \subsection{Copyrights} \label{sec:copyrights} -This document is copyright by Rahul Jain, 2002, all rights reserved. +This document is copyright by Rahul Jain, 2002--2003, all rights reserved. \chapter{General Concepts} \label{cha:concepts} From rjain at common-lisp.net Sat Feb 14 20:26:49 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sat, 14 Feb 2004 15:26:49 -0500 Subject: [defdoc-cvs] CVS update: Directory change: DefDoc/website Message-ID: Update of /project/defdoc/cvsroot/DefDoc/website In directory common-lisp.net:/tmp/cvs-serv21891/website Log Message: Directory /project/defdoc/cvsroot/DefDoc/website added to the repository Date: Sat Feb 14 15:26:49 2004 Author: rjain New directory DefDoc/website added From rjain at common-lisp.net Sat Feb 14 20:41:23 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sat, 14 Feb 2004 15:41:23 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/website/Makefile DefDoc/website/index.html Message-ID: Update of /project/defdoc/cvsroot/DefDoc/website In directory common-lisp.net:/tmp/cvs-serv30689/website Added Files: Makefile index.html Log Message: website and installer/generator Makefile Date: Sat Feb 14 15:41:23 2004 Author: rjain From rjain at common-lisp.net Sat Feb 14 21:02:49 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sat, 14 Feb 2004 16:02:49 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/website/Makefile Message-ID: Update of /project/defdoc/cvsroot/DefDoc/website In directory common-lisp.net:/tmp/cvs-serv9536/website Modified Files: Makefile Log Message: add upload target and tweak perms on files installed to the web site Date: Sat Feb 14 16:02:49 2004 Author: rjain Index: DefDoc/website/Makefile diff -u DefDoc/website/Makefile:1.1 DefDoc/website/Makefile:1.2 --- DefDoc/website/Makefile:1.1 Sat Feb 14 15:41:22 2004 +++ DefDoc/website/Makefile Sat Feb 14 16:02:48 2004 @@ -1,13 +1,19 @@ INSTALL="/usr/bin/install" -WEBDIR="../public_html" +WEBDIR="public_html" -install: install-html install-docs +upload: install + scp -r public_html/ common-lisp.net:/project/defdoc/ + +$(WEBDIR): + mkdir $@ + +install: $(WEBDIR) install-html install-docs install-docs: install-overview install-overview: overview.pdf overview.ps ../doc/overview.tex - $(INSTALL) $^ $(WEBDIR) + $(INSTALL) -m 644 $^ $(WEBDIR) overview.pdf overview.ps: ../doc/overview.tex overview.bbl @@ -18,7 +24,7 @@ ln -s $< $@ install-html: - $(INSTALL) $(wildcard *.html) $(WEBDIR) + $(INSTALL) -m 644 $(wildcard *.html) $(WEBDIR) # From rjain at common-lisp.net Sat Feb 14 22:30:49 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sat, 14 Feb 2004 17:30:49 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/website/Makefile Message-ID: Update of /project/defdoc/cvsroot/DefDoc/website In directory common-lisp.net:/tmp/cvs-serv28802/website Modified Files: Makefile Log Message: hack because make doesn't recognize dirs as files Date: Sat Feb 14 17:30:49 2004 Author: rjain Index: DefDoc/website/Makefile diff -u DefDoc/website/Makefile:1.2 DefDoc/website/Makefile:1.3 --- DefDoc/website/Makefile:1.2 Sat Feb 14 16:02:48 2004 +++ DefDoc/website/Makefile Sat Feb 14 17:30:49 2004 @@ -6,7 +6,7 @@ scp -r public_html/ common-lisp.net:/project/defdoc/ $(WEBDIR): - mkdir $@ + -mkdir $@ install: $(WEBDIR) install-html install-docs From rjain at common-lisp.net Sat Feb 14 22:31:05 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sat, 14 Feb 2004 17:31:05 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/website/index.html Message-ID: Update of /project/defdoc/cvsroot/DefDoc/website In directory common-lisp.net:/tmp/cvs-serv31235/website Modified Files: index.html Log Message: use site's stylesheet Date: Sat Feb 14 17:31:05 2004 Author: rjain Index: DefDoc/website/index.html diff -u DefDoc/website/index.html:1.1 DefDoc/website/index.html:1.2 --- DefDoc/website/index.html:1.1 Sat Feb 14 15:41:22 2004 +++ DefDoc/website/index.html Sat Feb 14 17:31:05 2004 @@ -2,6 +2,7 @@ + DefDoc - An extensible, dynamic document creation system @@ -33,6 +34,6 @@
-Last modified: Sat Feb 14 15:14:34 EST 2004 +Last modified: Sat Feb 14 17:33:04 EST 2004 From rjain at common-lisp.net Sat Feb 14 22:39:38 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sat, 14 Feb 2004 17:39:38 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/doc/overview.tex Message-ID: Update of /project/defdoc/cvsroot/DefDoc/doc In directory common-lisp.net:/tmp/cvs-serv22025/doc Modified Files: overview.tex Log Message: update copyright to extend all the way to now Date: Sat Feb 14 17:39:38 2004 Author: rjain Index: DefDoc/doc/overview.tex diff -u DefDoc/doc/overview.tex:1.2 DefDoc/doc/overview.tex:1.3 --- DefDoc/doc/overview.tex:1.2 Sat Feb 14 15:26:22 2004 +++ DefDoc/doc/overview.tex Sat Feb 14 17:39:38 2004 @@ -19,7 +19,7 @@ \title{\doctitle \\ {\it\large\docsubtitle}} \author{by \myname} -\date{\texttt{$$Id: overview.tex,v 1.2 2004/02/14 20:26:22 rjain Exp $$}} +\date{\texttt{$$Id: overview.tex,v 1.3 2004/02/14 22:39:38 rjain Exp $$}} \begin{document} \maketitle @@ -38,7 +38,7 @@ \subsection{Copyrights} \label{sec:copyrights} -This document is copyright by Rahul Jain, 2002--2003, all rights reserved. +This document is copyright by Rahul Jain, 2002--2004, all rights reserved. \chapter{General Concepts} \label{cha:concepts} From rjain at common-lisp.net Sun Feb 15 05:01:45 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:01:45 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/frontends/basic/engine.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src/frontends/basic In directory common-lisp.net:/tmp/cvs-serv25120/src/frontends/basic Modified Files: engine.lisp Log Message: additions and tweaks for the defdoc-generated defdoc website: elements that are abbreviations for more complex sequences of elements hyperlink document element small-caps style element subtitle in documents Date: Sun Feb 15 00:01:45 2004 Author: rjain Index: DefDoc/src/frontends/basic/engine.lisp diff -u DefDoc/src/frontends/basic/engine.lisp:1.1.1.1 DefDoc/src/frontends/basic/engine.lisp:1.2 --- DefDoc/src/frontends/basic/engine.lisp:1.1.1.1 Sun Dec 7 18:27:06 2003 +++ DefDoc/src/frontends/basic/engine.lisp Sun Feb 15 00:01:45 2004 @@ -17,7 +17,7 @@ `(doc , at item))) contents)))) -(defmacro doc (type initargs &body body) +(defmacro doc (type &optional initargs &body body) (let ((initargs (quote-keynames initargs))) `(make-instance ',type 'contents ,(make-contents-form body) From rjain at common-lisp.net Sun Feb 15 05:01:45 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:01:45 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/elements/abbreviations.lisp DefDoc/src/elements/links.lisp DefDoc/src/elements/package.lisp DefDoc/src/elements/style.lisp DefDoc/src/elements/toplevel.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src/elements In directory common-lisp.net:/tmp/cvs-serv25120/src/elements Modified Files: package.lisp style.lisp toplevel.lisp Added Files: abbreviations.lisp links.lisp Log Message: additions and tweaks for the defdoc-generated defdoc website: elements that are abbreviations for more complex sequences of elements hyperlink document element small-caps style element subtitle in documents Date: Sun Feb 15 00:01:44 2004 Author: rjain Index: DefDoc/src/elements/package.lisp diff -u DefDoc/src/elements/package.lisp:1.1.1.1 DefDoc/src/elements/package.lisp:1.2 --- DefDoc/src/elements/package.lisp:1.1.1.1 Sun Dec 7 18:27:11 2003 +++ DefDoc/src/elements/package.lisp Sun Feb 15 00:01:44 2004 @@ -74,6 +74,7 @@ #:toplevel-subelement #:document #:title + #:subtitle #:author #:copyright #:date @@ -98,7 +99,16 @@ ;;; style.lisp #:bold - #:italic)) + #:italic + #:small-caps + + ;;; abbreviations.lisp + #:abbreviation + #:defabbreviation + + ;;; links.lisp + #:link + #:url)) (defpackage :defdoc.elements.section-header (:use) Index: DefDoc/src/elements/style.lisp diff -u DefDoc/src/elements/style.lisp:1.1.1.1 DefDoc/src/elements/style.lisp:1.2 --- DefDoc/src/elements/style.lisp:1.1.1.1 Sun Dec 7 18:27:11 2003 +++ DefDoc/src/elements/style.lisp Sun Feb 15 00:01:44 2004 @@ -14,3 +14,9 @@ () (:documentation "The contents of this container are to toggle the use of italicization relative to its parent.")) + +(defclass small-caps (style-container) + () + (:documentation "The contents of this container are ideally to render +with lowercase letters using uppercase glpyhs scaled to be as tall as +the x-height, while preserving weighting.")) Index: DefDoc/src/elements/toplevel.lisp diff -u DefDoc/src/elements/toplevel.lisp:1.1.1.1 DefDoc/src/elements/toplevel.lisp:1.2 --- DefDoc/src/elements/toplevel.lisp:1.1.1.1 Sun Dec 7 18:27:11 2003 +++ DefDoc/src/elements/toplevel.lisp Sun Feb 15 00:01:44 2004 @@ -4,6 +4,9 @@ ((title :initform nil :initarg title :accessor title) + (subtitle :initform nil + :initarg subtitle + :accessor subtitle) (author :initform nil :initarg author :accessor author) From rjain at common-lisp.net Sun Feb 15 05:01:44 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:01:44 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/defdoc.asd Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src In directory common-lisp.net:/tmp/cvs-serv25120/src Modified Files: defdoc.asd Log Message: additions and tweaks for the defdoc-generated defdoc website: elements that are abbreviations for more complex sequences of elements hyperlink document element small-caps style element subtitle in documents Date: Sun Feb 15 00:01:44 2004 Author: rjain Index: DefDoc/src/defdoc.asd diff -u DefDoc/src/defdoc.asd:1.1.1.1 DefDoc/src/defdoc.asd:1.2 --- DefDoc/src/defdoc.asd:1.1.1.1 Sun Dec 7 18:27:05 2003 +++ DefDoc/src/defdoc.asd Sun Feb 15 00:01:44 2004 @@ -1,19 +1,17 @@ (asdf:defsystem :DefDoc - :components + :components ((:module :core - :core-dep t :pathname "" :components ((:file "package"))) (:module :layout-core :components - ((:file "package" - :core-dep t) + ((:file "package") (:file "lengths") - (:file "aesthetics"))) + (:file "aesthetics")) + :depends-on (:core)) (:module :elements :components - ((:file "package" - :core-dep t) + ((:file "package") (:file "color") #+nil (:file "fonts") (:file "basic-elements") @@ -22,24 +20,27 @@ (:file "structural" :depends-on ("basic-elements")) (:file "style" + :depends-on ("basic-elements")) + (:file "abbreviations" + :depends-on ("basic-elements")) + (:file "links" :depends-on ("basic-elements"))) :depends-on (:layout-core)) #+nil (:module :font-metrics :components - ((:file "package" - :core-dep t) + ((:file "package") (:file "tfm") (:file "tfm-reader" :depends-on ("tfm")) (:file "afm") (:file "afm-reader" :depends-on ("afm")) - (:file "freetype"))) + (:file "freetype")) + :depends-on (:core)) (:module :layout :components - ((:file "package" - :core-dep t) + ((:file "package") (:file "output-destinations") (:file "output-formats" :depends-on ("output-destinations")) @@ -47,7 +48,7 @@ :depends-on ("output-formats")) (:file "no-layout-engine" :depends-on ("engine-framework" "output-formats")) - (:file "flexible-layout-engine" + (:file "flexiblxbe-layout-engine" :depends-on ("engine-framework" "output-formats")) (:file "html-engine" :depends-on ("output-formats" "no-layout-engine"))) @@ -56,12 +57,10 @@ :depends-on (:layout :elements)) (:module "frontends" :components - ((:file "package" - :core-dep t) + ((:file "package") (:module "basic" :components - ((:file "package" - :core-dep t) + ((:file "package") (:file "engine")))) :depends-on (:layout :elements))) :depends-on (:specified-types)) From rjain at common-lisp.net Sun Feb 15 05:01:46 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:01:46 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/layout/engine-framework.lisp DefDoc/src/layout/html-engine.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src/layout In directory common-lisp.net:/tmp/cvs-serv25120/src/layout Modified Files: engine-framework.lisp html-engine.lisp Log Message: additions and tweaks for the defdoc-generated defdoc website: elements that are abbreviations for more complex sequences of elements hyperlink document element small-caps style element subtitle in documents Date: Sun Feb 15 00:01:46 2004 Author: rjain Index: DefDoc/src/layout/engine-framework.lisp diff -u DefDoc/src/layout/engine-framework.lisp:1.1.1.1 DefDoc/src/layout/engine-framework.lisp:1.2 --- DefDoc/src/layout/engine-framework.lisp:1.1.1.1 Sun Dec 7 18:27:06 2003 +++ DefDoc/src/layout/engine-framework.lisp Sun Feb 15 00:01:45 2004 @@ -288,3 +288,6 @@ (call-next-method)) t) +(defmethod convert ((input defdoc.elements:abbreviation) (output t)) + (dolist (element (contents input)) + (convert element output))) \ No newline at end of file Index: DefDoc/src/layout/html-engine.lisp diff -u DefDoc/src/layout/html-engine.lisp:1.1.1.1 DefDoc/src/layout/html-engine.lisp:1.2 --- DefDoc/src/layout/html-engine.lisp:1.1.1.1 Sun Dec 7 18:27:07 2003 +++ DefDoc/src/layout/html-engine.lisp Sun Feb 15 00:01:46 2004 @@ -22,6 +22,7 @@ text, e.g.") (defvar *document-title*) +(defvar *document-subtitle*) (defvar *html-stream*) @@ -202,6 +203,7 @@ (defmethod convert ((input toplevel-element) (output html-output)) (with-accessors ((title title) + (subtitle subtitle) (author author) (date date) (copyright copyright)) input @@ -210,7 +212,8 @@ (let ((*suppress-html-tags* t)) (convert element output))))) (let ((*html-head-elements* *html-head-elements*) - (*document-title* title)) + (*document-title* title) + (*document-subtitle* subtitle)) (when author (push (list :META :NAME "Author" :CONTENT (convert-to-string author)) *html-head-elements*)) @@ -231,7 +234,9 @@ (with-html-block+ (0 :mandatory :HTML) (with-html-block+ (1 :mandatory :HEAD) (with-html-block (:TITLE) - (convert-to-text *document-title*)) + (convert-to-text *document-title*) + (write " - " :stream *html-stream*) + (convert-to-text *document-subtitle*)) (dolist (element *html-head-elements*) (pprint-newline :linear *html-stream*) (write-html-tag* element))) @@ -278,6 +283,14 @@ (define-html-conversion italic (input) (with-html-inline (:I) + (convert))) + +(define-html-conversion small-caps (input) + (with-html-inline (:SPAN :style "font-variant: small-caps") + (convert))) + +(define-html-conversion link (input) + (with-html-inline (:A :href (url input)) (convert))) (define-html-conversion discretionary-hyphen (input) From rjain at common-lisp.net Sun Feb 15 05:02:02 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:02:02 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/website/website.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/website In directory common-lisp.net:/tmp/cvs-serv28290/website Added Files: website.lisp Log Message: the defdoc website Date: Sun Feb 15 00:02:02 2004 Author: rjain From rjain at common-lisp.net Sun Feb 15 05:07:20 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:07:20 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/defdoc.asd Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src In directory common-lisp.net:/tmp/cvs-serv26273 Modified Files: defdoc.asd Log Message: remove stray crap Date: Sun Feb 15 00:07:20 2004 Author: rjain Index: DefDoc/src/defdoc.asd diff -u DefDoc/src/defdoc.asd:1.2 DefDoc/src/defdoc.asd:1.3 --- DefDoc/src/defdoc.asd:1.2 Sun Feb 15 00:01:44 2004 +++ DefDoc/src/defdoc.asd Sun Feb 15 00:07:20 2004 @@ -48,7 +48,7 @@ :depends-on ("output-formats")) (:file "no-layout-engine" :depends-on ("engine-framework" "output-formats")) - (:file "flexiblxbe-layout-engine" + (:file "flexible-layout-engine" :depends-on ("engine-framework" "output-formats")) (:file "html-engine" :depends-on ("output-formats" "no-layout-engine"))) From rjain at common-lisp.net Sun Feb 15 05:09:08 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:09:08 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/layout/html-engine.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src/layout In directory common-lisp.net:/tmp/cvs-serv22869 Modified Files: html-engine.lisp Log Message: tweak Date: Sun Feb 15 00:09:08 2004 Author: rjain Index: DefDoc/src/layout/html-engine.lisp diff -u DefDoc/src/layout/html-engine.lisp:1.2 DefDoc/src/layout/html-engine.lisp:1.3 --- DefDoc/src/layout/html-engine.lisp:1.2 Sun Feb 15 00:01:46 2004 +++ DefDoc/src/layout/html-engine.lisp Sun Feb 15 00:09:07 2004 @@ -235,7 +235,7 @@ (with-html-block+ (1 :mandatory :HEAD) (with-html-block (:TITLE) (convert-to-text *document-title*) - (write " - " :stream *html-stream*) + (write-string " - " :stream *html-stream*) (convert-to-text *document-subtitle*)) (dolist (element *html-head-elements*) (pprint-newline :linear *html-stream*) From rjain at common-lisp.net Sun Feb 15 05:20:54 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:20:54 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/layout/html-engine.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src/layout In directory common-lisp.net:/tmp/cvs-serv24735 Modified Files: html-engine.lisp Log Message: fix to tweak... Date: Sun Feb 15 00:20:54 2004 Author: rjain Index: DefDoc/src/layout/html-engine.lisp diff -u DefDoc/src/layout/html-engine.lisp:1.3 DefDoc/src/layout/html-engine.lisp:1.4 --- DefDoc/src/layout/html-engine.lisp:1.3 Sun Feb 15 00:09:07 2004 +++ DefDoc/src/layout/html-engine.lisp Sun Feb 15 00:20:53 2004 @@ -235,7 +235,7 @@ (with-html-block+ (1 :mandatory :HEAD) (with-html-block (:TITLE) (convert-to-text *document-title*) - (write-string " - " :stream *html-stream*) + (write-string " - " *html-stream*) (convert-to-text *document-subtitle*)) (dolist (element *html-head-elements*) (pprint-newline :linear *html-stream*) From rjain at common-lisp.net Sun Feb 15 05:24:14 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:24:14 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/defdoc.asd Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src In directory common-lisp.net:/tmp/cvs-serv15361/src Modified Files: defdoc.asd Log Message: unfortunately, I really need to do the real fix for lack of :core-deps in asdf Date: Sun Feb 15 00:24:14 2004 Author: rjain Index: DefDoc/src/defdoc.asd diff -u DefDoc/src/defdoc.asd:1.3 DefDoc/src/defdoc.asd:1.4 --- DefDoc/src/defdoc.asd:1.3 Sun Feb 15 00:07:20 2004 +++ DefDoc/src/defdoc.asd Sun Feb 15 00:24:14 2004 @@ -6,15 +6,20 @@ (:module :layout-core :components ((:file "package") - (:file "lengths") - (:file "aesthetics")) + (:file "lengths" + :depends-on ("package")) + (:file "aesthetics" + :depends-on ("package"))) :depends-on (:core)) (:module :elements :components ((:file "package") - (:file "color") - #+nil (:file "fonts") - (:file "basic-elements") + (:file "color" + :depends-on ("package")) + #+nil (:file "fonts" + :depends-on ("package")) + (:file "basic-elements" + :depends-on ("package")) (:file "toplevel" :depends-on ("basic-elements")) (:file "structural" @@ -30,18 +35,22 @@ (:module :font-metrics :components ((:file "package") - (:file "tfm") + (:file "tfm" + :depends-on ("package")) (:file "tfm-reader" :depends-on ("tfm")) - (:file "afm") + (:file "afm" + :depends-on ("package")) (:file "afm-reader" :depends-on ("afm")) - (:file "freetype")) + (:file "freetype") + :depends-on ("package")) :depends-on (:core)) (:module :layout :components ((:file "package") - (:file "output-destinations") + (:file "output-destinations" + :depends-on ("package")) (:file "output-formats" :depends-on ("output-destinations")) (:file "engine-framework" @@ -61,6 +70,7 @@ (:module "basic" :components ((:file "package") - (:file "engine")))) + (:file "engine" + :depends-on ("package"))))) :depends-on (:layout :elements))) :depends-on (:specified-types)) From rjain at common-lisp.net Sun Feb 15 05:26:36 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:26:36 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/website/website.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/website In directory common-lisp.net:/tmp/cvs-serv30592/website Modified Files: website.lisp Log Message: since current clc require doesn't take user-packages into account, use asdf directly fix link urls to include a "/" after "src" Date: Sun Feb 15 00:26:36 2004 Author: rjain Index: DefDoc/website/website.lisp diff -u DefDoc/website/website.lisp:1.1 DefDoc/website/website.lisp:1.2 --- DefDoc/website/website.lisp:1.1 Sun Feb 15 00:02:02 2004 +++ DefDoc/website/website.lisp Sun Feb 15 00:26:36 2004 @@ -1,3 +1,5 @@ +(asdf:operate 'asdf:load-op :defdoc) + (defpackage :defdoc.website (:use :defdoc :defdoc.elements :defdoc.layout :common-lisp :defdoc.frontends.basic)) @@ -26,16 +28,16 @@ "The code is very incomplete, but what there is is " (link (url (gen-src-link "/")) "publically available")". " "There are definitions for various types of " - (link (url (gen-src-link "elements/")) "document elements")". " + (link (url (gen-src-link "/elements/")) "document elements")". " "There are also definitions for the abstract types of " - (link (url (gen-src-link "layout/")) "layout engines") + (link (url (gen-src-link "/layout/")) "layout engines") " as well as the " - (link (url (gen-src-link "layout/html-engine.lisp")) " HTML layout engine")". " + (link (url (gen-src-link "/layout/html-engine.lisp")) " HTML layout engine")". " "Finally, there is a " - (link (url (gen-src-link "frontends/basic/")) "basic frontend")", " + (link (url (gen-src-link "/frontends/basic/")) "basic frontend")", " "essentially a few simple macros for creating "(DefDoc)" documents. " "A more fully-featured frontend is planned, which will be sensitive to the " "current context and allow texual content to be entered unquoted.") (paragraph () "This site is actually a "(DefDoc)" " - (link (url (gen-src-link "../website/website.lisp")) "document")"."))) + (link (url (gen-src-link "/../website/website.lisp")) "document")"."))) From rjain at common-lisp.net Sun Feb 15 05:27:01 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:27:01 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/website/Makefile Message-ID: Update of /project/defdoc/cvsroot/DefDoc/website In directory common-lisp.net:/tmp/cvs-serv1955/website Modified Files: Makefile Log Message: generate the website using defdoc Date: Sun Feb 15 00:27:01 2004 Author: rjain Index: DefDoc/website/Makefile diff -u DefDoc/website/Makefile:1.3 DefDoc/website/Makefile:1.4 --- DefDoc/website/Makefile:1.3 Sat Feb 14 17:30:49 2004 +++ DefDoc/website/Makefile Sun Feb 15 00:27:01 2004 @@ -24,7 +24,7 @@ ln -s $< $@ install-html: - $(INSTALL) -m 644 $(wildcard *.html) $(WEBDIR) + lisp -batch -load website.lisp -eval "(in-package :defdoc.frontends.basic-user) (convert-doc 'defdoc.website::index 'single-page-html-output 'output-filename \""$(WEBDIR)"/index.html\" 'print-pretty t) (ext:quit)" # From rjain at common-lisp.net Sun Feb 15 05:28:12 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:28:12 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/website/index.html Message-ID: Update of /project/defdoc/cvsroot/DefDoc/website In directory common-lisp.net:/tmp/cvs-serv4096/website Removed Files: index.html Log Message: get rid of this, since we now have a defdoc-generated site Date: Sun Feb 15 00:28:12 2004 Author: rjain From rjain at common-lisp.net Sun Feb 15 05:35:05 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 00:35:05 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/layout/html-engine.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src/layout In directory common-lisp.net:/tmp/cvs-serv14849 Modified Files: html-engine.lisp Log Message: oops, don't output "-" when there is no subtitle Date: Sun Feb 15 00:35:04 2004 Author: rjain Index: DefDoc/src/layout/html-engine.lisp diff -u DefDoc/src/layout/html-engine.lisp:1.4 DefDoc/src/layout/html-engine.lisp:1.5 --- DefDoc/src/layout/html-engine.lisp:1.4 Sun Feb 15 00:20:53 2004 +++ DefDoc/src/layout/html-engine.lisp Sun Feb 15 00:35:04 2004 @@ -235,8 +235,9 @@ (with-html-block+ (1 :mandatory :HEAD) (with-html-block (:TITLE) (convert-to-text *document-title*) - (write-string " - " *html-stream*) - (convert-to-text *document-subtitle*)) + (when *document-subtitle* + (write-string " - " *html-stream*) + (convert-to-text *document-subtitle*))) (dolist (element *html-head-elements*) (pprint-newline :linear *html-stream*) (write-html-tag* element))) From rjain at common-lisp.net Sun Feb 15 08:48:19 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 03:48:19 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/website/website.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/website In directory common-lisp.net:/tmp/cvs-serv7168/website Modified Files: website.lisp Log Message: add info about mailing lists Date: Sun Feb 15 03:48:19 2004 Author: rjain Index: DefDoc/website/website.lisp diff -u DefDoc/website/website.lisp:1.2 DefDoc/website/website.lisp:1.3 --- DefDoc/website/website.lisp:1.2 Sun Feb 15 00:26:36 2004 +++ DefDoc/website/website.lisp Sun Feb 15 03:48:19 2004 @@ -13,6 +13,9 @@ (unless (eql (aref target (1- (length target))) #\/) "&rev=HEAD&content-type=text/vnd.viewcvs-markup"))) +(defun gen-mailing-list-link (target) + (concatenate 'string "/mailman/listinfo/defdoc-" target)) + (defdoc index (document title (doc DefDoc) subtitle "An extensible, dynamic document creation system" author "Rahul Jain") @@ -40,4 +43,10 @@ "current context and allow texual content to be entered unquoted.") (paragraph () "This site is actually a "(DefDoc)" " - (link (url (gen-src-link "/../website/website.lisp")) "document")"."))) + (link (url (gen-src-link "/../website/website.lisp")) "document")".")) + (section (title "Communication") + (paragraph () + "There are 3 mailing lists for "(DefDoc)", " + (link (url (gen-mailing-list-link "announce")) "defdoc-announce")", " + (link (url (gen-mailing-list-link "devel")) "defdoc-devel")", and " + (link (url (gen-mailing-list-link "cvs")) "defdoc-cvs")"."))) From rjain at common-lisp.net Sun Feb 15 19:08:18 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 14:08:18 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/COPYRIGHT Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src In directory common-lisp.net:/tmp/cvs-serv9376/src Added Files: COPYRIGHT Log Message: copyright notice Date: Sun Feb 15 14:08:18 2004 Author: rjain From rjain at common-lisp.net Mon Feb 16 02:13:23 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Sun, 15 Feb 2004 21:13:23 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/elements/textual.lisp DefDoc/src/elements/links.lisp DefDoc/src/elements/style.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src/elements In directory common-lisp.net:/tmp/cvs-serv29729/src/elements Modified Files: links.lisp style.lisp Added Files: textual.lisp Log Message: add bibliographical citation class, rejigger class hierarchy to have a common texual element superclass Date: Sun Feb 15 21:13:23 2004 Author: rjain Index: DefDoc/src/elements/links.lisp diff -u DefDoc/src/elements/links.lisp:1.1 DefDoc/src/elements/links.lisp:1.2 --- DefDoc/src/elements/links.lisp:1.1 Sun Feb 15 00:01:44 2004 +++ DefDoc/src/elements/links.lisp Sun Feb 15 21:13:23 2004 @@ -1,5 +1,8 @@ (in-package :defdoc.elements) -(defclass link (horizontal-element horizontal-container - flowing-container-mixin) +(defclass link (texual-structure-element) ((url :initarg url :type string :accessor url))) + +(defclass citation (texual-structure-element) + ((reference :initarg reference :accessor reference) + (location :initarg location :accessor location))) Index: DefDoc/src/elements/style.lisp diff -u DefDoc/src/elements/style.lisp:1.2 DefDoc/src/elements/style.lisp:1.3 --- DefDoc/src/elements/style.lisp:1.2 Sun Feb 15 00:01:44 2004 +++ DefDoc/src/elements/style.lisp Sun Feb 15 21:13:23 2004 @@ -1,21 +1,15 @@ (in-package :defdoc.elements) -(defclass style-container (horizontal-element horizontal-container - flowing-container-mixin) - () - (:documentation "Abstract class for containers that merely give stylistic properties to -their contents.")) - -(defclass bold (style-container) +(defclass bold (texual-structure-element) () (:documentation "The contents of this container are to use a bolder font (if possible).")) -(defclass italic (style-container) +(defclass italic (texual-structure-element) () (:documentation "The contents of this container are to toggle the use of italicization relative to its parent.")) -(defclass small-caps (style-container) +(defclass small-caps (texual-structure-element) () (:documentation "The contents of this container are ideally to render with lowercase letters using uppercase glpyhs scaled to be as tall as From rjain at common-lisp.net Mon Feb 16 05:40:22 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Mon, 16 Feb 2004 00:40:22 -0500 Subject: [defdoc-cvs] CVS update: Directory change: DefDoc/contrib Message-ID: Update of /project/defdoc/cvsroot/DefDoc/contrib In directory common-lisp.net:/tmp/cvs-serv3104/contrib Log Message: Directory /project/defdoc/cvsroot/DefDoc/contrib added to the repository Date: Mon Feb 16 00:40:21 2004 Author: rjain New directory DefDoc/contrib added From rjain at common-lisp.net Mon Feb 16 05:41:58 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Mon, 16 Feb 2004 00:41:58 -0500 Subject: [defdoc-cvs] CVS update: Directory change: DefDoc/contrib/project-website Message-ID: Update of /project/defdoc/cvsroot/DefDoc/contrib/project-website In directory common-lisp.net:/tmp/cvs-serv7463/contrib/project-website Log Message: Directory /project/defdoc/cvsroot/DefDoc/contrib/project-website added to the repository Date: Mon Feb 16 00:41:58 2004 Author: rjain New directory DefDoc/contrib/project-website added From rjain at common-lisp.net Mon Feb 16 05:44:33 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Mon, 16 Feb 2004 00:44:33 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/defdoc.asd Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src In directory common-lisp.net:/tmp/cvs-serv12194/src Modified Files: defdoc.asd Log Message: add the new files from the rejiggering of class hierarchy to the defsystem form Date: Mon Feb 16 00:44:20 2004 Author: rjain Index: DefDoc/src/defdoc.asd diff -u DefDoc/src/defdoc.asd:1.4 DefDoc/src/defdoc.asd:1.5 --- DefDoc/src/defdoc.asd:1.4 Sun Feb 15 00:24:14 2004 +++ DefDoc/src/defdoc.asd Mon Feb 16 00:44:08 2004 @@ -24,12 +24,14 @@ :depends-on ("basic-elements")) (:file "structural" :depends-on ("basic-elements")) - (:file "style" + (:file "textual" :depends-on ("basic-elements")) + (:file "style" + :depends-on ("textual")) (:file "abbreviations" :depends-on ("basic-elements")) (:file "links" - :depends-on ("basic-elements"))) + :depends-on ("textual"))) :depends-on (:layout-core)) #+nil (:module :font-metrics From rjain at common-lisp.net Mon Feb 16 05:44:57 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Mon, 16 Feb 2004 00:44:57 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/layout/engine-framework.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src/layout In directory common-lisp.net:/tmp/cvs-serv24782/src/layout Modified Files: engine-framework.lisp Log Message: call PREPARE directly on the toplevel element instead of on its subelements so that subclasses can hook in Date: Mon Feb 16 00:44:57 2004 Author: rjain Index: DefDoc/src/layout/engine-framework.lisp diff -u DefDoc/src/layout/engine-framework.lisp:1.2 DefDoc/src/layout/engine-framework.lisp:1.3 --- DefDoc/src/layout/engine-framework.lisp:1.2 Sun Feb 15 00:01:45 2004 +++ DefDoc/src/layout/engine-framework.lisp Mon Feb 16 00:44:57 2004 @@ -262,8 +262,7 @@ (let ((*vertical-sequence* '()) (*vertical-sequence-tail* '()) (*header-level* 1)) - (dolist (subelement (contents input)) - (prepare subelement output)) + (prepare input output) (compute-breaks input *vertical-sequence* output))) (defmethod convert :around ((input toplevel-element) (output t)) From rjain at common-lisp.net Mon Feb 16 05:45:19 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Mon, 16 Feb 2004 00:45:19 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/src/layout/flexible-layout-engine.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/src/layout In directory common-lisp.net:/tmp/cvs-serv31682/src/layout Modified Files: flexible-layout-engine.lisp Log Message: get rid of rogue whitespace Date: Mon Feb 16 00:45:19 2004 Author: rjain Index: DefDoc/src/layout/flexible-layout-engine.lisp diff -u DefDoc/src/layout/flexible-layout-engine.lisp:1.1.1.1 DefDoc/src/layout/flexible-layout-engine.lisp:1.2 --- DefDoc/src/layout/flexible-layout-engine.lisp:1.1.1.1 Sun Dec 7 18:27:07 2003 +++ DefDoc/src/layout/flexible-layout-engine.lisp Mon Feb 16 00:45:19 2004 @@ -17,7 +17,7 @@ previous-previous-penalty) (completed-element section-header previous-element) - (previous-previous-penalty *lone-heading-penalty* + (previous-previous-penalty *lone-heading-penalty* previous-penalty) (previous-element (pop contents) current-element) From rjain at common-lisp.net Mon Feb 16 05:45:36 2004 From: rjain at common-lisp.net (Rahul Jain) Date: Mon, 16 Feb 2004 00:45:36 -0500 Subject: [defdoc-cvs] CVS update: DefDoc/contrib/project-website/COPYRIGHT DefDoc/contrib/project-website/defdoc.contrib.project-website.asd DefDoc/contrib/project-website/project-website.lisp Message-ID: Update of /project/defdoc/cvsroot/DefDoc/contrib/project-website In directory common-lisp.net:/tmp/cvs-serv32032/contrib/project-website Added Files: COPYRIGHT defdoc.contrib.project-website.asd project-website.lisp Log Message: add a contrib for generating a project website Date: Mon Feb 16 00:45:35 2004 Author: rjain