version 1.112, 2010/09/04 20:18:53 |
version 1.118, 2010/12/17 10:37:26 |
Line 57 static const struct htmldata htmltags[TAG_MAX] = { |
|
Line 57 static const struct htmldata htmltags[TAG_MAX] = { |
|
{"br", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_BR */ |
{"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 */ |
|
{"tbody", HTML_CLRLINE}, /* TAG_TBODY */ |
{"col", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_COL */ |
{"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 */ |
|
{"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 */ |
}; |
}; |
|
|
static const char *const htmlfonts[HTMLFONT_MAX] = { |
static const char *const htmlfonts[HTMLFONT_MAX] = { |
Line 121 ml_alloc(char *outopts, enum htmltype type) |
|
Line 128 ml_alloc(char *outopts, enum htmltype type) |
|
|
|
h->type = type; |
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) |
|
|
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 450 print_otag(struct html *h, enum htmltag tag, |
|
Line 450 print_otag(struct html *h, enum htmltag tag, |
|
putchar('>'); |
putchar('>'); |
|
|
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
|
|
|
if ((HTML_AUTOCLOSE | HTML_CLRLINE) & htmltags[tag].flags) |
|
putchar('\n'); |
|
|
return(t); |
return(t); |
} |
} |
|
|
Line 551 print_text(struct html *h, const char *word) |
|
Line 555 print_text(struct html *h, const char *word) |
|
if ( ! print_encode(h, word, 0)) |
if ( ! print_encode(h, word, 0)) |
if ( ! (h->flags & HTML_NONOSPACE)) |
if ( ! (h->flags & HTML_NONOSPACE)) |
h->flags &= ~HTML_NOSPACE; |
h->flags &= ~HTML_NOSPACE; |
|
|
|
h->flags &= ~HTML_IGNDELIM; |
|
|
/* |
/* |
* 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 |