Remove duplicate UNCONST definition.

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index 78577714e129be370fc35e17b68286cd1b7de03e..79b738cae98b393587795fb49ccbe8ae66f101eb 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,6 +1,6 @@
-/*     $Id: term.h,v 1.70 2010/06/30 12:27:55 kristaps Exp $ */
+/*     $Id: term.h,v 1.79 2011/01/05 15:37:23 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * 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,
 
 enum   termtype {
        TERMTYPE_CHAR,

-       TERMTYPE_PS
+       TERMTYPE_PS,
+       TERMTYPE_PDF

 };
 
 enum   termfont {
 };
 
 enum   termfont {


@@ -42,9 +43,10 @@ enum termfont {
 typedef void   (*term_margin)(struct termp *, const void *);
 
 struct termp_ps {
 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_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 */
        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            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) */
        size_t            pages;        /* number of pages shown */
        size_t            lineheight;   /* line height (AFM units) */
        size_t            top;          /* body top (AFM units) */


@@ -61,11 +64,22 @@ 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            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_tbl {
+       int               width;        /* width in fixed chars */
+       int               decimal;      /* decimal point position */

 };
 
 struct termp {
        enum termtype     type;
 };
 
 struct termp {
        enum termtype     type;

-       size_t            defrmargin;   /* Right margin of the device.. */
+       struct rofftbl    tbl;          /* table configuration */
+       size_t            defrmargin;   /* Right margin of the device. */

        size_t            rmargin;      /* Current right margin. */
        size_t            maxrmargin;   /* Max right margin. */
        size_t            maxcols;      /* Max size of buf. */
        size_t            rmargin;      /* Current right margin. */
        size_t            maxrmargin;   /* Max right margin. */
        size_t            maxcols;      /* Max size of buf. */


@@ -103,7 +117,7 @@ struct      termp {
        void            (*endline)(struct termp *);
        void            (*advance)(struct termp *, size_t);
        size_t          (*width)(const struct termp *, char);
        void            (*endline)(struct termp *);
        void            (*advance)(struct termp *, size_t);
        size_t          (*width)(const struct termp *, char);

-       size_t          (*hspan)(const struct termp *,
+       double          (*hspan)(const struct termp *,

                                const struct roffsu *);
        const void       *argf;         /* arg for headf/footf */
        union {
                                const struct roffsu *);
        const void       *argf;         /* arg for headf/footf */
        union {


@@ -112,6 +126,7 @@ struct      termp {
 };
 
 struct termp    *term_alloc(enum termenc);
 };
 
 struct termp    *term_alloc(enum termenc);

+void             term_tbl(struct termp *, const struct tbl_span *);

 void             term_free(struct termp *);
 void             term_newln(struct termp *);
 void             term_vspace(struct termp *);
 void             term_free(struct termp *);
 void             term_newln(struct termp *);
 void             term_vspace(struct termp *);