Churn-ish check-in getting mdoc_parseln() and man_parseln() to accept a

[mandoc.git] / mandoc.h

diff --git a/mandoc.h b/mandoc.h
index e8c4dd6024fce19bedfc0d8474b190dec2f12938..2fc74676c12d8e12c29de1d0344d85d63f3af44e 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.6 2010/05/24 01:41:31 schwarze Exp $ */
+/*     $Id: mandoc.h,v 1.12 2010/06/12 11:41:50 kristaps Exp $ */

 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -17,26 +17,31 @@
 #ifndef MANDOC_H
 #define MANDOC_H
 
 #ifndef MANDOC_H
 #define MANDOC_H
 

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

 __BEGIN_DECLS
 
 enum   mandocerr {
        MANDOCERR_OK,
        MANDOCERR_UPPERCASE, /* text should be uppercase */
 __BEGIN_DECLS
 
 enum   mandocerr {
        MANDOCERR_OK,
        MANDOCERR_UPPERCASE, /* text should be uppercase */

-       MANDOCERR_SECOOO, /* sections out of conentional order */
+       MANDOCERR_SECOOO, /* sections out of conventional order */

        MANDOCERR_SECREP, /* section name repeats */
        MANDOCERR_PROLOGOOO, /* out of order prologue */
        MANDOCERR_PROLOGREP, /* repeated prologue entry */
        MANDOCERR_LISTFIRST, /* list type must come first */
        MANDOCERR_SECREP, /* section name repeats */
        MANDOCERR_PROLOGOOO, /* out of order prologue */
        MANDOCERR_PROLOGREP, /* repeated prologue entry */
        MANDOCERR_LISTFIRST, /* list type must come first */

-       MANDOCERR_COLUMNS, /* column syntax is inconsistent */

        MANDOCERR_BADSTANDARD, /* bad standard */
        MANDOCERR_BADLIB, /* bad library */
        MANDOCERR_BADESCAPE, /* bad escape sequence */
        MANDOCERR_BADQUOTE, /* unterminated quoted string */
        MANDOCERR_NOWIDTHARG, /* argument requires the width argument */
        MANDOCERR_BADSTANDARD, /* bad standard */
        MANDOCERR_BADLIB, /* bad library */
        MANDOCERR_BADESCAPE, /* bad escape sequence */
        MANDOCERR_BADQUOTE, /* unterminated quoted string */
        MANDOCERR_NOWIDTHARG, /* argument requires the width argument */

+       /* FIXME: merge with MANDOCERR_IGNARGV. */

        MANDOCERR_WIDTHARG, /* superfluous width argument */
        MANDOCERR_WIDTHARG, /* superfluous width argument */

+       MANDOCERR_IGNARGV, /* macro ignoring argv */

        MANDOCERR_BADDATE, /* bad date argument */
        MANDOCERR_BADWIDTH, /* bad width argument */
        MANDOCERR_BADDATE, /* bad date argument */
        MANDOCERR_BADWIDTH, /* bad width argument */

-       MANDOCERR_BADMSEC, /* unknown manual sction */
+       MANDOCERR_BADMSEC, /* unknown manual section */

        MANDOCERR_SECMSEC, /* section not in conventional manual section */
        MANDOCERR_EOLNSPACE, /* end of line whitespace */
        MANDOCERR_SCOPEEXIT, /* scope open on exit */
        MANDOCERR_SECMSEC, /* section not in conventional manual section */
        MANDOCERR_EOLNSPACE, /* end of line whitespace */
        MANDOCERR_SCOPEEXIT, /* scope open on exit */


@@ -70,18 +75,18 @@ enum        mandocerr {
        MANDOCERR_NOBODY, /* macro requires body argument(s) */
        MANDOCERR_NOARGV, /* macro requires argument(s) */
        MANDOCERR_NOTITLE, /* no title in document */
        MANDOCERR_NOBODY, /* macro requires body argument(s) */
        MANDOCERR_NOARGV, /* macro requires argument(s) */
        MANDOCERR_NOTITLE, /* no title in document */

+       MANDOCERR_LISTTYPE, /* missing list type */
+       MANDOCERR_DISPTYPE, /* missing display type */

        MANDOCERR_ARGSLOST, /* line argument(s) will be lost */
        MANDOCERR_BODYLOST, /* body argument(s) will be lost */
 #define        MANDOCERR_ERROR         MANDOCERR_BODYLOST
 
        MANDOCERR_ARGSLOST, /* line argument(s) will be lost */
        MANDOCERR_BODYLOST, /* body argument(s) will be lost */
 #define        MANDOCERR_ERROR         MANDOCERR_BODYLOST
 

+       MANDOCERR_COLUMNS, /* column syntax is inconsistent */

        /* FIXME: this should be a MANDOCERR_ERROR */
        MANDOCERR_FONTTYPE, /* missing font type */
        /* FIXME: this should be a MANDOCERR_ERROR */
        /* FIXME: this should be a MANDOCERR_ERROR */
        MANDOCERR_FONTTYPE, /* missing font type */
        /* FIXME: this should be a MANDOCERR_ERROR */

-       MANDOCERR_DISPTYPE, /* missing display type */
-       /* FIXME: this should be a MANDOCERR_ERROR */
-       MANDOCERR_LISTTYPE, /* missing list type */
-       /* FIXME: this should be a MANDOCERR_ERROR */

        MANDOCERR_NESTEDDISP, /* displays may not be nested */
        MANDOCERR_NESTEDDISP, /* displays may not be nested */

+       MANDOCERR_BADDISP, /* unsupported display type */

        MANDOCERR_SYNTNOSCOPE, /* request scope close w/none open */
        MANDOCERR_SYNTSCOPE, /* scope broken, syntax violated */
        MANDOCERR_SYNTLINESCOPE, /* line scope broken, syntax violated */
        MANDOCERR_SYNTNOSCOPE, /* request scope close w/none open */
        MANDOCERR_SYNTSCOPE, /* scope broken, syntax violated */
        MANDOCERR_SYNTLINESCOPE, /* line scope broken, syntax violated */