February 2004 - defdoc-cvs@common-lisp.net

[defdoc-cvs] CVS update: DefDoc/website/index.html
by Rahul Jain 15 Feb '04

15 Feb '04

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

1 0

[defdoc-cvs] CVS update: DefDoc/website/Makefile
by Rahul Jain 15 Feb '04

15 Feb '04

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)" #

1 0

[defdoc-cvs] CVS update: DefDoc/website/website.lisp
by Rahul Jain 15 Feb '04

15 Feb '04

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")".")))

1 0

[defdoc-cvs] CVS update: DefDoc/src/defdoc.asd
by Rahul Jain 15 Feb '04

15 Feb '04

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))

1 0

[defdoc-cvs] CVS update: DefDoc/src/layout/html-engine.lisp
by Rahul Jain 15 Feb '04

15 Feb '04

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*)

1 0

[defdoc-cvs] CVS update: DefDoc/src/layout/html-engine.lisp
by Rahul Jain 15 Feb '04

15 Feb '04

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*)

1 0

[defdoc-cvs] CVS update: DefDoc/src/defdoc.asd
by Rahul Jain 15 Feb '04

15 Feb '04

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")))

1 0

[defdoc-cvs] CVS update: DefDoc/website/website.lisp
by Rahul Jain 15 Feb '04

15 Feb '04

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

1 0

[defdoc-cvs] CVS update: DefDoc/src/layout/engine-framework.lisp DefDoc/src/layout/html-engine.lisp
by Rahul Jain 15 Feb '04

15 Feb '04

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)

1 0

[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
by Rahul Jain 15 Feb '04

15 Feb '04

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)

1 0