version 1.231, 2019/07/22 03:21:49 |
version 1.234, 2020/02/27 01:43:52 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-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 |
Line 64 static void print_man_head(struct termp *, |
|
Line 64 static void print_man_head(struct termp *, |
|
static void print_man_foot(struct termp *, |
static void print_man_foot(struct termp *, |
const struct roff_meta *); |
const struct roff_meta *); |
static void print_bvspace(struct termp *, |
static void print_bvspace(struct termp *, |
const struct roff_node *, int); |
struct roff_node *, int); |
|
|
static int pre_B(DECL_ARGS); |
static int pre_B(DECL_ARGS); |
static int pre_DT(DECL_ARGS); |
static int pre_DT(DECL_ARGS); |
Line 205 terminal_man(void *arg, const struct roff_meta *man) |
|
Line 205 terminal_man(void *arg, const struct roff_meta *man) |
|
* first, print it. |
* first, print it. |
*/ |
*/ |
static void |
static void |
print_bvspace(struct termp *p, const struct roff_node *n, int pardist) |
print_bvspace(struct termp *p, struct roff_node *n, int pardist) |
{ |
{ |
int i; |
struct roff_node *nch; |
|
int i; |
|
|
term_newln(p); |
term_newln(p); |
|
|
if (n->body != NULL && n->body->child != NULL) |
if (n->body != NULL && |
if (n->body->child->type == ROFFT_TBL) |
(nch = roff_node_child(n->body)) != NULL && |
return; |
nch->type == ROFFT_TBL) |
|
return; |
|
|
if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS) |
if (n->parent->tok != MAN_RS && roff_node_prev(n) == NULL) |
if (n->prev == NULL) |
return; |
return; |
|
|
|
for (i = 0; i < pardist; i++) |
for (i = 0; i < pardist; i++) |
term_vspace(p); |
term_vspace(p); |
Line 621 pre_TP(DECL_ARGS) |
|
Line 622 pre_TP(DECL_ARGS) |
|
while (nn != NULL && (nn->flags & NODE_LINE) == 0) |
while (nn != NULL && (nn->flags & NODE_LINE) == 0) |
nn = nn->next; |
nn = nn->next; |
|
|
|
if (nn == NULL) |
|
return 0; |
|
|
|
if (nn->type == ROFFT_TEXT) |
|
tag_man(p, nn); |
|
else if (nn->child != NULL && |
|
nn->child->type == ROFFT_TEXT && |
|
(nn->tok == MAN_B || nn->tok == MAN_BI || |
|
nn->tok == MAN_BR || nn->tok == MAN_I || |
|
nn->tok == MAN_IB || nn->tok == MAN_IR)) |
|
tag_man(p, nn->child); |
|
|
while (nn != NULL) { |
while (nn != NULL) { |
print_man_node(p, mt, nn, meta); |
print_man_node(p, mt, nn, meta); |
nn = nn->next; |
nn = nn->next; |
Line 671 pre_SS(DECL_ARGS) |
|
Line 684 pre_SS(DECL_ARGS) |
|
* and after an empty subsection. |
* and after an empty subsection. |
*/ |
*/ |
|
|
do { |
if ((n = roff_node_prev(n)) == NULL || |
n = n->prev; |
(n->tok == MAN_SS && roff_node_child(n->body) == NULL)) |
} while (n != NULL && n->tok >= MAN_TH && |
|
man_term_act(n->tok)->flags & MAN_NOTEXT); |
|
if (n == NULL || n->type == ROFFT_COMMENT || |
|
(n->tok == MAN_SS && n->body->child == NULL)) |
|
break; |
break; |
|
|
for (i = 0; i < mt->pardist; i++) |
for (i = 0; i < mt->pardist; i++) |
Line 716 pre_SH(DECL_ARGS) |
|
Line 725 pre_SH(DECL_ARGS) |
|
* and after an empty section. |
* and after an empty section. |
*/ |
*/ |
|
|
do { |
if ((n = roff_node_prev(n)) == NULL || |
n = n->prev; |
(n->tok == MAN_SH && roff_node_child(n->body) == NULL)) |
} while (n != NULL && n->tok >= MAN_TH && |
|
man_term_act(n->tok)->flags & MAN_NOTEXT); |
|
if (n == NULL || n->type == ROFFT_COMMENT || |
|
(n->tok == MAN_SH && n->body->child == NULL)) |
|
break; |
break; |
|
|
for (i = 0; i < mt->pardist; i++) |
for (i = 0; i < mt->pardist; i++) |
Line 827 pre_SY(DECL_ARGS) |
|
Line 832 pre_SY(DECL_ARGS) |
|
|
|
switch (n->type) { |
switch (n->type) { |
case ROFFT_BLOCK: |
case ROFFT_BLOCK: |
if (n->prev == NULL || n->prev->tok != MAN_SY) |
if ((nn = roff_node_prev(n)) == NULL || nn->tok != MAN_SY) |
print_bvspace(p, n, mt->pardist); |
print_bvspace(p, n, mt->pardist); |
return 1; |
return 1; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
Line 1168 tag_man(struct termp *p, struct roff_node *n) |
|
Line 1173 tag_man(struct termp *p, struct roff_node *n) |
|
|
|
assert(n->type == ROFFT_TEXT); |
assert(n->type == ROFFT_TEXT); |
cp = n->string; |
cp = n->string; |
prio = 1; |
prio = TAG_STRONG; |
for (;;) { |
for (;;) { |
switch (*cp) { |
switch (*cp) { |
case ' ': |
case ' ': |
case '\t': |
case '\t': |
prio = INT_MAX; |
prio = TAG_WEAK; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case '-': |
case '-': |
cp++; |
cp++; |