Reject the escape sequences \[uD800] to \[uDFFF] in the parser.

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index 561d06e2de47c7f2cfac5c3a2155fbf9e46abcec..e6644dc85d83a35af86d5403764d66d3a9654c3e 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,6 +1,6 @@
-/*     $Id: html.h,v 1.40 2011/01/29 14:49:44 kristaps Exp $ */
+/*     $Id: html.h,v 1.71 2015/10/13 22:59:54 schwarze Exp $ */

 /*
 /*

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


@@ -14,10 +14,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifndef HTML_H
-#define HTML_H
-
-__BEGIN_DECLS

 
 enum   htmltag {
        TAG_HTML,
 
 enum   htmltag {
        TAG_HTML,


@@ -44,18 +40,32 @@ enum        htmltag {
        TAG_DT,
        TAG_DD,
        TAG_BLOCKQUOTE,
        TAG_DT,
        TAG_DD,
        TAG_BLOCKQUOTE,

-       TAG_P,

        TAG_PRE,
        TAG_B,
        TAG_I,
        TAG_CODE,
        TAG_SMALL,
        TAG_PRE,
        TAG_B,
        TAG_I,
        TAG_CODE,
        TAG_SMALL,

+       TAG_STYLE,
+       TAG_MATH,
+       TAG_MROW,
+       TAG_MI,
+       TAG_MO,
+       TAG_MSUP,
+       TAG_MSUB,
+       TAG_MSUBSUP,
+       TAG_MFRAC,
+       TAG_MSQRT,
+       TAG_MFENCED,
+       TAG_MTABLE,
+       TAG_MTR,
+       TAG_MTD,
+       TAG_MUNDEROVER,
+       TAG_MUNDER,
+       TAG_MOVER,

        TAG_MAX
 };
 
 enum   htmlattr {
        TAG_MAX
 };
 
 enum   htmlattr {

-       ATTR_HTTPEQUIV,
-       ATTR_CONTENT,

        ATTR_NAME,
        ATTR_REL,
        ATTR_HREF,
        ATTR_NAME,
        ATTR_REL,
        ATTR_HREF,


@@ -63,11 +73,12 @@ enum        htmlattr {
        ATTR_MEDIA,
        ATTR_CLASS,
        ATTR_STYLE,
        ATTR_MEDIA,
        ATTR_CLASS,
        ATTR_STYLE,

-       ATTR_WIDTH,

        ATTR_ID,
        ATTR_ID,

-       ATTR_SUMMARY,
-       ATTR_ALIGN,

        ATTR_COLSPAN,
        ATTR_COLSPAN,

+       ATTR_CHARSET,
+       ATTR_OPEN,
+       ATTR_CLOSE,
+       ATTR_MATHVARIANT,

        ATTR_MAX
 };
 
        ATTR_MAX
 };
 


@@ -75,6 +86,7 @@ enum  htmlfont {
        HTMLFONT_NONE = 0,
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,
        HTMLFONT_NONE = 0,
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,

+       HTMLFONT_BI,

        HTMLFONT_MAX
 };
 
        HTMLFONT_MAX
 };
 


@@ -102,12 +114,6 @@ struct     htmlpair {
 #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_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;
 
 struct html {
        int               flags;


@@ -117,10 +123,13 @@ struct    html {
 #define        HTML_PREKEEP     (1 << 3)
 #define        HTML_NONOSPACE   (1 << 4) /* never add spaces */
 #define        HTML_LITERAL     (1 << 5) /* literal (e.g., <PRE>) context */
 #define        HTML_PREKEEP     (1 << 3)
 #define        HTML_NONOSPACE   (1 << 4) /* never add spaces */
 #define        HTML_LITERAL     (1 << 5) /* literal (e.g., <PRE>) context */

+#define        HTML_SKIPCHAR    (1 << 6) /* skip the next character */
+#define        HTML_NOSPLIT     (1 << 7) /* do not break line before .An */
+#define        HTML_SPLIT       (1 << 8) /* break line before .An */
+#define        HTML_NONEWLINE   (1 << 9) /* No line break in nofill mode. */

        struct tagq       tags; /* stack of open tags */
        struct rofftbl    tbl; /* current table */
        struct tag       *tblt; /* current open table scope */
        struct tagq       tags; /* stack of open tags */
        struct rofftbl    tbl; /* current table */
        struct tag       *tblt; /* current open table scope */

-       void             *symtab; /* character-escapes */

        char             *base_man; /* base for manpage href */
        char             *base_includes; /* base for include href */
        char             *style; /* style-sheet URI */
        char             *base_man; /* base for manpage href */
        char             *base_includes; /* base for include href */
        char             *style; /* style-sheet URI */


@@ -129,33 +138,42 @@ struct    html {
        struct tag       *metaf; /* current open font scope */
        enum htmlfont     metal; /* last used font */
        enum htmlfont     metac; /* current font mode */
        struct tag       *metaf; /* current open font scope */
        enum htmlfont     metal; /* last used font */
        enum htmlfont     metac; /* current font mode */

-       enum htmltype     type;
+       int               oflags; /* output options */
+#define        HTML_FRAGMENT    (1 << 0) /* don't emit HTML/HEAD/BODY */

 };
 
 };
 

+__BEGIN_DECLS
+
+struct tbl_span;
+struct eqn;
+

 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_otag(struct html *, enum htmltag, 
+struct tag      *print_otag(struct html *, enum htmltag,

                                int, const struct htmlpair *);
 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 *);
                                int, const struct htmlpair *);
 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             print_eqn(struct html *, const struct eqn *);
+void             print_paragraph(struct html *);

 
 

-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 *, ...);
+#if __GNUC__ - 0 >= 4
+__attribute__((__format__ (__printf__, 2, 3)))
+#endif
+void             bufcat_fmt(struct html *, const char *, ...);

 void             bufcat(struct html *, const char *);
 void             bufcat(struct html *, const char *);

-void             bufcat_style(struct html *, 
+void             bufcat_id(struct html *, const char *);
+void             bufcat_style(struct html *,

                        const char *, const char *);
                        const char *, const char *);

-void             bufncat(struct html *, const char *, size_t);
+void             bufcat_su(struct html *, const char *,
+                       const struct roffsu *);

 void             bufinit(struct html *);
 void             bufinit(struct html *);

+void             buffmt_man(struct html *,
+                       const char *, const char *);
+void             buffmt_includes(struct html *, const char *);

 
 

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

 
 __END_DECLS
 
 __END_DECLS

-
-#endif /*!HTML_H*/