-/* $Id: html.c,v 1.16 2008/12/08 16:29:57 kristaps Exp $ */
+/* $Id: html.c,v 1.26 2008/12/10 17:40:56 kristaps Exp $ */
/*
* Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
*
#include <string.h>
#include <unistd.h>
-#include "libmdocml.h"
-#include "private.h"
+#include "html.h"
#include "ml.h"
-
/* TODO: allow head/tail-less invocations (just "div" start). */
struct htmlnode {
struct htmlnode *parent;
};
-
struct htmlq {
struct htmlnode *last;
};
-static int html_loadcss(struct md_mbuf *, const char *);
-
+static int html_loadcss(struct md_mbuf *,
+ const char *);
static int html_alloc(void **);
static void html_free(void *);
-static ssize_t html_endtag(struct md_mbuf *, void *,
- const struct md_args *,
+static ssize_t html_endtag(struct ml_args *,
enum md_ns, int);
-static ssize_t html_beginstring(struct md_mbuf *,
- const struct md_args *,
+static ssize_t html_beginstring(struct ml_args *,
const char *, size_t);
-static ssize_t html_beginhttp(struct md_mbuf *,
- const struct md_args *,
+static ssize_t html_endstring(struct ml_args *,
const char *, size_t);
-static ssize_t html_endstring(struct md_mbuf *,
- const struct md_args *,
- const char *, size_t);
-static ssize_t html_endhttp(struct md_mbuf *,
- const struct md_args *,
- const char *, size_t);
-static ssize_t html_begintag(struct md_mbuf *, void *,
- const struct md_args *,
- enum md_ns, int,
+static ssize_t html_begintag(struct ml_args *,
+ enum md_ns, int,
const int *, const char **);
-static int html_begin(struct md_mbuf *,
- const struct md_args *,
+static int html_begin(struct ml_args *,
+ const struct tm *,
+ const char *, const char *,
+ enum roffmsec, enum roffvol);
+static int html_end(struct ml_args *,
const struct tm *,
const char *, const char *,
- enum roffmsec, const char *);
+ enum roffmsec, enum roffvol);
static int html_printargs(struct md_mbuf *, int,
const char *, const int *,
const char **, size_t *);
-static int html_end(struct md_mbuf *,
- const struct md_args *);
+static ssize_t html_beginhttp(struct md_mbuf *,
+ const struct md_args *,
+ const char *, size_t);
+static ssize_t html_endhttp(struct md_mbuf *,
+ const struct md_args *,
+ const char *, size_t);
static int html_blocktagname(struct md_mbuf *,
const struct md_args *, int,
struct htmlq *, const int *,
static int html_It_bodytagname(struct md_mbuf *,
struct htmlq *, const int *,
const char **, size_t *);
+static int html_tputln(struct md_mbuf *,
+ enum ml_scope, int, enum html_tag);
+static int html_aputln(struct md_mbuf *, enum ml_scope,
+ int, enum html_tag,
+ int, const struct html_pair *);
/* ARGSUSED */
{
struct htmlnode *n;
int i;
+ struct html_pair attr[2];
for (n = q->last; n; n = n->parent)
if (n->tok == ROFF_Bl)
i < ROFF_MAXLINEARG; i++) {
switch (n->argc[i]) {
case (ROFF_Ohang):
- return(ml_nputs(mbuf, "div", 3, res));
+ return(html_stput(mbuf, HTML_TAG_DIV, res));
case (ROFF_Tag):
- /* FALLTHROUGH */
+ attr[0].attr = HTML_ATTR_VALIGN;
+ attr[0].val = "top";
+ attr[1].attr = HTML_ATTR_NOWRAP;
+ attr[1].val = "true";
+ return(html_saput(mbuf, HTML_TAG_TD,
+ res, 2, attr));
case (ROFF_Column):
- return(ml_nputs(mbuf, "td", 2, res));
+ attr[0].attr = HTML_ATTR_VALIGN;
+ attr[0].val = "top";
+ return(html_saput(mbuf, HTML_TAG_TD,
+ res, 1, attr));
default:
break;
}
{
struct htmlnode *n;
int i;
+ struct html_pair attr[1];
for (n = q->last; n; n = n->parent)
if (n->tok == ROFF_Bl)
case (ROFF_Ohang):
/* FALLTHROUGH */
case (ROFF_Inset):
- return(ml_nputs(mbuf, "div", 3, res));
+ return(html_stput(mbuf, HTML_TAG_DIV, res));
case (ROFF_Tag):
/* FALLTHROUGH */
case (ROFF_Column):
- return(ml_nputs(mbuf, "td", 2, res));
+ attr[0].attr = HTML_ATTR_VALIGN;
+ attr[0].val = "top";
+ return(html_saput(mbuf, HTML_TAG_TD,
+ res, 1, attr));
default:
break;
}
&& i < ROFF_MAXLINEARG; i++) {
switch (argc[i]) {
case (ROFF_Enum):
- return(ml_nputs(mbuf, "ol", 2, res));
+ return(html_stput(mbuf, HTML_TAG_OL, res));
case (ROFF_Bullet):
/* FALLTHROUGH */
case (ROFF_Dash):
case (ROFF_Ohang):
/* FALLTHROUGH */
case (ROFF_Inset):
- return(ml_nputs(mbuf, "ul", 2, res));
+ return(html_stput(mbuf, HTML_TAG_UL, res));
case (ROFF_Tag):
/* FALLTHROUGH */
case (ROFF_Column):
- return(ml_nputs(mbuf, "table", 5, res));
+ return(html_stput(mbuf, HTML_TAG_TABLE, res));
default:
break;
}
case (ROFF_Ohang):
/* FALLTHROUGH */
case (ROFF_Inset):
- return(ml_nputs(mbuf, "li", 2, res));
+ return(html_stput(mbuf, HTML_TAG_LI, res));
case (ROFF_Tag):
/* FALLTHROUGH */
case (ROFF_Column):
- return(ml_nputs(mbuf, "tr", 2, res));
+ return(html_stput(mbuf, HTML_TAG_TR, res));
default:
break;
}
}
+static int
+html_tputln(struct md_mbuf *mbuf, enum ml_scope scope,
+ int i, enum html_tag tag)
+{
+
+ if ( ! ml_putchars(mbuf, ' ', INDENT(i) * INDENT_SZ, NULL))
+ return(0);
+ if ( ! html_tput(mbuf, scope, tag, NULL))
+ return(0);
+ return(ml_nputs(mbuf, "\n", 1, NULL));
+}
+
+
+static int
+html_aputln(struct md_mbuf *mbuf, enum ml_scope scope, int i,
+ enum html_tag tag, int sz, const struct html_pair *p)
+{
+
+ if ( ! ml_putchars(mbuf, ' ', INDENT(i) * INDENT_SZ, NULL))
+ return(0);
+ if ( ! html_aput(mbuf, scope, tag, NULL, sz, p))
+ return(0);
+ return(ml_nputs(mbuf, "\n", 1, NULL));
+}
+
+
/* ARGSUSED */
static int
-html_begin(struct md_mbuf *mbuf, const struct md_args *args,
- const struct tm *tm, const char *os,
- const char *title, enum roffmsec section,
- const char *vol)
+html_begin(struct ml_args *p, const struct tm *tm, const char *os,
+ const char *name, enum roffmsec msec, enum roffvol vol)
{
- const char *preamble, *css, *trail;
- char buf[512];
- size_t res;
+ enum roffvol bvol;
+ struct html_pair attr[4];
+ char ts[32], title[64];
+ int i;
- preamble =
- "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n"
- " \"http://www.w3.org/TR/html4/strict.dtd\">\n"
- "<html>\n"
- "<head>\n"
- " <meta http-equiv=\"Content-Type\"\n"
- " content=\"text/html;charset=utf-8\">\n"
- " <meta name=\"resource-type\" content=\"document\">\n"
- " <title>Manual Page for %s(%s)</title>\n";
-
- css =
- " <link rel=\"stylesheet\" type=\"text/css\"\n"
- " href=\"%s\">\n";
- trail =
- "</head>\n"
- "<body>\n"
- "<div class=\"mdoc\">";
+ (void)snprintf(ts, sizeof(ts), "%s(%s)",
+ name, roff_msecname(msec));
- res = 0;
+ if (vol >= ROFF_ARCH_START) {
+ switch (msec) {
+ case(ROFF_MSEC_1):
+ /* FALLTHROUGH */
+ case(ROFF_MSEC_6):
+ /* FALLTHROUGH */
+ case(ROFF_MSEC_7):
+ bvol = ROFF_VOL_URM;
+ break;
+ case(ROFF_MSEC_2):
+ /* FALLTHROUGH */
+ case(ROFF_MSEC_3):
+ /* FALLTHROUGH */
+ case(ROFF_MSEC_3p):
+ /* FALLTHROUGH */
+ case(ROFF_MSEC_4):
+ /* FALLTHROUGH */
+ case(ROFF_MSEC_5):
+ bvol = ROFF_VOL_PRM;
+ break;
+ case(ROFF_MSEC_8):
+ bvol = ROFF_VOL_PRM;
+ break;
+ case(ROFF_MSEC_9):
+ bvol = ROFF_VOL_KM;
+ break;
+ case(ROFF_MSEC_UNASS):
+ /* FALLTHROUGH */
+ case(ROFF_MSEC_DRAFT):
+ /* FALLTHROUGH */
+ case(ROFF_MSEC_PAPER):
+ bvol = ROFF_VOL_NONE;
+ break;
+ default:
+ abort();
+ /* NOTREACHED */
+ }
+
+ (void)snprintf(title, sizeof(title), "%s (%s)",
+ roff_volname(bvol), roff_volname(vol));
+ } else
+ (void)snprintf(title, sizeof(title), "%s", roff_volname(vol));
- (void)snprintf(buf, sizeof(buf) - 1,
- preamble, title, ml_section(section));
- if ( ! ml_puts(mbuf, buf, &res))
+ i = 0;
+
+ if ( ! html_typeput(p->mbuf, HTML_TYPE_4_01_STRICT, NULL))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_HTML))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_HEAD))
+ return(0);
+
+ attr[0].attr = HTML_ATTR_HTTP_EQUIV;
+ attr[0].val = "content-type";
+ attr[1].attr = HTML_ATTR_CONTENT;
+ attr[1].val = "text/html;charset=utf-8";
+
+ if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr))
return(0);
- assert(args->params.html.css);
- if (HTML_CSS_EMBED & args->params.html.flags) {
- if ( ! ml_puts(mbuf, " <style type=\"text/css\"><!--\n", &res))
+ attr[0].attr = HTML_ATTR_NAME;
+ attr[0].val = "resource-type";
+ attr[1].attr = HTML_ATTR_CONTENT;
+ attr[1].val = "document";
+
+ if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr))
+ return(0);
+
+ if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_TITLE))
+ return(0);
+ if ( ! ml_putstring(p->mbuf, ts, NULL))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TITLE))
+ return(0);
+
+ if (HTML_CSS_EMBED & p->args->params.html.flags) {
+ attr[0].attr = HTML_ATTR_TYPE;
+ attr[0].val = "text/css";
+
+ if ( ! html_aputln(p->mbuf, ML_OPEN, i,
+ HTML_TAG_STYLE, 1, attr))
return(0);
- if ( ! html_loadcss(mbuf, args->params.html.css))
+ if ( ! html_commentput(p->mbuf, ML_OPEN, NULL))
return(0);
- if ( ! ml_puts(mbuf, " --!></style>\n", &res))
+
+ if ( ! html_loadcss(p->mbuf, p->args->params.html.css))
+ return(0);
+
+ if ( ! html_commentput(p->mbuf, ML_CLOSE, NULL))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_STYLE))
return(0);
} else {
- (void)snprintf(buf, sizeof(buf) - 1, css,
- args->params.html.css);
- if ( ! ml_puts(mbuf, buf, &res))
+ attr[0].attr = HTML_ATTR_REL;
+ attr[0].val = "stylesheet";
+ attr[1].attr = HTML_ATTR_TYPE;
+ attr[1].val = "text/css";
+ attr[2].attr = HTML_ATTR_HREF;
+ attr[2].val = p->args->params.html.css;
+
+ if ( ! html_aputln(p->mbuf, ML_OPEN, i,
+ HTML_TAG_LINK, 3, attr))
return(0);
}
- if ( ! ml_puts(mbuf, trail, &res))
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_HEAD))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_BODY))
+ return(0);
+
+ attr[0].attr = HTML_ATTR_CLASS;
+ attr[0].val = "mdoc";
+
+ if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_DIV, 1, attr))
return(0);
- return(1);
+ attr[0].attr = HTML_ATTR_WIDTH;
+ attr[0].val = "100%";
+ attr[1].attr = HTML_ATTR_CLASS;
+ attr[1].val = "header-table";
+
+ if ( ! html_aputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 2, attr))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TR))
+ return(0);
+
+ attr[0].attr = HTML_ATTR_ALIGN;
+ attr[0].val = "left";
+ attr[1].attr = HTML_ATTR_CLASS;
+ attr[1].val = "header-section";
+
+ if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
+ return(0);
+ if ( ! ml_putstring(p->mbuf, ts, NULL))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD))
+ return(0);
+
+ attr[0].attr = HTML_ATTR_ALIGN;
+ attr[0].val = "center";
+ attr[1].attr = HTML_ATTR_CLASS;
+ attr[1].val = "header-volume";
+
+ if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
+ return(0);
+ if ( ! ml_putstring(p->mbuf, title, NULL))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD))
+ return(0);
+
+ attr[0].attr = HTML_ATTR_ALIGN;
+ attr[0].val = "right";
+ attr[1].attr = HTML_ATTR_CLASS;
+ attr[1].val = "header-section";
+
+ if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
+ return(0);
+ if ( ! ml_putstring(p->mbuf, ts, NULL))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD))
+ return(0);
+
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TR))
+ return(0);
+ return(html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TABLE));
}
/* ARGSUSED */
static int
-html_end(struct md_mbuf *mbuf, const struct md_args *args)
+html_end(struct ml_args *p, const struct tm *tm, const char *os,
+ const char *name, enum roffmsec msec, enum roffvol vol)
{
+ struct html_pair attr[4];
+ int i;
+ char ts[64];
+
+ if (0 == strftime(ts, sizeof(ts), "%B %d, %Y", tm)) {
+ warn("strftime");
+ return(0);
+ }
+
+ i = 0;
+
+ attr[0].attr = HTML_ATTR_WIDTH;
+ attr[0].val = "100%";
+ attr[1].attr = HTML_ATTR_CLASS;
+ attr[1].val = "header-footer";
+
+ if ( ! html_aputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 2, attr))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TR))
+ return(0);
+
+ attr[0].attr = HTML_ATTR_ALIGN;
+ attr[0].val = "left";
+ attr[1].attr = HTML_ATTR_CLASS;
+ attr[1].val = "footer-os";
+
+ if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
+ return(0);
+ if ( ! ml_putstring(p->mbuf, os, NULL))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD))
+ return(0);
- return(ml_puts(mbuf, "</div></body>\n</html>", NULL));
+ attr[0].attr = HTML_ATTR_ALIGN;
+ attr[0].val = "right";
+ attr[1].attr = HTML_ATTR_CLASS;
+ attr[1].val = "footer-date";
+
+ if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr))
+ return(0);
+ if ( ! ml_putstring(p->mbuf, ts, NULL))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD))
+ return(0);
+
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TR))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TABLE))
+ return(0);
+
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_DIV))
+ return(0);
+ if ( ! html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_BODY))
+ return(0);
+ return(html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_HTML));
}
case (ROFF_Bl):
return(html_Bl_bodytagname(mbuf, q, argc, argv, res));
case (ROFF_Fo):
- return(ml_nputs(mbuf, "span", 4, res));
+ return(html_stput(mbuf, HTML_TAG_SPAN, res));
case (ROFF_It):
return(html_It_bodytagname(mbuf, q, argc, argv, res));
case (ROFF_Oo):
- return(ml_nputs(mbuf, "span", 4, res));
+ return(html_stput(mbuf, HTML_TAG_SPAN, res));
default:
break;
}
- return(ml_puts(mbuf, "div", res));
+ return(html_stput(mbuf, HTML_TAG_DIV, res));
}
case (ROFF_It):
return(html_It_headtagname(mbuf, q, argc, argv, res));
case (ROFF_Fo):
- return(ml_nputs(mbuf, "span", 4, res));
+ /* FALLTHROUGH */
case (ROFF_Oo):
- return(ml_nputs(mbuf, "span", 4, res));
+ return(html_stput(mbuf, HTML_TAG_SPAN, res));
case (ROFF_Sh):
- return(ml_nputs(mbuf, "h1", 2, res));
+ return(html_stput(mbuf, HTML_TAG_H1, res));
case (ROFF_Ss):
- return(ml_nputs(mbuf, "h2", 2, res));
+ return(html_stput(mbuf, HTML_TAG_H2, res));
default:
break;
}
- return(ml_nputs(mbuf, "div", 3, res));
+ return(html_stput(mbuf, HTML_TAG_DIV, res));
}
switch (tok) {
case (ROFF_Fo):
- return(ml_nputs(mbuf, "span", 4, res));
+ /* FALLTHROUGH */
case (ROFF_Oo):
- return(ml_nputs(mbuf, "span", 4, res));
+ return(html_stput(mbuf, HTML_TAG_SPAN, res));
case (ROFF_It):
return(html_It_blocktagname(mbuf, q, argc, argv, res));
default:
break;
}
- return(ml_puts(mbuf, "div", res));
+ return(html_stput(mbuf, HTML_TAG_DIV, res));
}
const int *argc, const char **argv, size_t *res)
{
+ /* FIXME: use API in ml.h. */
+
if ( ! ml_puts(mbuf, " class=\"", res))
return(0);
if ( ! ml_puts(mbuf, ns, res))
return(0);
switch (tok) {
+ case (ROFF_Sh):
+
+ /* FIXME: use API in ml.h. */
+
+ assert(*argv);
+ if ( ! ml_nputs(mbuf, " name=\"", 7, res))
+ return(0);
+ if ( ! ml_putstring(mbuf, *argv++, res))
+ return(0);
+ while (*argv) {
+ if ( ! ml_putstring(mbuf, "_", res))
+ return(0);
+ if ( ! ml_putstring(mbuf, *argv++, res))
+ return(0);
+ }
+ if ( ! ml_nputs(mbuf, "\"", 1, res))
+ return(0);
+ break;
+
case (ROFF_Sx):
+
+ /* FIXME: use API in ml.h. */
+
assert(*argv);
if ( ! ml_nputs(mbuf, " href=\"#", 8, res))
return(0);
- if ( ! ml_putstring(mbuf, *argv, res))
+ if ( ! ml_putstring(mbuf, *argv++, res))
return(0);
+ while (*argv) {
+ if ( ! ml_putstring(mbuf, "_", res))
+ return(0);
+ if ( ! ml_putstring(mbuf, *argv++, res))
+ return(0);
+ }
if ( ! ml_nputs(mbuf, "\"", 1, res))
return(0);
+
break;
default:
break;
{
switch (tok) {
+ case (ROFF_Sh):
+ return(html_stput(mbuf, HTML_TAG_A, res));
case (ROFF_Pp):
- return(ml_nputs(mbuf, "div", 3, res));
+ return(html_stput(mbuf, HTML_TAG_DIV, res));
case (ROFF_Sx):
- return(ml_nputs(mbuf, "a", 1, res));
+ return(html_stput(mbuf, HTML_TAG_A, res));
default:
break;
}
- return(ml_puts(mbuf, "span", res));
+ return(html_stput(mbuf, HTML_TAG_SPAN, res));
}
static ssize_t
-html_begintag(struct md_mbuf *mbuf, void *data,
- const struct md_args *args, enum md_ns ns,
+html_begintag(struct ml_args *p, enum md_ns ns,
int tok, const int *argc, const char **argv)
{
size_t res;
assert(ns != MD_NS_DEFAULT);
res = 0;
- assert(data);
- q = (struct htmlq *)data;
+ q = (struct htmlq *)p->data;
if (NULL == (node = calloc(1, sizeof(struct htmlnode)))) {
warn("calloc");
switch (ns) {
case (MD_NS_BLOCK):
- if ( ! html_blocktagname(mbuf, args, tok,
+ if ( ! html_blocktagname(p->mbuf, p->args, tok,
q, argc, argv, &res))
return(-1);
- if ( ! html_blocktagargs(mbuf, args, tok,
+ if ( ! html_blocktagargs(p->mbuf, p->args, tok,
argc, argv, &res))
return(-1);
break;
case (MD_NS_BODY):
- if ( ! html_bodytagname(mbuf, args, tok,
+ if ( ! html_bodytagname(p->mbuf, p->args, tok,
q, argc, argv, &res))
return(-1);
- if ( ! html_bodytagargs(mbuf, args, tok,
+ if ( ! html_bodytagargs(p->mbuf, p->args, tok,
argc, argv, &res))
return(-1);
break;
case (MD_NS_HEAD):
- if ( ! html_headtagname(mbuf, args, tok, q,
+ if ( ! html_headtagname(p->mbuf, p->args, tok, q,
argc, argv, &res))
return(-1);
- if ( ! html_headtagargs(mbuf, args, tok,
+ if ( ! html_headtagargs(p->mbuf, p->args, tok,
argc, argv, &res))
return(-1);
break;
default:
- if ( ! html_inlinetagname(mbuf, args, tok, &res))
+ if ( ! html_inlinetagname(p->mbuf, p->args, tok, &res))
return(-1);
- if ( ! html_inlinetagargs(mbuf, args, tok,
+ if ( ! html_inlinetagargs(p->mbuf, p->args, tok,
argc, argv, &res))
return(-1);
break;
static ssize_t
-html_endtag(struct md_mbuf *mbuf, void *data,
- const struct md_args *args, enum md_ns ns, int tok)
+html_endtag(struct ml_args *p, enum md_ns ns, int tok)
{
size_t res;
struct htmlq *q;
assert(ns != MD_NS_DEFAULT);
res = 0;
- assert(data);
- q = (struct htmlq *)data;
+ q = (struct htmlq *)p->data;
node = q->last;
switch (ns) {
case (MD_NS_BLOCK):
- if ( ! html_blocktagname(mbuf, args, tok,
+ if ( ! html_blocktagname(p->mbuf, p->args, tok,
q, node->argc,
(const char **)node->argv, &res))
return(-1);
break;
case (MD_NS_BODY):
- if ( ! html_bodytagname(mbuf, args, tok,
+ if ( ! html_bodytagname(p->mbuf, p->args, tok,
q, node->argc,
(const char **)node->argv, &res))
return(-1);
break;
case (MD_NS_HEAD):
- if ( ! html_headtagname(mbuf, args, tok,
+ if ( ! html_headtagname(p->mbuf, p->args, tok,
q, node->argc,
(const char **)node->argv, &res))
return(-1);
break;
default:
- if ( ! html_inlinetagname(mbuf, args, tok, &res))
+ if ( ! html_inlinetagname(p->mbuf, p->args, tok, &res))
return(-1);
break;
}
}
+/* ARGSUSED */
static ssize_t
html_beginhttp(struct md_mbuf *mbuf,
const struct md_args *args,
const char *buf, size_t sz)
{
size_t res;
+ struct html_pair pair;
res = 0;
+ pair.attr = HTML_ATTR_HREF;
+ pair.val = (char *)buf;
- if ( ! ml_puts(mbuf, "<a href=\"", &res))
- return(-1);
- if (1 != ml_nputstring(mbuf, buf, sz, &res))
+ if ( ! html_aput(mbuf, ML_OPEN, HTML_TAG_A, &res, 1, &pair))
return(-1);
- if ( ! ml_puts(mbuf, "\">", &res))
- return(-1);
-
return((ssize_t)res);
}
+/* ARGSUSED */
static ssize_t
html_endhttp(struct md_mbuf *mbuf,
const struct md_args *args,
size_t res;
res = 0;
-
- if ( ! ml_puts(mbuf, "</a>", &res))
+ if ( ! html_tput(mbuf, ML_CLOSE, HTML_TAG_A, &res))
return(-1);
-
return((ssize_t)res);
}
/* ARGSUSED */
static ssize_t
-html_beginstring(struct md_mbuf *mbuf,
- const struct md_args *args,
- const char *buf, size_t sz)
+html_beginstring(struct ml_args *p, const char *buf, size_t sz)
{
if (0 == strncmp(buf, "http://", 7))
- return(html_beginhttp(mbuf, args, buf, sz));
+ return(html_beginhttp(p->mbuf, p->args, buf, sz));
return(0);
}
/* ARGSUSED */
static ssize_t
-html_endstring(struct md_mbuf *mbuf,
- const struct md_args *args,
- const char *buf, size_t sz)
+html_endstring(struct ml_args *p, const char *buf, size_t sz)
{
if (0 == strncmp(buf, "http://", 7))
- return(html_endhttp(mbuf, args, buf, sz));
+ return(html_endhttp(p->mbuf, p->args, buf, sz));
return(0);
}
git.ckatri.com / mandoc.git / blobdiff