diff options
author | bapt <bapt@FreeBSD.org> | 2015-03-02 16:58:57 +0000 |
---|---|---|
committer | bapt <bapt@FreeBSD.org> | 2015-03-02 16:58:57 +0000 |
commit | 4f48dc950ba2d6423d4f4c83899f03525d151b77 (patch) | |
tree | 62b21fcacf1cf3f74af46a3ab4385a92d9fa9eba /contrib/mdocml/man_html.c | |
parent | f4d100725d976f4335d33258435f7c9df86e4b36 (diff) | |
parent | 80c7f1aee8189548bae378d187dc2944e26ec112 (diff) | |
download | FreeBSD-src-4f48dc950ba2d6423d4f4c83899f03525d151b77.zip FreeBSD-src-4f48dc950ba2d6423d4f4c83899f03525d151b77.tar.gz |
Update mandoc to cvs snaphot from 20150302
Use the new unsupp warning level to detect the unsupported manpages in man(1)
Diffstat (limited to 'contrib/mdocml/man_html.c')
-rw-r--r-- | contrib/mdocml/man_html.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/mdocml/man_html.c b/contrib/mdocml/man_html.c index 1455e1e..0e0fad9 100644 --- a/contrib/mdocml/man_html.c +++ b/contrib/mdocml/man_html.c @@ -1,7 +1,7 @@ -/* $Id: man_html.c,v 1.107 2014/12/04 02:05:42 schwarze Exp $ */ +/* $Id: man_html.c,v 1.111 2015/02/10 08:05:30 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -100,7 +100,6 @@ static const struct htmlman mans[MAN_MAX] = { { man_I_pre, NULL }, /* I */ { man_alt_pre, NULL }, /* IR */ { man_alt_pre, NULL }, /* RI */ - { man_ign_pre, NULL }, /* na */ { man_br_pre, NULL }, /* sp */ { man_literal_pre, NULL }, /* nf */ { man_literal_pre, NULL }, /* fi */ @@ -193,9 +192,10 @@ static void print_man_nodelist(MAN_ARGS) { - print_man_node(man, n, mh, h); - if (n->next) - print_man_nodelist(man, n->next, mh, h); + while (n != NULL) { + print_man_node(man, n, mh, h); + n = n->next; + } } static void @@ -216,7 +216,7 @@ print_man_node(MAN_ARGS) print_paragraph(h); return; } - if (n->flags & MAN_LINE && (*n->string == ' ' || + if (n->flags & MAN_LINE && (*n->string == ' ' || (n->prev != NULL && mh->fl & MANH_LITERAL && ! (h->flags & HTML_NONEWLINE)))) print_otag(h, TAG_BR, 0, NULL); @@ -362,7 +362,7 @@ man_br_pre(MAN_ARGS) if (MAN_sp == n->tok) { if (NULL != (n = n->child)) if ( ! a2roffsu(n->string, &su, SCALE_VS)) - SCALE_VS_INIT(&su, atoi(n->string)); + su.scale = 1.0; } else su.scale = 0.0; |