termpair flags unset before post, after body (suggested by schwarze@openbsd).

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index d03d12c54cc2994f82022753ce134571d70d23ff..e63657e1293106df22731e64885df1a38edc1f5b 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,33 +1,57 @@
-/* $Id: man_macro.c,v 1.6 2009/03/25 15:36:05 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.17 2009/06/18 10:53:58 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>

  *
  * Permission to use, copy, modify, and distribute this software for any
  *
  * Permission to use, copy, modify, and distribute this software for any

- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.

  *
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */
 #include <assert.h>
 #include <ctype.h>
  */
 #include <assert.h>
 #include <ctype.h>

-#include <err.h> /* XXX */

 #include <stdlib.h>
 #include <stdlib.h>

-#include <stdio.h>

 #include <string.h>
 
 #include "libman.h"
 
 #include <string.h>
 
 #include "libman.h"
 

+#define        FL_NLINE        (1 << 0)
+#define        FL_TLINE        (1 << 1)
+

 static int              man_args(struct man *, int, 
                                int *, char *, char **);
 
 static int              man_args(struct man *, int, 
                                int *, char *, char **);
 

+static int man_flags[MAN_MAX] = {
+       0, /* br */
+       0, /* TH */
+       0, /* SH */
+       0, /* SS */
+       FL_TLINE, /* TP */
+       0, /* LP */
+       0, /* PP */
+       0, /* P */
+       0, /* IP */
+       0, /* HP */
+       FL_NLINE, /* SM */
+       FL_NLINE, /* SB */
+       FL_NLINE, /* BI */
+       FL_NLINE, /* IB */
+       FL_NLINE, /* BR */
+       FL_NLINE, /* RB */
+       FL_NLINE, /* R */
+       FL_NLINE, /* B */
+       FL_NLINE, /* I */
+       FL_NLINE, /* IR */
+       FL_NLINE, /* RI */
+       0, /* na */
+       FL_NLINE, /* i */
+};

 
 int
 man_macro(struct man *man, int tok, int line, 
 
 int
 man_macro(struct man *man, int tok, int line, 


@@ -56,8 +80,30 @@ man_macro(struct man *man, int tok, int line,
                man->next = MAN_NEXT_SIBLING;
        }
 
                man->next = MAN_NEXT_SIBLING;
        }
 

-       for ( ; man->last && man->last != n; 
-                       man->last = man->last->parent) {
+       if (n == man->last && (FL_NLINE & man_flags[tok])) {
+               if (MAN_NLINE & man->flags) 
+                       return(man_perr(man, line, ppos, WLNSCOPE));
+               man->flags |= MAN_NLINE;
+               return(1);
+       }
+
+       if (FL_TLINE & man_flags[tok]) {
+               if (MAN_NLINE & man->flags) 
+                       return(man_perr(man, line, ppos, WLNSCOPE));
+               man->flags |= MAN_NLINE;
+               return(1);
+       }
+
+       /*
+        * Note that when TH is pruned, we'll be back at the root, so
+        * make sure that we don't clobber as its sibling.
+        */
+
+       for ( ; man->last; man->last = man->last->parent) {
+               if (man->last == n)
+                       break;
+               if (man->last->type == MAN_ROOT)
+                       break;

                if ( ! man_valid_post(man))
                        return(0);
                if ( ! man_action_post(man))
                if ( ! man_valid_post(man))
                        return(0);
                if ( ! man_action_post(man))


@@ -66,12 +112,16 @@ man_macro(struct man *man, int tok, int line,
 
        assert(man->last);
 
 
        assert(man->last);
 

-       if ( ! man_valid_post(man))
+       /*
+        * Same here regarding whether we're back at the root. 
+        */
+
+       if (man->last->type != MAN_ROOT && ! man_valid_post(man))

                return(0);
                return(0);

-       if ( ! man_action_post(man))
+       if (man->last->type != MAN_ROOT && ! man_action_post(man))

                return(0);
                return(0);

-
-       man->next = MAN_NEXT_SIBLING;
+       if (man->last->type != MAN_ROOT)
+               man->next = MAN_NEXT_SIBLING;

 
        return(1);
 }
 
        return(1);
 }


@@ -88,6 +138,7 @@ man_macroend(struct man *m)
                if ( ! man_action_post(m))
                        return(0);
        }
                if ( ! man_action_post(m))
                        return(0);
        }

+       assert(m->last == m->first);

 
        if ( ! man_valid_post(m))
                return(0);
 
        if ( ! man_valid_post(m))
                return(0);


@@ -100,7 +151,7 @@ man_macroend(struct man *m)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-man_args(struct man *man, int line, 
+man_args(struct man *m, int line, 

                int *pos, char *buf, char **v)
 {
 
                int *pos, char *buf, char **v)
 {
 


@@ -133,8 +184,10 @@ man_args(struct man *man, int line,
                if (buf[*pos])
                        return(1);
 
                if (buf[*pos])
                        return(1);
 

-               warnx("tail whitespace");
-               return(-1);
+               if ( ! man_pwarn(m, line, *pos, WTSPACE))
+                       return(-1);
+
+               return(1);

        }
 
        /*
        }
 
        /*


@@ -149,8 +202,9 @@ man_args(struct man *man, int line,
                (*pos)++;
 
        if (0 == buf[*pos]) {
                (*pos)++;
 
        if (0 == buf[*pos]) {

-               warnx("unterminated quotation");
-               return(-1);
+               if ( ! man_pwarn(m, line, *pos, WTQUOTE))
+                       return(-1);
+               return(1);

        }
 
        buf[(*pos)++] = 0;
        }
 
        buf[(*pos)++] = 0;


@@ -163,6 +217,7 @@ man_args(struct man *man, int line,
        if (buf[*pos])
                return(1);
 
        if (buf[*pos])
                return(1);
 

-       warnx("tail whitespace");
-       return(-1);
+       if ( ! man_pwarn(m, line, *pos, WTSPACE))
+               return(-1);
+       return(1);

 }
 }