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)