=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.99 retrieving revision 1.102 diff -u -p -r1.99 -r1.102 --- mandoc/main.c 2010/07/20 14:56:42 1.99 +++ mandoc/main.c 2010/08/08 14:45:59 1.102 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.99 2010/07/20 14:56:42 kristaps Exp $ */ +/* $Id: main.c,v 1.102 2010/08/08 14:45:59 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -37,6 +37,10 @@ #include "man.h" #include "roff.h" +#ifndef MAP_FILE +#define MAP_FILE 0 +#endif + #define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) /* FIXME: Intel's compiler? LLVM? pcc? */ @@ -68,7 +72,8 @@ enum outt { OUTT_HTML, OUTT_XHTML, OUTT_LINT, - OUTT_PS + OUTT_PS, + OUTT_PDF }; struct curparse { @@ -461,6 +466,7 @@ fdesc(struct curparse *curp) struct buf ln, blk; int i, pos, lnn, lnn_start, with_mmap, of; enum rofferr re; + unsigned char c; struct man *man; struct mdoc *mdoc; struct roff *roff; @@ -503,8 +509,8 @@ fdesc(struct curparse *curp) * writers: use special characters. */ - if ( ! isgraph((u_char)blk.buf[i]) && - ! isblank((u_char)blk.buf[i])) { + c = (unsigned char) blk.buf[i]; + if ( ! (isascii(c) && (isgraph(c) || isblank(c)))) { if ( ! mmsg(MANDOCERR_BADCHAR, curp, lnn_start, pos, "ignoring byte")) @@ -630,9 +636,13 @@ fdesc(struct curparse *curp) curp->outdata = ascii_alloc(curp->outopts); curp->outfree = ascii_free; break; + case (OUTT_PDF): + curp->outdata = pdf_alloc(curp->outopts); + curp->outfree = pspdf_free; + break; case (OUTT_PS): curp->outdata = ps_alloc(curp->outopts); - curp->outfree = ps_free; + curp->outfree = pspdf_free; break; default: break; @@ -650,6 +660,8 @@ fdesc(struct curparse *curp) curp->outman = tree_man; curp->outmdoc = tree_mdoc; break; + case (OUTT_PDF): + /* FALLTHROUGH */ case (OUTT_ASCII): /* FALLTHROUGH */ case (OUTT_PS): @@ -784,6 +796,8 @@ toptions(struct curparse *curp, char *arg) curp->outtype = OUTT_XHTML; else if (0 == strcmp(arg, "ps")) curp->outtype = OUTT_PS; + else if (0 == strcmp(arg, "pdf")) + curp->outtype = OUTT_PDF; else { fprintf(stderr, "%s: Bad argument\n", arg); return(0);