===================================================================
RCS file: /cvs/mandoc/mandoc.h,v
retrieving revision 1.91
retrieving revision 1.94
diff -u -p -r1.91 -r1.94
--- mandoc/mandoc.h	2011/07/22 14:55:07	1.91
+++ mandoc/mandoc.h	2011/07/23 18:41:18	1.94
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.h,v 1.91 2011/07/22 14:55:07 kristaps Exp $ */
+/*	$Id: mandoc.h,v 1.94 2011/07/23 18:41:18 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -110,7 +110,6 @@ enum	mandocerr {
 	MANDOCERR_ERROR, /* ===== start of errors ===== */
 
 	/* related to equations */
-	MANDOCERR_EQNNEST, /* too many nested equation defines */
 	MANDOCERR_EQNNSCOPE, /* unexpected equation scope closure*/
 	MANDOCERR_EQNSCOPE, /* equation scope open on exit */
 	MANDOCERR_EQNBADSCOPE, /* overlapping equation scopes */
@@ -285,7 +284,8 @@ enum	eqn_boxt {
 	EQN_ROOT, /* root of parse tree */
 	EQN_TEXT, /* text (number, variable, whatever) */
 	EQN_SUBEXPR, /* nested `eqn' subexpression */
-	EQN_LIST /* list of subexpressions */
+	EQN_LIST, /* subexpressions list */
+	EQN_MATRIX /* matrix subexpression */
 };
 
 enum	eqn_markt {
@@ -305,6 +305,7 @@ enum	eqn_fontt {
 	EQNFONT_NONE = 0,
 	EQNFONT_ROMAN,
 	EQNFONT_BOLD,
+	EQNFONT_FAT,
 	EQNFONT_ITALIC,
 	EQNFONT__MAX
 };
@@ -324,6 +325,9 @@ enum	eqn_pilet {
 	EQNPILE_CPILE,
 	EQNPILE_RPILE,
 	EQNPILE_LPILE,
+	EQNPILE_CCOL,
+	EQNPILE_RCOL,
+	EQNPILE_LCOL,
 	EQNPILE__MAX
 };
 
@@ -346,7 +350,6 @@ struct	eqn_box {
 	enum eqn_markt	  mark; /* a mark about the box */
 	enum eqn_fontt	  font; /* font of box */
 	enum eqn_pilet	  pile; /* equation piling */
-	int		  above; /* next node is above */
 };
 
 /*
@@ -354,6 +357,7 @@ struct	eqn_box {
  * line and position. 
  */
 struct	eqn {
+	char		 *name; /* identifier (or NULL) */
 	struct eqn_box	 *root; /* root mathematical expression */
 	int		  ln; /* invocation line */
 	int		  pos; /* invocation position */