version 1.93, 2010/01/29 14:39:37 |
version 1.97, 2010/04/03 12:46:35 |
Line 96 static void print_doctype(struct html *); |
|
Line 96 static void print_doctype(struct html *); |
|
static void print_xmltype(struct html *); |
static void print_xmltype(struct html *); |
static int print_encode(struct html *, const char *, int); |
static int print_encode(struct html *, const char *, int); |
static void print_metaf(struct html *, enum roffdeco); |
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); |
static void *ml_alloc(char *, enum htmltype); |
|
|
|
|
Line 351 print_encode(struct html *h, const char *p, int norecu |
|
Line 353 print_encode(struct html *h, const char *p, int norecu |
|
} |
} |
|
|
|
|
|
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 358 print_otag(struct html *h, enum htmltag tag, |
|
Line 369 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 = malloc(sizeof(struct tag)); |
if (NULL == t) { |
if (NULL == t) { |
Line 374 print_otag(struct html *h, enum htmltag tag, |
|
Line 387 print_otag(struct html *h, enum htmltag tag, |
|
if ( ! (HTML_CLRLINE & htmltags[tag].flags)) |
if ( ! (HTML_CLRLINE & htmltags[tag].flags)) |
putchar(' '); |
putchar(' '); |
|
|
|
/* 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); |
|
(void)print_encode(h, p[i].val, 1); |
/* 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) |
if (HTML_AUTOCLOSE & htmltags[tag].flags) |
switch (h->type) { |
switch (h->type) { |
case (HTML_XHTML_1_0_STRICT): |
case (HTML_XHTML_1_0_STRICT): |
Line 445 print_doctype(struct html *h) |
|
Line 466 print_doctype(struct html *h) |
|
{ |
{ |
const char *doctype; |
const char *doctype; |
const char *dtd; |
const char *dtd; |
|
const char *name; |
|
|
switch (h->type) { |
switch (h->type) { |
case (HTML_HTML_4_01_STRICT): |
case (HTML_HTML_4_01_STRICT): |
|
name = "HTML"; |
doctype = "-//W3C//DTD HTML 4.01//EN"; |
doctype = "-//W3C//DTD HTML 4.01//EN"; |
dtd = "http://www.w3.org/TR/html4/strict.dtd"; |
dtd = "http://www.w3.org/TR/html4/strict.dtd"; |
break; |
break; |
default: |
default: |
|
name = "html"; |
doctype = "-//W3C//DTD XHTML 1.0 Strict//EN"; |
doctype = "-//W3C//DTD XHTML 1.0 Strict//EN"; |
dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"; |
dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"; |
break; |
break; |
} |
} |
|
|
printf("<!DOCTYPE HTML PUBLIC \"%s\" \"%s\">\n", doctype, dtd); |
printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n", |
|
name, doctype, dtd); |
} |
} |
|
|
|
|
Line 482 print_text(struct html *h, const char *p) |
|
Line 507 print_text(struct html *h, const char *p) |
|
case(')'): |
case(')'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(']'): |
case(']'): |
/* FALLTHROUGH */ |
|
case('}'): |
|
if ( ! (HTML_IGNDELIM & h->flags)) |
if ( ! (HTML_IGNDELIM & h->flags)) |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
break; |
break; |
Line 500 print_text(struct html *h, const char *p) |
|
Line 523 print_text(struct html *h, const char *p) |
|
|
|
if (*p && 0 == *(p + 1)) |
if (*p && 0 == *(p + 1)) |
switch (*p) { |
switch (*p) { |
|
case('|'): |
|
/* FALLTHROUGH */ |
case('('): |
case('('): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case('['): |
case('['): |
/* FALLTHROUGH */ |
|
case('{'): |
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
break; |
break; |
default: |
default: |