When in a <PRE>, don't print out the <BR> before lines that have leading

[mandoc.git] / mandoc.h

diff --git a/mandoc.h b/mandoc.h
index 260ce40a532514faaef2ab363b637e47b60b7832..f9c77487493f6ea9a9c9a86385da76e68ea66e87 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.50 2011/01/10 14:40:30 kristaps Exp $ */
+/*     $Id: mandoc.h,v 1.53 2011/01/12 15:50:42 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -80,6 +80,7 @@ enum  mandocerr {
        MANDOCERR_LISTFIRST, /* list type must come first */
        MANDOCERR_NOWIDTHARG, /* tag lists require a width argument */
        MANDOCERR_FONTTYPE, /* missing font type */
+       MANDOCERR_WNOSCOPE, /* skipping end of block that is not open */
 
        /* related to bad macro arguments */
        MANDOCERR_IGNARGV, /* skipping argument */
@@ -114,6 +115,7 @@ enum        mandocerr {
 
        MANDOCERR_ROFFLOOP, /* input stack limit exceeded, infinite loop? */
        MANDOCERR_BADCHAR, /* skipping bad character */
+       MANDOCERR_NAMESC, /* escaped character not allowed in a name */
        MANDOCERR_NOTEXT, /* skipping text before the first section header */
        MANDOCERR_MACRO, /* skipping unknown macro */
        MANDOCERR_REQUEST, /* NOT IMPLEMENTED: skipping request */
@@ -200,7 +202,7 @@ enum        tbl_cellt {
 struct tbl_cell {
        struct tbl_cell  *next;
        enum tbl_cellt    pos;
-       int               spacing;
+       size_t            spacing;
        int               flags;
 #define        TBL_CELL_TALIGN  (1 << 0) /* t, T */
 #define        TBL_CELL_BALIGN  (1 << 1) /* d, D */
@@ -222,12 +224,12 @@ struct    tbl_row {
 };
 
 enum   tbl_datt {
-       TBL_DATA_NONE,
-       TBL_DATA_DATA,
-       TBL_DATA_HORIZ,
-       TBL_DATA_DHORIZ,
-       TBL_DATA_NHORIZ,
-       TBL_DATA_NDHORIZ
+       TBL_DATA_NONE, /* has no data */
+       TBL_DATA_DATA, /* consists of data/string */
+       TBL_DATA_HORIZ, /* horizontal line */
+       TBL_DATA_DHORIZ, /* double-horizontal line */
+       TBL_DATA_NHORIZ, /* squeezed horizontal line */
+       TBL_DATA_NDHORIZ /* squeezed double-horizontal line */
 };
 
 /*
@@ -235,10 +237,10 @@ enum      tbl_datt {
  * string value that's in the cell.  The rest is layout.
  */
 struct tbl_dat {
-       struct tbl_cell  *layout; /* layout cell: CAN BE NULL */
+       struct tbl_cell  *layout; /* layout cell */
        int               spans; /* how many spans follow */
        struct tbl_dat   *next;
-       char             *string;
+       char             *string; /* data (NULL if not TBL_DATA_DATA) */
        enum tbl_datt     pos;
 };
 
@@ -254,7 +256,7 @@ enum        tbl_spant {
 struct tbl_span {
        struct tbl       *tbl;
        struct tbl_head  *head;
-       struct tbl_row   *layout; /* layout row: CAN BE NULL */
+       struct tbl_row   *layout; /* layout row */
        struct tbl_dat   *first;
        struct tbl_dat   *last;
        int               flags;