=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_html.c,v retrieving revision 1.128 retrieving revision 1.129 diff -c -r1.128 -r1.129 *** src/usr.bin/mandoc/man_html.c 2020/02/12 21:14:24 1.128 --- src/usr.bin/mandoc/man_html.c 2020/02/27 01:25:57 1.129 *************** *** 1,4 **** ! /* $OpenBSD: man_html.c,v 1.128 2020/02/12 21:14:24 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons * Copyright (c) 2013-2015, 2017-2020 Ingo Schwarze --- 1,4 ---- ! /* $OpenBSD: man_html.c,v 1.129 2020/02/27 01:25:57 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons * Copyright (c) 2013-2015, 2017-2020 Ingo Schwarze *************** *** 32,38 **** #include "main.h" #define MAN_ARGS const struct roff_meta *man, \ ! const struct roff_node *n, \ struct html *h struct man_html_act { --- 32,38 ---- #include "main.h" #define MAN_ARGS const struct roff_meta *man, \ ! struct roff_node *n, \ struct html *h struct man_html_act { *************** *** 242,248 **** * Close the list if no further item of the same type * follows; otherwise, close the item only. */ ! if (list_continues(n, n->next) == '\0') { print_tagq(h, t); t = NULL; } --- 242,248 ---- * Close the list if no further item of the same type * follows; otherwise, close the item only. */ ! if (list_continues(n, roff_node_next(n)) == '\0') { print_tagq(h, t); t = NULL; } *************** *** 443,457 **** static int man_IP_pre(MAN_ARGS) { ! const struct roff_node *nn; const char *list_class; enum htmltag list_elem, body_elem; char list_type; nn = n->type == ROFFT_BLOCK ? n : n->parent; ! if ((list_type = list_continues(nn->prev, nn)) == '\0') { /* Start a new list. */ ! if ((list_type = list_continues(nn, nn->next)) == '\0') list_type = ' '; switch (list_type) { case ' ': --- 443,459 ---- static int man_IP_pre(MAN_ARGS) { ! struct roff_node *nn; const char *list_class; enum htmltag list_elem, body_elem; char list_type; nn = n->type == ROFFT_BLOCK ? n : n->parent; ! list_type = list_continues(roff_node_prev(nn), nn); ! if (list_type == '\0') { /* Start a new list. */ ! list_type = list_continues(nn, roff_node_next(nn)); ! if (list_type == '\0') list_type = ' '; switch (list_type) { case ' ':