=================================================================== RCS file: /cvs/mandoc/mandoc.h,v retrieving revision 1.85 retrieving revision 1.88 diff -u -p -r1.85 -r1.88 --- mandoc/mandoc.h 2011/07/21 13:18:24 1.85 +++ mandoc/mandoc.h 2011/07/21 15:21:13 1.88 @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.85 2011/07/21 13:18:24 kristaps Exp $ */ +/* $Id: mandoc.h,v 1.88 2011/07/21 15:21:13 kristaps Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * @@ -298,18 +298,45 @@ enum eqn_markt { EQNMARK__MAX }; -/* +enum eqn_fontt { + EQNFONT_NONE = 0, + EQNFONT_ROMAN, + EQNFONT_BOLD, + EQNFONT_ITALIC, + EQNFONT__MAX +}; + +enum eqn_post { + EQNPOS_NONE = 0, + EQNPOS_OVER, + EQNPOS_SUP, + EQNPOS_SUB, + EQNPOS_TO, + EQNPOS_FROM, + EQNPOS_ABOVE, + EQNPOS__MAX +}; + + /* * A "box" is a parsed mathematical expression as defined by the eqn.7 * grammar. */ struct eqn_box { + int size; /* font size of expression */ +#define EQN_DEFSIZE INT_MIN enum eqn_boxt type; /* type of node */ struct eqn_box *child; /* child node */ struct eqn_box *next; /* next in tree */ + enum eqn_post pos; /* position of next box */ char *text; /* text (or NULL) */ - enum eqn_markt mark; /* whether 'marked' */ + enum eqn_markt mark; /* a mark about the box */ + enum eqn_fontt font; /* font of box */ }; +/* + * An equation consists of a tree of expressions starting at a given + * line and position. + */ struct eqn { struct eqn_box *root; /* root mathematical expression */ int ln; /* invocation line */