If no output device was allocated because no file wanted to produce output,

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index bb453b6b1371d352008d78481c088a02626a6dda..ca959589acd62cdea7e83b857ffc7ee473356642 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_macro.c,v 1.204 2015/10/15 22:27:24 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.206 2015/10/20 02:01:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -228,6 +228,7 @@ mdoc_endparse(struct roff_man *mdoc)
        /* Rewind to the first. */
 
        rew_last(mdoc, mdoc->first);
+       mdoc_state_reset(mdoc);
 }
 
 /*
@@ -239,6 +240,10 @@ lookup(struct roff_man *mdoc, int from, int line, int ppos, const char *p)
 {
        int      res;
 
+       if (mdoc->flags & MDOC_PHRASEQF) {
+               mdoc->flags &= ~MDOC_PHRASEQF;
+               return TOKEN_NONE;
+       }
        if (from == TOKEN_NONE || mdoc_macros[from].flags & MDOC_PARSED) {
                res = mdoc_hash_find(p);
                if (res != TOKEN_NONE) {
@@ -258,25 +263,18 @@ lookup(struct roff_man *mdoc, int from, int line, int ppos, const char *p)
 static void
 rew_last(struct roff_man *mdoc, const struct roff_node *to)
 {
-       struct roff_node        *np;
 
        if (to->flags & MDOC_VALID)
                return;
 
        while (mdoc->last != to) {
-               /*
-                * Save the parent here, because we may delete the
-                * mdoc->last node in the post-validation phase and reset
-                * it to mdoc->last->parent, causing a step in the closing
-                * out to be lost.
-                */
-               np = mdoc->last->parent;
-               mdoc_valid_post(mdoc);
-               mdoc->last = np;
-               assert(mdoc->last);
+               mdoc_state(mdoc, mdoc->last);
+               mdoc->last->flags |= MDOC_VALID | MDOC_ENDED;
+               mdoc->last = mdoc->last->parent;
        }
+       mdoc_state(mdoc, mdoc->last);
+       mdoc->last->flags |= MDOC_VALID | MDOC_ENDED;
        mdoc->next = ROFF_NEXT_SIBLING;
-       mdoc_valid_post(mdoc);
 }
 
 /*
@@ -1030,26 +1028,39 @@ blk_full(MACRO_PROT_ARGS)
        if (tok == MDOC_Bk)
                mdoc->flags |= MDOC_KEEP;
 
-       ac = ARGS_PEND;
+       ac = ARGS_EOLN;
        for (;;) {
+
+               /*
+                * If we are right after a tab character,
+                * do not parse the first word for macros.
+                */
+
+               if (mdoc->flags & MDOC_PHRASEQN) {
+                       mdoc->flags &= ~MDOC_PHRASEQN;
+                       mdoc->flags |= MDOC_PHRASEQF;
+               }
+
                la = *pos;
                lac = ac;
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
                if (ac == ARGS_EOLN) {
-                       if (lac != ARGS_PPHRASE && lac != ARGS_PHRASE)
+                       if (lac != ARGS_PHRASE ||
+                           ! (mdoc->flags & MDOC_PHRASEQF))
                                break;
+
                        /*
-                        * This is necessary: if the last token on a
-                        * line is a `Ta' or tab, then we'll get
-                        * ARGS_EOLN, so we must be smart enough to
-                        * reopen our scope if the last parse was a
-                        * phrase or partial phrase.
+                        * This line ends in a tab; start the next
+                        * column now, with a leading blank.
                         */
+
                        if (body != NULL)
                                rew_last(mdoc, body);
                        body = roff_body_alloc(mdoc, line, ppos, tok);
+                       roff_word_alloc(mdoc, line, ppos, "\\&");
                        break;
                }
+
                if (tok == MDOC_Bd || tok == MDOC_Bk) {
                        mandoc_vmsg(MANDOCERR_ARG_EXCESS,
                            mdoc->parse, line, la, "%s ... %s",
@@ -1070,9 +1081,7 @@ blk_full(MACRO_PROT_ARGS)
                 */
 
                if (head == NULL &&
-                   ac != ARGS_PEND &&
                    ac != ARGS_PHRASE &&
-                   ac != ARGS_PPHRASE &&
                    ac != ARGS_QWORD &&
                    mdoc_isdelim(p) == DELIM_OPEN) {
                        dword(mdoc, line, la, p, DELIM_OPEN, 0);
@@ -1084,9 +1093,7 @@ blk_full(MACRO_PROT_ARGS)
                if (head == NULL)
                        head = roff_head_alloc(mdoc, line, ppos, tok);
 
-               if (ac == ARGS_PHRASE ||
-                   ac == ARGS_PEND ||
-                   ac == ARGS_PPHRASE) {
+               if (ac == ARGS_PHRASE) {
 
                        /*
                         * If we haven't opened a body yet, rewind the
@@ -1096,18 +1103,11 @@ blk_full(MACRO_PROT_ARGS)
                        rew_last(mdoc, body == NULL ? head : body);
                        body = roff_body_alloc(mdoc, line, ppos, tok);
 
-                       /*
-                        * Process phrases: set whether we're in a
-                        * partial-phrase (this effects line handling)
-                        * then call down into the phrase parser.
-                        */
+                       /* Process to the tab or to the end of the line. */
 
-                       if (ac == ARGS_PPHRASE)
-                               mdoc->flags |= MDOC_PPHRASE;
-                       if (ac == ARGS_PEND && lac == ARGS_PPHRASE)
-                               mdoc->flags |= MDOC_PPHRASE;
+                       mdoc->flags |= MDOC_PHRASE;
                        parse_rest(mdoc, TOKEN_NONE, line, &la, buf);
-                       mdoc->flags &= ~MDOC_PPHRASE;
+                       mdoc->flags &= ~MDOC_PHRASE;
 
                        /* There may have been `Ta' macros. */