version 1.39, 2015/02/13 15:35:15 |
version 1.40, 2015/02/13 18:01:53 |
Line 160 outbuf_addchar(struct state *st) |
|
Line 160 outbuf_addchar(struct state *st) |
|
if ('\\' == last) |
if ('\\' == last) |
st->outbuf[st->outbuflen++] = 'e'; |
st->outbuf[st->outbuflen++] = 'e'; |
st->outbuf[st->outbuflen] = '\0'; |
st->outbuf[st->outbuflen] = '\0'; |
st->wantws = 0; |
|
} |
} |
|
|
static void |
static void |
Line 174 outbuf_addstr(struct state *st, const char *str) |
|
Line 173 outbuf_addstr(struct state *st, const char *str) |
|
memcpy(st->outbuf + st->outbuflen, str, slen+1); |
memcpy(st->outbuf + st->outbuflen, str, slen+1); |
st->outbuflen += slen; |
st->outbuflen += slen; |
last = str[slen - 1]; |
last = str[slen - 1]; |
st->wantws = 0; |
|
} |
} |
|
|
static void |
static void |
Line 184 outbuf_flush(struct state *st) |
|
Line 182 outbuf_flush(struct state *st) |
|
if (0 == st->outbuflen) |
if (0 == st->outbuflen) |
return; |
return; |
|
|
|
if (OUST_TXT == st->oust && st->wantws) |
|
putchar(' '); |
|
|
fputs(st->outbuf, stdout); |
fputs(st->outbuf, stdout); |
*st->outbuf = '\0'; |
*st->outbuf = '\0'; |
st->outbuflen = 0; |
st->outbuflen = 0; |
|
|
formatcode(struct state *st, const char *buf, size_t *start, |
formatcode(struct state *st, const char *buf, size_t *start, |
size_t end, int nomacro, int pos) |
size_t end, int nomacro, int pos) |
{ |
{ |
enum fmt fmt; |
|
size_t i, j, dsz; |
size_t i, j, dsz; |
|
enum fmt fmt; |
|
int wantws; |
unsigned char uc; |
unsigned char uc; |
|
|
assert(*start + 1 < end); |
assert(*start + 1 < end); |
Line 563 formatcode(struct state *st, const char *buf, size_t * |
|
Line 565 formatcode(struct state *st, const char *buf, size_t * |
|
* allows to break at this point as well. |
* allows to break at this point as well. |
*/ |
*/ |
|
|
st->wantws |= ' ' == buf[*start]; |
wantws = ' ' == buf[*start] || |
|
(OUST_MAC == st->oust ? st->wantws : ! st->outbuflen); |
|
|
/* |
/* |
* If we are on a text line and there is no |
* If we are on a text line and there is no |
Line 573 formatcode(struct state *st, const char *buf, size_t * |
|
Line 576 formatcode(struct state *st, const char *buf, size_t * |
|
* lest we clobber out output state. |
* lest we clobber out output state. |
*/ |
*/ |
|
|
if (OUST_MAC != st->oust && !st->wantws) { |
if (OUST_MAC != st->oust && ! wantws) { |
if (OUST_NL != st->oust) |
if (OUST_NL != st->oust) |
putchar('\n'); |
putchar('\n'); |
printf(".Pf "); |
printf(".Pf "); |
|
st->wantws = 0; |
} |
} |
|
|
outbuf_flush(st); |
outbuf_flush(st); |
|
|
/* Whitespace is easier to suppress on macro lines. */ |
/* Whitespace is easier to suppress on macro lines. */ |
|
|
if (OUST_MAC == st->oust && !st->wantws) |
if (OUST_MAC == st->oust && ! wantws) |
printf(" Ns "); |
printf(" Ns "); |
|
|
/* Unless we are on a macro line, start one. */ |
/* Unless we are on a macro line, start one. */ |
|
|
if (OUST_MAC != st->oust && st->wantws) { |
if (OUST_MAC != st->oust && wantws) { |
if (OUST_NL != st->oust) |
if (OUST_NL != st->oust) |
putchar('\n'); |
putchar('\n'); |
putchar('.'); |
putchar('.'); |
Line 687 formatcode(struct state *st, const char *buf, size_t * |
|
Line 691 formatcode(struct state *st, const char *buf, size_t * |
|
} |
} |
if (*start + 1 < end && '<' == buf[*start + 1] && |
if (*start + 1 < end && '<' == buf[*start + 1] && |
'A' <= buf[*start] && 'Z' >= buf[*start]) { |
'A' <= buf[*start] && 'Z' >= buf[*start]) { |
formatcode(st, buf, start, end, nomacro, 1); |
if ( ! formatcode(st, buf, start, end, nomacro, 1)) |
|
st->wantws = 1; |
continue; |
continue; |
} |
} |
|
|
Line 729 formatcode(struct state *st, const char *buf, size_t * |
|
Line 734 formatcode(struct state *st, const char *buf, size_t * |
|
putchar('e'); |
putchar('e'); |
} |
} |
|
|
if (FMT__MAX == fmt) |
|
return(0); |
|
|
|
if ( ! nomacro && FMT_CODE == fmt) |
if ( ! nomacro && FMT_CODE == fmt) |
printf(" Qc "); |
printf(" Qc "); |
|
|
st->wantws = ' ' == last; |
st->wantws = ' ' == last; |
return(1); |
return(FMT__MAX != fmt); |
} |
} |
|
|
/* |
/* |
Line 1309 donamenm(struct state *st, const char *buf, size_t *st |
|
Line 1311 donamenm(struct state *st, const char *buf, size_t *st |
|
* |
* |
* Uses formatcode() to go to OUST_MAC mode |
* Uses formatcode() to go to OUST_MAC mode |
* and outbuf_flush() to go to OUST_TXT mode. |
* and outbuf_flush() to go to OUST_TXT mode. |
* Main text mode wantws handling is in this function. |
* In text mode, wantws requests white space before the text |
|
* currently contained in the outbuf, not before upcoming text. |
* Must make sure to go back to OUST_NL/wantws mode before returning. |
* Must make sure to go back to OUST_NL/wantws mode before returning. |
*/ |
*/ |
static void |
static void |
Line 1385 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1388 ordinary(struct state *st, const char *buf, size_t sta |
|
/* |
/* |
* On whitespace, flush the output buffer |
* On whitespace, flush the output buffer |
* and allow breaking to a macro line. |
* and allow breaking to a macro line. |
* Otherwise, buffer text and clear wantws. |
* Otherwise, merely buffer text. |
*/ |
*/ |
|
|
last = buf[start++]; |
last = buf[start++]; |
Line 1407 ordinary(struct state *st, const char *buf, size_t sta |
|
Line 1410 ordinary(struct state *st, const char *buf, size_t sta |
|
} |
} |
|
|
outbuf_flush(st); |
outbuf_flush(st); |
putchar(' '); |
if (OUST_MAC == st->oust) |
st->wantws = 1; |
mdoc_newln(st); |
|
else |
|
st->wantws = 1; |
} |
} |
|
|
if (start < end - 1 && '<' == buf[start + 1] && |
if (start < end - 1 && '<' == buf[start + 1] && |