version 1.102, 2010/06/19 20:46:27 |
version 1.105, 2010/07/06 12:37:17 |
Line 393 print_otag(struct html *h, enum htmltag tag, |
|
Line 393 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(" "); |
|
} |
|
|
/* Print out the tag name and attributes. */ |
/* Print out the tag name and attributes. */ |
|
|
Line 484 print_doctype(struct html *h) |
|
Line 491 print_doctype(struct html *h) |
|
|
|
|
|
void |
void |
print_text(struct html *h, const char *p) |
print_text(struct html *h, const char *word) |
{ |
{ |
|
|
if (*p && 0 == *(p + 1)) |
if (word[0] && '\0' == word[1]) |
switch (*p) { |
switch (word[0]) { |
case('.'): |
case('.'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case(','): |
case(','): |
Line 511 print_text(struct html *h, const char *p) |
|
Line 518 print_text(struct html *h, const char *p) |
|
break; |
break; |
} |
} |
|
|
if ( ! (h->flags & HTML_NOSPACE)) |
if ( ! (HTML_NOSPACE & h->flags)) { |
putchar(' '); |
/* Manage keeps! */ |
|
if ( ! (HTML_KEEP & h->flags)) { |
|
if (HTML_PREKEEP & h->flags) |
|
h->flags |= HTML_KEEP; |
|
putchar(' '); |
|
} else |
|
printf(" "); |
|
} |
|
|
assert(p); |
assert(word); |
if ( ! print_encode(h, p, 0)) |
if ( ! print_encode(h, word, 0)) |
h->flags &= ~HTML_NOSPACE; |
h->flags &= ~HTML_NOSPACE; |
|
|
/* |
/* |
* Note that we don't process the pipe: the parser sees it as |
* Note that we don't process the pipe: the parser sees it as |
* punctuation, but we don't in terms of typography. |
* punctuation, but we don't in terms of typography. |
*/ |
*/ |
if (*p && 0 == *(p + 1)) |
if (word[0] && '\0' == word[1]) |
switch (*p) { |
switch (word[0]) { |
case('('): |
case('('): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case('['): |
case('['): |
Line 718 bufcat_su(struct html *h, const char *p, const struct |
|
Line 732 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); |
} |
} |
|
|
|
|