diff options
author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-04-02 21:03:19 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2015-04-02 21:03:19 +0000 |
commit | 52f47df93eb084f158fd9bc0d4e05c50b862c070 (patch) | |
tree | 40ed12440582ddf8d36b4e9c7bbd8bd293715fa7 /usr.bin/mandoc/man_html.c | |
parent | 03f96d6a1e0fc2678c70fb77304b03c8b955ae5b (diff) |
First step towards parser unification:
Replace enum mdoc_type and enum man_type by a unified enum roff_type.
Almost mechanical, no functional change.
Written on the ICE train from Frankfurt to Bruxelles on the way to p2k15.
Diffstat (limited to 'usr.bin/mandoc/man_html.c')
-rw-r--r-- | usr.bin/mandoc/man_html.c | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/usr.bin/mandoc/man_html.c b/usr.bin/mandoc/man_html.c index 45031122cd0..712ad37340d 100644 --- a/usr.bin/mandoc/man_html.c +++ b/usr.bin/mandoc/man_html.c @@ -1,4 +1,4 @@ -/* $OpenBSD: man_html.c,v 1.65 2015/03/03 21:09:25 schwarze Exp $ */ +/* $OpenBSD: man_html.c,v 1.66 2015/04/02 21:03:18 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -7,9 +7,9 @@ * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF @@ -24,6 +24,7 @@ #include <string.h> #include "mandoc_aux.h" +#include "roff.h" #include "man.h" #include "out.h" #include "html.h" @@ -131,10 +132,10 @@ print_bvspace(struct html *h, const struct man_node *n) { if (n->body && n->body->child) - if (MAN_TBL == n->body->child->type) + if (n->body->child->type == ROFFT_TBL) return; - if (MAN_ROOT == n->parent->type || MAN_RS != n->parent->tok) + if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS) if (NULL == n->prev) return; @@ -206,10 +207,10 @@ print_man_node(MAN_ARGS) t = h->tags.head; switch (n->type) { - case MAN_ROOT: + case ROFFT_ROOT: man_root_pre(man, n, mh, h); break; - case MAN_TEXT: + case ROFFT_TEXT: if ('\0' == *n->string) { print_paragraph(h); return; @@ -220,12 +221,12 @@ print_man_node(MAN_ARGS) print_otag(h, TAG_BR, 0, NULL); print_text(h, n->string); return; - case MAN_EQN: + case ROFFT_EQN: if (n->flags & MAN_LINE) putchar('\n'); print_eqn(h, n->eqn); break; - case MAN_TBL: + case ROFFT_TBL: /* * This will take care of initialising all of the table * state data for the first table, then tearing it down @@ -264,10 +265,10 @@ print_man_node(MAN_ARGS) print_stagq(h, t); switch (n->type) { - case MAN_ROOT: + case ROFFT_ROOT: man_root_post(man, n, mh, h); break; - case MAN_EQN: + case ROFFT_EQN: break; default: if (mans[n->tok].post) @@ -280,7 +281,7 @@ static int a2width(const struct man_node *n, struct roffsu *su) { - if (MAN_TEXT != n->type) + if (n->type != ROFFT_TEXT) return(0); if (a2roffsu(n->string, su, SCALE_EN)) return(1); @@ -382,12 +383,12 @@ man_SH_pre(MAN_ARGS) { struct htmlpair tag; - if (MAN_BLOCK == n->type) { + if (n->type == ROFFT_BLOCK) { mh->fl &= ~MANH_LITERAL; PAIR_CLASS_INIT(&tag, "section"); print_otag(h, TAG_DIV, 1, &tag); return(1); - } else if (MAN_BODY == n->type) + } else if (n->type == ROFFT_BODY) return(1); print_otag(h, TAG_H1, 0, NULL); @@ -466,12 +467,12 @@ man_SS_pre(MAN_ARGS) { struct htmlpair tag; - if (MAN_BLOCK == n->type) { + if (n->type == ROFFT_BLOCK) { mh->fl &= ~MANH_LITERAL; PAIR_CLASS_INIT(&tag, "subsection"); print_otag(h, TAG_DIV, 1, &tag); return(1); - } else if (MAN_BODY == n->type) + } else if (n->type == ROFFT_BODY) return(1); print_otag(h, TAG_H2, 0, NULL); @@ -482,9 +483,9 @@ static int man_PP_pre(MAN_ARGS) { - if (MAN_HEAD == n->type) + if (n->type == ROFFT_HEAD) return(0); - else if (MAN_BLOCK == n->type) + else if (n->type == ROFFT_BLOCK) print_bvspace(h, n); return(1); @@ -495,10 +496,10 @@ man_IP_pre(MAN_ARGS) { const struct man_node *nn; - if (MAN_BODY == n->type) { + if (n->type == ROFFT_BODY) { print_otag(h, TAG_DD, 0, NULL); return(1); - } else if (MAN_HEAD != n->type) { + } else if (n->type != ROFFT_HEAD) { print_otag(h, TAG_DL, 0, NULL); return(1); } @@ -534,9 +535,9 @@ man_HP_pre(MAN_ARGS) struct roffsu su; const struct man_node *np; - if (MAN_HEAD == n->type) + if (n->type == ROFFT_HEAD) return(0); - else if (MAN_BLOCK != n->type) + else if (n->type != ROFFT_BLOCK) return(1); np = n->head->child; @@ -635,9 +636,9 @@ man_RS_pre(MAN_ARGS) struct htmlpair tag; struct roffsu su; - if (MAN_HEAD == n->type) + if (n->type == ROFFT_HEAD) return(0); - else if (MAN_BODY == n->type) + else if (n->type == ROFFT_BODY) return(1); SCALE_HS_INIT(&su, INDENT); @@ -657,15 +658,15 @@ man_UR_pre(MAN_ARGS) struct htmlpair tag[2]; n = n->child; - assert(MAN_HEAD == n->type); + assert(n->type == ROFFT_HEAD); if (n->nchild) { - assert(MAN_TEXT == n->child->type); + assert(n->child->type == ROFFT_TEXT); PAIR_CLASS_INIT(&tag[0], "link-ext"); PAIR_HREF_INIT(&tag[1], n->child->string); print_otag(h, TAG_A, 2, tag); } - assert(MAN_BODY == n->next->type); + assert(n->next->type == ROFFT_BODY); if (n->next->nchild) n = n->next; |