-/* $Id: man_html.c,v 1.84 2011/11/18 17:05:50 joerg Exp $ */
+/* $Id: man_html.c,v 1.89 2012/11/17 00:26:33 schwarze Exp $ */
/*
- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#define INDENT 5
-#define MAN_ARGS const struct man_meta *m, \
+#define MAN_ARGS const struct man_meta *man, \
const struct man_node *n, \
struct mhtml *mh, \
struct html *h
static void print_man_head(MAN_ARGS);
static void print_man_nodelist(MAN_ARGS);
static void print_man_node(MAN_ARGS);
-
static int a2width(const struct man_node *,
struct roffsu *);
-
-static int man_alt_pre(MAN_ARGS);
-static int man_br_pre(MAN_ARGS);
-static int man_ign_pre(MAN_ARGS);
-static int man_in_pre(MAN_ARGS);
-static int man_literal_pre(MAN_ARGS);
-static void man_root_post(MAN_ARGS);
-static void man_root_pre(MAN_ARGS);
static int man_B_pre(MAN_ARGS);
static int man_HP_pre(MAN_ARGS);
-static int man_I_pre(MAN_ARGS);
static int man_IP_pre(MAN_ARGS);
+static int man_I_pre(MAN_ARGS);
+static int man_OP_pre(MAN_ARGS);
static int man_PP_pre(MAN_ARGS);
static int man_RS_pre(MAN_ARGS);
static int man_SH_pre(MAN_ARGS);
static int man_SM_pre(MAN_ARGS);
static int man_SS_pre(MAN_ARGS);
+static int man_alt_pre(MAN_ARGS);
+static int man_br_pre(MAN_ARGS);
+static int man_ign_pre(MAN_ARGS);
+static int man_in_pre(MAN_ARGS);
+static int man_literal_pre(MAN_ARGS);
+static void man_root_post(MAN_ARGS);
+static void man_root_pre(MAN_ARGS);
static const struct htmlman mans[MAN_MAX] = {
{ man_br_pre, NULL }, /* br */
{ man_ign_pre, NULL }, /* AT */
{ man_in_pre, NULL }, /* in */
{ man_ign_pre, NULL }, /* ft */
+ { man_OP_pre, NULL }, /* OP */
+ { man_literal_pre, NULL }, /* EX */
+ { man_literal_pre, NULL }, /* EE */
};
/*
}
void
-html_man(void *arg, const struct man *m)
+html_man(void *arg, const struct man *man)
{
struct mhtml mh;
memset(&mh, 0, sizeof(struct mhtml));
- print_man(man_meta(m), man_node(m), &mh, (struct html *)arg);
+ print_man(man_meta(man), man_node(man), &mh, (struct html *)arg);
putchar('\n');
}
print_gen_decls(h);
t = print_otag(h, TAG_HTML, 0, NULL);
tt = print_otag(h, TAG_HEAD, 0, NULL);
- print_man_head(m, n, mh, h);
+ print_man_head(man, n, mh, h);
print_tagq(h, tt);
print_otag(h, TAG_BODY, 0, NULL);
print_otag(h, TAG_DIV, 1, &tag);
} else
t = print_otag(h, TAG_DIV, 1, &tag);
- print_man_nodelist(m, n, mh, h);
+ print_man_nodelist(man, n, mh, h);
print_tagq(h, t);
}
{
print_gen_head(h);
- bufcat_fmt(h, "%s(%s)", m->title, m->msec);
+ assert(man->title);
+ assert(man->msec);
+ bufcat_fmt(h, "%s(%s)", man->title, man->msec);
print_otag(h, TAG_TITLE, 0, NULL);
print_text(h, h->buf);
}
print_man_nodelist(MAN_ARGS)
{
- print_man_node(m, n, mh, h);
+ print_man_node(man, n, mh, h);
if (n->next)
- print_man_nodelist(m, n->next, mh, h);
+ print_man_nodelist(man, n->next, mh, h);
}
switch (n->type) {
case (MAN_ROOT):
- man_root_pre(m, n, mh, h);
+ man_root_pre(man, n, mh, h);
break;
case (MAN_TEXT):
/*
t = h->tags.head;
}
if (mans[n->tok].pre)
- child = (*mans[n->tok].pre)(m, n, mh, h);
+ child = (*mans[n->tok].pre)(man, n, mh, h);
break;
}
if (child && n->child)
- print_man_nodelist(m, n->child, mh, h);
+ print_man_nodelist(man, n->child, mh, h);
/* This will automatically close out any font scope. */
print_stagq(h, t);
switch (n->type) {
case (MAN_ROOT):
- man_root_post(m, n, mh, h);
+ man_root_post(man, n, mh, h);
break;
case (MAN_EQN):
break;
default:
if (mans[n->tok].post)
- (*mans[n->tok].post)(m, n, mh, h);
+ (*mans[n->tok].post)(man, n, mh, h);
break;
}
}
char b[BUFSIZ], title[BUFSIZ];
b[0] = 0;
- if (m->vol)
- (void)strlcat(b, m->vol, BUFSIZ);
+ if (man->vol)
+ (void)strlcat(b, man->vol, BUFSIZ);
- snprintf(title, BUFSIZ - 1, "%s(%s)", m->title ? m->title : "",
- m->msec ? m->msec : "");
+ assert(man->title);
+ assert(man->msec);
+ snprintf(title, BUFSIZ - 1, "%s(%s)", man->title, man->msec);
PAIR_SUMMARY_INIT(&tag[0], "Document Header");
PAIR_CLASS_INIT(&tag[1], "head");
PAIR_CLASS_INIT(&tag[0], "foot-date");
print_otag(h, TAG_TD, 1, tag);
- if (m->date)
- print_text(h, m->date);
+ assert(man->date);
+ print_text(h, man->date);
print_stagq(h, tt);
PAIR_CLASS_INIT(&tag[0], "foot-os");
PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
print_otag(h, TAG_TD, 2, tag);
- if (m->source)
- print_text(h, m->source);
+ if (man->source)
+ print_text(h, man->source);
print_tagq(h, t);
}
if (TAG_MAX != fp)
t = print_otag(h, fp, 0, NULL);
- print_man_node(m, nn, mh, h);
+ print_man_node(man, nn, mh, h);
if (t)
print_tagq(h, t);
/* For IP, only print the first header element. */
if (MAN_IP == n->tok && n->child)
- print_man_node(m, n->child, mh, h);
+ print_man_node(man, n->child, mh, h);
/* For TP, only print next-line header elements. */
if (MAN_TP == n->tok)
for (nn = n->child; nn; nn = nn->next)
if (nn->line > n->line)
- print_man_node(m, nn, mh, h);
+ print_man_node(man, nn, mh, h);
return(0);
}
return(1);
}
+/* ARGSUSED */
+static int
+man_OP_pre(MAN_ARGS)
+{
+ struct tag *tt;
+ struct htmlpair tag;
+
+ print_text(h, "[");
+ h->flags |= HTML_NOSPACE;
+ PAIR_CLASS_INIT(&tag, "opt");
+ tt = print_otag(h, TAG_SPAN, 1, &tag);
+
+ if (NULL != (n = n->child)) {
+ print_otag(h, TAG_B, 0, NULL);
+ print_text(h, n->string);
+ }
+
+ print_stagq(h, tt);
+
+ if (NULL != n && NULL != n->next) {
+ print_otag(h, TAG_I, 0, NULL);
+ print_text(h, n->next->string);
+ }
+
+ print_stagq(h, tt);
+ h->flags |= HTML_NOSPACE;
+ print_text(h, "]");
+ return(0);
+}
+
+
/* ARGSUSED */
static int
man_B_pre(MAN_ARGS)
man_literal_pre(MAN_ARGS)
{
- if (MAN_nf != n->tok) {
+ if (MAN_fi == n->tok || MAN_EE == n->tok) {
print_otag(h, TAG_BR, 0, NULL);
mh->fl &= ~MANH_LITERAL;
} else
git.ckatri.com / mandoc.git / blobdiff