Parse for the closing delimiter `\}' for conditionals

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index 38afbfa659d6d50ccef8d59befd078761b37a208..3da11394bc20c249c8487839c9326e6f9ec71539 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,6 +1,6 @@
-/*     $Id: term.h,v 1.82 2011/05/14 18:15:20 kristaps Exp $ */
+/*     $Id: term.h,v 1.92 2012/05/31 22:29:13 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 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,7 +22,9 @@ __BEGIN_DECLS
 struct termp;
 
 enum   termenc {
-       TERMENC_ASCII
+       TERMENC_ASCII,
+       TERMENC_LOCALE,
+       TERMENC_UTF8
 };
 
 enum   termtype {
@@ -42,35 +44,6 @@ enum termfont {
 
 typedef void   (*term_margin)(struct termp *, const void *);
 
-struct termp_ps {
-       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 */
-       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            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            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) */
-       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 */
@@ -79,6 +52,8 @@ struct        termp_tbl {
 struct termp {
        enum termtype     type;
        struct rofftbl    tbl;          /* table configuration */
+       int               mdocstyle;    /* imitate mdoc(7) output */
+       size_t            defindent;    /* Default indent for text. */
        size_t            defrmargin;   /* Right margin of the device. */
        size_t            rmargin;      /* Current right margin. */
        size_t            maxrmargin;   /* Max right margin. */
@@ -88,10 +63,10 @@ struct      termp {
        int               col;          /* Bytes in buf. */
        size_t            viscol;       /* Chars on current line. */
        int               overstep;     /* See termp_flushln(). */
+       int               skipvsp;      /* Vertical space to skip. */
        int               flags;
 #define        TERMP_SENTENCE   (1 << 1)       /* Space before a sentence. */
 #define        TERMP_NOSPACE    (1 << 2)       /* No space before words. */
-#define        TERMP_NOLPAD     (1 << 3)       /* See term_flushln(). */
 #define        TERMP_NOBREAK    (1 << 4)       /* See term_flushln(). */
 #define        TERMP_IGNDELIM   (1 << 6)       /* Delims like regulars. */
 #define        TERMP_NONOSPACE  (1 << 7)       /* No space (no autounset). */
@@ -103,6 +78,7 @@ 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. */
+#define        TERMP_SKIPCHAR   (1 << 16)      /* Skip the next character. */
        int              *buf;          /* Output buffer. */
        enum termenc      enc;          /* Type of encoding. */
        struct mchars    *symtab;       /* Encoded-symbol table. */
@@ -120,12 +96,10 @@ struct     termp {
        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_eqn(struct termp *, const struct eqn *);
 void             term_tbl(struct termp *, const struct tbl_span *);
 void             term_free(struct termp *);
 void             term_newln(struct termp *);