version 1.178, 2011/03/15 16:23:51 |
version 1.181, 2011/03/22 10:13:01 |
|
|
#include <string.h> |
#include <string.h> |
|
|
#include "mandoc.h" |
#include "mandoc.h" |
#include "chars.h" |
|
#include "out.h" |
#include "out.h" |
#include "term.h" |
#include "term.h" |
#include "main.h" |
#include "main.h" |
Line 80 term_alloc(enum termenc enc) |
|
Line 79 term_alloc(enum termenc enc) |
|
{ |
{ |
struct termp *p; |
struct termp *p; |
|
|
p = calloc(1, sizeof(struct termp)); |
p = mandoc_calloc(1, sizeof(struct termp)); |
if (NULL == p) { |
|
perror(NULL); |
|
exit((int)MANDOCLEVEL_SYSERR); |
|
} |
|
|
|
p->enc = enc; |
p->enc = enc; |
return(p); |
return(p); |
} |
} |
Line 468 term_word(struct termp *p, const char *word) |
|
Line 462 term_word(struct termp *p, const char *word) |
|
|
|
sv = word; |
sv = word; |
|
|
if (word[0] && '\0' == word[1]) |
if (DELIM_CLOSE == mandoc_isdelim(word)) |
switch (word[0]) { |
if ( ! (TERMP_IGNDELIM & p->flags)) |
case('.'): |
p->flags |= TERMP_NOSPACE; |
/* FALLTHROUGH */ |
|
case(','): |
|
/* FALLTHROUGH */ |
|
case(';'): |
|
/* FALLTHROUGH */ |
|
case(':'): |
|
/* FALLTHROUGH */ |
|
case('?'): |
|
/* FALLTHROUGH */ |
|
case('!'): |
|
/* FALLTHROUGH */ |
|
case(')'): |
|
/* FALLTHROUGH */ |
|
case(']'): |
|
if ( ! (TERMP_IGNDELIM & p->flags)) |
|
p->flags |= TERMP_NOSPACE; |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
if ( ! (TERMP_NOSPACE & p->flags)) { |
if ( ! (TERMP_NOSPACE & p->flags)) { |
if ( ! (TERMP_KEEP & p->flags)) { |
if ( ! (TERMP_KEEP & p->flags)) { |
Line 553 term_word(struct termp *p, const char *word) |
|
Line 527 term_word(struct termp *p, const char *word) |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
} |
} |
|
|
/* |
if (DELIM_OPEN == mandoc_isdelim(sv)) |
* Note that we don't process the pipe: the parser sees it as |
p->flags |= TERMP_NOSPACE; |
* punctuation, but we don't in terms of typography. |
|
*/ |
|
if (sv[0] && '\0' == sv[1]) |
|
switch (sv[0]) { |
|
case('('): |
|
/* FALLTHROUGH */ |
|
case('['): |
|
p->flags |= TERMP_NOSPACE; |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
} |
|
|
|
|
Line 579 adjbuf(struct termp *p, size_t sz) |
|
Line 541 adjbuf(struct termp *p, size_t sz) |
|
while (sz >= p->maxcols) |
while (sz >= p->maxcols) |
p->maxcols <<= 2; |
p->maxcols <<= 2; |
|
|
p->buf = realloc(p->buf, p->maxcols); |
p->buf = mandoc_realloc(p->buf, p->maxcols); |
if (NULL == p->buf) { |
|
perror(NULL); |
|
exit((int)MANDOCLEVEL_SYSERR); |
|
} |
|
} |
} |
|
|
|
|