Kick out two attibutes we don't use any more in HTML5.

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 0d3ca7e30e9995a0aed9aace51620eb5015984e3..ef6a2c35187755ddd0d7ef26c0a67318e1284460 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.134 2014/07/30 20:06:36 schwarze Exp $ */
+/*     $Id: man.c,v 1.139 2014/09/06 23:24:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -16,9 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
@@ -68,7 +66,6 @@ const struct man_node *
 man_node(const struct man *man)
 {
 
-       assert( ! (MAN_HALT & man->flags));
        return(man->first);
 }
 
@@ -76,7 +73,6 @@ const struct man_meta *
 man_meta(const struct man *man)
 {
 
-       assert( ! (MAN_HALT & man->flags));
        return(&man->meta);
 }
 
@@ -116,11 +112,7 @@ int
 man_endparse(struct man *man)
 {
 
-       assert( ! (MAN_HALT & man->flags));
-       if (man_macroend(man))
-               return(1);
-       man->flags |= MAN_HALT;
-       return(0);
+       return(man_macroend(man));
 }
 
 int
@@ -129,8 +121,6 @@ man_parseln(struct man *man, int ln, char *buf, int offs)
 
        man->flags |= MAN_NEWLINE;
 
-       assert( ! (MAN_HALT & man->flags));
-
        return (roff_getcontrol(man->roff, buf, &offs) ?
            man_pmacro(man, ln, buf, offs) :
            man_ptext(man, ln, buf, offs));
@@ -194,10 +184,11 @@ man_node_append(struct man *man, struct man_node *p)
        assert(p->parent);
        p->parent->nchild++;
 
-       if ( ! man_valid_pre(man, p))
-               return(0);
-
        switch (p->type) {
+       case MAN_BLOCK:
+               if (p->tok == MAN_SH || p->tok == MAN_SS)
+                       man->flags &= ~MAN_LITERAL;
+               break;
        case MAN_HEAD:
                assert(MAN_BLOCK == p->parent->type);
                p->parent->head = p;
@@ -352,8 +343,6 @@ man_addeqn(struct man *man, const struct eqn *ep)
 {
        struct man_node *n;
 
-       assert( ! (MAN_HALT & man->flags));
-
        n = man_node_alloc(man, ep->ln, ep->pos, MAN_EQN, MAN_MAX);
        n->eqn = ep;
 
@@ -369,8 +358,6 @@ man_addspan(struct man *man, const struct tbl_span *sp)
 {
        struct man_node *n;
 
-       assert( ! (MAN_HALT & man->flags));
-
        n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX);
        n->span = sp;
 
@@ -484,13 +471,6 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
        int              i, ppos;
        int              bline;
 
-       if ('"' == buf[offs]) {
-               mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse,
-                   ln, offs, NULL);
-               return(1);
-       } else if ('\0' == buf[offs])
-               return(1);
-
        ppos = offs;
 
        /*
@@ -508,8 +488,8 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
        tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX;
 
        if (MAN_MAX == tok) {
-               mandoc_vmsg(MANDOCERR_MACRO, man->parse, ln, ppos,
-                   "%s", buf + ppos - 1);
+               mandoc_msg(MANDOCERR_MACRO, man->parse,
+                   ln, ppos, buf + ppos - 1);
                return(1);
        }
 
@@ -590,7 +570,7 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
 
        assert(man_macros[tok].fp);
        if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf))
-               goto err;
+               return(0);
 
        /* In quick mode (for mandocdb), abort after the NAME section. */
 
@@ -602,34 +582,14 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
        }
 
        /*
-        * We weren't in a block-line scope when entering the
-        * above-parsed macro, so return.
-        */
-
-       if ( ! bline) {
-               man->flags &= ~MAN_ILINE;
-               return(1);
-       }
-
-       /*
-        * If we're in a block scope, then allow this macro to slip by
-        * without closing scope around it.
+        * If we are in a next-line scope for a block head,
+        * close it out now and switch to the body,
+        * unless the next-line scope is allowed to continue.
         */
 
-       if (MAN_ILINE & man->flags) {
-               man->flags &= ~MAN_ILINE;
+       if ( ! bline || man->flags & MAN_ELINE ||
+           man_macros[tok].flags & MAN_NSCOPED)
                return(1);
-       }
-
-       /*
-        * If we've opened a new next-line element scope, then return
-        * now, as the next line will close out the block scope.
-        */
-
-       if (MAN_ELINE & man->flags)
-               return(1);
-
-       /* Close out the block scope opened in the prior line.  */
 
        assert(MAN_BLINE & man->flags);
        man->flags &= ~MAN_BLINE;
@@ -637,11 +597,6 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
        if ( ! man_unscope(man, man->last->parent))
                return(0);
        return(man_body_alloc(man, ln, ppos, man->last->tok));
-
-err:   /* Error out. */
-
-       man->flags |= MAN_HALT;
-       return(0);
 }
 
 /*