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 ce14a356c15999716caf59d40b67a2bc19bb1b56..ef6a2c35187755ddd0d7ef26c0a67318e1284460 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.133 2014/07/07 21:36:20 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>
 /*
  * 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.
  */
  * 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"
 #include "config.h"

-#endif

 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 


@@ -68,7 +66,6 @@ const struct man_node *
 man_node(const struct man *man)
 {
 
 man_node(const struct man *man)
 {
 

-       assert( ! (MAN_HALT & man->flags));

        return(man->first);
 }
 
        return(man->first);
 }
 


@@ -76,7 +73,6 @@ const struct man_meta *
 man_meta(const struct man *man)
 {
 
 man_meta(const struct man *man)
 {
 

-       assert( ! (MAN_HALT & man->flags));

        return(&man->meta);
 }
 
        return(&man->meta);
 }
 


@@ -116,11 +112,7 @@ int
 man_endparse(struct man *man)
 {
 
 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
 }
 
 int


@@ -129,8 +121,6 @@ man_parseln(struct man *man, int ln, char *buf, int offs)
 
        man->flags |= MAN_NEWLINE;
 
 
        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));
        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++;
 
        assert(p->parent);
        p->parent->nchild++;
 

-       if ( ! man_valid_pre(man, p))
-               return(0);
-

        switch (p->type) {
        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;
        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;
 
 {
        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;
 
        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;
 
 {
        struct man_node *n;
 

-       assert( ! (MAN_HALT & man->flags));
-

        n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX);
        n->span = sp;
 
        n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX);
        n->span = sp;
 


@@ -478,17 +465,11 @@ man_ptext(struct man *man, int line, char *buf, int offs)
 static int
 man_pmacro(struct man *man, int ln, char *buf, int offs)
 {
 static int
 man_pmacro(struct man *man, int ln, char *buf, int offs)
 {

-       int              i, ppos;
-       enum mant        tok;

        char             mac[5];
        struct man_node *n;
        char             mac[5];
        struct man_node *n;

-
-       if ('"' == buf[offs]) {
-               mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse,
-                   ln, offs, NULL);
-               return(1);
-       } else if ('\0' == buf[offs])
-               return(1);
+       enum mant        tok;
+       int              i, ppos;
+       int              bline;

 
        ppos = offs;
 
 
        ppos = offs;
 


@@ -507,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) {
        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);
        }
 
                return(1);
        }
 


@@ -581,20 +562,15 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
                man->flags &= ~MAN_BLINE;
        }
 
                man->flags &= ~MAN_BLINE;
        }
 

-       /*
-        * Save the fact that we're in the next-line for a block.  In
-        * this way, embedded roff instructions can "remember" state
-        * when they exit.
-        */
+       /* Remember whether we are in next-line scope for a block head. */

 
 

-       if (MAN_BLINE & man->flags)
-               man->flags |= MAN_BPLINE;
+       bline = man->flags & MAN_BLINE;

 
        /* Call to handler... */
 
        assert(man_macros[tok].fp);
        if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf))
 
        /* Call to handler... */
 
        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. */
 
 
        /* In quick mode (for mandocdb), abort after the NAME section. */
 


@@ -606,47 +582,21 @@ 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 ( ! (MAN_BPLINE & man->flags)) {
-               man->flags &= ~MAN_ILINE;
-               return(1);
-       }
-       man->flags &= ~MAN_BPLINE;
-
-       /*
-        * If we're in a block scope, then allow this macro to slip by
-        * without closing scope around it.
-        */
-
-       if (MAN_ILINE & man->flags) {
-               man->flags &= ~MAN_ILINE;
-               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 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_ELINE & man->flags)
+       if ( ! bline || man->flags & MAN_ELINE ||
+           man_macros[tok].flags & MAN_NSCOPED)

                return(1);
 
                return(1);
 

-       /* Close out the block scope opened in the prior line.  */
-

        assert(MAN_BLINE & man->flags);
        man->flags &= ~MAN_BLINE;
 
        if ( ! man_unscope(man, man->last->parent))
                return(0);
        return(man_body_alloc(man, ln, ppos, man->last->tok));
        assert(MAN_BLINE & man->flags);
        man->flags &= ~MAN_BLINE;
 
        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);

 }
 
 /*
 }
 
 /*