typo; noticed by jmc@ some time ago

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index 3dc282fad0a0c08cb7d83fe40ac7d5ac7ae8991a..decd7f40649ef262dee975bad9c26b61c55734fe 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,6 +1,7 @@
-/*     $Id: term.h,v 1.77 2011/01/02 12:21:07 kristaps Exp $ */
+/*     $Id: term.h,v 1.101 2014/04/20 16:46:05 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>

  *
  * 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


@@ -22,7 +23,9 @@ __BEGIN_DECLS
 struct termp;
 
 enum   termenc {
 struct termp;
 
 enum   termenc {

-       TERMENC_ASCII
+       TERMENC_ASCII,
+       TERMENC_LOCALE,
+       TERMENC_UTF8

 };
 
 enum   termtype {
 };
 
 enum   termtype {


@@ -35,6 +38,7 @@ enum  termfont {
        TERMFONT_NONE = 0,
        TERMFONT_BOLD,
        TERMFONT_UNDER,
        TERMFONT_NONE = 0,
        TERMFONT_BOLD,
        TERMFONT_UNDER,

+       TERMFONT_BI,

        TERMFONT__MAX
 };
 
        TERMFONT__MAX
 };
 


@@ -42,38 +46,18 @@ enum        termfont {
 
 typedef void   (*term_margin)(struct termp *, const void *);
 
 
 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 */

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

-       size_t            defrmargin;   /* Right margin of the device.. */
+       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            lastrmargin;  /* Right margin before the last ll. */

        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. */


@@ -81,56 +65,58 @@ struct      termp {
        size_t            tabwidth;     /* Distance of tab positions. */
        size_t            col;          /* Bytes in buf. */
        size_t            viscol;       /* Chars on current line. */
        size_t            tabwidth;     /* Distance of tab positions. */
        size_t            col;          /* Bytes in buf. */
        size_t            viscol;       /* Chars on current line. */

+       size_t            trailspace;   /* See termp_flushln(). */

        int               overstep;     /* See termp_flushln(). */
        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. */
        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). */
-#define        TERMP_DANGLE     (1 << 8)       /* See term_flushln(). */
-#define        TERMP_HANG       (1 << 9)       /* See term_flushln(). */
-#define        TERMP_TWOSPACE   (1 << 10)      /* See term_flushln(). */
-#define        TERMP_NOSPLIT    (1 << 11)      /* See termp_an_pre/post(). */
-#define        TERMP_SPLIT      (1 << 12)      /* See termp_an_pre/post(). */
-#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. */
+#define        TERMP_NONOSPACE  (1 << 3)       /* No space (no autounset). */
+#define        TERMP_NBRWORD    (1 << 4)       /* Make next word nonbreaking. */
+#define        TERMP_KEEP       (1 << 5)       /* Keep words together. */
+#define        TERMP_PREKEEP    (1 << 6)       /* ...starting with the next one. */
+#define        TERMP_SKIPCHAR   (1 << 7)       /* Skip the next character. */
+#define        TERMP_NOBREAK    (1 << 8)       /* See term_flushln(). */
+#define        TERMP_BRIND      (1 << 9)       /* See term_flushln(). */
+#define        TERMP_DANGLE     (1 << 10)      /* See term_flushln(). */
+#define        TERMP_HANG       (1 << 11)      /* See term_flushln(). */
+#define        TERMP_NOSPLIT    (1 << 12)      /* See termp_an_pre/post(). */
+#define        TERMP_SPLIT      (1 << 13)      /* See termp_an_pre/post(). */
+#define        TERMP_ANPREC     (1 << 14)      /* See termp_an_pre(). */
+       int              *buf;          /* Output buffer. */

        enum termenc      enc;          /* Type of encoding. */
        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 */
        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);
        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);
+       void            (*setwidth)(struct termp *, int, size_t);
+       size_t          (*width)(const struct termp *, int);

        double          (*hspan)(const struct termp *,
                                const struct roffsu *);
        const void       *argf;         /* arg for headf/footf */
        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 *);
 void             term_vspace(struct termp *);
 void             term_word(struct termp *, const char *);
 void             term_flushln(struct termp *);
 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_word(struct termp *, const char *);
 void             term_flushln(struct termp *);

-void             term_begin(struct termp *, term_margin, 
+void             term_begin(struct termp *, term_margin,

                        term_margin, const void *);
 void             term_end(struct termp *);
 
                        term_margin, const void *);
 void             term_end(struct termp *);
 

-size_t           term_hspan(const struct termp *, 
+void             term_setwidth(struct termp *, const char *);
+size_t           term_hspan(const struct termp *,

                        const struct roffsu *);
 size_t           term_vspan(const struct termp *,
                        const struct roffsu *);
                        const struct roffsu *);
 size_t           term_vspan(const struct termp *,
                        const struct roffsu *);