===================================================================
RCS file: /cvs/mandoc/mandoc.h,v
retrieving revision 1.43
retrieving revision 1.60
diff -u -p -r1.43 -r1.60
--- mandoc/mandoc.h	2011/01/02 10:10:57	1.43
+++ mandoc/mandoc.h	2011/03/17 09:16:38	1.60
@@ -1,6 +1,6 @@
-/*	$Id: mandoc.h,v 1.43 2011/01/02 10:10:57 kristaps Exp $ */
+/*	$Id: mandoc.h,v 1.60 2011/03/17 09:16:38 kristaps Exp $ */
 /*
- * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -50,7 +50,8 @@ enum	mandocerr {
 	MANDOCERR_NOTITLE, /* no title in document */
 	MANDOCERR_UPPERCASE, /* document title should be all caps */
 	MANDOCERR_BADMSEC, /* unknown manual section */
-	MANDOCERR_BADDATE, /* cannot parse date argument */
+	MANDOCERR_NODATE, /* date missing, using today's date */
+	MANDOCERR_BADDATE, /* cannot parse date, using it verbatim */
 	MANDOCERR_PROLOGOOO, /* prologue macros out of order */
 	MANDOCERR_PROLOGREP, /* duplicate prologue macro */
 	MANDOCERR_BADPROLOG, /* macro not allowed in prologue */
@@ -68,6 +69,7 @@ enum	mandocerr {
 	/* related to macros and nesting */
 	MANDOCERR_MACROOBS, /* skipping obsolete macro */
 	MANDOCERR_IGNPAR, /* skipping paragraph macro */
+	MANDOCERR_IGNNS, /* skipping no-space macro */
 	MANDOCERR_SCOPENEST, /* blocks badly nested */
 	MANDOCERR_CHILD, /* child violates parent syntax */
 	MANDOCERR_NESTEDDISP, /* nested displays are not portable */
@@ -75,10 +77,12 @@ enum	mandocerr {
 
 	/* related to missing macro arguments */
 	MANDOCERR_MACROEMPTY, /* skipping empty macro */
+	MANDOCERR_ARGCWARN, /* argument count wrong */
 	MANDOCERR_DISPTYPE, /* missing display type */
 	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 */
@@ -99,9 +103,6 @@ enum	mandocerr {
 	MANDOCERR_BADESCAPE, /* unknown escape sequence */
 	MANDOCERR_BADQUOTE, /* unterminated quoted string */
 
-	/* related to tables */
-	MANDOCERR_TBLEXTRADAT, /* extra data cells */
-
 	MANDOCERR_ERROR, /* ===== start of errors ===== */
 
 	/* related to tables */
@@ -110,9 +111,13 @@ enum	mandocerr {
 	MANDOCERR_TBLLAYOUT, /* bad table layout */
 	MANDOCERR_TBLNOLAYOUT, /* no table layout cells specified */
 	MANDOCERR_TBLNODATA, /* no table data cells specified */
+	MANDOCERR_TBLIGNDATA, /* ignore data in cell */
+	MANDOCERR_TBLBLOCK, /* data block still open */
+	MANDOCERR_TBLEXTRADAT, /* ignoring extra data cells */
 
 	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 */
@@ -149,7 +154,6 @@ struct	tbl {
 	char		  tab; /* cell-separator */
 	char		  decimal; /* decimal point */
 	int		  linesize;
-	char		  delims[2];
 	int		  opts;
 #define	TBL_OPT_CENTRE	 (1 << 0)
 #define	TBL_OPT_EXPAND	 (1 << 1)
@@ -158,6 +162,7 @@ struct	tbl {
 #define	TBL_OPT_ALLBOX	 (1 << 4)
 #define	TBL_OPT_NOKEEP	 (1 << 5)
 #define	TBL_OPT_NOSPACE	 (1 << 6)
+	int		  cols; /* number of columns */
 };
 
 enum	tbl_headt {
@@ -173,8 +178,7 @@ enum	tbl_headt {
  */
 struct	tbl_head {
 	enum tbl_headt	  pos;
-	int		  width; /* width of cell in fixed chars */
-	int		  decimal; /* decimal point position */
+	int		  ident; /* 0 <= unique id < cols */
 	struct tbl_head	 *next;
 	struct tbl_head	 *prev;
 };
@@ -200,7 +204,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,11 +226,12 @@ struct	tbl_row {
 };
 
 enum	tbl_datt {
-	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 */
 };
 
 /*
@@ -234,9 +239,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;
 };
 
@@ -250,13 +256,26 @@ enum	tbl_spant {
  * A row of data in a table.
  */
 struct	tbl_span {
-	struct tbl_row	 *layout; /* layout row: CAN BE NULL */
+	struct tbl	 *tbl;
+	struct tbl_head	 *head;
+	struct tbl_row	 *layout; /* layout row */
 	struct tbl_dat	 *first;
 	struct tbl_dat	 *last;
+	int		  line; /* parse line */
+	int		  flags;
+#define	TBL_SPAN_FIRST	 (1 << 0)
+#define	TBL_SPAN_LAST	 (1 << 1)
 	enum tbl_spant	  pos;
 	struct tbl_span	 *next;
 };
 
+struct	eqn {
+	size_t		  sz;
+	char		 *data;
+	int		  line; /* invocation line */
+	int		  pos; /* invocation position */
+};
+
 /*
  * Available registers (set in libroff, accessed elsewhere).
  */
@@ -293,14 +312,32 @@ struct	regset {
 	struct reg	  regs[REG__MAX];
 };
 
-__BEGIN_DECLS
-
 /*
- * Callback function for warnings, errors, and fatal errors as they
- * occur in the compilers libroff, libmdoc, and libman.
+ * A punctuation delimiter, used only in mdoc(7) documents, is opening,
+ * closing, or "middle mark" punctuation.  These govern spacing.
+ * Opening punctuation (e.g., the opening parenthesis) suppresses the
+ * following space; closing punctuation (e.g., the closing parenthesis)
+ * suppresses the leading space; middle punctuation (e.g., the vertical
+ * bar) can do either.  The middle punctuation delimiter bends the rules
+ * depending on usage.
  */
-typedef	int		(*mandocmsg)(enum mandocerr, void *,
-				int, int, const char *);
+enum	mdelim {
+	DELIM_NONE = 0,
+	DELIM_OPEN,
+	DELIM_MIDDLE,
+	DELIM_CLOSE
+};
+
+typedef	int	(*mandocmsg)(enum mandocerr, void *,
+			int, int, const char *);
+
+__BEGIN_DECLS
+
+void		 *mandoc_calloc(size_t, size_t);
+void		 *mandoc_malloc(size_t);
+void		 *mandoc_realloc(void *, size_t);
+#define	DELIMSZ	  6 /* hint: max possible size of a delimiter */
+enum mdelim	  mandoc_isdelim(const char *);
 
 __END_DECLS