version 1.127, 2011/03/15 16:23:51 |
version 1.130, 2011/03/22 10:13:01 |
|
|
|
|
#include "mandoc.h" |
#include "mandoc.h" |
#include "out.h" |
#include "out.h" |
#include "chars.h" |
|
#include "html.h" |
#include "html.h" |
#include "main.h" |
#include "main.h" |
|
|
Line 120 ml_alloc(char *outopts, enum htmltype type) |
|
Line 119 ml_alloc(char *outopts, enum htmltype type) |
|
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((int)MANDOCLEVEL_SYSERR); |
|
} |
|
|
|
h->type = type; |
h->type = type; |
h->tags.head = NULL; |
h->tags.head = NULL; |
Line 400 print_otag(struct html *h, enum htmltag tag, |
|
Line 395 print_otag(struct html *h, enum htmltag tag, |
|
/* Push this tags onto the stack of open scopes. */ |
/* 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((int)MANDOCLEVEL_SYSERR); |
|
} |
|
t->tag = tag; |
t->tag = tag; |
t->next = h->tags.head; |
t->next = h->tags.head; |
h->tags.head = t; |
h->tags.head = t; |
|
|
print_text(struct html *h, const char *word) |
print_text(struct html *h, const char *word) |
{ |
{ |
|
|
if (word[0] && '\0' == word[1]) |
if (DELIM_CLOSE == mandoc_isdelim(word)) |
switch (word[0]) { |
if ( ! (HTML_IGNDELIM & h->flags)) |
case('.'): |
h->flags |= HTML_NOSPACE; |
/* 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 ( ! (HTML_NOSPACE & h->flags)) { |
if ( ! (HTML_NOSPACE & h->flags)) { |
/* Manage keeps! */ |
/* Manage keeps! */ |
Line 574 print_text(struct html *h, const char *word) |
|
Line 545 print_text(struct html *h, const char *word) |
|
|
|
h->flags &= ~HTML_IGNDELIM; |
h->flags &= ~HTML_IGNDELIM; |
|
|
/* |
if (DELIM_OPEN == mandoc_isdelim(word)) |
* Note that we don't process the pipe: the parser sees it as |
h->flags |= HTML_NOSPACE; |
* punctuation, but we don't in terms of typography. |
|
*/ |
|
if (word[0] && '\0' == word[1]) |
|
switch (word[0]) { |
|
case('('): |
|
/* FALLTHROUGH */ |
|
case('['): |
|
h->flags |= HTML_NOSPACE; |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
} |
|
|
|
|