Whack removed function from libroff.

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index 503acd57de81c5e90192ab4581bb116446a92111..3bce983535b7e996e08b0ef678711adc49a59da3 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,6 +1,6 @@
-/*     $Id: html.h,v 1.25 2010/07/06 12:37:17 kristaps Exp $ */
+/*     $Id: html.h,v 1.36 2010/12/24 14:14:00 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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


@@ -33,12 +33,23 @@ enum        htmltag {
        TAG_BR,
        TAG_A,
        TAG_TABLE,
        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_DL,
+       TAG_DT,
+       TAG_DD,
+       TAG_BLOCKQUOTE,
+       TAG_P,
+       TAG_PRE,
+       TAG_B,
+       TAG_I,
+       TAG_CODE,
+       TAG_SMALL,

        TAG_MAX
 };
 
        TAG_MAX
 };
 


@@ -53,10 +64,9 @@ 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
 };
 


@@ -72,18 +82,9 @@ struct       tag {
        enum htmltag      tag;
 };
 
        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;
 
 struct htmlpair {
        enum htmlattr     key;


@@ -113,8 +114,8 @@ struct      html {
 #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;
        struct tagq       tags;

-       struct ordq       ords;

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


@@ -122,9 +123,9 @@ 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;
+       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;
 };
 


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