=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man.c,v retrieving revision 1.9 retrieving revision 1.10 diff -c -r1.9 -r1.10 *** src/usr.bin/mandoc/man.c 2009/08/22 20:14:37 1.9 --- src/usr.bin/mandoc/man.c 2009/08/22 23:17:39 1.10 *************** *** 1,4 **** ! /* $Id: man.c,v 1.9 2009/08/22 20:14:37 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * --- 1,4 ---- ! /* $Id: man.c,v 1.10 2009/08/22 23:17:39 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * *************** *** 40,46 **** "expected empty block head", /* WNHEADARGS */ "unknown macro", /* WMACRO */ "ill-formed macro", /* WMACROFORM */ ! "scope open on exit" /* WEXITSCOPE */ }; const char *const __man_macronames[MAN_MAX] = { --- 40,49 ---- "expected empty block head", /* WNHEADARGS */ "unknown macro", /* WMACRO */ "ill-formed macro", /* WMACROFORM */ ! "scope open on exit", /* WEXITSCOPE */ ! "no scope context", /* WNOSCOPE */ ! "literal context already open", /* WOLITERAL */ ! "no literal context open" /* WNLITERAL */ }; const char *const __man_macronames[MAN_MAX] = { *************** *** 50,56 **** "BI", "IB", "BR", "RB", "R", "B", "I", "IR", "RI", "na", "i", "sp", ! "nf", "fi", "r" }; const char * const *man_macronames = __man_macronames; --- 53,60 ---- "BI", "IB", "BR", "RB", "R", "B", "I", "IR", "RI", "na", "i", "sp", ! "nf", "fi", "r", "RE", ! "RS", "DT" }; const char * const *man_macronames = __man_macronames; *************** *** 63,68 **** --- 67,74 ---- static int man_pmacro(struct man *, int, char *); static void man_free1(struct man *); static int man_alloc1(struct man *); + static int pstring(struct man *, int, int, + const char *, size_t); const struct man_node * *************** *** 257,270 **** int ! man_elem_alloc(struct man *man, int line, int pos, int tok) { struct man_node *p; p = man_node_alloc(line, pos, MAN_ELEM, tok); if (NULL == p) return(0); ! return(man_node_append(man, p)); } --- 263,279 ---- int ! man_elem_alloc(struct man *m, int line, int pos, int tok) { struct man_node *p; p = man_node_alloc(line, pos, MAN_ELEM, tok); if (NULL == p) return(0); ! if ( ! man_node_append(m, p)) ! return(0); ! m->next = MAN_NEXT_CHILD; ! return(1); } *************** *** 313,333 **** } ! int ! man_word_alloc(struct man *man, ! int line, int pos, const char *word) { ! struct man_node *p; ! p = man_node_alloc(line, pos, MAN_TEXT, -1); ! if (NULL == p) return(0); ! if (NULL == (p->string = strdup(word))) return(0); ! return(man_node_append(man, p)); } void man_node_free(struct man_node *p) { --- 322,364 ---- } ! static int ! pstring(struct man *m, int line, int pos, ! const char *p, size_t len) { ! struct man_node *n; ! size_t sv; ! n = man_node_alloc(line, pos, MAN_TEXT, -1); ! if (NULL == n) return(0); ! ! n->string = malloc(len + 1); ! if (NULL == n->string) { ! free(n); return(0); ! } ! ! sv = strlcpy(n->string, p, len + 1); ! ! /* Prohibit truncation. */ ! assert(sv < len + 1); ! ! if ( ! man_node_append(m, n)) ! return(0); ! m->next = MAN_NEXT_SIBLING; ! return(1); } + int + man_word_alloc(struct man *m, int line, int pos, const char *word) + { + + return(pstring(m, line, pos, word, strlen(word))); + } + + void man_node_free(struct man_node *p) { *************** *** 343,377 **** void man_node_freelist(struct man_node *p) { if (p->child) man_node_freelist(p->child); - if (p->next) - man_node_freelist(p->next); - assert(0 == p->nchild); man_node_free(p); } static int man_ptext(struct man *m, int line, char *buf) { ! /* First allocate word. */ ! if ( ! man_word_alloc(m, line, 0, buf)) return(0); - m->next = MAN_NEXT_SIBLING; /* * Co-ordinate what happens with having a next-line scope open: * first close out the element scope (if applicable), then close * out the block scope (also if applicable). */ - /* XXX - this should be in man_action.c. */ - if (MAN_ELINE & m->flags) { m->flags &= ~MAN_ELINE; if ( ! man_unscope(m, m->last->parent)) --- 374,445 ---- void man_node_freelist(struct man_node *p) { + struct man_node *n; if (p->child) man_node_freelist(p->child); assert(0 == p->nchild); + n = p->next; man_node_free(p); + if (n) + man_node_freelist(n); } static int man_ptext(struct man *m, int line, char *buf) { + int i, j; ! /* Literal free-form text whitespace is preserved. */ ! if (MAN_LITERAL & m->flags) { ! if ( ! man_word_alloc(m, line, 0, buf)) ! return(0); ! goto descope; ! } ! ! /* First de-chunk and allocate words. */ ! ! for (i = 0; ' ' == buf[i]; i++) ! /* Skip leading whitespace. */ ; ! if (0 == buf[i]) { ! if ( ! pstring(m, line, 0, &buf[i], 0)) ! return(0); ! goto descope; ! } ! ! for (j = i; buf[i]; i++) { ! if (' ' != buf[i]) ! continue; ! ! /* Escaped whitespace. */ ! if (i && ' ' == buf[i] && '\\' == buf[i - 1]) ! continue; ! ! buf[i++] = 0; ! if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) ! return(0); ! ! for ( ; ' ' == buf[i]; i++) ! /* Skip trailing whitespace. */ ; ! ! j = i; ! if (0 == buf[i]) ! break; ! } ! ! if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j))) return(0); + descope: + /* * Co-ordinate what happens with having a next-line scope open: * first close out the element scope (if applicable), then close * out the block scope (also if applicable). */ if (MAN_ELINE & m->flags) { m->flags &= ~MAN_ELINE; if ( ! man_unscope(m, m->last->parent)) *************** *** 391,398 **** int man_pmacro(struct man *m, int ln, char *buf) { ! int i, j, c, ppos, fl; ! char mac[5]; /* Comments and empties are quickly ignored. */ --- 459,467 ---- int man_pmacro(struct man *m, int ln, char *buf) { ! int i, j, c, ppos, fl; ! char mac[5]; ! struct man_node *n; /* Comments and empties are quickly ignored. */ *************** *** 449,454 **** --- 518,549 ---- while (buf[i] && ' ' == buf[i]) i++; + /* Remove prior ELINE macro, if applicable. */ + + if (m->flags & MAN_ELINE) { + n = m->last; + assert(NULL == n->child); + assert(0 == n->nchild); + if ( ! man_nwarn(m, n, WLNSCOPE)) + return(0); + + if (n->prev) { + assert(n != n->parent->child); + assert(n == n->prev->next); + n->prev->next = NULL; + m->last = n->prev; + m->next = MAN_NEXT_SIBLING; + } else { + assert(n == n->parent->child); + n->parent->child = NULL; + m->last = n->parent; + m->next = MAN_NEXT_CHILD; + } + + man_node_free(n); + m->flags &= ~MAN_ELINE; + } + /* Begin recursive parse sequence. */ assert(man_macros[c].fp); *************** *** 469,476 **** return(1); /* Close out the block scope opened in the prior line. */ - - /* XXX - this should be in man_action.c. */ assert(MAN_BLINE & m->flags); m->flags &= ~MAN_BLINE; --- 564,569 ----