Removed superfluous HTML_NEWLINE.

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index 17b39ae0b881de6696d29cd64d598852e34fce9f..87451ea8aa034d175be11820218b0f26e94e2f23 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/*     $Id: html.h,v 1.10 2009/10/03 16:36:06 kristaps Exp $ */
+/*     $Id: html.h,v 1.20 2009/11/14 12:04:59 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -57,32 +57,50 @@ enum        htmlattr {
        ATTR_WIDTH,
        ATTR_VALIGN,
        ATTR_TARGET,
        ATTR_WIDTH,
        ATTR_VALIGN,
        ATTR_TARGET,

+       ATTR_ID,
+       ATTR_SUMMARY,

        ATTR_MAX
 };
 
 struct tag {
        ATTR_MAX
 };
 
 struct tag {

+       struct tag       *next;

        enum htmltag      tag;
        enum htmltag      tag;

-       SLIST_ENTRY(tag)  entry;

 };
 
 struct ord {
 };
 
 struct ord {

-       int               pos;
+       struct ord       *next;

        const void       *cookie;
        const void       *cookie;

-       SLIST_ENTRY(ord)  entry;
+       int               pos;

 };
 
 };
 

-SLIST_HEAD(tagq, tag);
-SLIST_HEAD(ordq, ord);
+struct tagq {
+       struct tag       *head;
+};
+struct ordq {
+       struct ord       *head;
+};

 
 struct htmlpair {
        enum htmlattr     key;
 
 struct htmlpair {
        enum htmlattr     key;

-       char             *val;
+       const char       *val;

 };
 
 };
 

+#define        PAIR_CLASS_INIT(p, v) \
+       do { (p)->key = ATTR_CLASS; \
+       (p)->val = (v); } while (/* CONSTCOND */ 0)
+#define        PAIR_HREF_INIT(p, v) \
+       do { (p)->key = ATTR_HREF; \
+       (p)->val = (v); } while (/* CONSTCOND */ 0)
+#define        PAIR_STYLE_INIT(p, h) \
+       do { (p)->key = ATTR_STYLE; \
+       (p)->val = (h)->buf; } while (/* CONSTCOND */ 0)
+#define        PAIR_SUMMARY_INIT(p, v) \
+       do { (p)->key = ATTR_SUMMARY; \
+       (p)->val = (v); } while (/* CONSTCOND */ 0)
+

 struct html {
        int               flags;
 #define        HTML_NOSPACE     (1 << 0)
 struct html {
        int               flags;
 #define        HTML_NOSPACE     (1 << 0)

-#define        HTML_NEWLINE     (1 << 1)

 #define        HTML_IGNDELIM    (1 << 2)
        struct tagq       tags;
        struct ordq       ords;
 #define        HTML_IGNDELIM    (1 << 2)
        struct tagq       tags;
        struct ordq       ords;


@@ -93,8 +111,11 @@ struct      html {
        char             *style;
        char              buf[BUFSIZ];
        size_t            buflen;
        char             *style;
        char              buf[BUFSIZ];
        size_t            buflen;

+       struct tag       *metaf;

 };
 
 };
 

+struct roffsu;
+

 void             print_gen_doctype(struct html *);
 void             print_gen_head(struct html *);
 struct tag      *print_otag(struct html *, enum htmltag, 
 void             print_gen_doctype(struct html *);
 void             print_gen_head(struct html *);
 struct tag      *print_otag(struct html *, enum htmltag, 


@@ -103,13 +124,20 @@ 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_stagq(struct html *, const struct tag *);
 void             print_text(struct html *, const char *);
 

-void             buffmt_man(struct html *, const char *, const char *);
+void             bufcat_su(struct html *, const char *, 
+                       const struct roffsu *);
+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             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             bufncat(struct html *, const char *, size_t);
 void             bufinit(struct html *);
 

+void             html_idcat(char *, const char *, int);
+

 __END_DECLS
 
 #endif /*!HTML_H*/
 __END_DECLS
 
 #endif /*!HTML_H*/