update after recent code changes

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 272b1e6e2f4b918b39f8898640674d601fc9c0fa..ce14a356c15999716caf59d40b67a2bc19bb1b56 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.129 2014/04/20 16:46:04 schwarze Exp $ */
+/*     $Id: man.c,v 1.133 2014/07/07 21:36:20 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -392,7 +392,7 @@ man_descope(struct man *man, int line, int offs)
 
        if (MAN_ELINE & man->flags) {
                man->flags &= ~MAN_ELINE;
-               if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX))
+               if ( ! man_unscope(man, man->last->parent))
                        return(0);
        }
 
@@ -400,7 +400,7 @@ man_descope(struct man *man, int line, int offs)
                return(1);
        man->flags &= ~MAN_BLINE;
 
-       if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX))
+       if ( ! man_unscope(man, man->last->parent))
                return(0);
        return(man_body_alloc(man, line, offs, man->last->tok));
 }
@@ -447,7 +447,8 @@ man_ptext(struct man *man, int line, char *buf, int offs)
 
        if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
                if (i > 1 && '\\' != buf[i - 2])
-                       man_pmsg(man, line, i - 1, MANDOCERR_EOLNSPACE);
+                       mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
+                           line, i - 1, NULL);
 
                for (--i; i && ' ' == buf[i]; i--)
                        /* Spin back to non-space. */ ;
@@ -483,7 +484,8 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
        struct man_node *n;
 
        if ('"' == buf[offs]) {
-               man_pmsg(man, ln, offs, MANDOCERR_BADCOMMENT);
+               mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse,
+                   ln, offs, NULL);
                return(1);
        } else if ('\0' == buf[offs])
                return(1);
@@ -521,7 +523,8 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
         */
 
        if ('\0' == buf[offs] && ' ' == buf[offs - 1])
-               man_pmsg(man, ln, offs - 1, MANDOCERR_EOLNSPACE);
+               mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
+                   ln, offs - 1, NULL);
 
        /*
         * Remove prior ELINE macro, as it's being clobbered by a new
@@ -539,7 +542,7 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
                if (MAN_NSCOPED & man_macros[n->tok].flags)
                        n = n->parent;
 
-               mandoc_vmsg(MANDOCERR_LINESCOPE, man->parse, n->line,
+               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line,
                    n->pos, "%s breaks %s", man_macronames[tok],
                    man_macronames[n->tok]);
 
@@ -570,7 +573,7 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
                assert(MAN_BLOCK == n->type);
                assert(MAN_SCOPED & man_macros[n->tok].flags);
 
-               mandoc_vmsg(MANDOCERR_LINESCOPE, man->parse, n->line,
+               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line,
                    n->pos, "%s breaks %s", man_macronames[tok],
                    man_macronames[n->tok]);
 
@@ -595,9 +598,12 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
 
        /* In quick mode (for mandocdb), abort after the NAME section. */
 
-       if (man->quick && MAN_SH == tok &&
-           strcmp(man->last->prev->child->string, "NAME"))
-               return(2);
+       if (man->quick && MAN_SH == tok) {
+               n = man->last;
+               if (MAN_BODY == n->type &&
+                   strcmp(n->prev->child->string, "NAME"))
+                       return(2);
+       }
 
        /*
         * We weren't in a block-line scope when entering the
@@ -633,7 +639,7 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
        assert(MAN_BLINE & man->flags);
        man->flags &= ~MAN_BLINE;
 
-       if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX))
+       if ( ! man_unscope(man, man->last->parent))
                return(0);
        return(man_body_alloc(man, ln, ppos, man->last->tok));