Fixed up some documentation in man.7: only documenting man.7 macros, not related...

[mandoc.git] / html.c
diff --git a/html.c b/html.c

index a2da5931f3d05f185337ea79dc8358f1628b780d..31372b992c8e59658869a0e18e089f20145648b1 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.94 2010/01/30 06:55:56 kristaps Exp $ */
+/*     $Id: html.c,v 1.96 2010/02/17 19:48:33 kristaps Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
@@ -312,7 +312,6 @@ print_encode(struct html *h, const char *p, int norecurse)
                 } else if ('>' == *p) {
                         printf("&gt;");
                         continue;
-               /* FIXME: already escaped? */
                 } else if ('&' == *p) {
                         printf("&amp;");
                         continue;
@@ -467,19 +466,23 @@ print_doctype(struct html *h)
  {
         const char      *doctype;
         const char      *dtd;
+       const char      *name;
  
         switch (h->type) {
         case (HTML_HTML_4_01_STRICT):
+               name = "HTML";
                 doctype = "-//W3C//DTD HTML 4.01//EN";
                 dtd = "http://www.w3.org/TR/html4/strict.dtd";
                 break;
         default:
+               name = "html";
                 doctype = "-//W3C//DTD XHTML 1.0 Strict//EN";
                 dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";
                 break;
         }
  
-       printf("<!DOCTYPE HTML PUBLIC \"%s\" \"%s\">\n", doctype, dtd);
+       printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n", 
+                       name, doctype, dtd);
  }