Whack removed function from libroff.

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index fd3939d07328d0ee699fcd6c955529dd60ac63f9..3bce983535b7e996e08b0ef678711adc49a59da3 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,6 +1,6 @@
-/*     $Id: html.h,v 1.17 2009/10/28 08:00:18 kristaps Exp $ */
+/*     $Id: html.h,v 1.36 2010/12/24 14:14:00 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -28,19 +28,28 @@ enum        htmltag {
        TAG_DIV,
        TAG_H1,
        TAG_H2,
        TAG_DIV,
        TAG_H1,
        TAG_H2,

-       TAG_P,

        TAG_SPAN,
        TAG_LINK,
        TAG_BR,
        TAG_A,
        TAG_TABLE,
        TAG_SPAN,
        TAG_LINK,
        TAG_BR,
        TAG_A,
        TAG_TABLE,

+       TAG_TBODY,

        TAG_COL,
        TAG_TR,
        TAG_TD,
        TAG_LI,
        TAG_UL,
        TAG_OL,
        TAG_COL,
        TAG_TR,
        TAG_TD,
        TAG_LI,
        TAG_UL,
        TAG_OL,

-       TAG_BASE,
+       TAG_DL,
+       TAG_DT,
+       TAG_DD,
+       TAG_BLOCKQUOTE,
+       TAG_P,
+       TAG_PRE,
+       TAG_B,
+       TAG_I,
+       TAG_CODE,
+       TAG_SMALL,

        TAG_MAX
 };
 
        TAG_MAX
 };
 


@@ -55,56 +64,58 @@ enum        htmlattr {
        ATTR_CLASS,
        ATTR_STYLE,
        ATTR_WIDTH,
        ATTR_CLASS,
        ATTR_STYLE,
        ATTR_WIDTH,

-       ATTR_VALIGN,
-       ATTR_TARGET,

        ATTR_ID,
        ATTR_SUMMARY,
        ATTR_ID,
        ATTR_SUMMARY,

+       ATTR_ALIGN,

        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;
 };
 

-struct ord {
-       struct ord       *next;
-       const void       *cookie;
-       int               pos;
-};
-

 struct tagq {
        struct tag       *head;
 };
 struct tagq {
        struct tag       *head;
 };

-struct ordq {
-       struct ord       *head;
-};

 
 struct htmlpair {
        enum htmlattr     key;
        const char       *val;
 };
 
 
 struct htmlpair {
        enum htmlattr     key;
        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)
+#define        HTML_IGNDELIM    (1 << 1)
+#define        HTML_KEEP        (1 << 2)
+#define        HTML_PREKEEP     (1 << 3)
+#define        HTML_NONOSPACE   (1 << 4)

        struct tagq       tags;
        struct tagq       tags;

-       struct ordq       ords;

        void             *symtab;
        char             *base;
        char             *base_man;
        void             *symtab;
        char             *base;
        char             *base_man;


@@ -112,11 +123,15 @@ struct    html {
        char             *style;
        char              buf[BUFSIZ];
        size_t            buflen;
        char             *style;
        char              buf[BUFSIZ];
        size_t            buflen;

+       struct tag       *metaf; /* current open font scope */
+       enum htmlfont     metal; /* last used font */
+       enum htmlfont     metac; /* current font mode */
+       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 *);
 struct tag      *print_otag(struct html *, enum htmltag, 
                                int, const struct htmlpair *);
 void             print_gen_head(struct html *);
 struct tag      *print_otag(struct html *, enum htmltag, 
                                int, const struct htmlpair *);