mandoc/html.c - diff

Return to html.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/html.c between version 1.161 and 1.166

version 1.161, 2014/08/13 15:25:22

version 1.166, 2014/09/27 09:03:24

Line 74 static const struct htmldata htmltags[TAG_MAX] = {

{"i", 0 }, /* TAG_I */

{"code", 0 }, /* TAG_CODE */

{"small", 0 }, /* TAG_SMALL */

{"em", 0 }, /* TAG_EM */

{"style", HTML_CLRLINE}, /* TAG_STYLE */

};

static const char *const htmlattrs[ATTR_MAX] = {

"http-equiv", /* ATTR_HTTPEQUIV */

"content", /* ATTR_CONTENT */

"name", /* ATTR_NAME */

"rel", /* ATTR_REL */

"href", /* ATTR_HREF */

Line 92 static const char *const htmlattrs[ATTR_MAX] = {

Line 90 static const char *const htmlattrs[ATTR_MAX] = {

"summary", /* ATTR_SUMMARY */

"align", /* ATTR_ALIGN */

"colspan", /* ATTR_COLSPAN */

"charset", /* ATTR_CHARSET */

};

static const char *const roffscales[SCALE_MAX] = {

Line 193 void

Line 192 void

print_gen_head(struct html *h)

{

struct htmlpair tag[4];

struct tag *t;

tag[0].key = ATTR_HTTPEQUIV;

tag[0].key = ATTR_CHARSET;

tag[0].val = "Content-Type";

tag[0].val = "utf-8";

tag[1].key = ATTR_CONTENT;

print_otag(h, TAG_META, 1, tag);

tag[1].val = "text/html; charset=utf-8";

print_otag(h, TAG_META, 2, tag);

tag[0].key = ATTR_NAME;

t = print_otag(h, TAG_STYLE, 0, NULL);

tag[0].val = "resource-type";

print_text(h, "table.head, table.foot { width: 100%; }\n");

tag[1].key = ATTR_CONTENT;

print_tagq(h, t);

tag[1].val = "document";

print_otag(h, TAG_META, 2, tag);

if (h->style) {

tag[0].key = ATTR_REL;

Line 494 print_otag(struct html *h, enum htmltag tag,

Line 490 print_otag(struct html *h, enum htmltag tag,

for (i = 0; i < sz; i++)

print_attr(h, htmlattrs[p[i].key], p[i].val);

/* Add non-overridable attributes. */

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");

}

/* Accommodate for XML "well-formed" singleton escaping. */

if (HTML_AUTOCLOSE & htmltags[tag].flags)

Line 537 print_ctag(struct html *h, enum htmltag tag)

Line 525 print_ctag(struct html *h, enum htmltag tag)

void

print_gen_decls(struct html *h)

{

const char *doctype;

const char *dtd;

const char *name;

switch (h->type) {

puts("<!DOCTYPE html>");

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:

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";

break;

}

printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n",

name, doctype, dtd);

}

void

Line 760 bufcat_su(struct html *h, const char *p, const struct

Line 730 bufcat_su(struct html *h, const char *p, const struct

v = su->scale;

if (SCALE_MM == su->unit && 0.0 == (v /= 100.0))

v = 1.0;

else if (SCALE_BU == su->unit)

v /= 24.0;

bufcat_fmt(h, "%s: %.2f%s;", p, v, roffscales[su->unit]);

}

CVSweb