From c893b75d7cad884ccefc3eea9dfbadad6577fdea Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sun, 28 Sep 2014 20:14:20 +0000 Subject: Change "to" and "from" commands to use munder, mover, and munderover. --- eqn_html.c | 13 ++++++++----- html.c | 5 ++++- html.h | 5 ++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/eqn_html.c b/eqn_html.c index 135ff992..f2e7f79d 100644 --- a/eqn_html.c +++ b/eqn_html.c @@ -1,4 +1,4 @@ -/* $Id: eqn_html.c,v 1.6 2014/09/28 14:06:09 kristaps Exp $ */ +/* $Id: eqn_html.c,v 1.7 2014/09/28 20:14:20 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -113,12 +113,14 @@ eqn_box(struct html *p, const struct eqn_box *bp, int next) */ switch (bp->pos) { case (EQNPOS_TO): - /* FALLTHROUGH */ + post = print_otag(p, TAG_MOVER, 0, NULL); + break; case (EQNPOS_SUP): post = print_otag(p, TAG_MSUP, 0, NULL); break; case (EQNPOS_FROM): - /* FALLTHROUGH */ + post = print_otag(p, TAG_MUNDER, 0, NULL); + break; case (EQNPOS_SUB): post = print_otag(p, TAG_MSUB, 0, NULL); break; @@ -126,9 +128,10 @@ eqn_box(struct html *p, const struct eqn_box *bp, int next) post = print_otag(p, TAG_MFRAC, 0, NULL); break; case (EQNPOS_FROMTO): - /* FALLTHROUGH */ + post = print_otag(p, TAG_MUNDEROVER, 0, NULL); + skiptwo = 1; + break; case (EQNPOS_SUBSUP): - /* This requires two elements. */ post = print_otag(p, TAG_MSUBSUP, 0, NULL); skiptwo = 1; break; diff --git a/html.c b/html.c index 942a2c6c..957c070b 100644 --- a/html.c +++ b/html.c @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.173 2014/09/28 11:33:15 kristaps Exp $ */ +/* $Id: html.c,v 1.174 2014/09/28 20:14:20 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011, 2014 Kristaps Dzonsons * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze @@ -87,6 +87,9 @@ static const struct htmldata htmltags[TAG_MAX] = { {"mtable", 0}, /* TAG_MTABLE */ {"mtr", 0}, /* TAG_MTR */ {"mtd", 0}, /* TAG_MTD */ + {"munderover", 0}, /* TAG_MUNDEROVER */ + {"munder", 0}, /* TAG_MUNDER*/ + {"mover", 0}, /* TAG_MOVER*/ }; static const char *const htmlattrs[ATTR_MAX] = { diff --git a/html.h b/html.h index 03bcb8e1..f3110eaf 100644 --- a/html.h +++ b/html.h @@ -1,4 +1,4 @@ -/* $Id: html.h,v 1.63 2014/09/28 11:33:15 kristaps Exp $ */ +/* $Id: html.h,v 1.64 2014/09/28 20:14:20 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * @@ -63,6 +63,9 @@ enum htmltag { TAG_MTABLE, TAG_MTR, TAG_MTD, + TAG_MUNDEROVER, + TAG_MUNDER, + TAG_MOVER, TAG_MAX }; -- cgit v1.2.3-56-ge451