diff options
author | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-07-24 10:09:03 +0000 |
---|---|---|
committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-07-24 10:09:03 +0000 |
commit | 0db02e2364d93cad88a1df785984438635066e39 (patch) | |
tree | e2692c9f56fe6ad6ad2dd87adb78c02298d14a2f /eqn_html.c | |
parent | 7151bb8eeed729397435c0c693efc5546cfda123 (diff) | |
download | mandoc-0db02e2364d93cad88a1df785984438635066e39.tar.gz |
Tuned the initial eqn output, making it completely simple. This
completes a full initial eqn system, so I'm tagging a release on it.
Diffstat (limited to 'eqn_html.c')
-rw-r--r-- | eqn_html.c | 50 |
1 files changed, 21 insertions, 29 deletions
@@ -27,10 +27,16 @@ #include "out.h" #include "html.h" +static const enum htmltag fontmap[EQNFONT__MAX] = { + TAG_SPAN, /* EQNFONT_NONE */ + TAG_SPAN, /* EQNFONT_ROMAN */ + TAG_B, /* EQNFONT_BOLD */ + TAG_B, /* EQNFONT_FAT */ + TAG_I /* EQNFONT_ITALIC */ +}; + + static void eqn_box(struct html *, const struct eqn_box *); -static void eqn_box_post(struct html *, const struct eqn_box *); -static void eqn_box_pre(struct html *, const struct eqn_box *); -static void eqn_text(struct html *, const struct eqn_box *); void print_eqn(struct html *p, const struct eqn *ep) @@ -51,39 +57,25 @@ print_eqn(struct html *p, const struct eqn *ep) static void eqn_box(struct html *p, const struct eqn_box *bp) { + struct tag *t; - eqn_box_pre(p, bp); - eqn_text(p, bp); - - if (bp->first) - eqn_box(p, bp->first); - - eqn_box_post(p, bp); - - if (bp->next) - eqn_box(p, bp->next); -} - -static void -eqn_box_pre(struct html *p, const struct eqn_box *bp) -{ + t = EQNFONT_NONE == bp->font ? NULL : + print_otag(p, fontmap[(int)bp->font], 0, NULL); if (bp->left) print_text(p, bp->left); -} + + if (bp->text) + print_text(p, bp->text); -static void -eqn_box_post(struct html *p, const struct eqn_box *bp) -{ + if (bp->first) + eqn_box(p, bp->first); + if (NULL != t) + print_tagq(p, t); if (bp->right) print_text(p, bp->right); -} -static void -eqn_text(struct html *p, const struct eqn_box *bp) -{ - - if (bp->text) - print_text(p, bp->text); + if (bp->next) + eqn_box(p, bp->next); } |