From d6dd8aa69b82d133439dd5f648f21afc723ce7ef Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sun, 28 Sep 2014 14:05:11 +0000 Subject: Parse from/to clauses in eqn. --- eqn.c | 7 ++++++- mandoc.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/eqn.c b/eqn.c index 6fb9e236..a012af0d 100644 --- a/eqn.c +++ b/eqn.c @@ -195,13 +195,14 @@ static const struct eqnstr eqnfonts[EQNFONT__MAX] = { }; static const struct eqnstr eqnposs[EQNPOS__MAX] = { - { "", 0 }, /* EQNPOS_NONE */ + { NULL, 0 }, /* EQNPOS_NONE */ { "over", 4 }, /* EQNPOS_OVER */ { "sup", 3 }, /* EQNPOS_SUP */ { NULL, 0 }, /* EQNPOS_SUPSUB */ { "sub", 3 }, /* EQNPOS_SUB */ { "to", 2 }, /* EQNPOS_TO */ { "from", 4 }, /* EQNPOS_FROM */ + { NULL, 0 }, /* EQNPOS_FROMTO */ }; static const struct eqnstr eqnpiles[EQNPILE__MAX] = { @@ -591,6 +592,10 @@ eqn_box(struct eqn_node *ep, struct eqn_box *last) NULL != last->last->prev && EQNPOS_SUB == last->last->prev->pos) last->last->prev->pos = EQNPOS_SUBSUP; + else if (EQNPOS_TO == i && + NULL != last->last->prev && + EQNPOS_FROM == last->last->prev->pos) + last->last->prev->pos = EQNPOS_FROMTO; else last->last->pos = (enum eqn_post)i; diff --git a/mandoc.h b/mandoc.h index 6fcab1e8..99d0d00a 100644 --- a/mandoc.h +++ b/mandoc.h @@ -340,6 +340,7 @@ enum eqn_post { EQNPOS_SUB, EQNPOS_TO, EQNPOS_FROM, + EQNPOS_FROMTO, EQNPOS__MAX }; -- cgit