=================================================================== RCS file: /cvs/mandoc/Attic/action.c,v retrieving revision 1.25 retrieving revision 1.28 diff -u -p -r1.25 -r1.28 --- mandoc/Attic/action.c 2009/02/28 14:43:35 1.25 +++ mandoc/Attic/action.c 2009/03/01 23:14:15 1.28 @@ -1,4 +1,4 @@ -/* $Id: action.c,v 1.25 2009/02/28 14:43:35 kristaps Exp $ */ +/* $Id: action.c,v 1.28 2009/03/01 23:14:15 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -259,7 +259,8 @@ post_dt(struct mdoc *mdoc) mdoc->meta.msec = mdoc_atomsec(p); if (MSEC_DEFAULT != mdoc->meta.msec) break; - return(mdoc_nerr(mdoc, n, "invalid parameter syntax")); + return(mdoc_nerr(mdoc, n, + "invalid parameter syntax")); case (2): mdoc->meta.vol = mdoc_atovol(p); if (VOL_DEFAULT != mdoc->meta.vol) @@ -267,9 +268,11 @@ post_dt(struct mdoc *mdoc) mdoc->meta.arch = mdoc_atoarch(p); if (ARCH_DEFAULT != mdoc->meta.arch) break; - return(mdoc_nerr(mdoc, n, "invalid parameter syntax")); + return(mdoc_nerr(mdoc, n, + "invalid parameter syntax")); default: - return(mdoc_nerr(mdoc, n, "too many parameters")); + return(mdoc_nerr(mdoc, n, + "too many parameters")); } } @@ -392,13 +395,9 @@ post_bl_width(struct mdoc *mdoc) * the macro's width as set in share/tmac/mdoc/doc-common. */ - 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))) + if (xstrcmp(*p, "Ds")) + width = 8; + else if (MDOC_MAX == (tok = mdoc_find(mdoc, *p))) return(1); else if (0 == (width = mdoc_macro2len(tok))) return(mdoc_warn(mdoc, WARN_SYNTAX,