version 1.256, 2015/10/30 19:04:16 |
version 1.260, 2017/02/16 03:00:23 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012-2017 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 136 mdoc_tail_alloc(struct roff_man *mdoc, int line, int p |
|
Line 136 mdoc_tail_alloc(struct roff_man *mdoc, int line, int p |
|
|
|
struct roff_node * |
struct roff_node * |
mdoc_endbody_alloc(struct roff_man *mdoc, int line, int pos, int tok, |
mdoc_endbody_alloc(struct roff_man *mdoc, int line, int pos, int tok, |
struct roff_node *body, enum mdoc_endbody end) |
struct roff_node *body) |
{ |
{ |
struct roff_node *p; |
struct roff_node *p; |
|
|
body->flags |= MDOC_ENDED; |
body->flags |= NODE_ENDED; |
body->parent->flags |= MDOC_ENDED; |
body->parent->flags |= NODE_ENDED; |
p = roff_node_alloc(mdoc, line, pos, ROFFT_BODY, tok); |
p = roff_node_alloc(mdoc, line, pos, ROFFT_BODY, tok); |
p->body = body; |
p->body = body; |
p->norm = body->norm; |
p->norm = body->norm; |
p->end = end; |
p->end = ENDBODY_SPACE; |
roff_node_append(mdoc, p); |
roff_node_append(mdoc, p); |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
return p; |
return p; |
Line 219 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 219 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
struct roff_node *n; |
struct roff_node *n; |
char *c, *ws, *end; |
char *c, *ws, *end; |
|
|
assert(mdoc->last); |
|
n = mdoc->last; |
n = mdoc->last; |
|
|
/* |
/* |
* Divert directly to list processing if we're encountering a |
* If a column list contains plain text, assume an implicit item |
* columnar ROFFT_BLOCK with or without a prior ROFFT_BLOCK entry |
* macro. This can happen one or more times at the beginning |
* (a ROFFT_BODY means it's already open, in which case we should |
* of such a list, intermixed with non-It mdoc macros and with |
* process within its context in the normal way). |
* nodes generated on the roff level, for example by tbl. |
*/ |
*/ |
|
|
if (n->tok == MDOC_Bl && n->type == ROFFT_BODY && |
if ((n->tok == MDOC_Bl && n->type == ROFFT_BODY && |
n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) { |
n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) || |
/* `Bl' is open without any children. */ |
(n->parent != NULL && n->parent->tok == MDOC_Bl && |
|
n->parent->norm->Bl.type == LIST_column)) { |
mdoc->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); |
mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); |
return 1; |
return 1; |
} |
} |
|
|
if (n->tok == MDOC_It && n->type == ROFFT_BLOCK && |
|
NULL != n->parent && |
|
MDOC_Bl == n->parent->tok && |
|
LIST_column == n->parent->norm->Bl.type) { |
|
/* `Bl' has block-level `It' children. */ |
|
mdoc->flags |= MDOC_FREECOL; |
|
mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); |
|
return 1; |
|
} |
|
|
|
/* |
/* |
* Search for the beginning of unescaped trailing whitespace (ws) |
* Search for the beginning of unescaped trailing whitespace (ws) |
* and for the first character not to be output (end). |
* and for the first character not to be output (end). |
Line 302 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 292 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
* behaviour that we want to work around it. |
* behaviour that we want to work around it. |
*/ |
*/ |
roff_elem_alloc(mdoc, line, offs, MDOC_sp); |
roff_elem_alloc(mdoc, line, offs, MDOC_sp); |
mdoc->last->flags |= MDOC_VALID | MDOC_ENDED; |
mdoc->last->flags |= NODE_VALID | NODE_ENDED; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
return 1; |
return 1; |
} |
} |
Line 321 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 311 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
assert(buf < end); |
assert(buf < end); |
|
|
if (mandoc_eos(buf+offs, (size_t)(end-buf-offs))) |
if (mandoc_eos(buf+offs, (size_t)(end-buf-offs))) |
mdoc->last->flags |= MDOC_EOS; |
mdoc->last->flags |= NODE_EOS; |
|
|
|
for (c = buf + offs; c != NULL; c = strchr(c + 1, '.')) { |
|
if (c - buf < offs + 2) |
|
continue; |
|
if (end - c < 4) |
|
break; |
|
if (isalpha((unsigned char)c[-2]) && |
|
isalpha((unsigned char)c[-1]) && |
|
c[1] == ' ' && |
|
isupper((unsigned char)(c[2] == ' ' ? c[3] : c[2])) && |
|
(c[-2] != 'n' || c[-1] != 'c') && |
|
(c[-2] != 'v' || c[-1] != 's')) |
|
mandoc_msg(MANDOCERR_EOS, mdoc->parse, |
|
line, (int)(c - buf), NULL); |
|
} |
|
|
return 1; |
return 1; |
} |
} |
|
|
Line 393 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
Line 399 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
* into macro processing. |
* into macro processing. |
*/ |
*/ |
|
|
if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) { |
n = mdoc->last; |
|
if (n == NULL || tok == MDOC_It || tok == MDOC_El) { |
mdoc_macro(mdoc, tok, ln, sv, &offs, buf); |
mdoc_macro(mdoc, tok, ln, sv, &offs, buf); |
return 1; |
return 1; |
} |
} |
|
|
n = mdoc->last; |
|
assert(mdoc->last); |
|
|
|
/* |
/* |
* If the first macro of a `Bl -column', open an `It' block |
* If a column list contains a non-It macro, assume an implicit |
* context around the parsed macro. |
* item macro. This can happen one or more times at the |
|
* beginning of such a list, intermixed with text lines and |
|
* with nodes generated on the roff level, for example by tbl. |
*/ |
*/ |
|
|
if (n->tok == MDOC_Bl && n->type == ROFFT_BODY && |
if ((n->tok == MDOC_Bl && n->type == ROFFT_BODY && |
n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) { |
n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) || |
mdoc->flags |= MDOC_FREECOL; |
(n->parent != NULL && n->parent->tok == MDOC_Bl && |
mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); |
n->parent->norm->Bl.type == LIST_column)) { |
return 1; |
|
} |
|
|
|
/* |
|
* If we're following a block-level `It' within a `Bl -column' |
|
* context (perhaps opened in the above block or in ptext()), |
|
* then open an `It' block context around the parsed macro. |
|
*/ |
|
|
|
if (n->tok == MDOC_It && n->type == ROFFT_BLOCK && |
|
NULL != n->parent && |
|
MDOC_Bl == n->parent->tok && |
|
LIST_column == n->parent->norm->Bl.type) { |
|
mdoc->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); |
mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); |
return 1; |
return 1; |