=================================================================== RCS file: /cvs/mandoc/roff.c,v retrieving revision 1.181 retrieving revision 1.182 diff -u -p -r1.181 -r1.182 --- mandoc/roff.c 2013/10/05 22:15:03 1.181 +++ mandoc/roff.c 2013/10/05 22:19:10 1.182 @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.181 2013/10/05 22:15:03 schwarze Exp $ */ +/* $Id: roff.c,v 1.182 2013/10/05 22:19:10 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons * Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze @@ -712,19 +712,14 @@ roff_parseln(struct roff *r, int ln, char **bufp, assert(ROFF_IGN == e || ROFF_CONT == e); if (ROFF_CONT != e) return(e); - if (r->eqn) - return(eqn_read(&r->eqn, ln, *bufp, pos, offs)); + } + if (r->eqn) + return(eqn_read(&r->eqn, ln, *bufp, ppos, offs)); + if ( ! ctl) { if (r->tbl) return(tbl_read(r->tbl, ln, *bufp, pos)); return(roff_parsetext(bufp, szp, pos, offs)); - } else if ( ! ctl) { - if (r->eqn) - return(eqn_read(&r->eqn, ln, *bufp, pos, offs)); - if (r->tbl) - return(tbl_read(r->tbl, ln, *bufp, pos)); - return(roff_parsetext(bufp, szp, pos, offs)); - } else if (r->eqn) - return(eqn_read(&r->eqn, ln, *bufp, ppos, offs)); + } /* * If a scope is open, go to the child handler for that macro,