From 97e14ef9a350c61c9891c1d43aab815c574c1ce6 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 16 Nov 2003 15:49:47 +0000 Subject: [PATCH] r8226: update to new dtd writing functions --- genpage.lisp | 8 ++------ project.lisp | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/genpage.lisp b/genpage.lisp index 9e34467..4b1dbf4 100644 --- a/genpage.lisp +++ b/genpage.lisp @@ -105,14 +105,10 @@ (when title-str (html (:title (lml-write-string title-str))))))) -(defvar +std-entities+ " - -") - (defun page-prologue (title format css altcss) (ecase format (:xml - (dtd-prologue format :entities +std-entities+) + (dtd-prologue format) (lml-format "~%" (aif css it "http://b9.com/umlsxml.css")) (lml-write-string "") @@ -127,7 +123,7 @@ (lml-write-string "")) ((:xhtml :xhtml11 :xhtml10-strict :xhtml10-transitional :xhtml10-frameset) - (dtd-prologue format :entities +std-entities+) + (dtd-prologue format) (lml-write-string "") (ml-head title (aif css it "http://b9.com/main.css") altcss) diff --git a/project.lisp b/project.lisp index 5ff3104..cf8c191 100644 --- a/project.lisp +++ b/project.lisp @@ -309,7 +309,7 @@ (net.aserve:with-http-response ((aserve-request ,req) (entity-aserve-entity ,ent) - :content-type (ml::format-string ,format ,headers) + :content-type (ml::format->string ,format) :timeout ,timeout :response (case ,response-code @@ -351,7 +351,7 @@ ,result ,outstr ,stream) (declare (ignorable ,stream)) (write-header-line "Status" ,response-string) - (write-header-line "Content-Type" (ml::format-string ,fmt ,headers)) + (write-header-line "Content-Type" (ml::format->string ,fmt)) (dolist (,hdr ,headers) (write-header-line (car ,hdr) (cdr ,hdr))) (unless ,precomp -- 2.34.1