=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.94 retrieving revision 1.96 diff -u -p -r1.94 -r1.96 --- mandoc/html.c 2010/01/30 06:55:56 1.94 +++ mandoc/html.c 2010/02/17 19:48:33 1.96 @@ -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 * @@ -312,7 +312,6 @@ print_encode(struct html *h, const char *p, int norecu } else if ('>' == *p) { printf(">"); continue; - /* FIXME: already escaped? */ } else if ('&' == *p) { printf("&"); 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("\n", doctype, dtd); + printf("\n", + name, doctype, dtd); }