=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.224 retrieving revision 1.232 diff -u -p -r1.224 -r1.232 --- mandoc/mdoc.c 2014/08/10 23:54:41 1.224 +++ mandoc/mdoc.c 2014/11/28 04:47:03 1.232 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.224 2014/08/10 23:54:41 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.232 2014/11/28 04:47:03 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze @@ -89,11 +89,7 @@ static void mdoc_free1(struct mdoc *); static void mdoc_alloc1(struct mdoc *); static struct mdoc_node *node_alloc(struct mdoc *, int, int, enum mdoct, enum mdoc_type); -static int node_append(struct mdoc *, - struct mdoc_node *); -#if 0 -static int mdoc_preptext(struct mdoc *, int, char *, int); -#endif +static void node_append(struct mdoc *, struct mdoc_node *); static int mdoc_ptext(struct mdoc *, int, char *, int); static int mdoc_pmacro(struct mdoc *, int, char *, int); @@ -198,7 +194,8 @@ int mdoc_endparse(struct mdoc *mdoc) { - return(mdoc_macroend(mdoc)); + mdoc_macroend(mdoc); + return(1); } int @@ -208,10 +205,9 @@ mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN); n->eqn = ep; - - if ( ! node_append(mdoc, n)) - return(0); - + if (ep->ln > mdoc->last->line) + n->flags |= MDOC_LINE; + node_append(mdoc, n); mdoc->next = MDOC_NEXT_SIBLING; return(1); } @@ -223,10 +219,7 @@ mdoc_addspan(struct mdoc *mdoc, const struct tbl_span n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL); n->span = sp; - - if ( ! node_append(mdoc, n)) - return(0); - + node_append(mdoc, n); mdoc->next = MDOC_NEXT_SIBLING; return(1); } @@ -239,7 +232,8 @@ int mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs) { - mdoc->flags |= MDOC_NEWLINE; + if (mdoc->last->type != MDOC_EQN || ln > mdoc->last->line) + mdoc->flags |= MDOC_NEWLINE; /* * Let the roff nS register switch SYNOPSIS mode early, @@ -257,7 +251,7 @@ mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int mdoc_ptext(mdoc, ln, buf, offs)); } -int +void mdoc_macro(MACRO_PROT_ARGS) { assert(tok < MDOC_MAX); @@ -267,7 +261,7 @@ mdoc_macro(MACRO_PROT_ARGS) mandoc_vmsg(MANDOCERR_DT_LATE, mdoc->parse, line, ppos, "Dt %s", buf + *pos); - return(1); + return; } } else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) { if (mdoc->meta.title == NULL) { @@ -280,12 +274,11 @@ mdoc_macro(MACRO_PROT_ARGS) mdoc->meta.vol = mandoc_strdup("LOCAL"); mdoc->flags |= MDOC_PBODY; } - - return((*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf)); + (*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf); } -static int +static void node_append(struct mdoc *mdoc, struct mdoc_node *p) { @@ -329,8 +322,7 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p) break; } - if ( ! mdoc_valid_pre(mdoc, p)) - return(0); + mdoc_valid_pre(mdoc, p); switch (p->type) { case MDOC_HEAD: @@ -357,14 +349,11 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p) case MDOC_TBL: /* FALLTHROUGH */ case MDOC_TEXT: - if ( ! mdoc_valid_post(mdoc)) - return(0); + mdoc_valid_post(mdoc); break; default: break; } - - return(1); } static struct mdoc_node * @@ -394,46 +383,41 @@ node_alloc(struct mdoc *mdoc, int line, int pos, return(p); } -int +void mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) { struct mdoc_node *p; p = node_alloc(mdoc, line, pos, tok, MDOC_TAIL); - if ( ! node_append(mdoc, p)) - return(0); + node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); } -int +struct mdoc_node * mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) { struct mdoc_node *p; assert(mdoc->first); assert(mdoc->last); - p = node_alloc(mdoc, line, pos, tok, MDOC_HEAD); - if ( ! node_append(mdoc, p)) - return(0); + node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); + return(p); } -int +struct mdoc_node * mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) { struct mdoc_node *p; p = node_alloc(mdoc, line, pos, tok, MDOC_BODY); - if ( ! node_append(mdoc, p)) - return(0); + node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); + return(p); } -int +void mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, struct mdoc_node *body, enum mdoc_endbody end) { @@ -443,13 +427,11 @@ mdoc_endbody_alloc(struct mdoc *mdoc, int line, int po p->pending = body; p->norm = body->norm; p->end = end; - if ( ! node_append(mdoc, p)) - return(0); + node_append(mdoc, p); mdoc->next = MDOC_NEXT_SIBLING; - return(1); } -int +struct mdoc_node * mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, struct mdoc_arg *args) { @@ -475,14 +457,12 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, default: break; } - - if ( ! node_append(mdoc, p)) - return(0); + node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); + return(p); } -int +void mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, struct mdoc_arg *args) { @@ -500,26 +480,19 @@ mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, default: break; } - - if ( ! node_append(mdoc, p)) - return(0); + node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); } -int +void mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p) { struct mdoc_node *n; n = node_alloc(mdoc, line, pos, MDOC_MAX, MDOC_TEXT); n->string = roff_strdup(mdoc->roff, p); - - if ( ! node_append(mdoc, n)) - return(0); - + node_append(mdoc, n); mdoc->next = MDOC_NEXT_SIBLING; - return(1); } void @@ -601,69 +574,15 @@ mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node * mdoc_node_free(p); } -int +void mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p) { mdoc_node_unlink(mdoc, p); - return(node_append(mdoc, p)); + node_append(mdoc, p); } -#if 0 /* - * Pre-treat a text line. - * Text lines can consist of equations, which must be handled apart from - * the regular text. - * Thus, use this function to step through a line checking if it has any - * equations embedded in it. - * This must handle multiple equations AND equations that do not end at - * the end-of-line, i.e., will re-enter in the next roff parse. - */ -static int -mdoc_preptext(struct mdoc *mdoc, int line, char *buf, int offs) -{ - char *start, *end; - char delim; - - while ('\0' != buf[offs]) { - /* Mark starting position if eqn is set. */ - start = NULL; - if ('\0' != (delim = roff_eqndelim(mdoc->roff))) - if (NULL != (start = strchr(buf + offs, delim))) - *start++ = '\0'; - - /* Parse text as normal. */ - if ( ! mdoc_ptext(mdoc, line, buf, offs)) - return(0); - - /* Continue only if an equation exists. */ - if (NULL == start) - break; - - /* Read past the end of the equation. */ - offs += start - (buf + offs); - assert(start == &buf[offs]); - if (NULL != (end = strchr(buf + offs, delim))) { - *end++ = '\0'; - while (' ' == *end) - end++; - } - - /* Parse the equation itself. */ - roff_openeqn(mdoc->roff, NULL, line, offs, buf); - - /* Process a finished equation? */ - if (roff_closeeqn(mdoc->roff)) - if ( ! mdoc_addeqn(mdoc, roff_eqn(mdoc->roff))) - return(0); - offs += (end - (buf + offs)); - } - - return(1); -} -#endif - -/* * Parse free-form text, that is, a line that does not begin with the * control character. */ @@ -687,7 +606,8 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int LIST_column == n->norm->Bl.type) { /* `Bl' is open without any children. */ mdoc->flags |= MDOC_FREECOL; - return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); + mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); + return(1); } if (MDOC_It == n->tok && MDOC_BLOCK == n->type && @@ -696,7 +616,8 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int LIST_column == n->parent->norm->Bl.type) { /* `Bl' has block-level `It' children. */ mdoc->flags |= MDOC_FREECOL; - return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); + mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); + return(1); } /* @@ -744,7 +665,7 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, line, (int)(ws-buf), NULL); - if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) { + if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) { mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse, line, (int)(c - buf), NULL); @@ -753,18 +674,15 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int * blank lines aren't allowed, but enough manuals assume this * behaviour that we want to work around it. */ - if ( ! mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL)) - return(0); - + mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL); mdoc->next = MDOC_NEXT_SIBLING; - - return(mdoc_valid_post(mdoc)); + mdoc_valid_post(mdoc); + return(1); } - if ( ! mdoc_word_alloc(mdoc, line, offs, buf+offs)) - return(0); + mdoc_word_alloc(mdoc, line, offs, buf+offs); - if (MDOC_LITERAL & mdoc->flags) + if (mdoc->flags & MDOC_LITERAL) return(1); /* @@ -777,7 +695,6 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int if (mandoc_eos(buf+offs, (size_t)(end-buf-offs))) mdoc->last->flags |= MDOC_EOS; - return(1); } @@ -788,46 +705,47 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int static int mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs) { + struct mdoc_node *n; + const char *cp; enum mdoct tok; int i, sv; char mac[5]; - struct mdoc_node *n; - /* Empty post-control lines are ignored. */ - - if ('"' == buf[offs]) { - mandoc_msg(MANDOCERR_COMMENT_BAD, mdoc->parse, - ln, offs, NULL); - return(1); - } else if ('\0' == buf[offs]) - return(1); - sv = offs; /* * Copy the first word into a nil-terminated buffer. - * Stop copying when a tab, space, or eoln is encountered. + * Stop when a space, tab, escape, or eoln is encountered. */ i = 0; - while (i < 4 && '\0' != buf[offs] && ' ' != buf[offs] && - '\t' != buf[offs]) + while (i < 4 && strchr(" \t\\", buf[offs]) == NULL) mac[i++] = buf[offs++]; mac[i] = '\0'; tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : MDOC_MAX; - if (MDOC_MAX == tok) { + if (tok == MDOC_MAX) { mandoc_msg(MANDOCERR_MACRO, mdoc->parse, ln, sv, buf + sv - 1); return(1); } - /* Disregard the first trailing tab, if applicable. */ + /* Skip a leading escape sequence or tab. */ - if ('\t' == buf[offs]) + switch (buf[offs]) { + case '\\': + cp = buf + offs + 1; + mandoc_escape(&cp, NULL, NULL); + offs = cp - buf; + break; + case '\t': offs++; + break; + default: + break; + } /* Jump to the next non-whitespace word. */ @@ -848,8 +766,10 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int * into macro processing. */ - if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) - return(mdoc_macro(mdoc, tok, ln, sv, &offs, buf)); + if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) { + mdoc_macro(mdoc, tok, ln, sv, &offs, buf); + return(1); + } n = mdoc->last; assert(mdoc->last); @@ -862,7 +782,8 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int if (MDOC_Bl == n->tok && MDOC_BODY == n->type && LIST_column == n->norm->Bl.type) { mdoc->flags |= MDOC_FREECOL; - return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)); + mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); + return(1); } /* @@ -876,13 +797,13 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int MDOC_Bl == n->parent->tok && LIST_column == n->parent->norm->Bl.type) { mdoc->flags |= MDOC_FREECOL; - return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)); + mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); + return(1); } /* Normal processing of a macro. */ - if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) - return(0); + mdoc_macro(mdoc, tok, ln, sv, &offs, buf); /* In quick mode (for mandocdb), abort after the NAME section. */