=================================================================== RCS file: /cvs/mandoc/mandoc.h,v retrieving revision 1.84 retrieving revision 1.87 diff -u -p -r1.84 -r1.87 --- mandoc/mandoc.h 2011/07/21 12:30:44 1.84 +++ mandoc/mandoc.h 2011/07/21 14:13:00 1.87 @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.84 2011/07/21 12:30:44 kristaps Exp $ */ +/* $Id: mandoc.h,v 1.87 2011/07/21 14:13:00 kristaps Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * @@ -285,7 +285,39 @@ enum eqn_boxt { EQN_SUBEXPR /* nested subexpression */ }; -/* +enum eqn_markt { + EQNMARK_NONE = 0, + EQNMARK_DOT, + EQNMARK_DOTDOT, + EQNMARK_HAT, + EQNMARK_TILDE, + EQNMARK_VEC, + EQNMARK_DYAD, + EQNMARK_BAR, + EQNMARK_UNDER, + 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. */ @@ -293,9 +325,16 @@ struct eqn_box { 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; /* 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 */