When a man(7) document contains unreasonably large numbers for

[mandoc.git] / mandoc.h

diff --git a/mandoc.h b/mandoc.h
index e7eefc07060fb1e534c0742e7cf545e0b4c595d6..a25163add17e4bb5b21d9e20e36203b622968a6e 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.163 2014/10/14 02:16:06 schwarze Exp $ */
+/*     $Id: mandoc.h,v 1.177 2014/12/16 23:44:41 schwarze Exp $ */

 /*
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -15,8 +15,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifndef MANDOC_H
-#define MANDOC_H

 
 #define ASCII_NBRSP     31  /* non-breaking space */
 #define        ASCII_HYPH       30  /* breakable hyphen */
 
 #define ASCII_NBRSP     31  /* non-breaking space */
 #define        ASCII_HYPH       30  /* breakable hyphen */


@@ -54,7 +52,6 @@ enum  mandocerr {
        MANDOCERR_TITLE_CASE, /* lower case character in document title */
        MANDOCERR_MSEC_MISSING, /* missing manual section, using "": macro */
        MANDOCERR_MSEC_BAD, /* unknown manual section: Dt ... section */
        MANDOCERR_TITLE_CASE, /* lower case character in document title */
        MANDOCERR_MSEC_MISSING, /* missing manual section, using "": macro */
        MANDOCERR_MSEC_BAD, /* unknown manual section: Dt ... section */

-       MANDOCERR_ARCH_BAD, /* unknown manual volume or arch: Dt ... volume */

        MANDOCERR_DATE_MISSING, /* missing date, using today's date */
        MANDOCERR_DATE_BAD, /* cannot parse date, using it verbatim: date */
        MANDOCERR_OS_MISSING, /* missing Os macro, using "" */
        MANDOCERR_DATE_MISSING, /* missing date, using today's date */
        MANDOCERR_DATE_BAD, /* cannot parse date, using it verbatim: date */
        MANDOCERR_OS_MISSING, /* missing Os macro, using "" */


@@ -78,6 +75,7 @@ enum  mandocerr {
 
        /* related to macros and nesting */
        MANDOCERR_MACRO_OBS, /* obsolete macro: macro */
 
        /* related to macros and nesting */
        MANDOCERR_MACRO_OBS, /* obsolete macro: macro */

+       MANDOCERR_MACRO_CALL, /* macro neither callable nor escaped: macro */

        MANDOCERR_PAR_SKIP, /* skipping paragraph macro: macro ... */
        MANDOCERR_PAR_MOVE, /* moving paragraph macro out of list: macro */
        MANDOCERR_NS_SKIP, /* skipping no-space macro */
        MANDOCERR_PAR_SKIP, /* skipping paragraph macro: macro ... */
        MANDOCERR_PAR_MOVE, /* moving paragraph macro out of list: macro */
        MANDOCERR_NS_SKIP, /* skipping no-space macro */


@@ -103,6 +101,7 @@ enum        mandocerr {
        MANDOCERR_IT_NOBODY, /* empty list item: Bl -type It */
        MANDOCERR_BF_NOFONT, /* missing font type, using \fR: Bf */
        MANDOCERR_BF_BADFONT, /* unknown font type, using \fR: Bf font */
        MANDOCERR_IT_NOBODY, /* empty list item: Bl -type It */
        MANDOCERR_BF_NOFONT, /* missing font type, using \fR: Bf */
        MANDOCERR_BF_BADFONT, /* unknown font type, using \fR: Bf font */

+       MANDOCERR_PF_SKIP, /* nothing follows prefix: Pf arg */

        MANDOCERR_ARG_STD, /* missing -std argument, adding it: macro */
        MANDOCERR_EQN_NOBOX, /* missing eqn box, using "": op */
 
        MANDOCERR_ARG_STD, /* missing -std argument, adding it: macro */
        MANDOCERR_EQN_NOBOX, /* missing eqn box, using "": op */
 


@@ -145,6 +144,7 @@ enum        mandocerr {
        MANDOCERR_TBLIGNDATA, /* ignore data in cell */
        MANDOCERR_TBLBLOCK, /* data block still open */
        MANDOCERR_TBLEXTRADAT, /* ignoring extra data cells */
        MANDOCERR_TBLIGNDATA, /* ignore data in cell */
        MANDOCERR_TBLBLOCK, /* data block still open */
        MANDOCERR_TBLEXTRADAT, /* ignoring extra data cells */

+       MANDOCERR_TBLMACRO, /* ignoring macro in table: macro */

 
        /* related to document structure and macros */
        MANDOCERR_ROFFLOOP, /* input stack limit exceeded, infinite loop? */
 
        /* related to document structure and macros */
        MANDOCERR_ROFFLOOP, /* input stack limit exceeded, infinite loop? */


@@ -159,6 +159,7 @@ enum        mandocerr {
        /* related to request and macro arguments */
        MANDOCERR_NAMESC, /* escaped character not allowed in a name: name */
        MANDOCERR_ARGCOUNT, /* argument count wrong */
        /* related to request and macro arguments */
        MANDOCERR_NAMESC, /* escaped character not allowed in a name: name */
        MANDOCERR_ARGCOUNT, /* argument count wrong */

+       MANDOCERR_BD_FILE, /* NOT IMPLEMENTED: Bd -file */

        MANDOCERR_BL_NOTYPE, /* missing list type, using -item: Bl */
        MANDOCERR_NM_NONAME, /* missing manual name, using "": Nm */
        MANDOCERR_OS_UNAME, /* uname(3) system call failed, using UNKNOWN */
        MANDOCERR_BL_NOTYPE, /* missing list type, using -item: Bl */
        MANDOCERR_NM_NONAME, /* missing manual name, using "": Nm */
        MANDOCERR_OS_UNAME, /* uname(3) system call failed, using UNKNOWN */


@@ -166,11 +167,11 @@ enum      mandocerr {
        MANDOCERR_IT_NONUM, /* skipping request without numeric argument */
        MANDOCERR_ARG_SKIP, /* skipping all arguments: macro args */
        MANDOCERR_ARG_EXCESS, /* skipping excess arguments: macro ... args */
        MANDOCERR_IT_NONUM, /* skipping request without numeric argument */
        MANDOCERR_ARG_SKIP, /* skipping all arguments: macro args */
        MANDOCERR_ARG_EXCESS, /* skipping excess arguments: macro ... args */

+       MANDOCERR_DIVZERO, /* divide by zero */

 
        MANDOCERR_FATAL, /* ===== start of fatal errors ===== */
 
        MANDOCERR_TOOLARGE, /* input too large */
 
        MANDOCERR_FATAL, /* ===== start of fatal errors ===== */
 
        MANDOCERR_TOOLARGE, /* input too large */

-       MANDOCERR_BD_FILE, /* NOT IMPLEMENTED: Bd -file */

        MANDOCERR_SO_PATH, /* NOT IMPLEMENTED: .so with absolute path or ".." */
        MANDOCERR_SO_FAIL, /* .so request failed */
 
        MANDOCERR_SO_PATH, /* NOT IMPLEMENTED: .so with absolute path or ".." */
        MANDOCERR_SO_FAIL, /* .so request failed */
 


@@ -392,6 +393,8 @@ struct      eqn {
 #define        MPARSE_MAN      2  /* assume -man */
 #define        MPARSE_SO       4  /* honour .so requests */
 #define        MPARSE_QUICK    8  /* abort the parse early */
 #define        MPARSE_MAN      2  /* assume -man */
 #define        MPARSE_SO       4  /* honour .so requests */
 #define        MPARSE_QUICK    8  /* abort the parse early */

+#define        MPARSE_UTF8     16 /* accept UTF-8 input */
+#define        MPARSE_LATIN1   32 /* accept ISO-LATIN-1 input */

 
 enum   mandoc_esc {
        ESCAPE_ERROR = 0, /* bail! unparsable escape */
 
 enum   mandoc_esc {
        ESCAPE_ERROR = 0, /* bail! unparsable escape */


@@ -412,30 +415,30 @@ enum      mandoc_esc {
 typedef        void    (*mandocmsg)(enum mandocerr, enum mandoclevel,
                        const char *, int, int, const char *);
 
 typedef        void    (*mandocmsg)(enum mandocerr, enum mandoclevel,
                        const char *, int, int, const char *);
 

+__BEGIN_DECLS
+

 struct mparse;
 struct mchars;
 struct mdoc;
 struct man;
 
 struct mparse;
 struct mchars;
 struct mdoc;
 struct man;
 

-__BEGIN_DECLS
-

 enum mandoc_esc          mandoc_escape(const char **, const char **, int *);
 struct mchars   *mchars_alloc(void);
 void             mchars_free(struct mchars *);
 enum mandoc_esc          mandoc_escape(const char **, const char **, int *);
 struct mchars   *mchars_alloc(void);
 void             mchars_free(struct mchars *);

-char             mchars_num2char(const char *, size_t);
+int              mchars_num2char(const char *, size_t);
+const char      *mchars_uc2str(int);

 int              mchars_num2uc(const char *, size_t);
 int              mchars_spec2cp(const struct mchars *,
                        const char *, size_t);
 const char      *mchars_spec2str(const struct mchars *,
                        const char *, size_t, size_t *);
 struct mparse   *mparse_alloc(int, enum mandoclevel, mandocmsg,
 int              mchars_num2uc(const char *, size_t);
 int              mchars_spec2cp(const struct mchars *,
                        const char *, size_t);
 const char      *mchars_spec2str(const struct mchars *,
                        const char *, size_t, size_t *);
 struct mparse   *mparse_alloc(int, enum mandoclevel, mandocmsg,

-                       const char *);
+                       const struct mchars *, const char *);

 void             mparse_free(struct mparse *);
 void             mparse_keep(struct mparse *);
 void             mparse_free(struct mparse *);
 void             mparse_keep(struct mparse *);

-enum mandoclevel  mparse_open(struct mparse *, int *, const char *,
-                       pid_t *);
+enum mandoclevel  mparse_open(struct mparse *, int *, const char *);

 enum mandoclevel  mparse_readfd(struct mparse *, int, const char *);
 enum mandoclevel  mparse_readfd(struct mparse *, int, const char *);

-enum mandoclevel  mparse_readmem(struct mparse *, const void *, size_t,
+enum mandoclevel  mparse_readmem(struct mparse *, void *, size_t,

                        const char *);
 void             mparse_reset(struct mparse *);
 void             mparse_result(struct mparse *,
                        const char *);
 void             mparse_reset(struct mparse *);
 void             mparse_result(struct mparse *,


@@ -443,8 +446,6 @@ void                  mparse_result(struct mparse *,
 const char      *mparse_getkeep(const struct mparse *);
 const char      *mparse_strerror(enum mandocerr);
 const char      *mparse_strlevel(enum mandoclevel);
 const char      *mparse_getkeep(const struct mparse *);
 const char      *mparse_strerror(enum mandocerr);
 const char      *mparse_strlevel(enum mandoclevel);

-enum mandoclevel  mparse_wait(struct mparse *, pid_t);
+enum mandoclevel  mparse_wait(struct mparse *);

 
 __END_DECLS
 
 __END_DECLS

-
-#endif /*!MANDOC_H*/