=================================================================== RCS file: /cvs/mandoc/mandoc.h,v retrieving revision 1.90 retrieving revision 1.93 diff -u -p -r1.90 -r1.93 --- mandoc/mandoc.h 2011/07/22 09:57:04 1.90 +++ mandoc/mandoc.h 2011/07/23 12:10:16 1.93 @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.90 2011/07/22 09:57:04 kristaps Exp $ */ +/* $Id: mandoc.h,v 1.93 2011/07/23 12:10:16 kristaps Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * @@ -110,7 +110,6 @@ enum mandocerr { MANDOCERR_ERROR, /* ===== start of errors ===== */ /* related to equations */ - MANDOCERR_EQNARGS, /* bad equation macro arguments */ MANDOCERR_EQNNEST, /* too many nested equation defines */ MANDOCERR_EQNNSCOPE, /* unexpected equation scope closure*/ MANDOCERR_EQNSCOPE, /* equation scope open on exit */ @@ -286,7 +285,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 { @@ -306,6 +306,7 @@ enum eqn_fontt { EQNFONT_NONE = 0, EQNFONT_ROMAN, EQNFONT_BOLD, + EQNFONT_FAT, EQNFONT_ITALIC, EQNFONT__MAX }; @@ -325,6 +326,9 @@ enum eqn_pilet { EQNPILE_CPILE, EQNPILE_RPILE, EQNPILE_LPILE, + EQNPILE_CCOL, + EQNPILE_RCOL, + EQNPILE_LCOL, EQNPILE__MAX }; @@ -347,7 +351,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 */ }; /*