=================================================================== RCS file: /cvs/texi2mdoc/util.c,v retrieving revision 1.21 retrieving revision 1.23 diff -u -p -r1.21 -r1.23 --- texi2mdoc/util.c 2015/03/01 13:39:51 1.21 +++ texi2mdoc/util.c 2015/03/02 18:12:53 1.23 @@ -1,4 +1,4 @@ -/* $Id: util.c,v 1.21 2015/03/01 13:39:51 kristaps Exp $ */ +/* $Id: util.c,v 1.23 2015/03/02 18:12:53 kristaps Exp $ */ /* * Copyright (c) 2015 Kristaps Dzonsons * @@ -184,7 +184,10 @@ texiputchar(struct texi *p, char c) if ('\'' == c && 0 == p->outcol) fputs("\\&", p->outfile); - fputc(c, p->outfile); + if (p->uppercase) + fputc(toupper((unsigned int)c), p->outfile); + else + fputc(c, p->outfile); if ('\\' == c) fputc('e', p->outfile); p->seenvs = 0; @@ -210,7 +213,12 @@ texiputchars(struct texi *p, const char *s) fputs("\\&", p->outfile); if ('\'' == *s && 0 == p->outcol) fputs("\\&", p->outfile); - p->outcol += fputs(s, p->outfile); + if (p->uppercase) + for ( ; '\0' != *s; s++) + p->outcol += fputc(toupper + ((unsigned int)*s), p->outfile); + else + p->outcol += fputs(s, p->outfile); p->seenvs = 0; } @@ -362,6 +370,7 @@ texipunctuate(struct texi *p, size_t *pos) case ('.'): case ('"'): case (':'): + case (';'): case ('!'): case ('?'): continue; @@ -415,15 +424,18 @@ advancenext(struct texi *p, size_t *pos) /* * Advance to the EOLN in the input stream. - * NOTE: THIS SHOULD NOT BE CALLED ON BLANK TEXT, as it will read up to - * the @\n. + * This will skip over '@' markers in an effort to ignore escaped + * newlines. */ size_t advanceeoln(struct texi *p, size_t *pos, int consumenl) { - while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) + while (*pos < BUFSZ(p) && '\n' != BUF(p)[*pos]) { + if ('@' == BUF(p)[*pos]) + advance(p, pos); advance(p, pos); + } if (*pos < BUFSZ(p) && consumenl) advance(p, pos); return(*pos); @@ -452,8 +464,13 @@ texiexecmacro(struct texi *p, struct teximacro *m, siz const char *cp; /* Disregard empty macros. */ - if (0 == (valsz = realsz = strlen(m->value))) + if (0 == (valsz = realsz = strlen(m->value))) { + args = argparse(p, pos, &asz, m->argsz); + for (i = 0; i < asz; i++) + free(args[i]); + free(args); return; + } /* * This is important: it protect us from macros that invoke more @@ -607,7 +624,7 @@ texicmd(const struct texi *p, size_t pos, size_t *end, return(TEXICMD__MAX); /* Alphabetic commands are special. */ - if ( ! isalpha((unsigned char)BUF(p)[pos])) { + if ( ! isalpha((unsigned int)BUF(p)[pos])) { if ((*end = pos + 1) == BUFSZ(p)) return(TEXICMD__MAX); for (i = 0; i < TEXICMD__MAX; i++) { @@ -1369,26 +1386,32 @@ teximdocclose(struct texi *p, int last) /* Print a reference to the "top" node. */ if (p->chapnum > 1) { + texiputchars(p, "Top node,"); snprintf(buf, sizeof(buf), "node1 7"); teximacroopen(p, "Xr "); texiputchars(p, buf); - texiputchars(p, " ,"); + texiputchars(p, " ;"); teximacroclose(p); } /* Print a reference to the previous node. */ if (p->chapnum > 2) { + texiputchars(p, "previous node,"); snprintf(buf, sizeof(buf), "node%zu 7", p->chapnum - 1); teximacroopen(p, "Xr "); texiputchars(p, buf); if ( ! last) - texiputchars(p, " ,"); + texiputchars(p, " ;"); teximacroclose(p); } /* Print a reference to the next node. */ if ( ! last) { + if (1 == p->chapnum) + texiputchars(p, "Next node,"); + else + texiputchars(p, "next node,"); snprintf(buf, sizeof(buf), "node%zu 7", p->chapnum + 1); teximacroopen(p, "Xr ");