improve homebrew cellar config example

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index ecb21689796d8052cfd2a44e1e46a3545013d907..34249df6a792421a2e02a2334ceba67250b63946 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,4 +1,4 @@
-/*     $Id: term.h,v 1.104 2014/10/26 17:12:03 schwarze Exp $ */
+/*     $Id: term.h,v 1.110 2014/12/23 13:48:57 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,12 +15,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef TERM_H
-#define TERM_H
-
-__BEGIN_DECLS
-
-struct termp;
 
 enum   termenc {
        TERMENC_ASCII,
@@ -44,6 +38,8 @@ enum  termfont {
 
 #define        TERM_MAXMARGIN    100000 /* FIXME */
 
+struct termp;
+
 typedef void   (*term_margin)(struct termp *, const void *);
 
 struct termp_tbl {
@@ -83,11 +79,13 @@ struct      termp {
 #define        TERMP_HANG       (1 << 11)      /* See term_flushln(). */
 #define        TERMP_NOSPLIT    (1 << 12)      /* Do not break line before .An. */
 #define        TERMP_SPLIT      (1 << 13)      /* Break line before .An. */
+#define        TERMP_NONEWLINE  (1 << 14)      /* No line break in nofill mode. */
        int              *buf;          /* Output buffer. */
        enum termenc      enc;          /* Type of encoding. */
-       struct mchars    *symtab;       /* Encoded-symbol table. */
+       const struct mchars *symtab;    /* Character table. */
        enum termfont     fontl;        /* Last font set. */
-       enum termfont     fontq[10];    /* Symmetric fonts. */
+       enum termfont    *fontq;        /* Symmetric fonts. */
+       int               fontsz;       /* Allocated size of font stack */
        int               fonti;        /* Index of font stack. */
        term_margin       headf;        /* invoked to print head */
        term_margin       footf;        /* invoked to print foot */
@@ -104,6 +102,11 @@ struct     termp {
        struct termp_ps  *ps;
 };
 
+__BEGIN_DECLS
+
+struct tbl_span;
+struct eqn;
+
 const char      *ascii_uc2str(int);
 
 void             term_eqn(struct termp *, const struct eqn *);
@@ -118,21 +121,16 @@ void                term_begin(struct termp *, term_margin,
 void             term_end(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 *);
+int              term_hspan(const struct termp *, const struct roffsu *);
+int              term_vspan(const struct termp *, const struct roffsu *);
 size_t           term_strlen(const struct termp *, const char *);
 size_t           term_len(const struct termp *, size_t);
 
-enum termfont    term_fonttop(struct termp *);
-const void      *term_fontq(struct termp *);
+const enum termfont *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_fontpopq(struct termp *, const enum termfont *);
 void             term_fontrepl(struct termp *, enum termfont);
 void             term_fontlast(struct termp *);
 
 __END_DECLS
-
-#endif /*!TERM_H*/