Drop explicit, constant style=margin-left attribute on .Bf blocks.

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index 759c42ac552a5ce7483581938c232c916deecedf..d6c51af5255ce3370ac8f6514c3bfb8f75e5c8d7 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,7 +1,7 @@
 /*     $OpenBSD$ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*     $OpenBSD$ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -89,6 +89,8 @@ static        const v_check __man_valids[MAN_MAX - MAN_TH] = {
        NULL,       /* EE */
        post_UR,    /* UR */
        NULL,       /* UE */
        NULL,       /* EE */
        post_UR,    /* UR */
        NULL,       /* UE */

+       post_UR,    /* MT */
+       NULL,       /* ME */

 };
 static const v_check *man_valids = __man_valids - MAN_TH;
 
 };
 static const v_check *man_valids = __man_valids - MAN_TH;
 


@@ -118,6 +120,7 @@ man_node_validate(struct roff_man *man)
        case ROFFT_ROOT:
                check_root(man, n);
                break;
        case ROFFT_ROOT:
                check_root(man, n);
                break;

+       case ROFFT_COMMENT:

        case ROFFT_EQN:
        case ROFFT_TBL:
                break;
        case ROFFT_EQN:
        case ROFFT_TBL:
                break;


@@ -147,10 +150,9 @@ man_node_validate(struct roff_man *man)
 static void
 check_root(CHKARGS)
 {
 static void
 check_root(CHKARGS)
 {

-

        assert((man->flags & (MAN_BLINE | MAN_ELINE)) == 0);
 
        assert((man->flags & (MAN_BLINE | MAN_ELINE)) == 0);
 

-       if (NULL == man->first->child)
+       if (n->last == NULL || n->last->type == ROFFT_COMMENT)

                mandoc_msg(MANDOCERR_DOC_EMPTY, man->parse,
                    n->line, n->pos, NULL);
        else
                mandoc_msg(MANDOCERR_DOC_EMPTY, man->parse,
                    n->line, n->pos, NULL);
        else


@@ -170,6 +172,12 @@ check_root(CHKARGS)
                man->meta.date = man->quick ? mandoc_strdup("") :
                    mandoc_normdate(man, NULL, n->line, n->pos);
        }
                man->meta.date = man->quick ? mandoc_strdup("") :
                    mandoc_normdate(man, NULL, n->line, n->pos);
        }

+
+       if (man->meta.os_e &&
+           (man->meta.rcsids & (1 << man->meta.os_e)) == 0)
+               mandoc_msg(MANDOCERR_RCS_MISSING, man->parse, 0, 0,
+                   man->meta.os_e == MANDOC_OS_OPENBSD ?
+                   "(OpenBSD)" : "(NetBSD)");

 }
 
 static void
 }
 
 static void


@@ -203,10 +211,9 @@ post_OP(CHKARGS)
 static void
 post_UR(CHKARGS)
 {
 static void
 post_UR(CHKARGS)
 {

-

        if (n->type == ROFFT_HEAD && n->child == NULL)
        if (n->type == ROFFT_HEAD && n->child == NULL)

-               mandoc_vmsg(MANDOCERR_UR_NOHEAD, man->parse,
-                   n->line, n->pos, "UR");
+               mandoc_msg(MANDOCERR_UR_NOHEAD, man->parse,
+                   n->line, n->pos, roff_name[n->tok]);

        check_part(man, n);
 }
 
        check_part(man, n);
 }
 


@@ -336,8 +343,14 @@ post_TH(CHKARGS)
 
        if (n && (n = n->next))
                man->meta.os = mandoc_strdup(n->string);
 
        if (n && (n = n->next))
                man->meta.os = mandoc_strdup(n->string);

-       else if (man->defos != NULL)
-               man->meta.os = mandoc_strdup(man->defos);
+       else if (man->os_s != NULL)
+               man->meta.os = mandoc_strdup(man->os_s);
+       if (man->meta.os_e == MANDOC_OS_OTHER && man->meta.os != NULL) {
+               if (strstr(man->meta.os, "OpenBSD") != NULL)
+                       man->meta.os_e = MANDOC_OS_OPENBSD;
+               else if (strstr(man->meta.os, "NetBSD") != NULL)
+                       man->meta.os_e = MANDOC_OS_NETBSD;
+       }

 
        /* TITLE MSEC DATE OS ->VOL<- */
        /* If missing, use the default VOL name for MSEC. */
 
        /* TITLE MSEC DATE OS ->VOL<- */
        /* If missing, use the default VOL name for MSEC. */