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

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index f3110eaf07f9e0d14ac0d644ef5bdc620668700f..e6644dc85d83a35af86d5403764d66d3a9654c3e 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,6 +1,6 @@
-/*     $Id: html.h,v 1.64 2014/09/28 20:14:20 kristaps Exp $ */
+/*     $Id: html.h,v 1.71 2015/10/13 22:59:54 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 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
@@ -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.
  */
-#ifndef HTML_H
-#define HTML_H
-
-__BEGIN_DECLS
 
 enum   htmltag {
        TAG_HTML,
@@ -82,6 +78,7 @@ enum  htmlattr {
        ATTR_CHARSET,
        ATTR_OPEN,
        ATTR_CLOSE,
+       ATTR_MATHVARIANT,
        ATTR_MAX
 };
 
@@ -129,10 +126,10 @@ struct    html {
 #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 mchars    *symtab; /* character-escapes */
        char             *base_man; /* base for manpage href */
        char             *base_includes; /* base for include href */
        char             *style; /* style-sheet URI */
@@ -145,6 +142,11 @@ struct     html {
 #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 *);
 struct tag      *print_otag(struct html *, enum htmltag,
@@ -175,5 +177,3 @@ void                  buffmt_includes(struct html *, const char *);
 int              html_strlen(const char *);
 
 __END_DECLS
-
-#endif /*!HTML_H*/