Properly checked in Ingo Schwarze' prologue/body-breaking patch, which I'd munged.

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index 6b8e5e7c02dd6fa0f7019e3f8f199d7acdae0656..4a1ed9022e4eb9a056f976d0809c9c262906e45a 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,4 +1,4 @@
-/*     $Id: term.h,v 1.45 2009/09/15 08:16:20 kristaps Exp $ */
+/*     $Id: term.h,v 1.52 2010/03/23 12:42:22 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -20,9 +20,13 @@
 __BEGIN_DECLS
 
 enum   termenc {
 __BEGIN_DECLS
 
 enum   termenc {

-       TERMENC_ASCII,
-       TERMENC_LATIN1,         /* Not implemented. */
-       TERMENC_UTF8            /* Not implemented. */
+       TERMENC_ASCII
+};
+
+enum   termfont {
+       TERMFONT_NONE = 0,
+       TERMFONT_BOLD,
+       TERMFONT_UNDER

 };
 
 struct termp {
 };
 
 struct termp {


@@ -31,6 +35,7 @@ struct        termp {
        size_t            maxcols;      /* Max size of buf. */
        size_t            offset;       /* Margin offest. */
        size_t            col;          /* Bytes in buf. */
        size_t            maxcols;      /* Max size of buf. */
        size_t            offset;       /* Margin offest. */
        size_t            col;          /* Bytes in buf. */

+       int               overstep;     /* See termp_flushln(). */

        int               flags;
 #define        TERMP_NOSPACE    (1 << 2)       /* No space before words. */
 #define        TERMP_NOLPAD     (1 << 3)       /* See term_flushln(). */
        int               flags;
 #define        TERMP_NOSPACE    (1 << 2)       /* No space before words. */
 #define        TERMP_NOLPAD     (1 << 3)       /* See term_flushln(). */


@@ -43,23 +48,30 @@ struct      termp {
 #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_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(). */

-       int               bold;
-       int               under;

        char             *buf;          /* Output buffer. */
        enum termenc      enc;          /* Type of encoding. */
        void             *symtab;       /* Encoded-symbol table. */
        char             *buf;          /* Output buffer. */
        enum termenc      enc;          /* Type of encoding. */
        void             *symtab;       /* Encoded-symbol table. */

+       enum termfont     fontl;        /* Last font set. */
+       enum termfont     fontq[10];    /* Symmetric fonts. */
+       int               fonti;        /* Index of font stack. */

 };
 
 };
 

-void            *term_ascii2htab(void);
-const char      *term_a2ascii(void *, const char *, size_t, size_t *);
-const char      *term_a2res(void *, const char *, size_t, size_t *);
-void             term_asciifree(void *);
-

 void             term_newln(struct termp *);
 void             term_vspace(struct termp *);
 void             term_word(struct termp *, const char *);
 void             term_flushln(struct termp *);
 
 void             term_newln(struct termp *);
 void             term_vspace(struct termp *);
 void             term_word(struct termp *, const char *);
 void             term_flushln(struct termp *);
 

+size_t           term_hspan(const struct roffsu *);
+size_t           term_vspan(const struct roffsu *);
+
+enum termfont    term_fonttop(struct termp *);
+const void      *term_fontq(struct termp *);
+void             term_fontpush(struct termp *, enum termfont);
+void             term_fontpop(struct termp *);
+void             term_fontpopq(struct termp *, const void *);
+void             term_fontrepl(struct termp *, enum termfont);
+void             term_fontlast(struct termp *);
+

 __END_DECLS
 
 #endif /*!TERM_H*/
 __END_DECLS
 
 #endif /*!TERM_H*/