Second test of log_accum.

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index b20d08d50e67478201536dd223f9c56ed41fe84d..5f462d979100ed75e234e48ef6e3fabef0bbc584 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/*     $Id: html.h,v 1.15 2009/10/27 04:50:14 kristaps Exp $ */
+/*     $Id: html.h,v 1.23 2010/04/05 08:51:56 kristaps Exp $ */

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


@@ -28,7 +28,6 @@ enum  htmltag {
        TAG_DIV,
        TAG_H1,
        TAG_H2,
        TAG_DIV,
        TAG_H1,
        TAG_H2,

-       TAG_P,

        TAG_SPAN,
        TAG_LINK,
        TAG_BR,
        TAG_SPAN,
        TAG_LINK,
        TAG_BR,


@@ -40,7 +39,6 @@ enum  htmltag {
        TAG_LI,
        TAG_UL,
        TAG_OL,
        TAG_LI,
        TAG_UL,
        TAG_OL,

-       TAG_BASE,

        TAG_MAX
 };
 
        TAG_MAX
 };
 


@@ -62,6 +60,13 @@ enum htmlattr {
        ATTR_MAX
 };
 
        ATTR_MAX
 };
 

+enum   htmlfont {
+       HTMLFONT_NONE = 0,
+       HTMLFONT_BOLD,
+       HTMLFONT_ITALIC,
+       HTMLFONT_MAX
+};
+

 struct tag {
        struct tag       *next;
        enum htmltag      tag;
 struct tag {
        struct tag       *next;
        enum htmltag      tag;


@@ -85,23 +90,26 @@ struct      htmlpair {
        const 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)
+#define        PAIR_INIT(p, t, v) \
+       do { \
+               (p)->key = (t); \
+               (p)->val = (v); \
+       } while (/* CONSTCOND */ 0)
+
+#define        PAIR_ID_INIT(p, v)      PAIR_INIT(p, ATTR_ID, v)
+#define        PAIR_CLASS_INIT(p, v)   PAIR_INIT(p, ATTR_CLASS, v)
+#define        PAIR_HREF_INIT(p, v)    PAIR_INIT(p, ATTR_HREF, v)
+#define        PAIR_STYLE_INIT(p, h)   PAIR_INIT(p, ATTR_STYLE, (h)->buf)
+#define        PAIR_SUMMARY_INIT(p, v) PAIR_INIT(p, ATTR_SUMMARY, v)
+
+enum   htmltype {
+       HTML_HTML_4_01_STRICT,
+       HTML_XHTML_1_0_STRICT
+};

 
 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;


@@ -112,12 +120,17 @@ struct    html {
        char             *style;
        char              buf[BUFSIZ];
        size_t            buflen;
        char             *style;
        char              buf[BUFSIZ];
        size_t            buflen;

+       struct tag       *metaf;
+       enum htmlfont     metal;
+       enum htmlfont     metac;
+       enum htmltype     type;

 };
 
 struct roffsu;
 
 };
 
 struct roffsu;
 

-void             print_gen_doctype(struct html *);
+void             print_gen_decls(struct html *);

 void             print_gen_head(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 *);
 struct tag      *print_otag(struct html *, enum htmltag, 
                                int, const struct htmlpair *);
 void             print_tagq(struct html *, const struct tag *);


@@ -136,6 +149,8 @@ void                  bufcat_style(struct html *,
 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*/