-/* $Id: html.c,v 1.139 2011/05/15 15:47:46 kristaps Exp $ */
+/* $Id: html.c,v 1.148 2011/07/04 09:42:38 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
"colspan", /* ATTR_COLSPAN */
};
-static void print_num(struct html *, const char *, size_t);
-static void print_spec(struct html *, const char *, size_t);
-static void print_res(struct html *, const char *, size_t);
-static void print_ctag(struct html *, enum htmltag);
-static void print_doctype(struct html *);
-static void print_xmltype(struct html *);
-static int print_encode(struct html *, const char *, int);
-static void print_metaf(struct html *, enum mandoc_esc);
-static void print_attr(struct html *,
- const char *, const char *);
-static void *ml_alloc(char *, enum htmltype);
+static const char *const roffscales[SCALE_MAX] = {
+ "cm", /* SCALE_CM */
+ "in", /* SCALE_IN */
+ "pc", /* SCALE_PC */
+ "pt", /* SCALE_PT */
+ "em", /* SCALE_EM */
+ "em", /* SCALE_MM */
+ "ex", /* SCALE_EN */
+ "ex", /* SCALE_BU */
+ "em", /* SCALE_VS */
+ "ex", /* SCALE_FS */
+};
+static void bufncat(struct html *, const char *, size_t);
+static void print_ctag(struct html *, enum htmltag);
+static int print_encode(struct html *, const char *, int);
+static void print_metaf(struct html *, enum mandoc_esc);
+static void print_attr(struct html *, const char *, const char *);
+static void *ml_alloc(char *, enum htmltype);
static void *
ml_alloc(char *outopts, enum htmltype type)
}
}
-/* ARGSUSED */
-static void
-print_num(struct html *h, const char *p, size_t len)
-{
- char c;
-
- if ('\0' != (c = mchars_num2char(p, len)))
- putchar((int)c);
-}
-
-static void
-print_spec(struct html *h, const char *p, size_t len)
-{
- int cp;
- const char *rhs;
- size_t sz;
-
- if ((cp = mchars_spec2cp(h->symtab, p, len)) > 0) {
- printf("&#%d;", cp);
- return;
- } else if (-1 == cp && 1 == len) {
- fwrite(p, 1, len, stdout);
- return;
- } else if (-1 == cp)
- return;
-
- if (NULL != (rhs = mchars_spec2str(h->symtab, p, len, &sz)))
- fwrite(rhs, 1, sz, stdout);
-}
-
-
-static void
-print_res(struct html *h, const char *p, size_t len)
-{
- int cp;
- const char *rhs;
- size_t sz;
-
- if ((cp = mchars_res2cp(h->symtab, p, len)) > 0) {
- printf("&#%d;", cp);
- return;
- } else if (-1 == cp)
- return;
-
- if (NULL != (rhs = mchars_res2str(h->symtab, p, len, &sz)))
- fwrite(rhs, 1, sz, stdout);
-}
-
-
static void
print_metaf(struct html *h, enum mandoc_esc deco)
{
case (ESCAPE_FONTBOLD):
font = HTMLFONT_BOLD;
break;
+ case (ESCAPE_FONT):
+ /* FALLTHROUGH */
case (ESCAPE_FONTROMAN):
font = HTMLFONT_NONE;
break;
switch (mandoc_escape(&cp, &seq, &ssz)) {
case (ESCAPE_ERROR):
return(sz);
- case (ESCAPE_NUMBERED):
+ case (ESCAPE_UNICODE):
/* FALLTHROUGH */
- case (ESCAPE_PREDEF):
+ case (ESCAPE_NUMBERED):
/* FALLTHROUGH */
case (ESCAPE_SPECIAL):
sz++;
print_encode(struct html *h, const char *p, int norecurse)
{
size_t sz;
- int len, nospace;
+ int c, len, nospace;
const char *seq;
enum mandoc_esc esc;
static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' };
break;
switch (esc) {
- case (ESCAPE_NUMBERED):
- print_num(h, seq, len);
+ case (ESCAPE_UNICODE):
+ /* Skip passed "u" header. */
+ c = mchars_num2uc(seq + 1, len - 1);
+ if ('\0' != c)
+ printf("&#x%x;", c);
break;
- case (ESCAPE_PREDEF):
- print_res(h, seq, len);
+ case (ESCAPE_NUMBERED):
+ c = mchars_num2char(seq, len);
+ if ('\0' != c)
+ putchar(c);
break;
case (ESCAPE_SPECIAL):
- print_spec(h, seq, len);
+ c = mchars_spec2cp(h->symtab, seq, len);
+ if (c > 0)
+ printf("&#%d;", c);
+ else if (-1 == c && 1 == len)
+ putchar((int)*seq);
break;
+ case (ESCAPE_FONT):
+ /* FALLTHROUGH */
case (ESCAPE_FONTPREV):
/* FALLTHROUGH */
case (ESCAPE_FONTBOLD):
}
}
-
void
print_gen_decls(struct html *h)
-{
-
- print_xmltype(h);
- print_doctype(h);
-}
-
-
-static void
-print_xmltype(struct html *h)
-{
-
- if (HTML_XHTML_1_0_STRICT == h->type)
- puts("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-}
-
-
-static void
-print_doctype(struct html *h)
{
const char *doctype;
const char *dtd;
dtd = "http://www.w3.org/TR/html4/strict.dtd";
break;
default:
+ puts("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
name = "html";
doctype = "-//W3C//DTD XHTML 1.0 Strict//EN";
dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";
}
}
-
void
bufinit(struct html *h)
{
h->buflen = 0;
}
-
void
bufcat_style(struct html *h, const char *key, const char *val)
{
bufcat(h, key);
- bufncat(h, ":", 1);
+ bufcat(h, ":");
bufcat(h, val);
- bufncat(h, ";", 1);
+ bufcat(h, ";");
}
-
void
bufcat(struct html *h, const char *p)
{
- bufncat(h, p, strlen(p));
+ h->buflen = strlcat(h->buf, p, BUFSIZ);
+ assert(h->buflen < BUFSIZ);
}
-
void
-buffmt(struct html *h, const char *fmt, ...)
+bufcat_fmt(struct html *h, const char *fmt, ...)
{
va_list ap;
h->buflen = strlen(h->buf);
}
-
-void
+static void
bufncat(struct html *h, const char *p, size_t sz)
{
- if (h->buflen + sz > BUFSIZ - 1)
- sz = BUFSIZ - 1 - h->buflen;
-
- (void)strncat(h->buf, p, sz);
+ assert(h->buflen + sz + 1 < BUFSIZ);
+ strncat(h->buf, p, sz);
h->buflen += sz;
}
-
void
buffmt_includes(struct html *h, const char *name)
{
pp = h->base_includes;
+ bufinit(h);
while (NULL != (p = strchr(pp, '%'))) {
bufncat(h, pp, (size_t)(p - pp));
switch (*(p + 1)) {
bufcat(h, pp);
}
-
void
buffmt_man(struct html *h,
const char *name, const char *sec)
pp = h->base_man;
- /* LINTED */
+ bufinit(h);
while (NULL != (p = strchr(pp, '%'))) {
bufncat(h, pp, (size_t)(p - pp));
switch (*(p + 1)) {
bufcat(h, sec ? sec : "1");
break;
case('N'):
- buffmt(h, name);
+ bufcat_fmt(h, name);
break;
default:
bufncat(h, p, 2);
bufcat(h, pp);
}
-
void
bufcat_su(struct html *h, const char *p, const struct roffsu *su)
{
double v;
- const char *u;
v = su->scale;
+ if (SCALE_MM == su->unit && 0.0 == (v /= 100.0))
+ v = 1.0;
- switch (su->unit) {
- case (SCALE_CM):
- u = "cm";
- break;
- case (SCALE_IN):
- u = "in";
- break;
- case (SCALE_PC):
- u = "pc";
- break;
- case (SCALE_PT):
- u = "pt";
- break;
- case (SCALE_EM):
- u = "em";
- break;
- case (SCALE_MM):
- if (0 == (v /= 100))
- v = 1;
- u = "em";
- break;
- case (SCALE_EN):
- u = "ex";
- break;
- case (SCALE_BU):
- u = "ex";
- break;
- case (SCALE_VS):
- u = "em";
- break;
- default:
- u = "ex";
- break;
- }
-
- /*
- * XXX: the CSS spec isn't clear as to which types accept
- * integer or real numbers, so we just make them all decimals.
- */
- buffmt(h, "%s: %.2f%s;", p, v, u);
+ bufcat_fmt(h, "%s: %.2f%s;", p, v, roffscales[su->unit]);
}
-
void
-html_idcat(char *dst, const char *src, int sz)
+bufcat_id(struct html *h, const char *src)
{
- int ssz;
-
- assert(sz > 2);
/* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
- /* We can't start with a number (bah). */
-
- if ('#' == *dst) {
- dst++;
- sz--;
- }
- if ('\0' == *dst) {
- *dst++ = 'x';
- *dst = '\0';
- sz--;
- }
-
- for ( ; *dst != '\0' && sz; dst++, sz--)
- /* Jump to end. */ ;
-
- for ( ; *src != '\0' && sz > 1; src++) {
- ssz = snprintf(dst, (size_t)sz, "%.2x", *src);
- sz -= ssz;
- dst += ssz;
- }
+ while ('\0' != *src)
+ bufcat_fmt(h, "%.2x", *src++);
}
git.ckatri.com / mandoc.git / blobdiff