From 6f603eaa29c0c620155a4676d14e514aae64f7fc Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sat, 27 Sep 2014 09:05:57 +0000 Subject: [PATCH] Kick out "summary" attribute, which isn't HTML5. --- html.c | 3 +-- html.h | 4 +--- man_html.c | 12 +++++------- mdoc_html.c | 12 +++++------- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/html.c b/html.c index 69b242c5..e9e38555 100644 --- a/html.c +++ b/html.c @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.166 2014/09/27 09:03:24 kristaps Exp $ */ +/* $Id: html.c,v 1.167 2014/09/27 09:05:57 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze @@ -87,7 +87,6 @@ static const char *const htmlattrs[ATTR_MAX] = { "style", /* ATTR_STYLE */ "width", /* ATTR_WIDTH */ "id", /* ATTR_ID */ - "summary", /* ATTR_SUMMARY */ "align", /* ATTR_ALIGN */ "colspan", /* ATTR_COLSPAN */ "charset", /* ATTR_CHARSET */ diff --git a/html.h b/html.h index 62a4c310..d85848e9 100644 --- a/html.h +++ b/html.h @@ -1,4 +1,4 @@ -/* $Id: html.h,v 1.57 2014/09/27 09:03:24 kristaps Exp $ */ +/* $Id: html.h,v 1.58 2014/09/27 09:05:57 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * @@ -64,7 +64,6 @@ enum htmlattr { ATTR_STYLE, ATTR_WIDTH, ATTR_ID, - ATTR_SUMMARY, ATTR_ALIGN, ATTR_COLSPAN, ATTR_CHARSET, @@ -103,7 +102,6 @@ struct htmlpair { #define PAIR_CLASS_INIT(p, v) PAIR_INIT(p, ATTR_CLASS, v) #define PAIR_HREF_INIT(p, v) PAIR_INIT(p, ATTR_HREF, v) #define PAIR_STYLE_INIT(p, h) PAIR_INIT(p, ATTR_STYLE, (h)->buf) -#define PAIR_SUMMARY_INIT(p, v) PAIR_INIT(p, ATTR_SUMMARY, v) enum htmltype { HTML_HTML_4_01_STRICT, diff --git a/man_html.c b/man_html.c index 1ab62990..8142ad85 100644 --- a/man_html.c +++ b/man_html.c @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.98 2014/09/27 09:02:19 kristaps Exp $ */ +/* $Id: man_html.c,v 1.99 2014/09/27 09:05:57 kristaps Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2013, 2014 Ingo Schwarze @@ -307,9 +307,8 @@ man_root_pre(MAN_ARGS) assert(man->msec); mandoc_asprintf(&title, "%s(%s)", man->title, man->msec); - PAIR_SUMMARY_INIT(&tag[0], "Document Header"); - PAIR_CLASS_INIT(&tag[1], "head"); - t = print_otag(h, TAG_TABLE, 2, tag); + PAIR_CLASS_INIT(&tag[0], "head"); + t = print_otag(h, TAG_TABLE, 1, tag); PAIR_INIT(&tag[0], ATTR_WIDTH, "30%"); print_otag(h, TAG_COL, 1, tag); print_otag(h, TAG_COL, 1, tag); @@ -345,9 +344,8 @@ man_root_post(MAN_ARGS) struct htmlpair tag[2]; struct tag *t, *tt; - PAIR_SUMMARY_INIT(&tag[0], "Document Footer"); - PAIR_CLASS_INIT(&tag[1], "foot"); - t = print_otag(h, TAG_TABLE, 2, tag); + PAIR_CLASS_INIT(&tag[0], "foot"); + t = print_otag(h, TAG_TABLE, 1, tag); PAIR_INIT(&tag[0], ATTR_WIDTH, "50%"); print_otag(h, TAG_COL, 1, tag); print_otag(h, TAG_COL, 1, tag); diff --git a/mdoc_html.c b/mdoc_html.c index 205da927..c251041a 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.201 2014/09/27 09:02:19 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.202 2014/09/27 09:05:57 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2014 Ingo Schwarze @@ -487,9 +487,8 @@ mdoc_root_post(MDOC_ARGS) struct htmlpair tag[2]; struct tag *t, *tt; - PAIR_SUMMARY_INIT(&tag[0], "Document Footer"); - PAIR_CLASS_INIT(&tag[1], "foot"); - t = print_otag(h, TAG_TABLE, 2, tag); + PAIR_CLASS_INIT(&tag[0], "foot"); + t = print_otag(h, TAG_TABLE, 1, tag); PAIR_INIT(&tag[0], ATTR_WIDTH, "50%"); print_otag(h, TAG_COL, 1, tag); print_otag(h, TAG_COL, 1, tag); @@ -529,9 +528,8 @@ mdoc_root_pre(MDOC_ARGS) mandoc_asprintf(&title, "%s(%s)", meta->title, meta->msec); - PAIR_SUMMARY_INIT(&tag[0], "Document Header"); - PAIR_CLASS_INIT(&tag[1], "head"); - t = print_otag(h, TAG_TABLE, 2, tag); + PAIR_CLASS_INIT(&tag[0], "head"); + t = print_otag(h, TAG_TABLE, 1, tag); PAIR_INIT(&tag[0], ATTR_WIDTH, "30%"); print_otag(h, TAG_COL, 1, tag); print_otag(h, TAG_COL, 1, tag); -- 2.47.1