Sync to OpenBSD:

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index d0e577a644ddd2c0d765f014cc121d3a4ed90a0a..147662e91253b465dab70f77f1479219e30bf7ae 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.86 2010/08/08 14:51:32 schwarze Exp $ */
+/*     $Id: man.c,v 1.92 2010/12/08 10:58:22 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -36,11 +36,10 @@ const       char *const __man_macronames[MAN_MAX] = {
        "IP",           "HP",           "SM",           "SB",
        "BI",           "IB",           "BR",           "RB",
        "R",            "B",            "I",            "IR",
-       "RI",           "na",           "i",            "sp",
-       "nf",           "fi",           "r",            "RE",
-       "RS",           "DT",           "UC",           "PD",
-       "Sp",           "Vb",           "Ve",           "AT",
-       "in"
+       "RI",           "na",           "sp",           "nf",
+       "fi",           "RE",           "RS",           "DT",
+       "UC",           "PD",           "AT",           "in",
+       "ft"
        };
 
 const  char * const *man_macronames = __man_macronames;
@@ -56,7 +55,6 @@ static        int              man_ptext(struct man *, int, char *, int);
 static int              man_pmacro(struct man *, int, char *, int);
 static void             man_free1(struct man *);
 static void             man_alloc1(struct man *);
-static int              macrowarn(struct man *, int, const char *, int);
 
 
 const struct man_node *
@@ -94,8 +92,7 @@ man_free(struct man *man)
 
 
 struct man *
-man_alloc(struct regset *regs, void *data, 
-               int pflags, mandocmsg msg)
+man_alloc(struct regset *regs, void *data, mandocmsg msg)
 {
        struct man      *p;
 
@@ -103,7 +100,6 @@ man_alloc(struct regset *regs, void *data,
 
        man_hash_init();
        p->data = data;
-       p->pflags = pflags;
        p->msg = msg;
        p->regs = regs;
 
@@ -219,8 +215,6 @@ man_node_append(struct man *man, struct man_node *p)
        case (MAN_TEXT):
                if ( ! man_valid_post(man))
                        return(0);
-               if ( ! man_action_post(man))
-                       return(0);
                break;
        default:
                break;
@@ -435,19 +429,6 @@ descope:
 }
 
 
-static int
-macrowarn(struct man *m, int ln, const char *buf, int offs)
-{
-       int              rc;
-
-       rc = man_vmsg(m, MANDOCERR_MACRO, ln, offs, 
-                       "unknown macro: %s%s",
-                       buf, strlen(buf) > 3 ? "..." : "");
-
-       return(MAN_IGN_MACRO & m->pflags ? rc : 0);
-}
-
-
 int
 man_pmacro(struct man *m, int ln, char *buf, int offs)
 {
@@ -490,15 +471,9 @@ man_pmacro(struct man *m, int ln, char *buf, int offs)
                mac[j++] = buf[i++];
        mac[j] = '\0';
 
-       if (j == 4 || j < 1) {
-               if ( ! macrowarn(m, ln, mac, ppos))
-                       goto err;
-               return(1);
-       }
-       
-       if (MAN_MAX == (tok = man_hash_find(mac))) {
-               if ( ! macrowarn(m, ln, mac, ppos))
-                       goto err;
+       tok = (j > 0 && j < 4) ? man_hash_find(mac) : MAN_MAX;
+       if (MAN_MAX == tok) {
+               man_vmsg(m, MANDOCERR_MACRO, ln, ppos, "%s", buf + ppos - 1);
                return(1);
        }
 
@@ -517,37 +492,23 @@ man_pmacro(struct man *m, int ln, char *buf, int offs)
                        goto err;
 
        /* 
-        * Remove prior ELINE macro, as it's being clobbering by a new
+        * Remove prior ELINE macro, as it's being clobbered by a new
         * macro.  Note that NSCOPED macros do not close out ELINE
         * macros---they don't print text---so we let those slip by.
         */
 
        if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&
                        m->flags & MAN_ELINE) {
-               assert(MAN_TEXT != m->last->type);
-
-               /*
-                * This occurs in the following construction:
-                *   .B
-                *   .br
-                *   .B
-                *   .br
-                *   I hate man macros.
-                * Flat-out disallow this madness.
-                */
-               if (MAN_NSCOPED & man_macros[m->last->tok].flags) {
-                       man_pmsg(m, ln, ppos, MANDOCERR_SYNTLINESCOPE);
-                       return(0);
-               }
-
                n = m->last;
+               assert(MAN_TEXT != n->type);
 
-               assert(n);
-               assert(NULL == n->child);
-               assert(0 == n->nchild);
+               /* Remove repeated NSCOPED macros causing ELINE. */
 
-               if ( ! man_nmsg(m, n, MANDOCERR_LINESCOPE))
-                       return(0);
+               if (MAN_NSCOPED & man_macros[n->tok].flags)
+                       n = n->parent;
+
+               man_vmsg(m, MANDOCERR_LINESCOPE, n->line, n->pos,
+                               "%s", man_macronames[n->tok]);
 
                man_node_delete(m, n);
                m->flags &= ~MAN_ELINE;