allow using an alternate mandoc binary

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index e17c244596c07e8ddc7f4ee5a1461eef2353ace5..bda7f7da6167b6bac707caea9c0954e91fc00a36 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,26 +1,20 @@
-/*     $Id: term.h,v 1.105 2014/10/28 17:36:19 schwarze Exp $ */
+/*     $Id: term.h,v 1.113 2015/04/04 17:47:18 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2015 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
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * 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,7 +38,10 @@ enum termfont {
 
 #define        TERM_MAXMARGIN    100000 /* FIXME */
 
-typedef void   (*term_margin)(struct termp *, const void *);
+struct roff_meta;
+struct termp;
+
+typedef void   (*term_margin)(struct termp *, const struct roff_meta *);
 
 struct termp_tbl {
        int               width;        /* width in fixed chars */
@@ -83,11 +80,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. */
        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 */
@@ -96,14 +95,19 @@ struct      termp {
        void            (*end)(struct termp *);
        void            (*endline)(struct termp *);
        void            (*advance)(struct termp *, size_t);
-       void            (*setwidth)(struct termp *, int, size_t);
+       void            (*setwidth)(struct termp *, int, int);
        size_t          (*width)(const struct termp *, int);
-       double          (*hspan)(const struct termp *,
+       int             (*hspan)(const struct termp *,
                                const struct roffsu *);
        const void       *argf;         /* arg for headf/footf */
        struct termp_ps  *ps;
 };
 
+__BEGIN_DECLS
+
+struct tbl_span;
+struct eqn;
+
 const char      *ascii_uc2str(int);
 
 void             term_eqn(struct termp *, const struct eqn *);
@@ -114,25 +118,19 @@ void                term_vspace(struct termp *);
 void             term_word(struct termp *, const char *);
 void             term_flushln(struct termp *);
 void             term_begin(struct termp *, term_margin,
-                       term_margin, const void *);
+                       term_margin, const struct roff_meta *);
 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 *);
 void             term_fontpush(struct termp *, enum termfont);
 void             term_fontpop(struct termp *);
-void             term_fontpopq(struct termp *, const void *);
+void             term_fontpopq(struct termp *, int);
 void             term_fontrepl(struct termp *, enum termfont);
 void             term_fontlast(struct termp *);
 
 __END_DECLS
-
-#endif /*!TERM_H*/