Print this page
Update to 1.12.3.

*** 1,9 **** ! /* $Id: mdoc.c,v 1.196 2011/09/30 00:13:28 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> ! * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * --- 1,9 ---- ! /* $Id: mdoc.c,v 1.206 2013/12/24 19:11:46 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> ! * Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. *
*** 102,125 **** #endif static int mdoc_ptext(struct mdoc *, int, char *, int); static int mdoc_pmacro(struct mdoc *, int, char *, int); const struct mdoc_node * ! mdoc_node(const struct mdoc *m) { ! assert( ! (MDOC_HALT & m->flags)); ! return(m->first); } const struct mdoc_meta * ! mdoc_meta(const struct mdoc *m) { ! assert( ! (MDOC_HALT & m->flags)); ! return(&m->meta); } /* * Frees volatile resources (parse tree, meta-data, fields). --- 102,125 ---- #endif static int mdoc_ptext(struct mdoc *, int, char *, int); static int mdoc_pmacro(struct mdoc *, int, char *, int); const struct mdoc_node * ! mdoc_node(const struct mdoc *mdoc) { ! assert( ! (MDOC_HALT & mdoc->flags)); ! return(mdoc->first); } const struct mdoc_meta * ! mdoc_meta(const struct mdoc *mdoc) { ! assert( ! (MDOC_HALT & mdoc->flags)); ! return(&mdoc->meta); } /* * Frees volatile resources (parse tree, meta-data, fields).
*** 195,211 **** /* * Allocate volatile and non-volatile parse resources. */ struct mdoc * ! mdoc_alloc(struct roff *roff, struct mparse *parse) { struct mdoc *p; p = mandoc_calloc(1, sizeof(struct mdoc)); p->parse = parse; p->roff = roff; mdoc_hash_init(); mdoc_alloc1(p); return(p); --- 195,212 ---- /* * Allocate volatile and non-volatile parse resources. */ struct mdoc * ! mdoc_alloc(struct roff *roff, struct mparse *parse, char *defos) { struct mdoc *p; p = mandoc_calloc(1, sizeof(struct mdoc)); p->parse = parse; + p->defos = defos; p->roff = roff; mdoc_hash_init(); mdoc_alloc1(p); return(p);
*** 215,311 **** /* * Climb back up the parse tree, validating open scopes. Mostly calls * through to macro_end() in macro.c. */ int ! mdoc_endparse(struct mdoc *m) { ! assert( ! (MDOC_HALT & m->flags)); ! if (mdoc_macroend(m)) return(1); ! m->flags |= MDOC_HALT; return(0); } int ! mdoc_addeqn(struct mdoc *m, const struct eqn *ep) { struct mdoc_node *n; ! assert( ! (MDOC_HALT & m->flags)); /* No text before an initial macro. */ ! if (SEC_NONE == m->lastnamed) { ! mdoc_pmsg(m, ep->ln, ep->pos, MANDOCERR_NOTEXT); return(1); } ! n = node_alloc(m, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN); n->eqn = ep; ! if ( ! node_append(m, n)) return(0); ! m->next = MDOC_NEXT_SIBLING; return(1); } int ! mdoc_addspan(struct mdoc *m, const struct tbl_span *sp) { struct mdoc_node *n; ! assert( ! (MDOC_HALT & m->flags)); /* No text before an initial macro. */ ! if (SEC_NONE == m->lastnamed) { ! mdoc_pmsg(m, sp->line, 0, MANDOCERR_NOTEXT); return(1); } ! n = node_alloc(m, sp->line, 0, MDOC_MAX, MDOC_TBL); n->span = sp; ! if ( ! node_append(m, n)) return(0); ! m->next = MDOC_NEXT_SIBLING; return(1); } /* * Main parse routine. Parses a single line -- really just hands off to * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). */ int ! mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs) { ! assert( ! (MDOC_HALT & m->flags)); ! m->flags |= MDOC_NEWLINE; /* * Let the roff nS register switch SYNOPSIS mode early, * such that the parser knows at all times * whether this mode is on or off. * Note that this mode is also switched by the Sh macro. */ ! if (roff_regisset(m->roff, REG_nS)) { ! if (roff_regget(m->roff, REG_nS)) ! m->flags |= MDOC_SYNOPSIS; else ! m->flags &= ~MDOC_SYNOPSIS; ! } ! return(mandoc_getcontrol(buf, &offs) ? ! mdoc_pmacro(m, ln, buf, offs) : ! mdoc_ptext(m, ln, buf, offs)); } int mdoc_macro(MACRO_PROT_ARGS) { --- 216,310 ---- /* * Climb back up the parse tree, validating open scopes. Mostly calls * through to macro_end() in macro.c. */ int ! mdoc_endparse(struct mdoc *mdoc) { ! assert( ! (MDOC_HALT & mdoc->flags)); ! if (mdoc_macroend(mdoc)) return(1); ! mdoc->flags |= MDOC_HALT; return(0); } int ! mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) { struct mdoc_node *n; ! assert( ! (MDOC_HALT & mdoc->flags)); /* No text before an initial macro. */ ! if (SEC_NONE == mdoc->lastnamed) { ! mdoc_pmsg(mdoc, ep->ln, ep->pos, MANDOCERR_NOTEXT); return(1); } ! n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN); n->eqn = ep; ! if ( ! node_append(mdoc, n)) return(0); ! mdoc->next = MDOC_NEXT_SIBLING; return(1); } int ! mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp) { struct mdoc_node *n; ! assert( ! (MDOC_HALT & mdoc->flags)); /* No text before an initial macro. */ ! if (SEC_NONE == mdoc->lastnamed) { ! mdoc_pmsg(mdoc, sp->line, 0, MANDOCERR_NOTEXT); return(1); } ! n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL); n->span = sp; ! if ( ! node_append(mdoc, n)) return(0); ! mdoc->next = MDOC_NEXT_SIBLING; return(1); } /* * Main parse routine. Parses a single line -- really just hands off to * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). */ int ! mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs) { ! assert( ! (MDOC_HALT & mdoc->flags)); ! mdoc->flags |= MDOC_NEWLINE; /* * Let the roff nS register switch SYNOPSIS mode early, * such that the parser knows at all times * whether this mode is on or off. * Note that this mode is also switched by the Sh macro. */ ! if (roff_getreg(mdoc->roff, "nS")) ! mdoc->flags |= MDOC_SYNOPSIS; else ! mdoc->flags &= ~MDOC_SYNOPSIS; ! return(roff_getcontrol(mdoc->roff, buf, &offs) ? ! mdoc_pmacro(mdoc, ln, buf, offs) : ! mdoc_ptext(mdoc, ln, buf, offs)); } int mdoc_macro(MACRO_PROT_ARGS) {
*** 312,346 **** assert(tok < MDOC_MAX); /* If we're in the body, deny prologue calls. */ if (MDOC_PROLOGUE & mdoc_macros[tok].flags && ! MDOC_PBODY & m->flags) { ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY); return(1); } /* If we're in the prologue, deny "body" macros. */ if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && ! ! (MDOC_PBODY & m->flags)) { ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG); ! if (NULL == m->meta.msec) ! m->meta.msec = mandoc_strdup("1"); ! if (NULL == m->meta.title) ! m->meta.title = mandoc_strdup("UNKNOWN"); ! if (NULL == m->meta.vol) ! m->meta.vol = mandoc_strdup("LOCAL"); ! if (NULL == m->meta.os) ! m->meta.os = mandoc_strdup("LOCAL"); ! if (NULL == m->meta.date) ! m->meta.date = mandoc_normdate ! (m->parse, NULL, line, ppos); ! m->flags |= MDOC_PBODY; } ! return((*mdoc_macros[tok].fp)(m, tok, line, ppos, pos, buf)); } static int node_append(struct mdoc *mdoc, struct mdoc_node *p) --- 311,345 ---- assert(tok < MDOC_MAX); /* If we're in the body, deny prologue calls. */ if (MDOC_PROLOGUE & mdoc_macros[tok].flags && ! MDOC_PBODY & mdoc->flags) { ! mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADBODY); return(1); } /* If we're in the prologue, deny "body" macros. */ if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && ! ! (MDOC_PBODY & mdoc->flags)) { ! mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADPROLOG); ! if (NULL == mdoc->meta.msec) ! mdoc->meta.msec = mandoc_strdup("1"); ! if (NULL == mdoc->meta.title) ! mdoc->meta.title = mandoc_strdup("UNKNOWN"); ! if (NULL == mdoc->meta.vol) ! mdoc->meta.vol = mandoc_strdup("LOCAL"); ! if (NULL == mdoc->meta.os) ! mdoc->meta.os = mandoc_strdup("LOCAL"); ! if (NULL == mdoc->meta.date) ! mdoc->meta.date = mandoc_normdate ! (mdoc->parse, NULL, line, ppos); ! mdoc->flags |= MDOC_PBODY; } ! return((*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf)); } static int node_append(struct mdoc *mdoc, struct mdoc_node *p)
*** 372,381 **** --- 371,382 ---- * everybody has one, but copying a null pointer is fine. */ switch (p->type) { case (MDOC_BODY): + if (ENDBODY_NOT != p->end) + break; /* FALLTHROUGH */ case (MDOC_TAIL): /* FALLTHROUGH */ case (MDOC_HEAD): p->norm = p->parent->norm;
*** 422,522 **** return(1); } static struct mdoc_node * ! node_alloc(struct mdoc *m, int line, int pos, enum mdoct tok, enum mdoc_type type) { struct mdoc_node *p; p = mandoc_calloc(1, sizeof(struct mdoc_node)); ! p->sec = m->lastsec; p->line = line; p->pos = pos; p->tok = tok; p->type = type; /* Flag analysis. */ ! if (MDOC_SYNOPSIS & m->flags) p->flags |= MDOC_SYNPRETTY; else p->flags &= ~MDOC_SYNPRETTY; ! if (MDOC_NEWLINE & m->flags) p->flags |= MDOC_LINE; ! m->flags &= ~MDOC_NEWLINE; return(p); } int ! mdoc_tail_alloc(struct mdoc *m, int line, int pos, enum mdoct tok) { struct mdoc_node *p; ! p = node_alloc(m, line, pos, tok, MDOC_TAIL); ! if ( ! node_append(m, p)) return(0); ! m->next = MDOC_NEXT_CHILD; return(1); } int ! mdoc_head_alloc(struct mdoc *m, int line, int pos, enum mdoct tok) { struct mdoc_node *p; ! assert(m->first); ! assert(m->last); ! p = node_alloc(m, line, pos, tok, MDOC_HEAD); ! if ( ! node_append(m, p)) return(0); ! m->next = MDOC_NEXT_CHILD; return(1); } int ! mdoc_body_alloc(struct mdoc *m, int line, int pos, enum mdoct tok) { struct mdoc_node *p; ! p = node_alloc(m, line, pos, tok, MDOC_BODY); ! if ( ! node_append(m, p)) return(0); ! m->next = MDOC_NEXT_CHILD; return(1); } int ! mdoc_endbody_alloc(struct mdoc *m, int line, int pos, enum mdoct tok, struct mdoc_node *body, enum mdoc_endbody end) { struct mdoc_node *p; ! p = node_alloc(m, line, pos, tok, MDOC_BODY); p->pending = body; p->end = end; ! if ( ! node_append(m, p)) return(0); ! m->next = MDOC_NEXT_SIBLING; return(1); } int ! mdoc_block_alloc(struct mdoc *m, int line, int pos, enum mdoct tok, struct mdoc_arg *args) { struct mdoc_node *p; ! p = node_alloc(m, line, pos, tok, MDOC_BLOCK); p->args = args; if (p->args) (args->refcnt)++; switch (tok) { --- 423,525 ---- return(1); } static struct mdoc_node * ! node_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, enum mdoc_type type) { struct mdoc_node *p; p = mandoc_calloc(1, sizeof(struct mdoc_node)); ! p->sec = mdoc->lastsec; p->line = line; p->pos = pos; + p->lastline = line; p->tok = tok; p->type = type; /* Flag analysis. */ ! if (MDOC_SYNOPSIS & mdoc->flags) p->flags |= MDOC_SYNPRETTY; else p->flags &= ~MDOC_SYNPRETTY; ! if (MDOC_NEWLINE & mdoc->flags) p->flags |= MDOC_LINE; ! mdoc->flags &= ~MDOC_NEWLINE; return(p); } int ! 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); ! mdoc->next = MDOC_NEXT_CHILD; return(1); } int ! 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); ! mdoc->next = MDOC_NEXT_CHILD; return(1); } int ! 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); ! mdoc->next = MDOC_NEXT_CHILD; return(1); } int ! mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, struct mdoc_node *body, enum mdoc_endbody end) { struct mdoc_node *p; ! p = node_alloc(mdoc, line, pos, tok, MDOC_BODY); p->pending = body; + p->norm = body->norm; p->end = end; ! if ( ! node_append(mdoc, p)) return(0); ! mdoc->next = MDOC_NEXT_SIBLING; return(1); } int ! mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, struct mdoc_arg *args) { struct mdoc_node *p; ! p = node_alloc(mdoc, line, pos, tok, MDOC_BLOCK); p->args = args; if (p->args) (args->refcnt)++; switch (tok) {
*** 531,554 **** break; default: break; } ! if ( ! node_append(m, p)) return(0); ! m->next = MDOC_NEXT_CHILD; return(1); } int ! mdoc_elem_alloc(struct mdoc *m, int line, int pos, enum mdoct tok, struct mdoc_arg *args) { struct mdoc_node *p; ! p = node_alloc(m, line, pos, tok, MDOC_ELEM); p->args = args; if (p->args) (args->refcnt)++; switch (tok) { --- 534,557 ---- break; default: break; } ! if ( ! node_append(mdoc, p)) return(0); ! mdoc->next = MDOC_NEXT_CHILD; return(1); } int ! mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, struct mdoc_arg *args) { struct mdoc_node *p; ! p = node_alloc(mdoc, line, pos, tok, MDOC_ELEM); p->args = args; if (p->args) (args->refcnt)++; switch (tok) {
*** 557,588 **** break; default: break; } ! if ( ! node_append(m, p)) return(0); ! m->next = MDOC_NEXT_CHILD; return(1); } int ! mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p) { struct mdoc_node *n; ! n = node_alloc(m, line, pos, MDOC_MAX, MDOC_TEXT); ! n->string = roff_strdup(m->roff, p); ! if ( ! node_append(m, n)) return(0); ! m->next = MDOC_NEXT_SIBLING; return(1); } static void mdoc_node_free(struct mdoc_node *p) { if (MDOC_BLOCK == p->type || MDOC_ELEM == p->type) --- 560,608 ---- break; default: break; } ! if ( ! node_append(mdoc, p)) return(0); ! mdoc->next = MDOC_NEXT_CHILD; return(1); } int ! 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); ! mdoc->next = MDOC_NEXT_SIBLING; return(1); } + void + mdoc_word_append(struct mdoc *mdoc, const char *p) + { + struct mdoc_node *n; + char *addstr, *newstr; + n = mdoc->last; + addstr = roff_strdup(mdoc->roff, p); + if (-1 == asprintf(&newstr, "%s %s", n->string, addstr)) { + perror(NULL); + exit((int)MANDOCLEVEL_SYSERR); + } + free(addstr); + free(n->string); + n->string = newstr; + mdoc->next = MDOC_NEXT_SIBLING; + } + static void mdoc_node_free(struct mdoc_node *p) { if (MDOC_BLOCK == p->type || MDOC_ELEM == p->type)
*** 594,604 **** free(p); } static void ! mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n) { /* Adjust siblings. */ if (n->prev) --- 614,624 ---- free(p); } static void ! mdoc_node_unlink(struct mdoc *mdoc, struct mdoc_node *n) { /* Adjust siblings. */ if (n->prev)
*** 616,654 **** n->parent->last = n->prev ? n->prev : NULL; } /* Adjust parse point, if applicable. */ ! if (m && m->last == n) { if (n->prev) { ! m->last = n->prev; ! m->next = MDOC_NEXT_SIBLING; } else { ! m->last = n->parent; ! m->next = MDOC_NEXT_CHILD; } } ! if (m && m->first == n) ! m->first = NULL; } void ! mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) { while (p->child) { assert(p->nchild); ! mdoc_node_delete(m, p->child); } assert(0 == p->nchild); ! mdoc_node_unlink(m, p); mdoc_node_free(p); } #if 0 /* * Pre-treat a text line. * Text lines can consist of equations, which must be handled apart from * the regular text. --- 636,682 ---- n->parent->last = n->prev ? n->prev : NULL; } /* Adjust parse point, if applicable. */ ! if (mdoc && mdoc->last == n) { if (n->prev) { ! mdoc->last = n->prev; ! mdoc->next = MDOC_NEXT_SIBLING; } else { ! mdoc->last = n->parent; ! mdoc->next = MDOC_NEXT_CHILD; } } ! if (mdoc && mdoc->first == n) ! mdoc->first = NULL; } void ! mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p) { while (p->child) { assert(p->nchild); ! mdoc_node_delete(mdoc, p->child); } assert(0 == p->nchild); ! mdoc_node_unlink(mdoc, p); mdoc_node_free(p); } + int + mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p) + { + + mdoc_node_unlink(mdoc, p); + return(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.
*** 656,679 **** * 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 *m, 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(m->roff))) if (NULL != (start = strchr(buf + offs, delim))) *start++ = '\0'; /* Parse text as normal. */ ! if ( ! mdoc_ptext(m, line, buf, offs)) return(0); /* Continue only if an equation exists. */ if (NULL == start) break; --- 684,707 ---- * 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;
*** 686,700 **** while (' ' == *end) end++; } /* Parse the equation itself. */ ! roff_openeqn(m->roff, NULL, line, offs, buf); /* Process a finished equation? */ ! if (roff_closeeqn(m->roff)) ! if ( ! mdoc_addeqn(m, roff_eqn(m->roff))) return(0); offs += (end - (buf + offs)); } return(1); --- 714,728 ---- 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);
*** 704,727 **** /* * Parse free-form text, that is, a line that does not begin with the * control character. */ static int ! mdoc_ptext(struct mdoc *m, int line, char *buf, int offs) { char *c, *ws, *end; struct mdoc_node *n; /* No text before an initial macro. */ ! if (SEC_NONE == m->lastnamed) { ! mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT); return(1); } ! assert(m->last); ! n = m->last; /* * Divert directly to list processing if we're encountering a * columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry * (a MDOC_BODY means it's already open, in which case we should --- 732,755 ---- /* * Parse free-form text, that is, a line that does not begin with the * control character. */ static int ! mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs) { char *c, *ws, *end; struct mdoc_node *n; /* No text before an initial macro. */ ! if (SEC_NONE == mdoc->lastnamed) { ! mdoc_pmsg(mdoc, line, offs, MANDOCERR_NOTEXT); return(1); } ! assert(mdoc->last); ! n = mdoc->last; /* * Divert directly to list processing if we're encountering a * columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry * (a MDOC_BODY means it's already open, in which case we should
*** 729,749 **** */ if (MDOC_Bl == n->tok && MDOC_BODY == n->type && LIST_column == n->norm->Bl.type) { /* `Bl' is open without any children. */ ! m->flags |= MDOC_FREECOL; ! return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); } if (MDOC_It == n->tok && MDOC_BLOCK == n->type && NULL != n->parent && MDOC_Bl == n->parent->tok && LIST_column == n->parent->norm->Bl.type) { /* `Bl' has block-level `It' children. */ ! m->flags |= MDOC_FREECOL; ! return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); } /* * Search for the beginning of unescaped trailing whitespace (ws) * and for the first character not to be output (end). --- 757,777 ---- */ if (MDOC_Bl == n->tok && MDOC_BODY == n->type && 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)); } if (MDOC_It == n->tok && MDOC_BLOCK == n->type && 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; ! return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); } /* * Search for the beginning of unescaped trailing whitespace (ws) * and for the first character not to be output (end).
*** 767,777 **** ws = c; /* * Strip trailing tabs in literal context only; * outside, they affect the next line. */ ! if (MDOC_LITERAL & m->flags) continue; break; case '\\': /* Skip the escaped character, too, if any. */ if (c[1]) --- 795,805 ---- ws = c; /* * Strip trailing tabs in literal context only; * outside, they affect the next line. */ ! if (MDOC_LITERAL & mdoc->flags) continue; break; case '\\': /* Skip the escaped character, too, if any. */ if (c[1])
*** 784,814 **** end = c + 1; } *end = '\0'; if (ws) ! mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE); ! if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) { ! mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN); /* * Insert a `sp' in the case of a blank line. Technically, * blank lines aren't allowed, but enough manuals assume this * behaviour that we want to work around it. */ ! if ( ! mdoc_elem_alloc(m, line, offs, MDOC_sp, NULL)) return(0); ! m->next = MDOC_NEXT_SIBLING; ! return(1); } ! if ( ! mdoc_word_alloc(m, line, offs, buf+offs)) return(0); ! if (MDOC_LITERAL & m->flags) return(1); /* * End-of-sentence check. If the last character is an unescaped * EOS character, then flag the node as being the end of a --- 812,843 ---- end = c + 1; } *end = '\0'; if (ws) ! mdoc_pmsg(mdoc, line, (int)(ws-buf), MANDOCERR_EOLNSPACE); ! if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) { ! mdoc_pmsg(mdoc, line, (int)(c-buf), MANDOCERR_NOBLANKLN); /* * Insert a `sp' in the case of a blank line. Technically, * 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->next = MDOC_NEXT_SIBLING; ! ! return(mdoc_valid_post(mdoc)); } ! if ( ! mdoc_word_alloc(mdoc, line, offs, buf+offs)) return(0); ! if (MDOC_LITERAL & mdoc->flags) return(1); /* * End-of-sentence check. If the last character is an unescaped * EOS character, then flag the node as being the end of a
*** 816,826 **** */ assert(buf < end); if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0)) ! m->last->flags |= MDOC_EOS; return(1); } --- 845,855 ---- */ assert(buf < end); if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0)) ! mdoc->last->flags |= MDOC_EOS; return(1); }
*** 827,847 **** /* * Parse a macro line, that is, a line beginning with the control * character. */ static int ! mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) { enum mdoct tok; int i, sv; char mac[5]; struct mdoc_node *n; /* Empty post-control lines are ignored. */ if ('"' == buf[offs]) { ! mdoc_pmsg(m, ln, offs, MANDOCERR_BADCOMMENT); return(1); } else if ('\0' == buf[offs]) return(1); sv = offs; --- 856,876 ---- /* * Parse a macro line, that is, a line beginning with the control * character. */ static int ! mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs) { enum mdoct tok; int i, sv; char mac[5]; struct mdoc_node *n; /* Empty post-control lines are ignored. */ if ('"' == buf[offs]) { ! mdoc_pmsg(mdoc, ln, offs, MANDOCERR_BADCOMMENT); return(1); } else if ('\0' == buf[offs]) return(1); sv = offs;
*** 859,869 **** mac[i] = '\0'; tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX; if (MDOC_MAX == tok) { ! mandoc_vmsg(MANDOCERR_MACRO, m->parse, ln, sv, "%s", buf + sv - 1); return(1); } /* Disregard the first trailing tab, if applicable. */ --- 888,898 ---- mac[i] = '\0'; tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX; if (MDOC_MAX == tok) { ! mandoc_vmsg(MANDOCERR_MACRO, mdoc->parse, ln, sv, "%s", buf + sv - 1); return(1); } /* Disregard the first trailing tab, if applicable. */
*** 880,914 **** * Trailing whitespace. Note that tabs are allowed to be passed * into the parser as "text", so we only warn about spaces here. */ if ('\0' == buf[offs] && ' ' == buf[offs - 1]) ! mdoc_pmsg(m, ln, offs - 1, MANDOCERR_EOLNSPACE); /* * If an initial macro or a list invocation, divert directly * into macro processing. */ ! if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) { ! if ( ! mdoc_macro(m, tok, ln, sv, &offs, buf)) goto err; return(1); } ! n = m->last; ! assert(m->last); /* * If the first macro of a `Bl -column', open an `It' block * context around the parsed macro. */ if (MDOC_Bl == n->tok && MDOC_BODY == n->type && LIST_column == n->norm->Bl.type) { ! m->flags |= MDOC_FREECOL; ! if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) goto err; return(1); } /* --- 909,943 ---- * Trailing whitespace. Note that tabs are allowed to be passed * into the parser as "text", so we only warn about spaces here. */ if ('\0' == buf[offs] && ' ' == buf[offs - 1]) ! mdoc_pmsg(mdoc, ln, offs - 1, MANDOCERR_EOLNSPACE); /* * If an initial macro or a list invocation, divert directly * into macro processing. */ ! if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) { ! if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) goto err; return(1); } ! n = mdoc->last; ! assert(mdoc->last); /* * If the first macro of a `Bl -column', open an `It' block * context around the parsed macro. */ if (MDOC_Bl == n->tok && MDOC_BODY == n->type && LIST_column == n->norm->Bl.type) { ! mdoc->flags |= MDOC_FREECOL; ! if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) goto err; return(1); } /*
*** 919,944 **** if (MDOC_It == n->tok && MDOC_BLOCK == n->type && NULL != n->parent && MDOC_Bl == n->parent->tok && LIST_column == n->parent->norm->Bl.type) { ! m->flags |= MDOC_FREECOL; ! if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) goto err; return(1); } /* Normal processing of a macro. */ ! if ( ! mdoc_macro(m, tok, ln, sv, &offs, buf)) goto err; return(1); err: /* Error out. */ ! m->flags |= MDOC_HALT; return(0); } enum mdelim mdoc_isdelim(const char *p) --- 948,973 ---- if (MDOC_It == n->tok && MDOC_BLOCK == n->type && NULL != n->parent && MDOC_Bl == n->parent->tok && LIST_column == n->parent->norm->Bl.type) { ! mdoc->flags |= MDOC_FREECOL; ! if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)) goto err; return(1); } /* Normal processing of a macro. */ ! if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) goto err; return(1); err: /* Error out. */ ! mdoc->flags |= MDOC_HALT; return(0); } enum mdelim mdoc_isdelim(const char *p)
*** 978,987 **** if ('\\' != p[0]) return(DELIM_NONE); if (0 == strcmp(p + 1, ".")) return(DELIM_CLOSE); ! if (0 == strcmp(p + 1, "*(Ba")) return(DELIM_MIDDLE); return(DELIM_NONE); } --- 1007,1016 ---- if ('\\' != p[0]) return(DELIM_NONE); if (0 == strcmp(p + 1, ".")) return(DELIM_CLOSE); ! if (0 == strcmp(p + 1, "fR|\\fP")) return(DELIM_MIDDLE); return(DELIM_NONE); }