Remove the ENDBODY_NOSPACE flag, simplifying the code.

[mandoc.git] / mandoc.h

diff --git a/mandoc.h b/mandoc.h
index d37187f3eccf7809eb7ba3886e9f825d8f409cfd..a80d6ae7b82deaf85b2e802d4ffeb08e04656dfe 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,7 +1,7 @@
-/*     $Id: mandoc.h,v 1.207 2015/10/30 19:04:16 schwarze Exp $ */
+/*     $Id: mandoc.h,v 1.214 2017/01/28 23:30:08 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -65,10 +65,11 @@ enum        mandocerr {
        MANDOCERR_DOC_EMPTY, /* no document body */
        MANDOCERR_SEC_BEFORE, /* content before first section header: macro */
        MANDOCERR_NAMESEC_FIRST, /* first section is not NAME: Sh title */
-       MANDOCERR_NAMESEC_NONM, /* NAME section without name */
+       MANDOCERR_NAMESEC_NONM, /* NAME section without Nm before Nd */
        MANDOCERR_NAMESEC_NOND, /* NAME section without description */
        MANDOCERR_NAMESEC_ND, /* description not at the end of NAME */
        MANDOCERR_NAMESEC_BAD, /* bad NAME section content: macro */
+       MANDOCERR_NAMESEC_PUNCT, /* missing comma before name: Nm name */
        MANDOCERR_ND_EMPTY, /* missing description line, using "" */
        MANDOCERR_SEC_ORDER, /* sections out of conventional order: Sh title */
        MANDOCERR_SEC_REP, /* duplicate section title: Sh title */
@@ -98,7 +99,7 @@ enum  mandocerr {
        MANDOCERR_ARG_EMPTY, /* empty argument, using 0n: macro arg */
        MANDOCERR_BD_NOTYPE, /* missing display type, using -ragged: Bd */
        MANDOCERR_BL_LATETYPE, /* list type is not the first argument: Bl arg */
-       MANDOCERR_BL_NOWIDTH, /* missing -width in -tag list, using 8n */
+       MANDOCERR_BL_NOWIDTH, /* missing -width in -tag list, using 6n */
        MANDOCERR_EX_NONAME, /* missing utility name, using "": Ex */
        MANDOCERR_FO_NOHEAD, /* missing function name, using "": Fo */
        MANDOCERR_IT_NOHEAD, /* empty head in list item: Bl -type It */
@@ -107,6 +108,7 @@ enum        mandocerr {
        MANDOCERR_BF_BADFONT, /* unknown font type, using \fR: Bf font */
        MANDOCERR_PF_SKIP, /* nothing follows prefix: Pf arg */
        MANDOCERR_RS_EMPTY, /* empty reference block: Rs */
+       MANDOCERR_XR_NOSEC, /* missing section argument: Xr arg */
        MANDOCERR_ARG_STD, /* missing -std argument, adding it: macro */
        MANDOCERR_OP_EMPTY, /* missing option string, using "": OP */
        MANDOCERR_UR_NOHEAD, /* missing resource identifier, using "": UR */
@@ -132,6 +134,7 @@ enum        mandocerr {
        MANDOCERR_FI_BLANK, /* blank line in fill mode, using .sp */
        MANDOCERR_FI_TAB, /* tab in filled text */
        MANDOCERR_SPACE_EOL, /* whitespace at end of input line */
+       MANDOCERR_EOS, /* new sentence, new line */
        MANDOCERR_COMMENT_BAD, /* bad comment style */
        MANDOCERR_ESC_BAD, /* invalid escape sequence: esc */
        MANDOCERR_STR_UNDEF, /* undefined string, using "": name */
@@ -408,7 +411,6 @@ enum        mandoc_esc {
 typedef        void    (*mandocmsg)(enum mandocerr, enum mandoclevel,
                        const char *, int, int, const char *);
 
-__BEGIN_DECLS
 
 struct mparse;
 struct roff_man;
@@ -424,7 +426,7 @@ const char   *mchars_spec2str(const char *, size_t, size_t *);
 struct mparse   *mparse_alloc(int, enum mandoclevel, mandocmsg, const char *);
 void             mparse_free(struct mparse *);
 void             mparse_keep(struct mparse *);
-enum mandoclevel  mparse_open(struct mparse *, int *, const char *);
+int              mparse_open(struct mparse *, const char *);
 enum mandoclevel  mparse_readfd(struct mparse *, int, const char *);
 enum mandoclevel  mparse_readmem(struct mparse *, void *, size_t,
                        const char *);
@@ -434,5 +436,4 @@ void                  mparse_result(struct mparse *,
 const char      *mparse_getkeep(const struct mparse *);
 const char      *mparse_strerror(enum mandocerr);
 const char      *mparse_strlevel(enum mandoclevel);
-
-__END_DECLS
+void             mparse_updaterc(struct mparse *, enum mandoclevel *);