Put tbl_alloc function right into the addspan() one, as this is the only

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index f4b98fe8d93db87a023d9a03ff4804da9eaa1c55..561d06e2de47c7f2cfac5c3a2155fbf9e46abcec 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/*     $Id: html.h,v 1.33 2010/12/20 13:07:55 kristaps Exp $ */
+/*     $Id: html.h,v 1.40 2011/01/29 14:49:44 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -48,7 +48,8 @@ enum  htmltag {
        TAG_PRE,
        TAG_B,
        TAG_I,
        TAG_PRE,
        TAG_B,
        TAG_I,

-       TAG_U,
+       TAG_CODE,
+       TAG_SMALL,

        TAG_MAX
 };
 
        TAG_MAX
 };
 


@@ -66,6 +67,7 @@ enum  htmlattr {
        ATTR_ID,
        ATTR_SUMMARY,
        ATTR_ALIGN,
        ATTR_ID,
        ATTR_SUMMARY,
        ATTR_ALIGN,

+       ATTR_COLSPAN,

        ATTR_MAX
 };
 
        ATTR_MAX
 };
 


@@ -109,35 +111,36 @@ enum      htmltype {
 
 struct html {
        int               flags;
 
 struct html {
        int               flags;

-#define        HTML_NOSPACE     (1 << 0)
+#define        HTML_NOSPACE     (1 << 0) /* suppress next space */

 #define        HTML_IGNDELIM    (1 << 1)
 #define        HTML_KEEP        (1 << 2)
 #define        HTML_PREKEEP     (1 << 3)
 #define        HTML_IGNDELIM    (1 << 1)
 #define        HTML_KEEP        (1 << 2)
 #define        HTML_PREKEEP     (1 << 3)

-#define        HTML_NONOSPACE   (1 << 4)
-       struct tagq       tags;
-       void             *symtab;
-       char             *base;
-       char             *base_man;
-       char             *base_includes;
-       char             *style;
-       char              buf[BUFSIZ];
+#define        HTML_NONOSPACE   (1 << 4) /* never add spaces */
+#define        HTML_LITERAL     (1 << 5) /* literal (e.g., <PRE>) context */
+       struct tagq       tags; /* stack of open tags */
+       struct rofftbl    tbl; /* current table */
+       struct tag       *tblt; /* current open table scope */
+       void             *symtab; /* character-escapes */
+       char             *base_man; /* base for manpage href */
+       char             *base_includes; /* base for include href */
+       char             *style; /* style-sheet URI */
+       char              buf[BUFSIZ]; /* see bufcat and friends */

        size_t            buflen;
        size_t            buflen;

-       struct tag       *metaf;
-       enum htmlfont     metal;
-       enum htmlfont     metac;
+       struct tag       *metaf; /* current open font scope */
+       enum htmlfont     metal; /* last used font */
+       enum htmlfont     metac; /* current font mode */

        enum htmltype     type;
 };
 
        enum htmltype     type;
 };
 

-struct roffsu;
-

 void             print_gen_decls(struct html *);
 void             print_gen_head(struct html *);
 void             print_gen_decls(struct html *);
 void             print_gen_head(struct html *);

-struct tag      *print_ofont(struct html *, enum htmlfont);

 struct tag      *print_otag(struct html *, enum htmltag, 
                                int, const struct htmlpair *);
 void             print_tagq(struct html *, const struct tag *);
 void             print_stagq(struct html *, const struct tag *);
 void             print_text(struct html *, const char *);
 struct tag      *print_otag(struct html *, enum htmltag, 
                                int, const struct htmlpair *);
 void             print_tagq(struct html *, const struct tag *);
 void             print_stagq(struct html *, const struct tag *);
 void             print_text(struct html *, const char *);

+void             print_tblclose(struct html *);
+void             print_tbl(struct html *, const struct tbl_span *);

 
 void             bufcat_su(struct html *, const char *, 
                        const struct roffsu *);
 
 void             bufcat_su(struct html *, const char *, 
                        const struct roffsu *);