version 1.283, 2015/10/22 21:54:23 |
version 1.291, 2017/03/03 13:55:32 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2015, 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 991 roff_node_alloc(struct roff_man *man, int line, int po |
|
Line 991 roff_node_alloc(struct roff_man *man, int line, int po |
|
n->sec = man->lastsec; |
n->sec = man->lastsec; |
|
|
if (man->flags & MDOC_SYNOPSIS) |
if (man->flags & MDOC_SYNOPSIS) |
n->flags |= MDOC_SYNPRETTY; |
n->flags |= NODE_SYNPRETTY; |
else |
else |
n->flags &= ~MDOC_SYNPRETTY; |
n->flags &= ~NODE_SYNPRETTY; |
if (man->flags & MDOC_NEWLINE) |
if (man->flags & MDOC_NEWLINE) |
n->flags |= MDOC_LINE; |
n->flags |= NODE_LINE; |
man->flags &= ~MDOC_NEWLINE; |
man->flags &= ~MDOC_NEWLINE; |
|
|
return n; |
return n; |
Line 1017 roff_node_append(struct roff_man *man, struct roff_nod |
|
Line 1017 roff_node_append(struct roff_man *man, struct roff_nod |
|
n->parent = man->last->parent; |
n->parent = man->last->parent; |
break; |
break; |
case ROFF_NEXT_CHILD: |
case ROFF_NEXT_CHILD: |
|
if (man->last->child != NULL) { |
|
n->next = man->last->child; |
|
man->last->child->prev = n; |
|
} else |
|
man->last->last = n; |
man->last->child = n; |
man->last->child = n; |
n->parent = man->last; |
n->parent = man->last; |
n->parent->last = n; |
|
break; |
break; |
default: |
default: |
abort(); |
abort(); |
} |
} |
n->parent->nchild++; |
|
man->last = n; |
man->last = n; |
|
|
switch (n->type) { |
switch (n->type) { |
Line 1060 roff_word_alloc(struct roff_man *man, int line, int po |
|
Line 1063 roff_word_alloc(struct roff_man *man, int line, int po |
|
n = roff_node_alloc(man, line, pos, ROFFT_TEXT, TOKEN_NONE); |
n = roff_node_alloc(man, line, pos, ROFFT_TEXT, TOKEN_NONE); |
n->string = roff_strdup(man->roff, word); |
n->string = roff_strdup(man->roff, word); |
roff_node_append(man, n); |
roff_node_append(man, n); |
if (man->macroset == MACROSET_MDOC) |
n->flags |= NODE_VALID | NODE_ENDED; |
n->flags |= MDOC_VALID | MDOC_ENDED; |
|
else |
|
n->flags |= MAN_VALID; |
|
man->next = ROFF_NEXT_SIBLING; |
man->next = ROFF_NEXT_SIBLING; |
} |
} |
|
|
Line 1133 roff_addeqn(struct roff_man *man, const struct eqn *eq |
|
Line 1133 roff_addeqn(struct roff_man *man, const struct eqn *eq |
|
n = roff_node_alloc(man, eqn->ln, eqn->pos, ROFFT_EQN, TOKEN_NONE); |
n = roff_node_alloc(man, eqn->ln, eqn->pos, ROFFT_EQN, TOKEN_NONE); |
n->eqn = eqn; |
n->eqn = eqn; |
if (eqn->ln > man->last->line) |
if (eqn->ln > man->last->line) |
n->flags |= MDOC_LINE; |
n->flags |= NODE_LINE; |
roff_node_append(man, n); |
roff_node_append(man, n); |
man->next = ROFF_NEXT_SIBLING; |
man->next = ROFF_NEXT_SIBLING; |
} |
} |
Line 1148 roff_addtbl(struct roff_man *man, const struct tbl_spa |
|
Line 1148 roff_addtbl(struct roff_man *man, const struct tbl_spa |
|
n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE); |
n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE); |
n->span = tbl; |
n->span = tbl; |
roff_node_append(man, n); |
roff_node_append(man, n); |
if (man->macroset == MACROSET_MDOC) |
n->flags |= NODE_VALID | NODE_ENDED; |
n->flags |= MDOC_VALID | MDOC_ENDED; |
|
else |
|
n->flags |= MAN_VALID; |
|
man->next = ROFF_NEXT_SIBLING; |
man->next = ROFF_NEXT_SIBLING; |
} |
} |
|
|
Line 1169 roff_node_unlink(struct roff_man *man, struct roff_nod |
|
Line 1166 roff_node_unlink(struct roff_man *man, struct roff_nod |
|
/* Adjust parent. */ |
/* Adjust parent. */ |
|
|
if (n->parent != NULL) { |
if (n->parent != NULL) { |
n->parent->nchild--; |
|
if (n->parent->child == n) |
if (n->parent->child == n) |
n->parent->child = n->next; |
n->parent->child = n->next; |
if (n->parent->last == n) |
if (n->parent->last == n) |
Line 1211 roff_node_delete(struct roff_man *man, struct roff_nod |
|
Line 1207 roff_node_delete(struct roff_man *man, struct roff_nod |
|
|
|
while (n->child != NULL) |
while (n->child != NULL) |
roff_node_delete(man, n->child); |
roff_node_delete(man, n->child); |
assert(n->nchild == 0); |
|
roff_node_unlink(man, n); |
roff_node_unlink(man, n); |
roff_node_free(n); |
roff_node_free(n); |
} |
} |
Line 1228 deroff(char **dest, const struct roff_node *n) |
|
Line 1223 deroff(char **dest, const struct roff_node *n) |
|
return; |
return; |
} |
} |
|
|
/* Skip leading whitespace and escape sequences. */ |
/* Skip leading whitespace. */ |
|
|
cp = n->string; |
for (cp = n->string; *cp != '\0'; cp++) { |
while (*cp != '\0') { |
if (cp[0] == '\\' && cp[1] != '\0' && |
if ('\\' == *cp) { |
strchr(" %&0^|~", cp[1]) != NULL) |
cp++; |
cp++; |
mandoc_escape((const char **)&cp, NULL, NULL); |
else if ( ! isspace((unsigned char)*cp)) |
} else if (isspace((unsigned char)*cp)) |
|
cp++; |
|
else |
|
break; |
break; |
} |
} |
|
|
|
/* Skip trailing backslash. */ |
|
|
|
sz = strlen(cp); |
|
if (sz > 0 && cp[sz - 1] == '\\') |
|
sz--; |
|
|
/* Skip trailing whitespace. */ |
/* Skip trailing whitespace. */ |
|
|
for (sz = strlen(cp); sz; sz--) |
for (; sz; sz--) |
if ( ! isspace((unsigned char)cp[sz-1])) |
if ( ! isspace((unsigned char)cp[sz-1])) |
break; |
break; |
|
|
Line 1610 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1608 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
return ROFF_IGN; |
return ROFF_IGN; |
while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ') |
while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ') |
pos++; |
pos++; |
while (buf->buf[pos] != '\0' && buf->buf[pos] == ' ') |
while (buf->buf[pos] == ' ') |
pos++; |
pos++; |
return tbl_read(r->tbl, ln, buf->buf, pos); |
return tbl_read(r->tbl, ln, buf->buf, pos); |
} |
} |
Line 3367 roff_strdup(const struct roff *r, const char *p) |
|
Line 3365 roff_strdup(const struct roff *r, const char *p) |
|
ssz = 0; |
ssz = 0; |
|
|
while ('\0' != *p) { |
while ('\0' != *p) { |
if ('\\' != *p && r->xtab && r->xtab[(int)*p].p) { |
assert((unsigned int)*p < 128); |
|
if ('\\' != *p && r->xtab && r->xtab[(unsigned int)*p].p) { |
sz = r->xtab[(int)*p].sz; |
sz = r->xtab[(int)*p].sz; |
res = mandoc_realloc(res, ssz + sz + 1); |
res = mandoc_realloc(res, ssz + sz + 1); |
memcpy(res + ssz, r->xtab[(int)*p].p, sz); |
memcpy(res + ssz, r->xtab[(int)*p].p, sz); |