=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.197 retrieving revision 1.202 diff -u -p -r1.197 -r1.202 --- mandoc/html.c 2017/01/19 01:00:14 1.197 +++ mandoc/html.c 2017/01/26 18:28:18 1.202 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.197 2017/01/19 01:00:14 schwarze Exp $ */ +/* $Id: html.c,v 1.202 2017/01/26 18:28:18 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons * Copyright (c) 2011-2015, 2017 Ingo Schwarze @@ -75,7 +75,6 @@ static const struct htmldata htmltags[TAG_MAX] = { {"dl", HTML_NLALL | HTML_INDENT}, {"dt", HTML_NLAROUND}, {"dd", HTML_NLAROUND | HTML_INDENT}, - {"blockquote", HTML_NLALL | HTML_INDENT}, {"pre", HTML_NLALL | HTML_NOINDENT}, {"b", 0}, {"i", 0}, @@ -115,7 +114,6 @@ static const char *const roffscales[SCALE_MAX] = { static void a2width(const char *, struct roffsu *); static void print_byte(struct html *, char); -static void print_endline(struct html *); static void print_endword(struct html *); static void print_indent(struct html *); static void print_word(struct html *, const char *); @@ -178,11 +176,7 @@ print_gen_head(struct html *h) print_endline(h); print_text(h, "td.head-vol { text-align: center; }"); print_endline(h); - print_text(h, "table.foot td { width: 50%; }"); - print_endline(h); - print_text(h, "table.head td { width: 33%; }"); - print_endline(h); - print_text(h, "div.spacer { margin: 1em 0; }"); + print_text(h, "div.Pp { margin: 1ex 0ex; }"); print_tagq(h, t); if (h->style) @@ -571,8 +565,11 @@ print_otag(struct html *h, enum htmltag tag, const cha SCALE_VS_INIT(su, i); break; case 'w': + case 'W': s = va_arg(ap, char *); a2width(s, su); + if (fmt[-1] == 'W') + su->scale *= -1.0; break; default: abort(); @@ -769,7 +766,7 @@ print_paragraph(struct html *h) { struct tag *t; - t = print_otag(h, TAG_DIV, "c", "spacer"); + t = print_otag(h, TAG_DIV, "c", "Pp"); print_tagq(h, t); } @@ -814,7 +811,7 @@ print_byte(struct html *h, char c) * If something was printed on the current output line, end it. * Not to be called right after print_indent(). */ -static void +void print_endline(struct html *h) { if (h->col == 0)