Final (?) fix to issue pointed out by Sascha Wildner: roff instructions clobbering...

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index ae15109a44a3711611712ccce2e8607e5017b086..0b69d58ce1f431889b1b57c89d6a796ab78eae23 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: man_validate.c,v 1.26 2009/10/24 05:45:05 kristaps Exp $ */
+/*     $Id: man_validate.c,v 1.33 2010/03/29 10:10:35 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * 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>
 
 #include <assert.h>
@@ -42,21 +46,24 @@ static      int       check_ge2(CHKARGS);
 static int       check_le5(CHKARGS);
 static int       check_par(CHKARGS);
 static int       check_part(CHKARGS);
+static int       check_roff(CHKARGS);
 static int       check_root(CHKARGS);
 static int       check_sec(CHKARGS);
 static int       check_text(CHKARGS);
+static int       check_title(CHKARGS);
 
 static v_check   posts_eq0[] = { check_eq0, NULL };
-static v_check   posts_ge2_le5[] = { check_ge2, check_le5, NULL };
+static v_check   posts_th[] = { check_ge2, check_le5, check_title, NULL };
 static v_check   posts_par[] = { check_par, NULL };
 static v_check   posts_part[] = { check_part, NULL };
 static v_check   posts_sec[] = { check_sec, NULL };
-static v_check   posts_sp[] = { check_le1, NULL };
+static v_check   posts_le1[] = { check_le1, NULL };
 static v_check   pres_bline[] = { check_bline, NULL };
+static v_check   pres_roff[] = { check_roff, NULL };
 
 static const struct man_valid man_valids[MAN_MAX] = {
-       { pres_bline, posts_eq0 }, /* br */
-       { pres_bline, posts_ge2_le5 }, /* TH */
+       { NULL, posts_eq0 }, /* br */
+       { pres_bline, posts_th }, /* TH */
        { pres_bline, posts_sec }, /* SH */
        { pres_bline, posts_sec }, /* SS */
        { pres_bline, posts_par }, /* TP */
@@ -76,9 +83,9 @@ static        const struct man_valid man_valids[MAN_MAX] = {
        { NULL, NULL }, /* I */
        { NULL, NULL }, /* IR */
        { NULL, NULL }, /* RI */
-       { pres_bline, posts_eq0 }, /* na */
+       { NULL, posts_eq0 }, /* na */
        { NULL, NULL }, /* i */
-       { pres_bline, posts_sp }, /* sp */
+       { NULL, posts_le1 }, /* sp */
        { pres_bline, posts_eq0 }, /* nf */
        { pres_bline, posts_eq0 }, /* fi */
        { NULL, NULL }, /* r */
@@ -87,6 +94,15 @@ static       const struct man_valid man_valids[MAN_MAX] = {
        { NULL, NULL }, /* DT */
        { NULL, NULL }, /* UC */
        { NULL, NULL }, /* PD */
+       { NULL, posts_eq0 }, /* Sp */
+       { pres_bline, posts_le1 }, /* Vb */
+       { pres_bline, posts_eq0 }, /* Ve */
+       { pres_roff, NULL }, /* de */
+       { pres_roff, NULL }, /* dei */
+       { pres_roff, NULL }, /* am */
+       { pres_roff, NULL }, /* ami */
+       { pres_roff, NULL }, /* ig */
+       { NULL, NULL }, /* . */
 };
 
 
@@ -158,6 +174,24 @@ check_root(CHKARGS)
 }
 
 
+static int
+check_title(CHKARGS) 
+{
+       const char      *p;
+
+       assert(n->child);
+       if ('\0' == *n->child->string)
+               return(man_nerr(m, n, WNOTITLE));
+
+       for (p = n->child->string; '\0' != *p; p++)
+               if (isalpha((u_char)*p) && ! isupper((u_char)*p))
+                       if ( ! man_nwarn(m, n, WTITLECASE))
+                               return(0);
+
+       return(1);
+}
+
+
 static int
 check_text(CHKARGS) 
 {
@@ -277,6 +311,24 @@ check_bline(CHKARGS)
        assert( ! (MAN_ELINE & m->flags));
        if (MAN_BLINE & m->flags)
                return(man_nerr(m, n, WLNSCOPE));
+
        return(1);
 }
 
+
+static int
+check_roff(CHKARGS)
+{
+
+       if (MAN_BLOCK != n->type)
+               return(1);
+
+       for (n = n->parent; n; n = n->parent)
+               if (MAN_de == n->tok || MAN_dei == n->tok ||
+                               MAN_am == n->tok || 
+                               MAN_ami == n->tok ||
+                               MAN_ig == n->tok)
+                       return(man_nerr(m, n, WROFFNEST));
+
+       return(1);
+}