From: Kevin M. Rosenberg Date: Sun, 16 Nov 2003 10:56:51 +0000 (+0000) Subject: r8225: add entities for latin-1 characters X-Git-Url: http://git.kpe.io/?p=wol.git;a=commitdiff_plain;h=1fa7614ba895d7a1bccd310cf9d8e8e1e2472d14 r8225: add entities for latin-1 characters --- diff --git a/genpage.lisp b/genpage.lisp index 4a00b5b..9e34467 100644 --- a/genpage.lisp +++ b/genpage.lisp @@ -12,7 +12,7 @@ ;;;; This file, part of wol, is Copyright (c) 2003 by Kevin M. Rosenberg ;;;; ************************************************************************* -(in-package #:wol) +(in-package wol) (defvar *header-table* (make-hash-table :size 100 :test 'eq) "Table of header functions indexed by site") @@ -105,11 +105,14 @@ (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) + (dtd-prologue format :entities +std-entities+) (lml-format "~%" (aif css it "http://b9.com/umlsxml.css")) (lml-write-string "") @@ -124,7 +127,7 @@ (lml-write-string "")) ((:xhtml :xhtml11 :xhtml10-strict :xhtml10-transitional :xhtml10-frameset) - (dtd-prologue format) + (dtd-prologue format :entities +std-entities+) (lml-write-string "") (ml-head title (aif css it "http://b9.com/main.css") altcss) diff --git a/project.lisp b/project.lisp index ed1ef48..5ff3104 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) + :content-type (ml::format-string ,format ,headers) :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)) + (write-header-line "Content-Type" (ml::format-string ,fmt ,headers)) (dolist (,hdr ,headers) (write-header-line (car ,hdr) (cdr ,hdr))) (unless ,precomp