version 1.158, 2015/04/19 13:50:25 |
version 1.162, 2015/04/23 15:35:59 |
Line 50 const char *const __man_macronames[MAN_MAX] = { |
|
Line 50 const char *const __man_macronames[MAN_MAX] = { |
|
|
|
const char * const *man_macronames = __man_macronames; |
const char * const *man_macronames = __man_macronames; |
|
|
static void man_breakscope(struct roff_man *, int); |
|
static void man_descope(struct roff_man *, int, int); |
static void man_descope(struct roff_man *, int, int); |
static int man_ptext(struct roff_man *, int, char *, int); |
static int man_ptext(struct roff_man *, int, char *, int); |
static int man_pmacro(struct roff_man *, int, char *, int); |
static int man_pmacro(struct roff_man *, int, char *, int); |
|
|
|
|
void |
|
man_endparse(struct roff_man *man) |
|
{ |
|
|
|
man_macroend(man); |
|
} |
|
|
|
int |
int |
man_parseln(struct roff_man *man, int ln, char *buf, int offs) |
man_parseln(struct roff_man *man, int ln, char *buf, int offs) |
{ |
{ |
Line 75 man_parseln(struct roff_man *man, int ln, char *buf, i |
|
Line 67 man_parseln(struct roff_man *man, int ln, char *buf, i |
|
man_ptext(man, ln, buf, offs)); |
man_ptext(man, ln, buf, offs)); |
} |
} |
|
|
void |
|
man_elem_alloc(struct roff_man *man, int line, int pos, int tok) |
|
{ |
|
struct roff_node *p; |
|
|
|
p = roff_node_alloc(man, line, pos, ROFFT_ELEM, tok); |
|
roff_node_append(man, p); |
|
man->next = ROFF_NEXT_CHILD; |
|
} |
|
|
|
void |
|
man_block_alloc(struct roff_man *man, int line, int pos, int tok) |
|
{ |
|
struct roff_node *p; |
|
|
|
p = roff_node_alloc(man, line, pos, ROFFT_BLOCK, tok); |
|
roff_node_append(man, p); |
|
man->next = ROFF_NEXT_CHILD; |
|
} |
|
|
|
void |
|
man_word_alloc(struct roff_man *man, int line, int pos, const char *word) |
|
{ |
|
struct roff_node *n; |
|
|
|
n = roff_node_alloc(man, line, pos, ROFFT_TEXT, MAN_MAX); |
|
n->string = roff_strdup(man->roff, word); |
|
roff_node_append(man, n); |
|
man_valid_post(man); |
|
man->next = ROFF_NEXT_SIBLING; |
|
} |
|
|
|
void |
|
man_word_append(struct roff_man *man, const char *word) |
|
{ |
|
struct roff_node *n; |
|
char *addstr, *newstr; |
|
|
|
n = man->last; |
|
addstr = roff_strdup(man->roff, word); |
|
mandoc_asprintf(&newstr, "%s %s", n->string, addstr); |
|
free(addstr); |
|
free(n->string); |
|
n->string = newstr; |
|
man->next = ROFF_NEXT_SIBLING; |
|
} |
|
|
|
void |
|
man_addeqn(struct roff_man *man, const struct eqn *ep) |
|
{ |
|
struct roff_node *n; |
|
|
|
n = roff_node_alloc(man, ep->ln, ep->pos, ROFFT_EQN, MAN_MAX); |
|
n->eqn = ep; |
|
if (ep->ln > man->last->line) |
|
n->flags |= MAN_LINE; |
|
roff_node_append(man, n); |
|
man->next = ROFF_NEXT_SIBLING; |
|
man_descope(man, ep->ln, ep->pos); |
|
} |
|
|
|
void |
|
man_addspan(struct roff_man *man, const struct tbl_span *sp) |
|
{ |
|
struct roff_node *n; |
|
|
|
man_breakscope(man, MAN_MAX); |
|
n = roff_node_alloc(man, sp->line, 0, ROFFT_TBL, MAN_MAX); |
|
n->span = sp; |
|
roff_node_append(man, n); |
|
man_valid_post(man); |
|
man->next = ROFF_NEXT_SIBLING; |
|
man_descope(man, sp->line, 0); |
|
} |
|
|
|
static void |
static void |
man_descope(struct roff_man *man, int line, int offs) |
man_descope(struct roff_man *man, int line, int offs) |
{ |
{ |
Line 178 man_ptext(struct roff_man *man, int line, char *buf, i |
|
Line 95 man_ptext(struct roff_man *man, int line, char *buf, i |
|
/* Literal free-form text whitespace is preserved. */ |
/* Literal free-form text whitespace is preserved. */ |
|
|
if (man->flags & MAN_LITERAL) { |
if (man->flags & MAN_LITERAL) { |
man_word_alloc(man, line, offs, buf + offs); |
roff_word_alloc(man, line, offs, buf + offs); |
man_descope(man, line, offs); |
man_descope(man, line, offs); |
return(1); |
return(1); |
} |
} |
Line 195 man_ptext(struct roff_man *man, int line, char *buf, i |
|
Line 112 man_ptext(struct roff_man *man, int line, char *buf, i |
|
/* Allocate a blank entry. */ |
/* Allocate a blank entry. */ |
if (man->last->tok != MAN_SH && |
if (man->last->tok != MAN_SH && |
man->last->tok != MAN_SS) { |
man->last->tok != MAN_SS) { |
man_elem_alloc(man, line, offs, MAN_sp); |
roff_elem_alloc(man, line, offs, MAN_sp); |
man->next = ROFF_NEXT_SIBLING; |
man->next = ROFF_NEXT_SIBLING; |
} |
} |
return(1); |
return(1); |
Line 222 man_ptext(struct roff_man *man, int line, char *buf, i |
|
Line 139 man_ptext(struct roff_man *man, int line, char *buf, i |
|
|
|
buf[i] = '\0'; |
buf[i] = '\0'; |
} |
} |
man_word_alloc(man, line, offs, buf + offs); |
roff_word_alloc(man, line, offs, buf + offs); |
|
|
/* |
/* |
* End-of-sentence check. If the last character is an unescaped |
* End-of-sentence check. If the last character is an unescaped |
Line 261 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
Line 178 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
|
|
mac[i] = '\0'; |
mac[i] = '\0'; |
|
|
tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX; |
tok = (i > 0 && i < 4) ? man_hash_find(mac) : TOKEN_NONE; |
|
|
if (tok == MAN_MAX) { |
if (tok == TOKEN_NONE) { |
mandoc_msg(MANDOCERR_MACRO, man->parse, |
mandoc_msg(MANDOCERR_MACRO, man->parse, |
ln, ppos, buf + ppos - 1); |
ln, ppos, buf + ppos - 1); |
return(1); |
return(1); |
Line 349 man_breakscope(struct roff_man *man, int tok) |
|
Line 266 man_breakscope(struct roff_man *man, int tok) |
|
* Delete the element that is being broken. |
* Delete the element that is being broken. |
*/ |
*/ |
|
|
if (man->flags & MAN_ELINE && (tok == MAN_MAX || |
if (man->flags & MAN_ELINE && (tok == TOKEN_NONE || |
! (man_macros[tok].flags & MAN_NSCOPED))) { |
! (man_macros[tok].flags & MAN_NSCOPED))) { |
n = man->last; |
n = man->last; |
assert(n->type != ROFFT_TEXT); |
assert(n->type != ROFFT_TEXT); |
Line 358 man_breakscope(struct roff_man *man, int tok) |
|
Line 275 man_breakscope(struct roff_man *man, int tok) |
|
|
|
mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, |
mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, |
n->line, n->pos, "%s breaks %s", |
n->line, n->pos, "%s breaks %s", |
tok == MAN_MAX ? "TS" : man_macronames[tok], |
tok == TOKEN_NONE ? "TS" : man_macronames[tok], |
man_macronames[n->tok]); |
man_macronames[n->tok]); |
|
|
roff_node_delete(man, n); |
roff_node_delete(man, n); |
Line 371 man_breakscope(struct roff_man *man, int tok) |
|
Line 288 man_breakscope(struct roff_man *man, int tok) |
|
* Delete the block that is being broken. |
* Delete the block that is being broken. |
*/ |
*/ |
|
|
if (man->flags & MAN_BLINE && (tok == MAN_MAX || |
if (man->flags & MAN_BLINE && (tok == TOKEN_NONE || |
man_macros[tok].flags & MAN_BSCOPE)) { |
man_macros[tok].flags & MAN_BSCOPE)) { |
n = man->last; |
n = man->last; |
if (n->type == ROFFT_TEXT) |
if (n->type == ROFFT_TEXT) |
Line 386 man_breakscope(struct roff_man *man, int tok) |
|
Line 303 man_breakscope(struct roff_man *man, int tok) |
|
|
|
mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, |
mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, |
n->line, n->pos, "%s breaks %s", |
n->line, n->pos, "%s breaks %s", |
tok == MAN_MAX ? "TS" : man_macronames[tok], |
tok == TOKEN_NONE ? "TS" : man_macronames[tok], |
man_macronames[n->tok]); |
man_macronames[n->tok]); |
|
|
roff_node_delete(man, n); |
roff_node_delete(man, n); |