=================================================================== RCS file: /cvs/mandoc/eqn.c,v retrieving revision 1.32 retrieving revision 1.37 diff -u -p -r1.32 -r1.37 --- mandoc/eqn.c 2011/07/23 12:01:54 1.32 +++ mandoc/eqn.c 2011/07/23 18:44:42 1.37 @@ -1,4 +1,4 @@ -/* $Id: eqn.c,v 1.32 2011/07/23 12:01:54 kristaps Exp $ */ +/* $Id: eqn.c,v 1.37 2011/07/23 18:44:42 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -102,6 +102,21 @@ enum eqn_symt { EQNSYM__MAX }; +enum eqnpartt { + EQN_DEFINE = 0, + EQN_NDEFINE, + EQN_TDEFINE, + EQN_SET, + EQN_UNDEF, + EQN_GFONT, + EQN_GSIZE, + EQN_BACK, + EQN_FWD, + EQN_UP, + EQN_DOWN, + EQN__MAX +}; + struct eqnstr { const char *name; size_t sz; @@ -122,14 +137,6 @@ struct eqnsym { const char *sym; }; -enum eqnpartt { - EQN_DEFINE = 0, - EQN_SET, - EQN_UNDEF, - EQN_GFONT, - EQN_GSIZE, - EQN__MAX -}; static enum eqn_rest eqn_box(struct eqn_node *, struct eqn_box *); static struct eqn_box *eqn_box_alloc(struct eqn_node *, @@ -140,7 +147,9 @@ static struct eqn_def *eqn_def_find(struct eqn_node *, static int eqn_do_gfont(struct eqn_node *); static int eqn_do_gsize(struct eqn_node *); static int eqn_do_define(struct eqn_node *); -static int eqn_do_set(struct eqn_node *); +static int eqn_do_ign1(struct eqn_node *); +static int eqn_do_ign2(struct eqn_node *); +static int eqn_do_tdefine(struct eqn_node *); static int eqn_do_undef(struct eqn_node *); static enum eqn_rest eqn_eqn(struct eqn_node *, struct eqn_box *); static enum eqn_rest eqn_list(struct eqn_node *, struct eqn_box *); @@ -153,10 +162,16 @@ static void eqn_rewind(struct eqn_node *); static const struct eqnpart eqnparts[EQN__MAX] = { { { "define", 6 }, eqn_do_define }, /* EQN_DEFINE */ - { { "set", 3 }, eqn_do_set }, /* EQN_SET */ + { { "ndefine", 7 }, eqn_do_define }, /* EQN_NDEFINE */ + { { "tdefine", 7 }, eqn_do_tdefine }, /* EQN_TDEFINE */ + { { "set", 3 }, eqn_do_ign2 }, /* EQN_SET */ { { "undef", 5 }, eqn_do_undef }, /* EQN_UNDEF */ { { "gfont", 5 }, eqn_do_gfont }, /* EQN_GFONT */ { { "gsize", 5 }, eqn_do_gsize }, /* EQN_GSIZE */ + { { "back", 4 }, eqn_do_ign1 }, /* EQN_BACK */ + { { "fwd", 3 }, eqn_do_ign1 }, /* EQN_FWD */ + { { "up", 2 }, eqn_do_ign1 }, /* EQN_UP */ + { { "down", 4 }, eqn_do_ign1 }, /* EQN_DOWN */ }; static const struct eqnstr eqnmarks[EQNMARK__MAX] = { @@ -175,6 +190,7 @@ static const struct eqnstr eqnfonts[EQNFONT__MAX] = { { "", 0 }, /* EQNFONT_NONE */ { "roman", 5 }, /* EQNFONT_ROMAN */ { "bold", 4 }, /* EQNFONT_BOLD */ + { "fat", 3 }, /* EQNFONT_FAT */ { "italic", 6 }, /* EQNFONT_ITALIC */ }; @@ -189,9 +205,11 @@ static const struct eqnstr eqnposs[EQNPOS__MAX] = { static const struct eqnstr eqnpiles[EQNPILE__MAX] = { { "", 0 }, /* EQNPILE_NONE */ + { "pile", 4 }, /* EQNPILE_PILE */ { "cpile", 5 }, /* EQNPILE_CPILE */ { "rpile", 5 }, /* EQNPILE_RPILE */ { "lpile", 5 }, /* EQNPILE_LPILE */ + { "col", 3 }, /* EQNPILE_COL */ { "ccol", 4 }, /* EQNPILE_CCOL */ { "rcol", 4 }, /* EQNPILE_RCOL */ { "lcol", 4 }, /* EQNPILE_LCOL */ @@ -275,9 +293,15 @@ eqn_read(struct eqn_node **epp, int ln, * validate the full equation. */ - if (0 == strcmp(p, ".EN")) { + if (0 == strncmp(p, ".EN", 3)) { er = eqn_end(ep); *epp = NULL; + p += 3; + while (' ' == *p || '\t' == *p) + p++; + if ('\0' == *p) + return(er); + mandoc_msg(MANDOCERR_ARGSLOST, ep->parse, ln, pos, NULL); return(er); } @@ -301,11 +325,24 @@ eqn_read(struct eqn_node **epp, int ln, } struct eqn_node * -eqn_alloc(int pos, int line, struct mparse *parse) +eqn_alloc(const char *name, int pos, int line, struct mparse *parse) { struct eqn_node *p; + size_t sz; + const char *end; p = mandoc_calloc(1, sizeof(struct eqn_node)); + + if ('\0' != *name) { + sz = strlen(name); + assert(sz); + do { + sz--; + end = name + (int)sz; + } while (' ' == *end || '\t' == *end); + p->eqn.name = mandoc_strndup(name, sz + 1); + } + p->parse = parse; p->eqn.ln = line; p->eqn.pos = pos; @@ -464,11 +501,16 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last) return(EQN_DESCOPE); else if (STRNEQ(start, sz, "above", 5)) return(EQN_DESCOPE); + else if (STRNEQ(start, sz, "mark", 4)) + return(EQN_OK); + else if (STRNEQ(start, sz, "lineup", 6)) + return(EQN_OK); for (i = 0; i < (int)EQN__MAX; i++) { if ( ! EQNSTREQ(&eqnparts[i].str, start, sz)) continue; - return((*eqnparts[i].fp)(ep) ? EQN_OK : EQN_ERR); + return((*eqnparts[i].fp)(ep) ? + EQN_OK : EQN_ERR); } if (STRNEQ(start, sz, "{", 1)) { @@ -605,6 +647,7 @@ eqn_free(struct eqn_node *p) free(p->defs[i].val); } + free(p->eqn.name); free(p->data); free(p->defs); free(p); @@ -681,7 +724,7 @@ again: /* Prevent self-definitions. */ if (lim >= EQN_NEST_MAX) { - EQN_MSG(MANDOCERR_EQNNEST, ep); + EQN_MSG(MANDOCERR_ROFFLOOP, ep); return(NULL); } @@ -754,14 +797,25 @@ again: } static int -eqn_do_set(struct eqn_node *ep) +eqn_do_ign1(struct eqn_node *ep) { - const char *start; - if (NULL == (start = eqn_nextrawtok(ep, NULL))) + if (NULL == eqn_nextrawtok(ep, NULL)) EQN_MSG(MANDOCERR_EQNEOF, ep); - else if (NULL == (start = eqn_nextrawtok(ep, NULL))) + else + return(1); + + return(0); +} + +static int +eqn_do_ign2(struct eqn_node *ep) +{ + + if (NULL == eqn_nextrawtok(ep, NULL)) EQN_MSG(MANDOCERR_EQNEOF, ep); + else if (NULL == eqn_nextrawtok(ep, NULL)) + EQN_MSG(MANDOCERR_EQNEOF, ep); else return(1); @@ -769,6 +823,20 @@ eqn_do_set(struct eqn_node *ep) } static int +eqn_do_tdefine(struct eqn_node *ep) +{ + + if (NULL == eqn_nextrawtok(ep, NULL)) + EQN_MSG(MANDOCERR_EQNEOF, ep); + else if (NULL == eqn_next(ep, ep->data[(int)ep->cur], NULL, 0)) + EQN_MSG(MANDOCERR_EQNEOF, ep); + else + return(1); + + return(0); +} + +static int eqn_do_define(struct eqn_node *ep) { const char *start; @@ -826,9 +894,8 @@ eqn_do_define(struct eqn_node *ep) static int eqn_do_gfont(struct eqn_node *ep) { - const char *start; - if (NULL == (start = eqn_nextrawtok(ep, NULL))) { + if (NULL == eqn_nextrawtok(ep, NULL)) { EQN_MSG(MANDOCERR_EQNEOF, ep); return(0); } @@ -845,7 +912,6 @@ eqn_do_gsize(struct eqn_node *ep) EQN_MSG(MANDOCERR_EQNEOF, ep); return(0); } - ep->gsize = mandoc_strntoi(start, sz, 10); return(1); }