Back out OpenBSD special case (ok Ingo Schwarze).

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index 23d1b53eaf2826ce04956f1cda59d19a2efc749e..7c10ff4f1b758ba51c1817530935425237f43f95 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,103 +1,78 @@
-/* $Id: term.h,v 1.33 2009/03/25 21:46:24 kristaps Exp $ */
+/*     $Id: term.h,v 1.53 2010/05/10 08:05:17 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>

  *
  * Permission to use, copy, modify, and distribute this software for any
  *
  * 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.
+ * 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 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR 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.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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
 
  */
 #ifndef TERM_H
 #define TERM_H
 

-#include "mdoc.h"
-#include "man.h"
-
-/* FIXME - clean up tabs. */
-
-#define        INDENT            6
-

 __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
+};
+
+#define        TERM_MAXMARGIN    100000 /* FIXME */
+

 struct termp {
        size_t            rmargin;      /* Current right margin. */
        size_t            maxrmargin;   /* Max right margin. */
        size_t            maxcols;      /* Max size of buf. */
        size_t            offset;       /* Margin offest. */
        size_t            col;          /* Bytes in buf. */
 struct termp {
        size_t            rmargin;      /* Current right margin. */
        size_t            maxrmargin;   /* Max right margin. */
        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;
        int               flags;

-#define        TERMP_NOSPACE    (1 << 0)       /* No space before words. */
-#define        TERMP_NOLPAD     (1 << 1)       /* No leftpad before flush. */
-#define        TERMP_NOBREAK    (1 << 2)       /* No break after flush. */
-#define        TERMP_LITERAL    (1 << 3)       /* Literal words. */
-#define        TERMP_IGNDELIM   (1 << 4)       /* Delims like regulars. */
-#define        TERMP_NONOSPACE  (1 << 5)       /* No space (no autounset). */
-#define        TERMP_NONOBREAK  (1 << 7)       /* Don't newln NOBREAK. */
-#define        TERMP_STYLE       0x0300        /* Style mask. */
-#define        TERMP_BOLD       (1 << 8)       /* Styles... */
-#define        TERMP_UNDER      (1 << 9)
+#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(). */

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

 };
 
 };
 

-/* XXX - clean this up. */
-
-struct termpair {
-       struct termpair  *ppair;
-       int               type;
-#define        TERMPAIR_FLAG    (1 << 0)
-       int               flag;
-       size_t            offset;
-       size_t            rmargin;
-       int               count;
-};
-
-#define        TERMPAIR_SETFLAG(termp, p, fl) \
-       do { \
-               assert(! (TERMPAIR_FLAG & (p)->type)); \
-               (termp)->flags |= (fl); \
-               (p)->flag = (fl); \
-               (p)->type |= TERMPAIR_FLAG; \
-       } while ( /* CONSTCOND */ 0)
-
-struct termact {
-       int     (*pre)(struct termp *, struct termpair *,
-                       const struct mdoc_meta *,
-                       const struct mdoc_node *);
-       void    (*post)(struct termp *, struct termpair *,
-                       const struct mdoc_meta *,
-                       const struct mdoc_node *);
-};
-
-void            *term_ascii2htab(void);
-const char      *term_a2ascii(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 *);

-void             term_node(struct termp *, struct termpair *,
-                       const struct mdoc_meta *,
-                       const struct mdoc_node *);

 
 

-const  struct termact   *termacts;
+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
 
 
 __END_DECLS