Cleanups in -T[x]html: make html_idcat() use the buffer and be called

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index 8d9db8909574bd4ff105fd4a2471312de172ed98..aba635f144a32bd530e95b2658444a68adc07dcb 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/*     $Id: html.h,v 1.38 2011/01/06 11:55:39 kristaps Exp $ */
+/*     $Id: html.h,v 1.44 2011/05/17 11:34:31 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -67,6 +67,7 @@ enum  htmlattr {
        ATTR_ID,
        ATTR_SUMMARY,
        ATTR_ALIGN,
+       ATTR_COLSPAN,
        ATTR_MAX
 };
 
@@ -110,14 +111,16 @@ enum      htmltype {
 
 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_NONOSPACE   (1 << 4)
+#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 */
-       void             *symtab; /* character-escapes */
+       struct tag       *tblt; /* current open table scope */
+       struct mchars    *symtab; /* character-escapes */
        char             *base_man; /* base for manpage href */
        char             *base_includes; /* base for include href */
        char             *style; /* style-sheet URI */
@@ -136,21 +139,22 @@ struct tag         *print_otag(struct html *, enum htmltag,
 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_fmt(struct html *, const char *, ...);
+void             bufcat(struct html *, const char *);
+void             bufcat_id(struct html *, const char *);
+void             bufcat_style(struct html *, 
+                       const char *, const char *);
 void             bufcat_su(struct html *, const char *, 
                        const struct roffsu *);
+void             bufinit(struct html *);
 void             buffmt_man(struct html *, 
                        const char *, const char *);
 void             buffmt_includes(struct html *, const char *);
-void             buffmt(struct html *, const char *, ...);
-void             bufcat(struct html *, const char *);
-void             bufcat_style(struct html *, 
-                       const char *, const char *);
-void             bufncat(struct html *, const char *, size_t);
-void             bufinit(struct html *);
 
-void             html_idcat(char *, const char *, int);
+int              html_strlen(const char *);
 
 __END_DECLS