Backed-out warning about Ds.

[mandoc.git] / action.c

diff --git a/action.c b/action.c
index 0e7e87baf8522f7a97afb620437041892aa672a2..0733c7973f1a42c076c25151411ec397daf8a611 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.28 2009/03/01 23:14:15 kristaps Exp $ */

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


@@ -259,7 +259,8 @@ post_dt(struct mdoc *mdoc)
                        mdoc->meta.msec = mdoc_atomsec(p);
                        if (MSEC_DEFAULT != mdoc->meta.msec)
                                break;
                        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)
                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;
                        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:
                default:

-                       return(mdoc_nerr(mdoc, n, "too many parameters"));
+                       return(mdoc_nerr(mdoc, n, 
+                                       "too many parameters"));

                }
        }
 
                }
        }
 


@@ -393,12 +396,12 @@ post_bl_width(struct mdoc *mdoc)
         */
 
        if (xstrcmp(*p, "Ds"))
         */
 
        if (xstrcmp(*p, "Ds"))

-               width = 6;
+               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,
        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", 
                                        mdoc_argnames[MDOC_Width]));
 
        mdoc_msg(mdoc, "re-writing %s argument: %s -> %zun",