=================================================================== RCS file: /cvs/mandoc/term.h,v retrieving revision 1.71 retrieving revision 1.76 diff -u -p -r1.71 -r1.76 --- mandoc/term.h 2010/06/30 12:30:36 1.71 +++ mandoc/term.h 2010/07/25 22:15:07 1.76 @@ -1,6 +1,6 @@ -/* $Id: term.h,v 1.71 2010/06/30 12:30:36 kristaps Exp $ */ +/* $Id: term.h,v 1.76 2010/07/25 22:15:07 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -27,7 +27,8 @@ enum termenc { enum termtype { TERMTYPE_CHAR, - TERMTYPE_PS + TERMTYPE_PS, + TERMTYPE_PDF }; enum termfont { @@ -42,9 +43,10 @@ enum termfont { typedef void (*term_margin)(struct termp *, const void *); struct termp_ps { - int psstate; /* state of ps output */ + int flags; #define PS_INLINE (1 << 0) /* we're in a word */ #define PS_MARGINS (1 << 1) /* we're in the margins */ +#define PS_NEWPAGE (1 << 2) /* new page, no words yet */ size_t pscol; /* visible column (AFM units) */ size_t psrow; /* visible row (AFM units) */ char *psmarg; /* margin buf */ @@ -52,6 +54,7 @@ struct termp_ps { size_t psmargcur; /* cur index in margin buf */ char last; /* character buffer */ enum termfont lastf; /* last set font */ + size_t scale; /* font scaling factor */ size_t pages; /* number of pages shown */ size_t lineheight; /* line height (AFM units) */ size_t top; /* body top (AFM units) */ @@ -61,6 +64,11 @@ struct termp_ps { size_t left; /* body left (AFM units) */ size_t header; /* header pos (AFM units) */ size_t footer; /* footer pos (AFM units) */ + size_t pdfbytes; /* current output byte */ + size_t pdflastpg; /* byte of last page mark */ + size_t pdfbody; /* start of body object */ + size_t *pdfobjs; /* table of object offsets */ + size_t pdfobjsz; /* size of pdfobjs */ }; struct termp {