version 1.251, 2015/04/23 15:35:59 |
version 1.254, 2015/10/12 00:08:15 |
Line 111 mdoc_parseln(struct roff_man *mdoc, int ln, char *buf, |
|
Line 111 mdoc_parseln(struct roff_man *mdoc, int ln, char *buf, |
|
else |
else |
mdoc->flags &= ~MDOC_SYNOPSIS; |
mdoc->flags &= ~MDOC_SYNOPSIS; |
|
|
return(roff_getcontrol(mdoc->roff, buf, &offs) ? |
return roff_getcontrol(mdoc->roff, buf, &offs) ? |
mdoc_pmacro(mdoc, ln, buf, offs) : |
mdoc_pmacro(mdoc, ln, buf, offs) : |
mdoc_ptext(mdoc, ln, buf, offs)); |
mdoc_ptext(mdoc, ln, buf, offs); |
} |
} |
|
|
void |
void |
Line 166 mdoc_endbody_alloc(struct roff_man *mdoc, int line, in |
|
Line 166 mdoc_endbody_alloc(struct roff_man *mdoc, int line, in |
|
p->end = end; |
p->end = end; |
roff_node_append(mdoc, p); |
roff_node_append(mdoc, p); |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
return(p); |
return p; |
} |
} |
|
|
struct roff_node * |
struct roff_node * |
Line 182 mdoc_block_alloc(struct roff_man *mdoc, int line, int |
|
Line 182 mdoc_block_alloc(struct roff_man *mdoc, int line, int |
|
|
|
switch (tok) { |
switch (tok) { |
case MDOC_Bd: |
case MDOC_Bd: |
/* FALLTHROUGH */ |
|
case MDOC_Bf: |
case MDOC_Bf: |
/* FALLTHROUGH */ |
|
case MDOC_Bl: |
case MDOC_Bl: |
/* FALLTHROUGH */ |
|
case MDOC_En: |
case MDOC_En: |
/* FALLTHROUGH */ |
|
case MDOC_Rs: |
case MDOC_Rs: |
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
break; |
break; |
Line 197 mdoc_block_alloc(struct roff_man *mdoc, int line, int |
|
Line 193 mdoc_block_alloc(struct roff_man *mdoc, int line, int |
|
} |
} |
roff_node_append(mdoc, p); |
roff_node_append(mdoc, p); |
mdoc->next = ROFF_NEXT_CHILD; |
mdoc->next = ROFF_NEXT_CHILD; |
return(p); |
return p; |
} |
} |
|
|
void |
void |
Line 255 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 251 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
/* `Bl' is open without any children. */ |
/* `Bl' is open without any children. */ |
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 && |
if (n->tok == MDOC_It && n->type == ROFFT_BLOCK && |
Line 265 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 261 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
/* `Bl' has block-level `It' children. */ |
/* `Bl' has block-level `It' children. */ |
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; |
} |
} |
|
|
/* |
/* |
Line 325 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 321 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
roff_elem_alloc(mdoc, line, offs, MDOC_sp); |
roff_elem_alloc(mdoc, line, offs, MDOC_sp); |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc_valid_post(mdoc); |
mdoc_valid_post(mdoc); |
return(1); |
return 1; |
} |
} |
|
|
roff_word_alloc(mdoc, line, offs, buf+offs); |
roff_word_alloc(mdoc, line, offs, buf+offs); |
|
|
if (mdoc->flags & MDOC_LITERAL) |
if (mdoc->flags & MDOC_LITERAL) |
return(1); |
return 1; |
|
|
/* |
/* |
* End-of-sentence check. If the last character is an unescaped |
* End-of-sentence check. If the last character is an unescaped |
Line 343 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 339 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
|
|
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 |= MDOC_EOS; |
return(1); |
return 1; |
} |
} |
|
|
/* |
/* |
Line 377 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
Line 373 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
if (tok == TOKEN_NONE) { |
if (tok == TOKEN_NONE) { |
mandoc_msg(MANDOCERR_MACRO, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO, mdoc->parse, |
ln, sv, buf + sv - 1); |
ln, sv, buf + sv - 1); |
return(1); |
return 1; |
} |
} |
|
|
/* Skip a leading escape sequence or tab. */ |
/* Skip a leading escape sequence or tab. */ |
Line 416 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
Line 412 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
|
|
if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) { |
if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) { |
mdoc_macro(mdoc, tok, ln, sv, &offs, buf); |
mdoc_macro(mdoc, tok, ln, sv, &offs, buf); |
return(1); |
return 1; |
} |
} |
|
|
n = mdoc->last; |
n = mdoc->last; |
Line 431 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
Line 427 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) { |
n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) { |
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; |
} |
} |
|
|
/* |
/* |
Line 446 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
Line 442 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
LIST_column == n->parent->norm->Bl.type) { |
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; |
} |
} |
|
|
/* Normal processing of a macro. */ |
/* Normal processing of a macro. */ |
Line 457 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
Line 453 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
|
|
if (mdoc->quick && MDOC_Sh == tok && |
if (mdoc->quick && MDOC_Sh == tok && |
SEC_NAME != mdoc->last->sec) |
SEC_NAME != mdoc->last->sec) |
return(2); |
return 2; |
|
|
return(1); |
return 1; |
} |
} |
|
|
enum mdelim |
enum mdelim |
Line 467 mdoc_isdelim(const char *p) |
|
Line 463 mdoc_isdelim(const char *p) |
|
{ |
{ |
|
|
if ('\0' == p[0]) |
if ('\0' == p[0]) |
return(DELIM_NONE); |
return DELIM_NONE; |
|
|
if ('\0' == p[1]) |
if ('\0' == p[1]) |
switch (p[0]) { |
switch (p[0]) { |
case '(': |
case '(': |
/* FALLTHROUGH */ |
|
case '[': |
case '[': |
return(DELIM_OPEN); |
return DELIM_OPEN; |
case '|': |
case '|': |
return(DELIM_MIDDLE); |
return DELIM_MIDDLE; |
case '.': |
case '.': |
/* FALLTHROUGH */ |
|
case ',': |
case ',': |
/* FALLTHROUGH */ |
|
case ';': |
case ';': |
/* FALLTHROUGH */ |
|
case ':': |
case ':': |
/* FALLTHROUGH */ |
|
case '?': |
case '?': |
/* FALLTHROUGH */ |
|
case '!': |
case '!': |
/* FALLTHROUGH */ |
|
case ')': |
case ')': |
/* FALLTHROUGH */ |
|
case ']': |
case ']': |
return(DELIM_CLOSE); |
return DELIM_CLOSE; |
default: |
default: |
return(DELIM_NONE); |
return DELIM_NONE; |
} |
} |
|
|
if ('\\' != p[0]) |
if ('\\' != p[0]) |
return(DELIM_NONE); |
return DELIM_NONE; |
|
|
if (0 == strcmp(p + 1, ".")) |
if (0 == strcmp(p + 1, ".")) |
return(DELIM_CLOSE); |
return DELIM_CLOSE; |
if (0 == strcmp(p + 1, "fR|\\fP")) |
if (0 == strcmp(p + 1, "fR|\\fP")) |
return(DELIM_MIDDLE); |
return DELIM_MIDDLE; |
|
|
return(DELIM_NONE); |
return DELIM_NONE; |
} |
|
|
|
void |
|
mdoc_deroff(char **dest, const struct roff_node *n) |
|
{ |
|
char *cp; |
|
size_t sz; |
|
|
|
if (n->type != ROFFT_TEXT) { |
|
for (n = n->child; n; n = n->next) |
|
mdoc_deroff(dest, n); |
|
return; |
|
} |
|
|
|
/* Skip leading whitespace. */ |
|
|
|
for (cp = n->string; '\0' != *cp; cp++) |
|
if (0 == isspace((unsigned char)*cp)) |
|
break; |
|
|
|
/* Skip trailing whitespace. */ |
|
|
|
for (sz = strlen(cp); sz; sz--) |
|
if (0 == isspace((unsigned char)cp[sz-1])) |
|
break; |
|
|
|
/* Skip empty strings. */ |
|
|
|
if (0 == sz) |
|
return; |
|
|
|
if (NULL == *dest) { |
|
*dest = mandoc_strndup(cp, sz); |
|
return; |
|
} |
|
|
|
mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp); |
|
free(*dest); |
|
*dest = cp; |
|
} |
} |