Made `Ds' emit a warning.

Default width is 78.

diff --git a/action.c b/action.c
index 0e7e87baf8522f7a97afb620437041892aa672a2..c24830ad2a8c8eb2166b46885e9dce86e4916826 100644 (file)
--- a/action.c
+++ b/action.c
@@ -1,4 +1,4 @@
-/* $Id: action.c,v 1.24 2009/02/28 14:40:07 kristaps Exp $ */
+/* $Id: action.c,v 1.25 2009/02/28 14:43:35 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -392,13 +392,17 @@ post_bl_width(struct mdoc *mdoc)
         * the macro's width as set in share/tmac/mdoc/doc-common.
         */
 
         * the macro's width as set in share/tmac/mdoc/doc-common.
         */
 

-       if (xstrcmp(*p, "Ds"))
+       if (xstrcmp(*p, "Ds")) {
+               if ( ! mdoc_warn(mdoc, WARN_COMPAT,
+                                       "%s argument deprecated",
+                                       mdoc_argnames[MDOC_Width]))
+                       return(0);

                width = 6;
                width = 6;

-       else if (MDOC_MAX == (tok = mdoc_find(mdoc, *p)))
+       } else if (MDOC_MAX == (tok = mdoc_find(mdoc, *p)))

                return(1);
        else if (0 == (width = mdoc_macro2len(tok))) 
                return(mdoc_warn(mdoc, WARN_SYNTAX,
                return(1);
        else if (0 == (width = mdoc_macro2len(tok))) 
                return(mdoc_warn(mdoc, WARN_SYNTAX,

-                                       "-%s macro has no length", 
+                                       "%s macro has no length", 

                                        mdoc_argnames[MDOC_Width]));
 
        mdoc_msg(mdoc, "re-writing %s argument: %s -> %zun", 
                                        mdoc_argnames[MDOC_Width]));
 
        mdoc_msg(mdoc, "re-writing %s argument: %s -> %zun", 

diff --git a/mdocterm.c b/mdocterm.c
index 3e2f70f05dbc74549f01920e6606adb86a7161f9..398794ca8fe78df78f42abc0cfabc1836872e8cc 100644 (file)
--- a/mdocterm.c
+++ b/mdocterm.c
@@ -1,4 +1,4 @@
-/* $Id: mdocterm.c,v 1.18 2009/02/27 10:55:16 kristaps Exp $ */
+/* $Id: mdocterm.c,v 1.19 2009/02/28 14:43:35 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -112,7 +112,7 @@ main(int argc, char *argv[])
        if (NULL == (mdoc = mmain_mdoc(p)))
                mmain_exit(p, 1);
 
        if (NULL == (mdoc = mmain_mdoc(p)))
                mmain_exit(p, 1);
 

-       termp.maxrmargin = 80; /* XXX */
+       termp.maxrmargin = 78; /* XXX */

        termp.rmargin = termp.maxrmargin;
        termp.maxcols = 1024;
        termp.offset = termp.col = 0;
        termp.rmargin = termp.maxrmargin;
        termp.maxcols = 1024;
        termp.offset = termp.col = 0;