Fixed undocumented `-diag' where NULL list item bodies aren't followed by a vspace.

[mandoc.git] / term.h

diff --git a/term.h b/term.h
index 9a9be5952c759a49675b3e191cd255e4cdd8cd89..e14a69c62b36bda36957c6ba761bbcf6ffd75c86 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,36 +1,33 @@
-/* $Id: term.h,v 1.30 2009/03/21 09:48:30 kristaps Exp $ */
+/*     $Id: term.h,v 1.41 2009/07/21 15:33:05 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * 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"
-

 /* FIXME - clean up tabs. */
 
 /* FIXME - clean up tabs. */
 

-#define        INDENT            6
+#define        INDENT            5
+#define        HALFINDENT        3

 
 __BEGIN_DECLS
 
 enum   termenc {
        TERMENC_ASCII,
 
 __BEGIN_DECLS
 
 enum   termenc {
        TERMENC_ASCII,

-       TERMENC_LATIN1,
-       TERMENC_UTF8
+       TERMENC_LATIN1,         /* Not implemented. */
+       TERMENC_UTF8            /* Not implemented. */

 };
 
 struct termp {
 };
 
 struct termp {


@@ -40,50 +37,22 @@ struct      termp {
        size_t            offset;       /* Margin offest. */
        size_t            col;          /* Bytes in buf. */
        int               flags;
        size_t            offset;       /* Margin offest. */
        size_t            col;          /* Bytes in buf. */
        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_STYLE       0x3           /* Style mask. */
+#define        TERMP_BOLD       (1 << 0)       /* Styles... */
+#define        TERMP_UNDER      (1 << 1)
+#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(). */

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

-/* 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_ascii2htab(void);
 const char      *term_a2ascii(void *, const char *, size_t, size_t *);
 void             term_asciifree(void *);


@@ -92,11 +61,6 @@ void           term_newln(struct termp *);
 void             term_vspace(struct termp *);
 void             term_word(struct termp *, const char *);
 void             term_flushln(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;

 
 __END_DECLS
 
 
 __END_DECLS