version 1.173, 2019/03/02 16:30:53 |
version 1.176, 2020/02/27 01:43:52 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
#include "main.h" |
#include "main.h" |
|
|
#define MAN_ARGS const struct roff_meta *man, \ |
#define MAN_ARGS const struct roff_meta *man, \ |
const struct roff_node *n, \ |
struct roff_node *n, \ |
struct html *h |
struct html *h |
|
|
struct man_html_act { |
struct man_html_act { |
Line 178 print_man_node(MAN_ARGS) |
|
Line 178 print_man_node(MAN_ARGS) |
|
} |
} |
if (*n->string == ' ' && n->flags & NODE_LINE && |
if (*n->string == ' ' && n->flags & NODE_LINE && |
(h->flags & HTML_NONEWLINE) == 0) |
(h->flags & HTML_NONEWLINE) == 0) |
print_endline(h); |
print_otag(h, TAG_BR, ""); |
else if (n->flags & NODE_DELIMC) |
else if (n->flags & NODE_DELIMC) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
t = h->tag; |
t = h->tag; |
Line 203 print_man_node(MAN_ARGS) |
|
Line 203 print_man_node(MAN_ARGS) |
|
* Close out scope of font prior to opening a macro |
* Close out scope of font prior to opening a macro |
* scope. |
* scope. |
*/ |
*/ |
if (HTMLFONT_NONE != h->metac) { |
if (h->metac != ESCAPE_FONTROMAN) { |
h->metal = h->metac; |
h->metal = h->metac; |
h->metac = HTMLFONT_NONE; |
h->metac = ESCAPE_FONTROMAN; |
} |
} |
|
|
/* |
/* |
Line 244 print_man_node(MAN_ARGS) |
|
Line 244 print_man_node(MAN_ARGS) |
|
* Close the list if no further item of the same type |
* Close the list if no further item of the same type |
* follows; otherwise, close the item only. |
* follows; otherwise, close the item only. |
*/ |
*/ |
if (list_continues(n, n->next) == '\0') { |
if (list_continues(n, roff_node_next(n)) == '\0') { |
print_tagq(h, t); |
print_tagq(h, t); |
t = NULL; |
t = NULL; |
} |
} |
Line 445 list_continues(const struct roff_node *n1, const struc |
|
Line 445 list_continues(const struct roff_node *n1, const struc |
|
static int |
static int |
man_IP_pre(MAN_ARGS) |
man_IP_pre(MAN_ARGS) |
{ |
{ |
const struct roff_node *nn; |
struct roff_node *nn; |
const char *list_class; |
const char *list_class; |
enum htmltag list_elem, body_elem; |
enum htmltag list_elem, body_elem; |
char list_type; |
char list_type; |
|
|
nn = n->type == ROFFT_BLOCK ? n : n->parent; |
nn = n->type == ROFFT_BLOCK ? n : n->parent; |
if ((list_type = list_continues(nn->prev, nn)) == '\0') { |
list_type = list_continues(roff_node_prev(nn), nn); |
|
if (list_type == '\0') { |
/* Start a new list. */ |
/* Start a new list. */ |
if ((list_type = list_continues(nn, nn->next)) == '\0') |
list_type = list_continues(nn, roff_node_next(nn)); |
|
if (list_type == '\0') |
list_type = ' '; |
list_type = ' '; |
switch (list_type) { |
switch (list_type) { |
case ' ': |
case ' ': |