=================================================================== RCS file: /cvs/mandoc/mdoc_macro.c,v retrieving revision 1.57 retrieving revision 1.65 diff -u -p -r1.57 -r1.65 --- mandoc/mdoc_macro.c 2010/05/07 06:05:38 1.57 +++ mandoc/mdoc_macro.c 2010/05/15 04:47:38 1.65 @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.57 2010/05/07 06:05:38 kristaps Exp $ */ +/* $Id: mdoc_macro.c,v 1.65 2010/05/15 04:47:38 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -26,6 +26,7 @@ #include #include "libmdoc.h" +#include "libmandoc.h" enum rew { REWIND_REWIND, @@ -45,9 +46,10 @@ static int obsolete(MACRO_PROT_ARGS); static int append_delims(struct mdoc *, int, int *, char *); -static enum mdoct lookup(int, const char *); +static enum mdoct lookup(enum mdoct, const char *); static enum mdoct lookup_raw(const char *); -static int phrase(struct mdoc *, int, int, char *); +static int phrase(struct mdoc *, int, int, + char *, enum margserr); static enum mdoct rew_alt(enum mdoct); static int rew_dobreak(enum mdoct, const struct mdoc_node *); @@ -267,7 +269,7 @@ mdoc_macroend(struct mdoc *m) * Look up a macro from within a subsequent context. */ static enum mdoct -lookup(int from, const char *p) +lookup(enum mdoct from, const char *p) { /* FIXME: make -diag lists be un-PARSED. */ @@ -283,7 +285,7 @@ lookup(int from, const char *p) static enum mdoct lookup_raw(const char *p) { - int res; + enum mdoct res; if (MDOC_MAX == (res = mdoc_hash_find(p))) return(MDOC_MAX); @@ -652,11 +654,13 @@ append_delims(struct mdoc *mdoc, int line, int *pos, c static int blk_exp_close(MACRO_PROT_ARGS) { - int j, lastarg, maxargs, flushed; + int j, lastarg, maxargs, flushed, nl; enum margserr ac; enum mdoct ntok; char *p; + nl = MDOC_NEWLINE & m->flags; + switch (tok) { case (MDOC_Ec): maxargs = 1; @@ -722,7 +726,7 @@ blk_exp_close(MACRO_PROT_ARGS) if ( ! flushed && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos)) return(0); - if (ppos > 1) + if ( ! nl) return(1); return(append_delims(m, line, pos, buf)); } @@ -731,13 +735,15 @@ blk_exp_close(MACRO_PROT_ARGS) static int in_line(MACRO_PROT_ARGS) { - int la, lastpunct, cnt, d, nc; + int la, lastpunct, cnt, d, nc, nl; enum margverr av; enum mdoct ntok; enum margserr ac; struct mdoc_arg *arg; char *p; + nl = MDOC_NEWLINE & m->flags; + /* * Whether we allow ignored elements (those without content, * usually because of reserved words) to squeak by. @@ -814,7 +820,7 @@ in_line(MACRO_PROT_ARGS) } if ( ! mdoc_macro(m, ntok, line, la, pos, buf)) return(0); - if (ppos > 1) + if ( ! nl) return(1); return(append_delims(m, line, pos, buf)); } @@ -874,7 +880,7 @@ in_line(MACRO_PROT_ARGS) return(0); } - if (ppos > 1) + if ( ! nl) return(1); return(append_delims(m, line, pos, buf)); } @@ -883,7 +889,7 @@ in_line(MACRO_PROT_ARGS) static int blk_full(MACRO_PROT_ARGS) { - int la; + int la, nl; struct mdoc_arg *arg; struct mdoc_node *head; /* save of head macro */ struct mdoc_node *body; /* save of body macro */ @@ -891,10 +897,12 @@ blk_full(MACRO_PROT_ARGS) struct mdoc_node *n; #endif enum mdoct ntok; - enum margserr ac; + enum margserr ac, lac; enum margverr av; char *p; + nl = MDOC_NEWLINE & m->flags; + /* Close out prior implicit scope. */ if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { @@ -952,8 +960,11 @@ blk_full(MACRO_PROT_ARGS) body = m->last; } - for (;;) { + ac = ARGS_ERROR; + + for ( ; ; ) { la = *pos; + lac = ac; ac = mdoc_args(m, line, pos, buf, tok, &p); if (ARGS_ERROR == ac) @@ -961,9 +972,17 @@ blk_full(MACRO_PROT_ARGS) if (ARGS_EOLN == ac) break; + if (ARGS_PEND == ac) { + if (ARGS_PPHRASE == lac) + ac = ARGS_PPHRASE; + else + ac = ARGS_PHRASE; + } + /* Don't emit leading punct. for phrases. */ - if (NULL == head && ARGS_PHRASE != ac && + if (NULL == head && + ARGS_PHRASE != ac && ARGS_PPHRASE != ac && ARGS_QWORD != ac && 1 == mdoc_isdelim(p)) { @@ -974,7 +993,8 @@ blk_full(MACRO_PROT_ARGS) /* Always re-open head for phrases. */ - if (NULL == head || ARGS_PHRASE == ac || + if (NULL == head || + ARGS_PHRASE == ac || ARGS_PPHRASE == ac) { if ( ! mdoc_head_alloc(m, line, ppos, tok)) return(0); @@ -982,8 +1002,11 @@ blk_full(MACRO_PROT_ARGS) } if (ARGS_PHRASE == ac || ARGS_PPHRASE == ac) { - if ( ! phrase(m, line, la, buf)) + if (ARGS_PPHRASE == ac) + m->flags |= MDOC_PPHRASE; + if ( ! phrase(m, line, la, buf, ac)) return(0); + m->flags &= ~MDOC_PPHRASE; if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos)) return(0); continue; @@ -1008,7 +1031,7 @@ blk_full(MACRO_PROT_ARGS) head = m->last; } - if (1 == ppos && ! append_delims(m, line, pos, buf)) + if (nl && ! append_delims(m, line, pos, buf)) return(0); /* If we've already opened our body, exit now. */ @@ -1048,7 +1071,7 @@ blk_full(MACRO_PROT_ARGS) static int blk_part_imp(MACRO_PROT_ARGS) { - int la; + int la, nl; enum mdoct ntok; enum margserr ac; char *p; @@ -1056,6 +1079,8 @@ blk_part_imp(MACRO_PROT_ARGS) struct mdoc_node *body; /* saved body context */ struct mdoc_node *n; + nl = MDOC_NEWLINE & m->flags; + /* * A macro that spans to the end of the line. This is generally * (but not necessarily) called as the first macro. The block @@ -1126,11 +1151,32 @@ blk_part_imp(MACRO_PROT_ARGS) body = m->last; } + for (n = body->child; n && n->next; n = n->next) + /* Do nothing. */ ; + /* + * End of sentence spacing: if the last node is a text node and + * has a trailing period, then mark it as being end-of-sentence. + */ + + if (n && MDOC_TEXT == n->type && n->string) + if (mandoc_eos(n->string, strlen(n->string))) + n->flags |= MDOC_EOS; + + /* Up-propogate the end-of-space flag. */ + + if (n && (MDOC_EOS & n->flags)) { + body->flags |= MDOC_EOS; + body->parent->flags |= MDOC_EOS; + } + + /* * If we can't rewind to our body, then our scope has already * been closed by another macro (like `Oc' closing `Op'). This * is ugly behaviour nodding its head to OpenBSD's overwhelming * crufty use of `Op' breakage. + * + * FIXME - this should be ifdef'd OpenBSD? */ for (n = m->last; n; n = n->parent) if (body == n) @@ -1144,7 +1190,7 @@ blk_part_imp(MACRO_PROT_ARGS) /* Standard appending of delimiters. */ - if (1 == ppos && ! append_delims(m, line, pos, buf)) + if (nl && ! append_delims(m, line, pos, buf)) return(0); /* Rewind scope, if applicable. */ @@ -1159,13 +1205,15 @@ blk_part_imp(MACRO_PROT_ARGS) static int blk_part_exp(MACRO_PROT_ARGS) { - int la; + int la, nl; enum margserr ac; struct mdoc_node *head; /* keep track of head */ struct mdoc_node *body; /* keep track of body */ char *p; enum mdoct ntok; + nl = MDOC_NEWLINE & m->flags; + /* * The opening of an explicit macro having zero or more leading * punctuation nodes; a head with optional single element (the @@ -1258,23 +1306,25 @@ blk_part_exp(MACRO_PROT_ARGS) /* Standard appending of delimiters. */ - if (ppos > 1) + if ( ! nl) return(1); - return(append_delims(m, line, pos, buf)); } +/* ARGSUSED */ static int in_line_argn(MACRO_PROT_ARGS) { - int la, flushed, j, maxargs; + int la, flushed, j, maxargs, nl; enum margserr ac; enum margverr av; struct mdoc_arg *arg; char *p; enum mdoct ntok; + nl = MDOC_NEWLINE & m->flags; + /* * A line macro that has a fixed number of arguments (maxargs). * Only open the scope once the first non-leading-punctuation is @@ -1394,8 +1444,7 @@ in_line_argn(MACRO_PROT_ARGS) if ( ! flushed && ! rew_elem(m, tok)) return(0); - - if (ppos > 1) + if ( ! nl) return(1); return(append_delims(m, line, pos, buf)); } @@ -1471,13 +1520,16 @@ in_line_eoln(MACRO_PROT_ARGS) static int ctx_synopsis(MACRO_PROT_ARGS) { + int nl; + nl = MDOC_NEWLINE & m->flags; + /* If we're not in the SYNOPSIS, go straight to in-line. */ if (SEC_SYNOPSIS != m->lastsec) return(in_line(m, tok, line, ppos, pos, buf)); /* If we're a nested call, same place. */ - if (ppos > 1) + if ( ! nl) return(in_line(m, tok, line, ppos, pos, buf)); /* @@ -1505,25 +1557,26 @@ obsolete(MACRO_PROT_ARGS) * macro is encountered. */ static int -phrase(struct mdoc *m, int line, int ppos, char *buf) +phrase(struct mdoc *m, int line, int ppos, char *buf, enum margserr ac) { int la, pos; - enum margserr ac; + enum margserr aac; enum mdoct ntok; char *p; + assert(ARGS_PHRASE == ac || ARGS_PPHRASE == ac); + for (pos = ppos; ; ) { la = pos; - /* Note: no calling context! */ - ac = mdoc_zargs(m, line, &pos, buf, 0, &p); + aac = mdoc_zargs(m, line, &pos, buf, 0, &p); - if (ARGS_ERROR == ac) + if (ARGS_ERROR == aac) return(0); - if (ARGS_EOLN == ac) + if (ARGS_EOLN == aac) break; - ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p); + ntok = ARGS_QWORD == aac ? MDOC_MAX : lookup_raw(p); if (MDOC_MAX == ntok) { if ( ! mdoc_word_alloc(m, line, la, p))