correctly handle scaling units after .PD

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index ec2d6871d02cff0eaf7c91dc2134f16d43305892..ce7b094ec3bb9fb67d831221c29dcf75c265f06b 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.102 2014/11/30 02:36:38 schwarze Exp $ */
+/*     $Id: read.c,v 1.105 2014/12/16 23:44:41 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -41,7 +41,6 @@
 #include "libmandoc.h"
 #include "mdoc.h"
 #include "man.h"
-#include "main.h"
 
 #define        REPARSE_LIMIT   1000
 
@@ -146,6 +145,7 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "empty list item",
        "missing font type, using \\fR",
        "unknown font type, using \\fR",
+       "nothing follows prefix",
        "missing -std argument, adding it",
        "missing eqn box, using \"\"",
 
@@ -188,6 +188,7 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "ignore data in cell",
        "data block still open",
        "ignoring extra data cells",
+       "ignoring macro in table",
 
        /* related to document structure and macros */
        "input stack limit exceeded, infinite loop?",
@@ -755,12 +756,12 @@ mparse_parse_buffer(struct mparse *curp, struct buf blk, const char *file)
 }
 
 enum mandoclevel
-mparse_readmem(struct mparse *curp, const void *buf, size_t len,
+mparse_readmem(struct mparse *curp, void *buf, size_t len,
                const char *file)
 {
        struct buf blk;
 
-       blk.buf = UNCONST(buf);
+       blk.buf = buf;
        blk.sz = len;
 
        mparse_parse_buffer(curp, blk, file);