[src/trunk]: src/external/bsd/mdocml/dist merge diffs

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/701ac1b78429
branches:  trunk
changeset: 785854:701ac1b78429
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Apr 03 14:50:26 2013 +0000

description:
merge diffs

diffstat:

 external/bsd/mdocml/dist/mdoc_argv.c     |   4 ++--
 external/bsd/mdocml/dist/mdoc_validate.c |  11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 3fc36e3b07af -r 701ac1b78429 external/bsd/mdocml/dist/mdoc_argv.c
--- a/external/bsd/mdocml/dist/mdoc_argv.c      Wed Apr 03 14:46:49 2013 +0000
+++ b/external/bsd/mdocml/dist/mdoc_argv.c      Wed Apr 03 14:50:26 2013 +0000
@@ -1,4 +1,4 @@
-/*     $Vendor-Id: mdoc_argv.c,v 1.81 2011/09/18 14:14:15 schwarze Exp $ */
+/*     $Vendor-Id: mdoc_argv.c,v 1.82 2012/03/23 05:50:24 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
  *
@@ -81,7 +81,7 @@
        ARGV_NONE,      /* MDOC_Ohang */
        ARGV_NONE,      /* MDOC_Inset */
        ARGV_MULTI,     /* MDOC_Column */
-       ARGV_SINGLE,    /* MDOC_Width */
+       ARGV_OPT_SINGLE, /* MDOC_Width */
        ARGV_NONE,      /* MDOC_Compact */
        ARGV_NONE,      /* MDOC_Std */
        ARGV_NONE,      /* MDOC_Filled */
diff -r 3fc36e3b07af -r 701ac1b78429 external/bsd/mdocml/dist/mdoc_validate.c
--- a/external/bsd/mdocml/dist/mdoc_validate.c  Wed Apr 03 14:46:49 2013 +0000
+++ b/external/bsd/mdocml/dist/mdoc_validate.c  Wed Apr 03 14:50:26 2013 +0000
@@ -1,4 +1,4 @@
-/*     $Vendor-Id: mdoc_validate.c,v 1.181 2011/12/03 16:58:54 schwarze Exp $ */
+/*     $Vendor-Id: mdoc_validate.c,v 1.182 2012/03/23 05:50:25 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze%openbsd.org@localhost>
@@ -661,8 +661,13 @@
                        comp = 1;
                        break;
                case (MDOC_Width):
-                       dup = (NULL != n->norm->Bl.width);
-                       width = n->args->argv[i].value[0];
+                       /* NB: this can be empty! */
+                       if (n->args->argv[i].sz) {
+                               width = n->args->argv[i].value[0];
+                               dup = (NULL != n->norm->Bl.width);
+                               break;
+                       }
+                       mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
                        break;
                case (MDOC_Offset):
                        /* NB: this can be empty! */