diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2014-09-27 08:54:34 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2014-09-27 08:54:34 +0000 |
| commit | 7f631c926eaa8069d1c48df8e5c6d375f83e1188 (patch) | |
| tree | a8be62abd48eb8af58ae56fc4deb0de6db18fb7a | |
| parent | b64b0de1475692efa4920bca0e34ce89a4c6db45 (diff) | |
| download | mandoc-7f631c926eaa8069d1c48df8e5c6d375f83e1188.tar.gz | |
First steps in HTML5: use UTF8 meta-charset and HTML5 doctype identifier.
| -rw-r--r-- | html.c | 43 | ||||
| -rw-r--r-- | html.h | 1 |
2 files changed, 6 insertions, 38 deletions
@@ -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("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); - name = "html"; - doctype = "-//W3C//DTD XHTML 1.0 Strict//EN"; - dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"; - break; - } - printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n", - name, doctype, dtd); + puts("<!DOCTYPE html>"); } void @@ -68,6 +68,7 @@ enum htmlattr { ATTR_SUMMARY, ATTR_ALIGN, ATTR_COLSPAN, + ATTR_CHARSET, ATTR_MAX }; |