Made `Ds' emit a warning.

Default width is 78.

2 files changed, 8 insertions, 4 deletions

diff --git a/action.c b/action.c
index 38ec2dd4..e5d88d74 100644
--- a/action.c
+++ b/action.c
@@ -392,13 +392,17 @@ post_bl_width(struct mdoc *mdoc)
 	 * 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;
-	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,
-					"-%s macro has no length", 
+					"%s macro has no length", 
 					mdoc_argnames[MDOC_Width]));
 
 	mdoc_msg(mdoc, "re-writing %s argument: %s -> %zun", 
diff --git a/mdocterm.c b/mdocterm.c
index 79db7723..ca695ab8 100644
--- a/mdocterm.c
+++ b/mdocterm.c
@@ -112,7 +112,7 @@ main(int argc, char *argv[])
 	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;