Note version 1.11.4 bits. Here we go!

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index 4c8e34ed4eb3f5319a8938a25a7bb0c82be029fb..130024de6ce6ac5cf0a74aaaef8ea90938c58428 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,6 +1,6 @@
-/*     $Id: term.h,v 1.71 2010/06/30 12:30:36 kristaps Exp $ */
+/*     $Id: term.h,v 1.85 2011/05/20 15:48:22 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
@@ -22,12 +22,15 @@ __BEGIN_DECLS
 struct termp;
 
 enum   termenc {
-       TERMENC_ASCII
+       TERMENC_ASCII,
+       TERMENC_LOCALE,
+       TERMENC_UTF8
 };
 
 enum   termtype {
        TERMTYPE_CHAR,
-       TERMTYPE_PS
+       TERMTYPE_PS,
+       TERMTYPE_PDF
 };
 
 enum   termfont {
@@ -41,37 +44,21 @@ enum        termfont {
 
 typedef void   (*term_margin)(struct termp *, const void *);
 
-struct termp_ps {
-       int               psstate;      /* state of ps output */
-#define        PS_INLINE        (1 << 0)       /* we're in a word */
-#define        PS_MARGINS       (1 << 1)       /* we're in the margins */
-       size_t            pscol;        /* visible column (AFM units) */
-       size_t            psrow;        /* visible row (AFM units) */
-       char             *psmarg;       /* margin buf */
-       size_t            psmargsz;     /* margin buf size */
-       size_t            psmargcur;    /* cur index in margin buf */
-       char              last;         /* character buffer */
-       enum termfont     lastf;        /* last set font */
-       size_t            pages;        /* number of pages shown */
-       size_t            lineheight;   /* line height (AFM units) */
-       size_t            top;          /* body top (AFM units) */
-       size_t            bottom;       /* body bottom (AFM units) */
-       size_t            height;       /* page height (AFM units */
-       size_t            width;        /* page width (AFM units) */
-       size_t            left;         /* body left (AFM units) */
-       size_t            header;       /* header pos (AFM units) */
-       size_t            footer;       /* footer pos (AFM units) */
+struct termp_tbl {
+       int               width;        /* width in fixed chars */
+       int               decimal;      /* decimal point position */
 };
 
 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. */
+       int               maxcols;      /* Max size of buf. */
        size_t            offset;       /* Margin offest. */
        size_t            tabwidth;     /* Distance of tab positions. */
-       size_t            col;          /* Bytes in buf. */
+       int               col;          /* Bytes in buf. */
        size_t            viscol;       /* Chars on current line. */
        int               overstep;     /* See termp_flushln(). */
        int               flags;
@@ -89,29 +76,27 @@ struct      termp {
 #define        TERMP_ANPREC     (1 << 13)      /* See termp_an_pre(). */
 #define        TERMP_KEEP       (1 << 14)      /* Keep words together. */
 #define        TERMP_PREKEEP    (1 << 15)      /* ...starting with the next one. */
-       char             *buf;          /* Output buffer. */
+       int              *buf;          /* Output buffer. */
        enum termenc      enc;          /* Type of encoding. */
-       void             *symtab;       /* Encoded-symbol table. */
+       struct mchars    *symtab;       /* Encoded-symbol table. */
        enum termfont     fontl;        /* Last font set. */
        enum termfont     fontq[10];    /* Symmetric fonts. */
        int               fonti;        /* Index of font stack. */
        term_margin       headf;        /* invoked to print head */
        term_margin       footf;        /* invoked to print foot */
-       void            (*letter)(struct termp *, char);
+       void            (*letter)(struct termp *, int);
        void            (*begin)(struct termp *);
        void            (*end)(struct termp *);
        void            (*endline)(struct termp *);
        void            (*advance)(struct termp *, size_t);
-       size_t          (*width)(const struct termp *, char);
+       size_t          (*width)(const struct termp *, int);
        double          (*hspan)(const struct termp *,
                                const struct roffsu *);
        const void       *argf;         /* arg for headf/footf */
-       union {
-               struct termp_ps ps;
-       } engine;
+       struct termp_ps  *ps;
 };
 
-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 *);