From 0c2237fc47306acb3e6e9a5120cb2f69a96efe72 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sat, 27 Sep 2014 08:54:34 +0000 Subject: First steps in HTML5: use UTF8 meta-charset and HTML5 doctype identifier. --- html.c | 45 ++++++--------------------------------------- html.h | 3 ++- 2 files changed, 8 insertions(+), 40 deletions(-) diff --git a/html.c b/html.c index d0c6f30a..26fe8cf0 100644 --- a/html.c +++ b/html.c @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.163 2014/08/14 00:31:43 schwarze Exp $ */ +/* $Id: html.c,v 1.164 2014/09/27 08:54:34 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze @@ -91,6 +91,7 @@ static const char *const htmlattrs[ATTR_MAX] = { "summary", /* ATTR_SUMMARY */ "align", /* ATTR_ALIGN */ "colspan", /* ATTR_COLSPAN */ + "charset", /* ATTR_CHARSET */ }; static const char *const roffscales[SCALE_MAX] = { @@ -193,17 +194,9 @@ print_gen_head(struct html *h) { struct htmlpair tag[4]; - tag[0].key = ATTR_HTTPEQUIV; - tag[0].val = "Content-Type"; - tag[1].key = ATTR_CONTENT; - tag[1].val = "text/html; charset=utf-8"; - print_otag(h, TAG_META, 2, tag); - - tag[0].key = ATTR_NAME; - tag[0].val = "resource-type"; - tag[1].key = ATTR_CONTENT; - tag[1].val = "document"; - print_otag(h, TAG_META, 2, tag); + tag[0].key = ATTR_CHARSET; + tag[0].val = "utf-8"; + print_otag(h, TAG_META, 1, tag); if (h->style) { tag[0].key = ATTR_REL; @@ -493,14 +486,6 @@ print_otag(struct html *h, enum htmltag tag, for (i = 0; i < sz; i++) print_attr(h, htmlattrs[p[i].key], p[i].val); - /* Add non-overridable attributes. */ - - if (TAG_HTML == tag && HTML_XHTML_1_0_STRICT == h->type) { - print_attr(h, "xmlns", "http://www.w3.org/1999/xhtml"); - print_attr(h, "xml:lang", "en"); - print_attr(h, "lang", "en"); - } - /* Accommodate for XML "well-formed" singleton escaping. */ if (HTML_AUTOCLOSE & htmltags[tag].flags) @@ -536,26 +521,8 @@ print_ctag(struct html *h, enum htmltag tag) void print_gen_decls(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: - puts(""); - name = "html"; - doctype = "-//W3C//DTD XHTML 1.0 Strict//EN"; - dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"; - break; - } - printf("\n", - name, doctype, dtd); + puts(""); } void diff --git a/html.h b/html.h index d2c87c7a..9c2861b6 100644 --- a/html.h +++ b/html.h @@ -1,4 +1,4 @@ -/* $Id: html.h,v 1.54 2014/09/17 19:55:59 schwarze Exp $ */ +/* $Id: html.h,v 1.55 2014/09/27 08:54:34 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * @@ -68,6 +68,7 @@ enum htmlattr { ATTR_SUMMARY, ATTR_ALIGN, ATTR_COLSPAN, + ATTR_CHARSET, ATTR_MAX }; -- cgit v1.2.3