Prevent negative arguments to the .ll request from causing integer

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index 894cfc4cff47ab369cac88618ed0a3081f34f5c6..521635f96fd9b290219d08e639f958809914afe6 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,6 +1,6 @@
-/*     $Id: html.h,v 1.49 2013/08/08 20:07:47 schwarze Exp $ */
+/*     $Id: html.h,v 1.67 2014/10/28 17:36:19 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
@@ -44,18 +44,32 @@ enum        htmltag {
        TAG_DT,
        TAG_DD,
        TAG_BLOCKQUOTE,
-       TAG_P,
        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 {
-       ATTR_HTTPEQUIV,
-       ATTR_CONTENT,
        ATTR_NAME,
        ATTR_REL,
        ATTR_HREF,
@@ -63,11 +77,12 @@ enum        htmlattr {
        ATTR_MEDIA,
        ATTR_CLASS,
        ATTR_STYLE,
-       ATTR_WIDTH,
        ATTR_ID,
-       ATTR_SUMMARY,
-       ATTR_ALIGN,
        ATTR_COLSPAN,
+       ATTR_CHARSET,
+       ATTR_OPEN,
+       ATTR_CLOSE,
+       ATTR_MATHVARIANT,
        ATTR_MAX
 };
 
@@ -103,12 +118,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_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;
@@ -119,26 +128,27 @@ struct    html {
 #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 */
        struct tagq       tags; /* stack of open tags */
        struct rofftbl    tbl; /* current table */
        struct tag       *tblt; /* current open table scope */
-       struct mchars    *symtab; /* character-escapes */
+       const struct mchars *symtab; /* character table */
        char             *base_man; /* base for manpage href */
        char             *base_includes; /* base for include href */
        char             *style; /* style-sheet URI */
        char              buf[BUFSIZ]; /* see bufcat and friends */
-       size_t            buflen; 
+       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; /* output media type */
        int               oflags; /* output options */
 #define        HTML_FRAGMENT    (1 << 0) /* don't emit HTML/HEAD/BODY */
 };
 
 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 *);
@@ -146,16 +156,20 @@ 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 *);
 
+#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_id(struct html *, const char *);
-void             bufcat_style(struct html *, 
+void             bufcat_style(struct html *,
                        const char *, const char *);
-void             bufcat_su(struct html *, const char *, 
+void             bufcat_su(struct html *, const char *,
                        const struct roffsu *);
 void             bufinit(struct html *);
-void             buffmt_man(struct html *, 
+void             buffmt_man(struct html *,
                        const char *, const char *);
 void             buffmt_includes(struct html *, const char *);