Prevent negative arguments to the .ll request from causing integer

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index 3775edb96b083b7228767476ad4dba620467943d..521635f96fd9b290219d08e639f958809914afe6 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,6 +1,6 @@
-/*     $Id: html.h,v 1.16 2009/10/28 05:08:17 kristaps Exp $ */
+/*     $Id: html.h,v 1.67 2014/10/28 17:36:19 schwarze Exp $ */

 /*
 /*

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


@@ -28,25 +28,48 @@ 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_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,


@@ -54,90 +77,103 @@ enum       htmlattr {
        ATTR_MEDIA,
        ATTR_CLASS,
        ATTR_STYLE,
        ATTR_MEDIA,
        ATTR_CLASS,
        ATTR_STYLE,

-       ATTR_WIDTH,
-       ATTR_VALIGN,
-       ATTR_TARGET,

        ATTR_ID,
        ATTR_ID,

-       ATTR_SUMMARY,
+       ATTR_COLSPAN,
+       ATTR_CHARSET,
+       ATTR_OPEN,
+       ATTR_CLOSE,
+       ATTR_MATHVARIANT,

        ATTR_MAX
 };
 
        ATTR_MAX
 };
 

+enum   htmlfont {
+       HTMLFONT_NONE = 0,
+       HTMLFONT_BOLD,
+       HTMLFONT_ITALIC,
+       HTMLFONT_BI,
+       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)

 
 struct html {
        int               flags;
 
 struct html {
        int               flags;

-#define        HTML_NOSPACE     (1 << 0)
-#define        HTML_NEWLINE     (1 << 1)
-#define        HTML_IGNDELIM    (1 << 2)
-       struct tagq       tags;
-       struct ordq       ords;
-       void             *symtab;
-       char             *base;
-       char             *base_man;
-       char             *base_includes;
-       char             *style;
-       char              buf[BUFSIZ];
+#define        HTML_NOSPACE     (1 << 0) /* suppress next space */
+#define        HTML_IGNDELIM    (1 << 1)
+#define        HTML_KEEP        (1 << 2)
+#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 */
+       struct tagq       tags; /* stack of open tags */
+       struct rofftbl    tbl; /* current table */
+       struct tag       *tblt; /* current open table scope */
+       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 */
+       int               oflags; /* output options */
+#define        HTML_FRAGMENT    (1 << 0) /* don't emit HTML/HEAD/BODY */

 };
 
 };
 

-struct roffsu;
-
-void             print_gen_doctype(struct html *);
+void             print_gen_decls(struct html *);

 void             print_gen_head(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 *);
                                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);
-void             html_idcpy(char *, const char *, int);
+int              html_strlen(const char *);

 
 __END_DECLS
 
 
 __END_DECLS