=================================================================== RCS file: /cvs/pod2mdoc/pod2mdoc.c,v retrieving revision 1.30 retrieving revision 1.37 diff -u -p -r1.30 -r1.37 --- pod2mdoc/pod2mdoc.c 2014/07/15 19:00:48 1.30 +++ pod2mdoc/pod2mdoc.c 2015/02/13 00:44:16 1.37 @@ -1,6 +1,7 @@ -/* $Id: pod2mdoc.c,v 1.30 2014/07/15 19:00:48 schwarze Exp $ */ +/* $Id: pod2mdoc.c,v 1.37 2015/02/13 00:44:16 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons + * Copyright (c) 2014, 2015 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -26,6 +27,8 @@ #include #include +#include "dict.h" + /* * In what section can we find Perl module manuals? * Sometimes (Mac OS X) it's 3pm, sometimes (OpenBSD, etc.) 3p. @@ -52,15 +55,26 @@ enum sect { SECT_SYNOPSIS, /* SYNOPSIS section */ }; +enum outstate { + OUST_NL = 0, /* just started a new output line */ + OUST_TXT, /* text line output in progress */ + OUST_MAC /* macro line output in progress */ +}; + struct state { + const char *fname; /* file being parsed */ int parsing; /* after =cut of before command */ int paused; /* in =begin and before =end */ - int haspar; /* in paragraph: do we need Pp? */ enum sect sect; /* which section are we in? */ - const char *fname; /* file being parsed */ #define LIST_STACKSZ 128 enum list lstack[LIST_STACKSZ]; /* open lists */ size_t lpos; /* where in list stack */ + int haspar; /* in paragraph: do we need Pp? */ + enum outstate oust; /* state of the mdoc output stream */ + int wantws; /* let mdoc(7) output whitespace here */ + char *outbuf; /* text buffered for output */ + size_t outbufsz; /* allocated size of outbuf */ + size_t outbuflen; /* current length of outbuf */ }; enum fmt { @@ -123,13 +137,85 @@ static const char fmts[FMT__MAX] = { static int last; + +static void +outbuf_grow(struct state *st, size_t by) +{ + + st->outbufsz += (by / 128 + 1) * 128; + st->outbuf = realloc(st->outbuf, st->outbufsz); + if (NULL == st->outbuf) { + perror(NULL); + exit(EXIT_FAILURE); + } +} + +static void +outbuf_addchar(struct state *st) +{ + + if (st->outbuflen + 2 >= st->outbufsz) + outbuf_grow(st, 1); + st->outbuf[st->outbuflen++] = last; + if ('\\' == last) + st->outbuf[st->outbuflen++] = 'e'; + st->outbuf[st->outbuflen] = '\0'; + st->wantws = 0; +} + +static void +outbuf_addstr(struct state *st, const char *str) +{ + size_t slen; + + slen = strlen(str); + if (st->outbuflen + slen >= st->outbufsz) + outbuf_grow(st, slen); + memcpy(st->outbuf + st->outbuflen, str, slen+1); + st->outbuflen += slen; + last = str[slen - 1]; + st->wantws = 0; +} + +static void +outbuf_flush(struct state *st) +{ + + if (0 == st->outbuflen) + return; + + fputs(st->outbuf, stdout); + *st->outbuf = '\0'; + st->outbuflen = 0; + + if (OUST_NL == st->oust) + st->oust = OUST_TXT; +} + +static void +mdoc_newln(struct state *st) +{ + + if (OUST_NL == st->oust) + return; + + putchar('\n'); + last = '\n'; + st->oust = OUST_NL; + st->wantws = 1; +} + /* * Given buf[*start] is at the start of an escape name, read til the end * of the escape ('>') then try to do something with it. * Sets start to be one after the '>'. + * + * This function does not care about output modes, + * it merely appends text to the output buffer, + * which can then be used in any mode. */ static void -formatescape(const char *buf, size_t *start, size_t end) +formatescape(struct state *st, const char *buf, size_t *start, size_t end) { char esc[16]; /* no more needed */ size_t i, max; @@ -157,17 +243,13 @@ formatescape(const char *buf, size_t *start, size_t en * Just let the rest of them go. */ if (0 == strcmp(esc, "lt")) - printf("\\(la"); + outbuf_addstr(st, "\\(la"); else if (0 == strcmp(esc, "gt")) - printf("\\(ra"); - else if (0 == strcmp(esc, "vb")) - printf("\\(ba"); + outbuf_addstr(st, "\\(ra"); + else if (0 == strcmp(esc, "verbar")) + outbuf_addstr(st, "\\(ba"); else if (0 == strcmp(esc, "sol")) - printf("\\(sl"); - else - return; - - last = 'a'; + outbuf_addstr(st, "\\(sl"); } /* @@ -175,6 +257,9 @@ formatescape(const char *buf, size_t *start, size_t en * I set "start" to be the end of the sequence (last right-carrot) so * that the caller can safely just continue processing. * If this is just an empty tag, I'll return 0. + * + * Always operates in OUST_MAC mode. + * Mode handling is done by the caller. */ static int trylink(const char *buf, size_t *start, size_t end, size_t dsz) @@ -309,6 +394,9 @@ trylink(const char *buf, size_t *start, size_t end, si * Our flag might be followed by an argument, so make sure that we're * accounting for that, too. * If we don't have a flag at all, however, then assume we're an "Ar". + * + * Always operates in OUST_MAC mode. + * Mode handlinf is done by the caller. */ static void dosynopsisfl(const char *buf, size_t *start, size_t end) @@ -374,20 +462,20 @@ again: * like X<...> and can contain nested format codes. * This consumes the whole format code, and any nested format codes, til * the end of matched production. - * If "reentrant", then we're being called after a macro has already - * been printed to the current line. * If "nomacro", then we don't print any macros, just contained data * (e.g., following "Sh" or "Nm"). * "pos" is only significant in SYNOPSIS, and should be 0 when invoked * as the first format code on a line (for decoration as an "Nm"), * non-zero otherwise. - * Return whether we've printed a macro or not--in other words, whether - * this should trigger a subsequent newline (this should be ignored when - * reentrant). + * + * Output mode handling is most complicated here. + * We may enter in any mode. + * We usually exit in OUST_MAC mode, except when + * entering without OUST_MAC and the code is invalid. */ static int formatcode(struct state *st, const char *buf, size_t *start, - size_t end, int reentrant, int nomacro, int pos) + size_t end, int nomacro, int pos) { enum fmt fmt; size_t i, j, dsz; @@ -427,7 +515,7 @@ formatcode(struct state *st, const char *buf, size_t * * processing for real macros. */ if (FMT_ESCAPE == fmt) { - formatescape(buf, start, end); + formatescape(st, buf, start, end); return(0); } else if (FMT_NULL == fmt || FMT_INDEX == fmt) { /* @@ -466,27 +554,50 @@ formatcode(struct state *st, const char *buf, size_t * * suppressed in, e.g., "Nm" and "Sh" macros). */ if (FMT__MAX != fmt && !nomacro) { + /* - * Print out the macro describing this format code. - * If we're not "reentrant" (not yet on a macro line) - * then print a newline, if necessary, and the macro - * indicator. - * Otherwise, offset us with a space. + * We may already have wantws if there was whitespace + * before the code ("text Bwantws |= ' ' == buf[*start]; + + /* + * If we are on a text line and there is no + * whitespace before our content, we have to make + * the previous word a prefix to the macro line. + * In the following, mdoc_newln() must not be used + * lest we clobber out output state. + */ + + if (OUST_MAC != st->oust && !st->wantws) { + if (OUST_NL != st->oust) putchar('\n'); + printf(".Pf "); + } + + outbuf_flush(st); + + /* Whitespace is easier to suppress on macro lines. */ + + if (OUST_MAC == st->oust && !st->wantws) + printf(" Ns "); + + /* Unless we are on a macro line, start one. */ + + if (OUST_MAC != st->oust && st->wantws) { + if (OUST_NL != st->oust) + putchar('\n'); putchar('.'); - } else + } else putchar(' '); - + /* - * If we don't have whitespace before us (and none after - * the opening delimiter), then suppress macro - * whitespace with Pf. + * Print the macro corresponding to this format code, + * and update the output state afterwards. */ - if (' ' != last && '\n' != last && ' ' != buf[*start]) - printf("Pf "); switch (fmt) { case (FMT_ITALIC): @@ -526,7 +637,10 @@ formatcode(struct state *st, const char *buf, size_t * default: abort(); } - } + st->oust = OUST_MAC; + st->wantws = 1; + } else + outbuf_flush(st); /* * Process until we reach the end marker (e.g., '>') or until we @@ -555,41 +669,48 @@ formatcode(struct state *st, const char *buf, size_t * break; } } - if (*start + 1 < end && '<' == buf[*start + 1]) { - formatcode(st, buf, start, end, 1, nomacro, 1); + if (*start + 1 < end && '<' == buf[*start + 1] && + 'A' <= buf[*start] && 'Z' >= buf[*start]) { + formatcode(st, buf, start, end, nomacro, 1); continue; } - /* - * Make sure that any macro-like words (or - * really any word starting with a capital - * letter) is assumed to be a macro that must be - * escaped. - * This matches "Xx " and "XxEOLN". - */ - if ((' ' == last || '\n' == last) && - end - *start > 1 && - isupper((int)buf[*start]) && - islower((int)buf[*start + 1]) && - (end - *start == 2 || - ' ' == buf[*start + 2])) - printf("\\&"); + /* Suppress newlines and multiple spaces. */ - /* Suppress newline. */ - if ('\n' == buf[*start]) - putchar(last = ' '); - else - putchar(last = buf[*start]); + last = buf[(*start)++]; + if (' ' == last || '\n' == last) { + putchar(' '); + while (*start < end && ' ' == buf[*start]) + (*start)++; + continue; + } + if (OUST_MAC == st->oust && FMT__MAX != fmt) { + if ( ! st->wantws) { + printf(" Ns "); + st->wantws = 1; + } + + /* + * Escape macro-like words. + * This matches "Xx " and "XxEOLN". + */ + + if (end - *start > 0 && + isupper((unsigned char)last) && + islower((unsigned char)buf[*start]) && + (end - *start == 1 || + ' ' == buf[*start + 1] || + '>' == buf[*start + 1])) + printf("\\&"); + } + + putchar(last); + /* Protect against character escapes. */ + if ('\\' == last) putchar('e'); - - (*start)++; - - if (' ' == last) - while (*start < end && ' ' == buf[*start]) - (*start)++; } if (FMT__MAX == fmt) @@ -598,32 +719,66 @@ formatcode(struct state *st, const char *buf, size_t * if ( ! nomacro && FMT_CODE == fmt) printf(" Qc "); - /* - * We're now subsequent the format code. - * If there isn't a space (or newline) here, and we haven't just - * printed a space, then suppress space. - */ - if ( ! nomacro && ' ' != last) - if (' ' != buf[*start] && '\n' != buf[*start]) - printf(" Ns "); - + st->wantws = ' ' == last; return(1); } /* * Calls formatcode() til the end of a paragraph. + * Goes to OUST_MAC mode and stays there when returning, + * such that the caller can add arguments to the macro line + * before closing it out. */ static void -formatcodeln(struct state *st, const char *buf, - size_t *start, size_t end, int nomacro) +formatcodeln(struct state *st, const char *linemac, + const char *buf, size_t *start, size_t end, int nomacro) { + int gotmacro, wantws; - last = ' '; + assert(OUST_NL == st->oust); + assert(st->wantws); + printf(".%s ", linemac); + st->oust = OUST_MAC; + + gotmacro = 0; while (*start < end) { - if (*start + 1 < end && '<' == buf[*start + 1]) { - formatcode(st, buf, start, end, 1, nomacro, 1); + wantws = ' ' == buf[*start] || '\n' == buf[*start]; + if (wantws) { + last = ' '; + do { + (*start)++; + } while (*start < end && ' ' == buf[*start]); + } + + if (*start + 1 < end && '<' == buf[*start + 1] && + 'A' <= buf[*start] && 'Z' >= buf[*start]) { + st->wantws |= wantws; + gotmacro = formatcode(st, buf, + start, end, nomacro, 1); continue; } + + if (gotmacro) { + if (*start < end || st->outbuflen) { + if (st->wantws || + (wantws && !st->outbuflen)) + printf(" No "); + else + printf(" Ns "); + } + gotmacro = 0; + } + outbuf_flush(st); + st->wantws = wantws; + + if (*start >= end) + break; + + if (st->wantws) { + putchar(' '); + st->wantws = 0; + } + /* * Since we're already on a macro line, we want to make * sure that we don't inadvertently invoke a macro. @@ -632,18 +787,15 @@ formatcodeln(struct state *st, const char *buf, * something that needn't be escaped. */ if (' ' == last && end - *start > 1 && - isupper((int)buf[*start]) && - islower((int)buf[*start + 1]) && - (end - *start == 2 || - ' ' == buf[*start + 2])) + isupper((unsigned char)buf[*start]) && + islower((unsigned char)buf[*start + 1]) && + (end - *start == 2 || ' ' == buf[*start + 2])) printf("\\&"); - if ('\n' == buf[*start]) - putchar(last = ' '); - else - putchar(last = buf[*start]); + putchar(last = buf[*start]); /* Protect against character escapes. */ + if ('\\' == last) putchar('e'); @@ -677,6 +829,9 @@ listguess(const char *buf, size_t start, size_t end) * A command paragraph, as noted in the perlpod manual, just indicates * that we should do something, optionally with some text to print as * well. + * From the perspective of external callers, + * always stays in OUST_NL/wantws mode, + * but its children do use OUST_MAC. */ static void command(struct state *st, const char *buf, size_t start, size_t end) @@ -720,7 +875,6 @@ command(struct state *st, const char *buf, size_t star * The behaviour of head= follows from a quick glance at * how pod2man handles it. */ - printf(".Sh "); st->sect = SECT_NONE; if (end - start == 4) { if (0 == memcmp(&buf[start], "NAME", 4)) @@ -729,29 +883,26 @@ command(struct state *st, const char *buf, size_t star if (0 == memcmp(&buf[start], "SYNOPSIS", 8)) st->sect = SECT_SYNOPSIS; } - formatcodeln(st, buf, &start, end, 1); - putchar('\n'); + formatcodeln(st, "Sh", buf, &start, end, 1); + mdoc_newln(st); st->haspar = 1; break; case (CMD_HEAD2): - printf(".Ss "); - formatcodeln(st, buf, &start, end, 1); - putchar('\n'); + formatcodeln(st, "Ss", buf, &start, end, 1); + mdoc_newln(st); st->haspar = 1; break; case (CMD_HEAD3): puts(".Pp"); - printf(".Em "); - formatcodeln(st, buf, &start, end, 0); - putchar('\n'); + formatcodeln(st, "Em", buf, &start, end, 0); + mdoc_newln(st); puts(".Pp"); st->haspar = 1; break; case (CMD_HEAD4): puts(".Pp"); - printf(".No "); - formatcodeln(st, buf, &start, end, 0); - putchar('\n'); + formatcodeln(st, "No", buf, &start, end, 0); + mdoc_newln(st); puts(".Pp"); st->haspar = 1; break; @@ -803,9 +954,8 @@ command(struct state *st, const char *buf, size_t star } switch (st->lstack[st->lpos - 1]) { case (LIST_TAG): - printf(".It "); - formatcodeln(st, buf, &start, end, 0); - putchar('\n'); + formatcodeln(st, "It", buf, &start, end, 0); + mdoc_newln(st); break; case (LIST_ENUM): /* FALLTHROUGH */ @@ -857,14 +1007,17 @@ command(struct state *st, const char *buf, size_t star /* * Just pump out the line in a verbatim block. + * From the perspective of external callers, + * always stays in OUST_NL/wantws mode. */ static void -verbatim(struct state *st, const char *buf, size_t start, size_t end) +verbatim(struct state *st, char *buf, size_t start, size_t end) { - int last; - size_t i; + size_t i, ift, ifo, ifa, ifc, inl; + char *cp; + int nopen; - if ( ! st->parsing || st->paused) + if ( ! st->parsing || st->paused || start == end) return; again: /* @@ -875,10 +1028,11 @@ again: */ if (SECT_SYNOPSIS == st->sect) { i = start; - for (i = start; i < end && ' ' == buf[i]; i++) - /* Spin. */ ; + while (i < end && buf[i] == ' ') + i++; if (i == end) return; + /* We're an include block! */ if (end - i > 10 && 0 == memcmp(&buf[i], "#include <", 10)) { @@ -899,10 +1053,90 @@ again: goto again; return; } + + /* Parse function declaration. */ + ifo = ifa = ifc = 0; + inl = end; + nopen = 0; + for (ift = i; i < end; i++) { + if (ifc) { + if (buf[i] != '\n') + continue; + inl = i; + break; + } + switch (buf[i]) { + case ' ': + if ( ! ifa) + ifo = i; + break; + case '(': + if (ifo) { + nopen++; + if ( ! ifa) + ifa = i; + } else + i = end; + break; + case ')': + switch (nopen) { + case 0: + i = end; + break; + case 1: + ifc = i; + break; + default: + nopen--; + break; + } + break; + default: + break; + } + } + + /* Encode function declaration. */ + if (ifc) { + for (i = ifa; i < ifc; i++) + if (buf[i] == '\n') + buf[i] = ' '; + buf[ifo++] = '\0'; + printf(".Ft %s", buf + ift); + if (buf[ifo] == '*') { + fputs(" *", stdout); + ifo++; + } + putchar('\n'); + buf[ifa++] = '\0'; + printf(".Fo %s\n", buf + ifo); + dict_put(buf + ifo, MDOC_Fo); + buf[ifc++] = '\0'; + for (;;) { + cp = strchr(buf + ifa, ','); + if (cp != NULL) + *cp++ = '\0'; + printf(".Fa \"%s\"\n", buf + ifa); + if (cp == NULL) + break; + while (*cp == ' ') + cp++; + ifa = cp - buf; + } + puts(".Fc"); + if (buf[ifc] == ';') + ifc++; + if (ifc < inl) { + buf[inl] = '\0'; + puts(buf + ifc); + } + start = inl + 1; + if (start < end) + goto again; + return; + } } - if (start == end) - return; puts(".Bd -literal"); for (last = ' '; start < end; start++) { /* @@ -916,7 +1150,7 @@ again: if ('\\' == buf[start]) printf("e"); } - putchar('\n'); + putchar(last = '\n'); puts(".Ed"); } @@ -946,30 +1180,28 @@ hasmatch(const char *buf, size_t start, size_t end) * If we're an ending bracket, see if we have a stack already. */ static int -dosynopsisop(const char *buf, int *last, +dosynopsisop(struct state *st, const char *buf, size_t *start, size_t end, size_t *opstack) { assert('[' == buf[*start] || ']' == buf[*start]); if ('[' == buf[*start] && hasmatch(buf, *start + 1, end)) { - if ('\n' != *last) - putchar('\n'); + mdoc_newln(st); puts(".Oo"); (*opstack)++; } else if ('[' == buf[*start]) return(0); if (']' == buf[*start] && *opstack > 0) { - if ('\n' != *last) - putchar('\n'); + mdoc_newln(st); puts(".Oc"); (*opstack)--; } else if (']' == buf[*start]) return(0); (*start)++; - *last = '\n'; + last = '\n'; while (' ' == buf[*start]) (*start)++; return(1); @@ -977,12 +1209,18 @@ dosynopsisop(const char *buf, int *last, /* * Format multiple "Nm" manpage names in the NAME section. + * From the perspective of external callers, + * always stays in OUST_NL/wantws mode, + * but its children do use OUST_MAC. */ static void donamenm(struct state *st, const char *buf, size_t *start, size_t end) { size_t word; + assert(OUST_NL == st->oust); + assert(st->wantws); + while (*start < end && ' ' == buf[*start]) (*start)++; @@ -992,17 +1230,17 @@ donamenm(struct state *st, const char *buf, size_t *st } while (*start < end) { - fputs(".Nm ", stdout); for (word = *start; word < end; word++) if (',' == buf[word]) break; - formatcodeln(st, buf, start, word, 1); + formatcodeln(st, "Nm", buf, start, word, 1); if (*start == end) { - putchar('\n'); - continue; + mdoc_newln(st); + break; } assert(',' == buf[*start]); - puts(" ,"); + printf(" ,"); + mdoc_newln(st); (*start)++; while (*start < end && ' ' == buf[*start]) (*start)++; @@ -1016,6 +1254,11 @@ donamenm(struct state *st, const char *buf, size_t *st * Lots of other snakes in the grass: escaping a newline followed by a * period (accidental mdoc(7) control), double-newlines after macro * passages, etc. + * + * Uses formatcode() to go to OUST_MAC mode + * and outbuf_flush() to go to OUST_TXT mode. + * Main text mode wantws handling is in this function. + * Must make sure to go back to OUST_NL/wantws mode before returning. */ static void ordinary(struct state *st, const char *buf, size_t start, size_t end) @@ -1046,9 +1289,8 @@ ordinary(struct state *st, const char *buf, size_t sta start = j + 1; while (start < end && ' ' == buf[start]) start++; - fputs(".Nd ", stdout); - formatcodeln(st, buf, &start, end, 1); - putchar('\n'); + formatcodeln(st, "Nd", buf, &start, end, 1); + mdoc_newln(st); return; } } @@ -1066,32 +1308,61 @@ ordinary(struct state *st, const char *buf, size_t sta * Escape initial control characters. */ while (start < end) { - if (start < end - 1 && '<' == buf[start + 1]) + if (start < end - 1 && '<' == buf[start + 1] && + 'A' <= buf[start] && 'Z' >= buf[start]) break; else if ('\n' == buf[start]) break; else if ('\n' == last && '.' == buf[start]) - printf("\\&"); + outbuf_addstr(st, "\\&"); else if ('\n' == last && '\'' == buf[start]) - printf("\\&"); + outbuf_addstr(st, "\\&"); /* * If we're in the SYNOPSIS, have square * brackets indicate that we're opening and * closing an optional context. */ + if (SECT_SYNOPSIS == st->sect && ('[' == buf[start] || ']' == buf[start]) && - dosynopsisop(buf, &last, - &start, end, &opstack)) + dosynopsisop(st, buf, + &start, end, &opstack)) continue; - putchar(last = buf[start++]); - if ('\\' == last) - putchar('e'); + + /* + * On whitespace, flush the output buffer + * and allow breaking to a macro line. + * Otherwise, buffer text and clear wantws. + */ + + last = buf[start++]; + if (' ' != last) { + outbuf_addchar(st); + continue; + } + + if ( ! strcmp(st->outbuf + st->outbuflen - 2, "()") && + dict_get(st->outbuf, st->outbuflen - 2) == + MDOC_Fo) { + st->outbuflen -= 2; + st->outbuf[st->outbuflen] = '\0'; + mdoc_newln(st); + fputs(".Fn ", stdout); + outbuf_flush(st); + mdoc_newln(st); + continue; + } + + outbuf_flush(st); + putchar(' '); + st->wantws = 1; } - if (start < end - 1 && '<' == buf[start + 1]) { - if (formatcode(st, buf, &start, end, 0, 0, seq)) { + if (start < end - 1 && '<' == buf[start + 1] && + 'A' <= buf[start] && 'Z' >= buf[start]) { + formatcode(st, buf, &start, end, 0, seq); + if (OUST_MAC == st->oust) { /* * Let mdoc(7) handle trailing punctuation. * XXX Some punctuation characters @@ -1106,23 +1377,37 @@ ordinary(struct state *st, const char *buf, size_t sta putchar(' '); putchar(buf[start++]); } - /* End the macro line. */ - putchar(last = '\n'); + + if (st->wantws || + ' ' == buf[start] || + '\n' == buf[start]) + mdoc_newln(st); + /* * Consume all whitespace * so we don't accidentally start * an implicit literal line. */ + while (start < end && ' ' == buf[start]) start++; + + /* + * Some text is following. + * Implement requested spacing. + */ + + if ( ! st->wantws && start < end && + ('<' != buf[start + 1] || + 'A' > buf[start] || + 'Z' < buf[start])) { + printf(" Ns "); + st->wantws = 1; + } } } else if (start < end && '\n' == buf[start]) { - /* - * Print the newline only if we haven't already - * printed a newline. - */ - if (last != '\n') - putchar(last = buf[start]); + outbuf_flush(st); + mdoc_newln(st); if (++start >= end) continue; /* @@ -1133,18 +1418,15 @@ ordinary(struct state *st, const char *buf, size_t sta * have a macro subsequent it, which may be * possible if we have an escape next. */ - if (' ' == buf[start] || '\t' == buf[start]) { + if (' ' == buf[start] || '\t' == buf[start]) puts(".br"); - last = '\n'; - } for ( ; start < end; start++) if (' ' != buf[start] && '\t' != buf[start]) break; } } - - if (last != '\n') - putchar('\n'); + outbuf_flush(st); + mdoc_newln(st); } /* @@ -1153,9 +1435,12 @@ ordinary(struct state *st, const char *buf, size_t sta * (default: starts with "="). */ static void -dopar(struct state *st, const char *buf, size_t start, size_t end) +dopar(struct state *st, char *buf, size_t start, size_t end) { + assert(OUST_NL == st->oust); + assert(st->wantws); + if (end == start) return; if (' ' == buf[start] || '\t' == buf[start]) @@ -1172,7 +1457,7 @@ dopar(struct state *st, const char *buf, size_t start, */ static void dofile(const struct args *args, const char *fname, - const struct tm *tm, const char *buf, size_t sz) + const struct tm *tm, char *buf, size_t sz) { char datebuf[64]; struct state st; @@ -1237,7 +1522,11 @@ dofile(const struct args *args, const char *fname, free(title); + dict_init(); memset(&st, 0, sizeof(struct state)); + st.oust = OUST_NL; + st.wantws = 1; + assert(sz > 0); /* Main loop over file contents. */ @@ -1261,6 +1550,7 @@ dofile(const struct args *args, const char *fname, dopar(&st, buf, cur, end); cur = sup; } + dict_destroy(); } /*