projects / lml.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 19631bc)
r8224: add entities argument to dtd-prologue
authorKevin M. Rosenberg <kevin@rosenberg.net>
Sun, 16 Nov 2003 10:56:37 +0000 (10:56 +0000)
committerKevin M. Rosenberg <kevin@rosenberg.net>
Sun, 16 Nov 2003 10:56:37 +0000 (10:56 +0000)
2/base.lisp patch | blob | history
2/data.lisp patch | blob | history
2/debian/changelog patch | blob | history

diff --git a/2/base.lisp b/2/base.lisp
index 91319c26527e25a01f88c1ebd3925c74215f77f3..517af2cc834fcf336e2db5be3d96930d43d56021 100644 (file)
--- a/2/base.lisp
+++ b/2/base.lisp
@@ -38,20 +38,28 @@
 (defun lml-print-date (date)
   (lml-write-string (date-string date)))
 
-(defun dtd-prologue (&optional (format :xhtml11))
+(defun dtd-prologue (&optional (format :xhtml11) &key entities)
   (case format
     ((:xhtml :xhtml11 :xhtml10-strict :xhtml10-transitional :xhtml10-frameset :xml)
      (lml-write-string +xml-prologue-string+)
-     (lml-write-char #\newline)))
-  (case format
-    ((:xhtml11 :xhtml)
-     (lml-write-string +xhtml11-dtd-string+))
-    (:xhtml10-strict
-     (lml-write-string +xhtml10-strict-dtd-string+))
-    (:xhtml10-transitional
-     (lml-write-string +xhtml10-transitional-dtd-string+))
-    (:xhtml10-frameset
-     (lml-write-string +xhtml10-frameset-dtd-string+))
+     (lml-write-char #\newline)
+     (case format
+       ((:xhtml11 :xhtml)
+       (lml-write-string +xhtml11-dtd-string+))
+       (:xhtml10-strict
+       (lml-write-string +xhtml10-strict-dtd-string+))
+       (:xhtml10-transitional
+       (lml-write-string +xhtml10-transitional-dtd-string+))
+       (:xhtml10-frameset
+       (lml-write-string +xhtml10-frameset-dtd-string+)))
+     (when entities
+       (lml-write-char #\space)
+       (lml-write-char #\[)
+       (lml-write-char #\Newline)
+       (lml-write-string entities)
+       (lml-write-char #\Newline)
+       (lml-write-char #\]))
+     (lml-write-char #\>))
     (:html
      (lml-write-string +html4-dtd-string+)))
   (lml-write-char #\newline))
diff --git a/2/data.lisp b/2/data.lisp
index 8480e3b20bf45124c43027566ae1640bdc14eb67..58cd22d5b8e2eba20bc4cb62576b05ec95b39a81 100644 (file)
--- a/2/data.lisp
+++ b/2/data.lisp
@@ -28,13 +28,13 @@
   "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">")
 
 (defvar +xhtml11-dtd-string+
-  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">")
+  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\"")
 
 (defvar +xhtml10-strict-dtd-string+
-  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml10/DTD/xhtml10-strict.dtd\">")
+  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml10/DTD/xhtml10-strict.dtd\"")
 
 (defvar +xhtml10-transitional-dtd-string+
-  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml10/DTD/xhtml10-transitional.dtd\">")
+  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml10/DTD/xhtml10-transitional.dtd\"")
 
 (defvar +xhtml10-frameset-dtd-string+
-  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" \"http://www.w3.org/TR/xhtml10/DTD/xhtml10-frameset.dtd\">")
+  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" \"http://www.w3.org/TR/xhtml10/DTD/xhtml10-frameset.dtd\"")
diff --git a/2/debian/changelog b/2/debian/changelog
index 1521f34c36354b08d2bf3adfca658c926a32ee70..fd65d054e6af0f6523664c28e825ec9290b13e8e 100644 (file)
--- a/2/debian/changelog
+++ b/2/debian/changelog
@@ -1,8 +1,14 @@
+cl-lml2 (1.4.2-1) unstable; urgency=low
+
+  * Add entities keyword to doctype output
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 16 Nov 2003 02:53:47 -0700
+
 cl-lml2 (1.4.1-1) unstable; urgency=low
 
   * Improve code walker
 
- -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 21 Jul 2003 12:01:34 -0600
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 16 Nov 2003 02:53:28 -0700
 
 cl-lml2 (1.4-1) unstable; urgency=low
 
Common Lisp HTML generation macros