version 1.82, 2009/11/09 05:11:46 |
version 1.129, 2011/03/17 09:16:38 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
|
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
|
#endif |
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
#include <assert.h> |
#include <assert.h> |
|
|
#include <string.h> |
#include <string.h> |
#include <unistd.h> |
#include <unistd.h> |
|
|
|
#include "mandoc.h" |
#include "out.h" |
#include "out.h" |
#include "chars.h" |
#include "chars.h" |
#include "html.h" |
#include "html.h" |
#include "main.h" |
#include "main.h" |
|
|
#define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) |
|
|
|
#define DOCTYPE "-//W3C//DTD HTML 4.01//EN" |
|
#define DTD "http://www.w3.org/TR/html4/strict.dtd" |
|
|
|
struct htmldata { |
struct htmldata { |
const char *name; |
const char *name; |
int flags; |
int flags; |
#define HTML_CLRLINE (1 << 0) |
#define HTML_CLRLINE (1 << 0) |
#define HTML_NOSTACK (1 << 1) |
#define HTML_NOSTACK (1 << 1) |
|
#define HTML_AUTOCLOSE (1 << 2) /* Tag has auto-closure. */ |
}; |
}; |
|
|
static const struct htmldata htmltags[TAG_MAX] = { |
static const struct htmldata htmltags[TAG_MAX] = { |
{"html", HTML_CLRLINE}, /* TAG_HTML */ |
{"html", HTML_CLRLINE}, /* TAG_HTML */ |
{"head", HTML_CLRLINE}, /* TAG_HEAD */ |
{"head", HTML_CLRLINE}, /* TAG_HEAD */ |
{"body", HTML_CLRLINE}, /* TAG_BODY */ |
{"body", HTML_CLRLINE}, /* TAG_BODY */ |
{"meta", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_META */ |
{"meta", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_META */ |
{"title", HTML_CLRLINE}, /* TAG_TITLE */ |
{"title", HTML_CLRLINE}, /* TAG_TITLE */ |
{"div", HTML_CLRLINE}, /* TAG_DIV */ |
{"div", HTML_CLRLINE}, /* TAG_DIV */ |
{"h1", 0}, /* TAG_H1 */ |
{"h1", 0}, /* TAG_H1 */ |
{"h2", 0}, /* TAG_H2 */ |
{"h2", 0}, /* TAG_H2 */ |
{"p", HTML_CLRLINE}, /* TAG_P */ |
|
{"span", 0}, /* TAG_SPAN */ |
{"span", 0}, /* TAG_SPAN */ |
{"link", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */ |
{"link", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_LINK */ |
{"br", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */ |
{"br", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_BR */ |
{"a", 0}, /* TAG_A */ |
{"a", 0}, /* TAG_A */ |
{"table", HTML_CLRLINE}, /* TAG_TABLE */ |
{"table", HTML_CLRLINE}, /* TAG_TABLE */ |
{"col", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_COL */ |
{"tbody", HTML_CLRLINE}, /* TAG_TBODY */ |
|
{"col", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_COL */ |
{"tr", HTML_CLRLINE}, /* TAG_TR */ |
{"tr", HTML_CLRLINE}, /* TAG_TR */ |
{"td", HTML_CLRLINE}, /* TAG_TD */ |
{"td", HTML_CLRLINE}, /* TAG_TD */ |
{"li", HTML_CLRLINE}, /* TAG_LI */ |
{"li", HTML_CLRLINE}, /* TAG_LI */ |
{"ul", HTML_CLRLINE}, /* TAG_UL */ |
{"ul", HTML_CLRLINE}, /* TAG_UL */ |
{"ol", HTML_CLRLINE}, /* TAG_OL */ |
{"ol", HTML_CLRLINE}, /* TAG_OL */ |
{"base", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_BASE */ |
{"dl", HTML_CLRLINE}, /* TAG_DL */ |
|
{"dt", HTML_CLRLINE}, /* TAG_DT */ |
|
{"dd", HTML_CLRLINE}, /* TAG_DD */ |
|
{"blockquote", HTML_CLRLINE}, /* TAG_BLOCKQUOTE */ |
|
{"p", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_P */ |
|
{"pre", HTML_CLRLINE }, /* TAG_PRE */ |
|
{"b", 0 }, /* TAG_B */ |
|
{"i", 0 }, /* TAG_I */ |
|
{"code", 0 }, /* TAG_CODE */ |
|
{"small", 0 }, /* TAG_SMALL */ |
}; |
}; |
|
|
static const char *const htmlattrs[ATTR_MAX] = { |
static const char *const htmlattrs[ATTR_MAX] = { |
"http-equiv", |
"http-equiv", /* ATTR_HTTPEQUIV */ |
"content", |
"content", /* ATTR_CONTENT */ |
"name", |
"name", /* ATTR_NAME */ |
"rel", |
"rel", /* ATTR_REL */ |
"href", |
"href", /* ATTR_HREF */ |
"type", |
"type", /* ATTR_TYPE */ |
"media", |
"media", /* ATTR_MEDIA */ |
"class", |
"class", /* ATTR_CLASS */ |
"style", |
"style", /* ATTR_STYLE */ |
"width", |
"width", /* ATTR_WIDTH */ |
"valign", |
"id", /* ATTR_ID */ |
"target", |
"summary", /* ATTR_SUMMARY */ |
"id", |
"align", /* ATTR_ALIGN */ |
"summary", |
"colspan", /* ATTR_COLSPAN */ |
}; |
}; |
|
|
#ifdef __linux__ |
static void print_num(struct html *, const char *, size_t); |
extern int getsubopt(char **, char * const *, char **); |
static void print_spec(struct html *, enum roffdeco, |
#endif |
const char *, size_t); |
|
static void print_res(struct html *, const char *, size_t); |
|
|
static void print_spec(struct html *, const char *, int); |
|
static void print_res(struct html *, const char *, int); |
|
static void print_ctag(struct html *, enum htmltag); |
static void print_ctag(struct html *, enum htmltag); |
static void print_encode(struct html *, const char *); |
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 roffdeco); |
|
static void print_attr(struct html *, |
|
const char *, const char *); |
|
static void *ml_alloc(char *, enum htmltype); |
|
|
|
|
void * |
static void * |
html_alloc(char *outopts) |
ml_alloc(char *outopts, enum htmltype type) |
{ |
{ |
struct html *h; |
struct html *h; |
const char *toks[4]; |
const char *toks[4]; |
Line 106 html_alloc(char *outopts) |
|
Line 120 html_alloc(char *outopts) |
|
toks[2] = "includes"; |
toks[2] = "includes"; |
toks[3] = NULL; |
toks[3] = NULL; |
|
|
h = calloc(1, sizeof(struct html)); |
h = mandoc_calloc(1, sizeof(struct html)); |
if (NULL == h) { |
|
perror(NULL); |
|
exit(EXIT_FAILURE); |
|
} |
|
|
|
|
h->type = type; |
h->tags.head = NULL; |
h->tags.head = NULL; |
h->ords.head = NULL; |
|
h->symtab = chars_init(CHARS_HTML); |
h->symtab = chars_init(CHARS_HTML); |
|
|
while (outopts && *outopts) |
while (outopts && *outopts) |
Line 134 html_alloc(char *outopts) |
|
Line 144 html_alloc(char *outopts) |
|
return(h); |
return(h); |
} |
} |
|
|
|
void * |
|
html_alloc(char *outopts) |
|
{ |
|
|
|
return(ml_alloc(outopts, HTML_HTML_4_01_STRICT)); |
|
} |
|
|
|
|
|
void * |
|
xhtml_alloc(char *outopts) |
|
{ |
|
|
|
return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT)); |
|
} |
|
|
|
|
void |
void |
html_free(void *p) |
html_free(void *p) |
{ |
{ |
struct tag *tag; |
struct tag *tag; |
struct ord *ord; |
|
struct html *h; |
struct html *h; |
|
|
h = (struct html *)p; |
h = (struct html *)p; |
|
|
while ((ord = h->ords.head) != NULL) { |
|
h->ords.head = ord->next; |
|
free(ord); |
|
} |
|
|
|
while ((tag = h->tags.head) != NULL) { |
while ((tag = h->tags.head) != NULL) { |
h->tags.head = tag->next; |
h->tags.head = tag->next; |
free(tag); |
free(tag); |
Line 191 print_gen_head(struct html *h) |
|
Line 210 print_gen_head(struct html *h) |
|
} |
} |
} |
} |
|
|
|
/* ARGSUSED */ |
|
static void |
|
print_num(struct html *h, const char *p, size_t len) |
|
{ |
|
const char *rhs; |
|
|
|
rhs = chars_num2char(p, len); |
|
if (rhs) |
|
putchar((int)*rhs); |
|
} |
|
|
static void |
static void |
print_spec(struct html *h, const char *p, int len) |
print_spec(struct html *h, enum roffdeco d, const char *p, size_t len) |
{ |
{ |
|
int cp; |
const char *rhs; |
const char *rhs; |
size_t sz; |
size_t sz; |
|
|
rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz); |
if ((cp = chars_spec2cp(h->symtab, p, len)) > 0) { |
|
printf("&#%d;", cp); |
if (NULL == rhs) |
|
return; |
return; |
fwrite(rhs, 1, sz, stdout); |
} else if (-1 == cp && DECO_SSPECIAL == d) { |
|
fwrite(p, 1, len, stdout); |
|
return; |
|
} else if (-1 == cp) |
|
return; |
|
|
|
if (NULL != (rhs = chars_spec2str(h->symtab, p, len, &sz))) |
|
fwrite(rhs, 1, sz, stdout); |
} |
} |
|
|
|
|
static void |
static void |
print_res(struct html *h, const char *p, int len) |
print_res(struct html *h, const char *p, size_t len) |
{ |
{ |
|
int cp; |
const char *rhs; |
const char *rhs; |
size_t sz; |
size_t sz; |
|
|
rhs = chars_a2res(h->symtab, p, (size_t)len, &sz); |
if ((cp = chars_res2cp(h->symtab, p, len)) > 0) { |
|
printf("&#%d;", cp); |
if (NULL == rhs) |
|
return; |
return; |
fwrite(rhs, 1, sz, stdout); |
} else if (-1 == cp) |
|
return; |
|
|
|
if (NULL != (rhs = chars_res2str(h->symtab, p, len, &sz))) |
|
fwrite(rhs, 1, sz, stdout); |
} |
} |
|
|
|
|
static void |
static void |
print_encode(struct html *h, const char *p) |
print_metaf(struct html *h, enum roffdeco deco) |
{ |
{ |
|
enum htmlfont font; |
|
|
|
switch (deco) { |
|
case (DECO_PREVIOUS): |
|
font = h->metal; |
|
break; |
|
case (DECO_ITALIC): |
|
font = HTMLFONT_ITALIC; |
|
break; |
|
case (DECO_BOLD): |
|
font = HTMLFONT_BOLD; |
|
break; |
|
case (DECO_ROMAN): |
|
font = HTMLFONT_NONE; |
|
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
|
|
if (h->metaf) { |
|
print_tagq(h, h->metaf); |
|
h->metaf = NULL; |
|
} |
|
|
|
h->metal = h->metac; |
|
h->metac = font; |
|
|
|
if (HTMLFONT_NONE != font) |
|
h->metaf = HTMLFONT_BOLD == font ? |
|
print_otag(h, TAG_B, 0, NULL) : |
|
print_otag(h, TAG_I, 0, NULL); |
|
} |
|
|
|
|
|
static int |
|
print_encode(struct html *h, const char *p, int norecurse) |
|
{ |
size_t sz; |
size_t sz; |
int len; |
int len, nospace; |
const char *seq; |
const char *seq; |
enum roffdeco deco; |
enum roffdeco deco; |
|
static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' }; |
|
|
|
nospace = 0; |
|
|
for (; *p; p++) { |
for (; *p; p++) { |
sz = strcspn(p, "\\<>&"); |
sz = strcspn(p, rejs); |
|
|
fwrite(p, 1, sz, stdout); |
fwrite(p, 1, sz, stdout); |
p += /* LINTED */ |
p += /* LINTED */ |
Line 244 print_encode(struct html *h, const char *p) |
|
Line 325 print_encode(struct html *h, const char *p) |
|
} else if ('&' == *p) { |
} else if ('&' == *p) { |
printf("&"); |
printf("&"); |
continue; |
continue; |
|
} else if (ASCII_HYPH == *p) { |
|
/* |
|
* Note: "soft hyphens" aren't graphically |
|
* displayed when not breaking the text; we want |
|
* them to be displayed. |
|
*/ |
|
/*printf("­");*/ |
|
putchar('-'); |
|
continue; |
} else if ('\0' == *p) |
} else if ('\0' == *p) |
break; |
break; |
|
|
Line 251 print_encode(struct html *h, const char *p) |
|
Line 341 print_encode(struct html *h, const char *p) |
|
len = a2roffdeco(&deco, &seq, &sz); |
len = a2roffdeco(&deco, &seq, &sz); |
|
|
switch (deco) { |
switch (deco) { |
|
case (DECO_NUMBERED): |
|
print_num(h, seq, sz); |
|
break; |
case (DECO_RESERVED): |
case (DECO_RESERVED): |
print_res(h, seq, sz); |
print_res(h, seq, sz); |
break; |
break; |
|
case (DECO_SSPECIAL): |
|
/* FALLTHROUGH */ |
case (DECO_SPECIAL): |
case (DECO_SPECIAL): |
print_spec(h, seq, sz); |
print_spec(h, deco, seq, sz); |
break; |
break; |
|
case (DECO_PREVIOUS): |
|
/* FALLTHROUGH */ |
|
case (DECO_BOLD): |
|
/* FALLTHROUGH */ |
|
case (DECO_ITALIC): |
|
/* FALLTHROUGH */ |
|
case (DECO_ROMAN): |
|
if (norecurse) |
|
break; |
|
print_metaf(h, deco); |
|
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
p += len - 1; |
p += len - 1; |
|
|
|
if (DECO_NOSPACE == deco && '\0' == *(p + 1)) |
|
nospace = 1; |
} |
} |
|
|
|
return(nospace); |
} |
} |
|
|
|
|
|
static void |
|
print_attr(struct html *h, const char *key, const char *val) |
|
{ |
|
printf(" %s=\"", key); |
|
(void)print_encode(h, val, 1); |
|
putchar('\"'); |
|
} |
|
|
|
|
struct tag * |
struct tag * |
print_otag(struct html *h, enum htmltag tag, |
print_otag(struct html *h, enum htmltag tag, |
int sz, const struct htmlpair *p) |
int sz, const struct htmlpair *p) |
Line 273 print_otag(struct html *h, enum htmltag tag, |
|
Line 393 print_otag(struct html *h, enum htmltag tag, |
|
int i; |
int i; |
struct tag *t; |
struct tag *t; |
|
|
|
/* Push this tags onto the stack of open scopes. */ |
|
|
if ( ! (HTML_NOSTACK & htmltags[tag].flags)) { |
if ( ! (HTML_NOSTACK & htmltags[tag].flags)) { |
t = malloc(sizeof(struct tag)); |
t = mandoc_malloc(sizeof(struct tag)); |
if (NULL == t) { |
|
perror(NULL); |
|
exit(EXIT_FAILURE); |
|
} |
|
t->tag = tag; |
t->tag = tag; |
t->next = h->tags.head; |
t->next = h->tags.head; |
h->tags.head = t; |
h->tags.head = t; |
Line 286 print_otag(struct html *h, enum htmltag tag, |
|
Line 404 print_otag(struct html *h, enum htmltag tag, |
|
t = NULL; |
t = NULL; |
|
|
if ( ! (HTML_NOSPACE & h->flags)) |
if ( ! (HTML_NOSPACE & h->flags)) |
if ( ! (HTML_CLRLINE & htmltags[tag].flags)) |
if ( ! (HTML_CLRLINE & htmltags[tag].flags)) { |
putchar(' '); |
/* Manage keeps! */ |
|
if ( ! (HTML_KEEP & h->flags)) { |
|
if (HTML_PREKEEP & h->flags) |
|
h->flags |= HTML_KEEP; |
|
putchar(' '); |
|
} else |
|
printf(" "); |
|
} |
|
|
|
if ( ! (h->flags & HTML_NONOSPACE)) |
|
h->flags &= ~HTML_NOSPACE; |
|
else |
|
h->flags |= HTML_NOSPACE; |
|
|
|
/* Print out the tag name and attributes. */ |
|
|
printf("<%s", htmltags[tag].name); |
printf("<%s", htmltags[tag].name); |
for (i = 0; i < sz; i++) { |
for (i = 0; i < sz; i++) |
printf(" %s=\"", htmlattrs[p[i].key]); |
print_attr(h, htmlattrs[p[i].key], p[i].val); |
assert(p->val); |
|
print_encode(h, p[i].val); |
/* Add non-overridable attributes. */ |
putchar('\"'); |
|
|
if (TAG_HTML == tag && HTML_XHTML_1_0_STRICT == h->type) { |
|
print_attr(h, "xmlns", "http://www.w3.org/1999/xhtml"); |
|
print_attr(h, "xml:lang", "en"); |
|
print_attr(h, "lang", "en"); |
} |
} |
|
|
|
/* Accomodate for XML "well-formed" singleton escaping. */ |
|
|
|
if (HTML_AUTOCLOSE & htmltags[tag].flags) |
|
switch (h->type) { |
|
case (HTML_XHTML_1_0_STRICT): |
|
putchar('/'); |
|
break; |
|
default: |
|
break; |
|
} |
|
|
putchar('>'); |
putchar('>'); |
|
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
if (HTML_CLRLINE & htmltags[tag].flags) |
|
h->flags |= HTML_NEWLINE; |
|
else |
|
h->flags &= ~HTML_NEWLINE; |
|
|
|
|
if ((HTML_AUTOCLOSE | HTML_CLRLINE) & htmltags[tag].flags) |
|
putchar('\n'); |
|
|
return(t); |
return(t); |
} |
} |
|
|
|
|
/* ARGSUSED */ |
|
static void |
static void |
print_ctag(struct html *h, enum htmltag tag) |
print_ctag(struct html *h, enum htmltag tag) |
{ |
{ |
Line 316 print_ctag(struct html *h, enum htmltag tag) |
|
Line 462 print_ctag(struct html *h, enum htmltag tag) |
|
printf("</%s>", htmltags[tag].name); |
printf("</%s>", htmltags[tag].name); |
if (HTML_CLRLINE & htmltags[tag].flags) { |
if (HTML_CLRLINE & htmltags[tag].flags) { |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NEWLINE; |
|
putchar('\n'); |
putchar('\n'); |
} else |
} |
h->flags &= ~HTML_NEWLINE; |
|
} |
} |
|
|
|
|
/* ARGSUSED */ |
|
void |
void |
print_gen_doctype(struct html *h) |
print_gen_decls(struct html *h) |
{ |
{ |
|
|
printf("<!DOCTYPE HTML PUBLIC \"%s\" \"%s\">", DOCTYPE, DTD); |
print_xmltype(h); |
|
print_doctype(h); |
} |
} |
|
|
|
|
void |
static void |
print_text(struct html *h, const char *p) |
print_xmltype(struct html *h) |
{ |
{ |
|
|
if (*p && 0 == *(p + 1)) |
if (HTML_XHTML_1_0_STRICT == h->type) |
switch (*p) { |
puts("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); |
case('.'): |
} |
/* FALLTHROUGH */ |
|
case(','): |
|
/* FALLTHROUGH */ |
|
case(';'): |
|
/* FALLTHROUGH */ |
|
case(':'): |
|
/* FALLTHROUGH */ |
|
case('?'): |
|
/* FALLTHROUGH */ |
|
case('!'): |
|
/* FALLTHROUGH */ |
|
case(')'): |
|
/* FALLTHROUGH */ |
|
case(']'): |
|
/* FALLTHROUGH */ |
|
case('}'): |
|
if ( ! (HTML_IGNDELIM & h->flags)) |
|
h->flags |= HTML_NOSPACE; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
if ( ! (h->flags & HTML_NOSPACE)) |
|
putchar(' '); |
|
|
|
h->flags &= ~HTML_NOSPACE; |
static void |
h->flags &= ~HTML_NEWLINE; |
print_doctype(struct html *h) |
|
{ |
|
const char *doctype; |
|
const char *dtd; |
|
const char *name; |
|
|
if (p) |
switch (h->type) { |
print_encode(h, p); |
case (HTML_HTML_4_01_STRICT): |
|
name = "HTML"; |
|
doctype = "-//W3C//DTD HTML 4.01//EN"; |
|
dtd = "http://www.w3.org/TR/html4/strict.dtd"; |
|
break; |
|
default: |
|
name = "html"; |
|
doctype = "-//W3C//DTD XHTML 1.0 Strict//EN"; |
|
dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"; |
|
break; |
|
} |
|
|
if (*p && 0 == *(p + 1)) |
printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n", |
switch (*p) { |
name, doctype, dtd); |
case('('): |
} |
/* FALLTHROUGH */ |
|
case('['): |
|
/* FALLTHROUGH */ |
void |
case('{'): |
print_text(struct html *h, const char *word) |
|
{ |
|
|
|
if (DELIM_CLOSE == mandoc_isdelim(word)) |
|
if ( ! (HTML_IGNDELIM & h->flags)) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
break; |
|
default: |
if ( ! (HTML_NOSPACE & h->flags)) { |
break; |
/* Manage keeps! */ |
} |
if ( ! (HTML_KEEP & h->flags)) { |
|
if (HTML_PREKEEP & h->flags) |
|
h->flags |= HTML_KEEP; |
|
putchar(' '); |
|
} else |
|
printf(" "); |
|
} |
|
|
|
assert(NULL == h->metaf); |
|
if (HTMLFONT_NONE != h->metac) |
|
h->metaf = HTMLFONT_BOLD == h->metac ? |
|
print_otag(h, TAG_B, 0, NULL) : |
|
print_otag(h, TAG_I, 0, NULL); |
|
|
|
assert(word); |
|
if ( ! print_encode(h, word, 0)) |
|
if ( ! (h->flags & HTML_NONOSPACE)) |
|
h->flags &= ~HTML_NOSPACE; |
|
|
|
if (h->metaf) { |
|
print_tagq(h, h->metaf); |
|
h->metaf = NULL; |
|
} |
|
|
|
h->flags &= ~HTML_IGNDELIM; |
|
|
|
if (DELIM_OPEN == mandoc_isdelim(word)) |
|
h->flags |= HTML_NOSPACE; |
} |
} |
|
|
|
|
Line 392 print_tagq(struct html *h, const struct tag *until) |
|
Line 557 print_tagq(struct html *h, const struct tag *until) |
|
struct tag *tag; |
struct tag *tag; |
|
|
while ((tag = h->tags.head) != NULL) { |
while ((tag = h->tags.head) != NULL) { |
|
/* |
|
* Remember to close out and nullify the current |
|
* meta-font and table, if applicable. |
|
*/ |
|
if (tag == h->metaf) |
|
h->metaf = NULL; |
|
if (tag == h->tblt) |
|
h->tblt = NULL; |
print_ctag(h, tag->tag); |
print_ctag(h, tag->tag); |
h->tags.head = tag->next; |
h->tags.head = tag->next; |
free(tag); |
free(tag); |
Line 409 print_stagq(struct html *h, const struct tag *suntil) |
|
Line 582 print_stagq(struct html *h, const struct tag *suntil) |
|
while ((tag = h->tags.head) != NULL) { |
while ((tag = h->tags.head) != NULL) { |
if (suntil && tag == suntil) |
if (suntil && tag == suntil) |
return; |
return; |
|
/* |
|
* Remember to close out and nullify the current |
|
* meta-font and table, if applicable. |
|
*/ |
|
if (tag == h->metaf) |
|
h->metaf = NULL; |
|
if (tag == h->tblt) |
|
h->tblt = NULL; |
print_ctag(h, tag->tag); |
print_ctag(h, tag->tag); |
h->tags.head = tag->next; |
h->tags.head = tag->next; |
free(tag); |
free(tag); |
Line 565 bufcat_su(struct html *h, const char *p, const struct |
|
Line 746 bufcat_su(struct html *h, const char *p, const struct |
|
break; |
break; |
} |
} |
|
|
if (su->pt) |
/* |
buffmt(h, "%s: %f%s;", p, v, u); |
* XXX: the CSS spec isn't clear as to which types accept |
else |
* integer or real numbers, so we just make them all decimals. |
/* LINTED */ |
*/ |
buffmt(h, "%s: %d%s;", p, (int)v, u); |
buffmt(h, "%s: %.2f%s;", p, v, u); |
} |
} |
|
|
|
|
Line 578 html_idcat(char *dst, const char *src, int sz) |
|
Line 759 html_idcat(char *dst, const char *src, int sz) |
|
{ |
{ |
int ssz; |
int ssz; |
|
|
assert(sz); |
assert(sz > 2); |
|
|
/* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */ |
/* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */ |
|
|
for ( ; *dst != '\0' && sz; dst++, sz--) |
|
/* Jump to end. */ ; |
|
|
|
assert(sz > 2); |
|
|
|
/* We can't start with a number (bah). */ |
/* We can't start with a number (bah). */ |
|
|
*dst++ = 'x'; |
if ('#' == *dst) { |
*dst = '\0'; |
dst++; |
sz--; |
sz--; |
|
} |
|
if ('\0' == *dst) { |
|
*dst++ = 'x'; |
|
*dst = '\0'; |
|
sz--; |
|
} |
|
|
|
for ( ; *dst != '\0' && sz; dst++, sz--) |
|
/* Jump to end. */ ; |
|
|
for ( ; *src != '\0' && sz > 1; src++) { |
for ( ; *src != '\0' && sz > 1; src++) { |
ssz = snprintf(dst, (size_t)sz, "%.2x", *src); |
ssz = snprintf(dst, (size_t)sz, "%.2x", *src); |