Simplify the roff(7) .ce and .rj terminal formatter by using the

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index a393ff6212a275181d7643a294baa61aecb72391..4eb0b7b891714f41b6973a3d2659f24ceaf25714 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,7 +1,7 @@
-/*     $Id: html.h,v 1.79 2017/01/26 18:28:18 schwarze Exp $ */
+/*     $Id: html.h,v 1.97 2018/12/31 11:09:25 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>

  *
  * 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


@@ -23,6 +23,7 @@ enum  htmltag {
        TAG_META,
        TAG_TITLE,
        TAG_DIV,
        TAG_META,
        TAG_TITLE,
        TAG_DIV,

+       TAG_IDIV,

        TAG_H1,
        TAG_H2,
        TAG_SPAN,
        TAG_H1,
        TAG_H2,
        TAG_SPAN,


@@ -30,8 +31,6 @@ 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_TR,
        TAG_TD,
        TAG_LI,


@@ -41,6 +40,8 @@ enum  htmltag {
        TAG_DT,
        TAG_DD,
        TAG_PRE,
        TAG_DT,
        TAG_DD,
        TAG_PRE,

+       TAG_VAR,
+       TAG_CITE,

        TAG_B,
        TAG_I,
        TAG_CODE,
        TAG_B,
        TAG_I,
        TAG_CODE,


@@ -49,6 +50,7 @@ enum  htmltag {
        TAG_MATH,
        TAG_MROW,
        TAG_MI,
        TAG_MATH,
        TAG_MROW,
        TAG_MI,

+       TAG_MN,

        TAG_MO,
        TAG_MSUP,
        TAG_MSUB,
        TAG_MO,
        TAG_MSUP,
        TAG_MSUB,


@@ -70,6 +72,7 @@ enum  htmlfont {
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,
        HTMLFONT_BI,
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,
        HTMLFONT_BI,

+       HTMLFONT_CW,

        HTMLFONT_MAX
 };
 
        HTMLFONT_MAX
 };
 


@@ -78,10 +81,6 @@ struct       tag {
        enum htmltag      tag;
 };
 
        enum htmltag      tag;
 };
 

-struct tagq {
-       struct tag       *head;
-};
-

 struct html {
        int               flags;
 #define        HTML_NOSPACE     (1 << 0) /* suppress next space */
 struct html {
        int               flags;
 #define        HTML_NOSPACE     (1 << 0) /* suppress next space */


@@ -89,21 +88,22 @@ struct      html {
 #define        HTML_KEEP        (1 << 2)
 #define        HTML_PREKEEP     (1 << 3)
 #define        HTML_NONOSPACE   (1 << 4) /* never add spaces */
 #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 */
 #define        HTML_NONEWLINE   (1 << 9) /* No line break in nofill mode. */
 #define        HTML_BUFFER      (1 << 10) /* Collect a word to see if it fits. */
 #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. */
 #define        HTML_BUFFER      (1 << 10) /* Collect a word to see if it fits. */

+#define        HTML_TOCDONE     (1 << 11) /* The TOC was already written. */

        size_t            indent; /* current output indentation level */
        int               noindent; /* indent disabled by <pre> */
        size_t            col; /* current output byte position */
        size_t            bufcol; /* current buf byte position */
        char              buf[80]; /* output buffer */
        size_t            indent; /* current output indentation level */
        int               noindent; /* indent disabled by <pre> */
        size_t            col; /* current output byte position */
        size_t            bufcol; /* current buf byte position */
        char              buf[80]; /* output buffer */

-       struct tagq       tags; /* stack of open tags */
+       struct tag       *tag; /* last open tag */

        struct rofftbl    tbl; /* current table */
        struct tag       *tblt; /* current open table scope */
        struct rofftbl    tbl; /* current table */
        struct tag       *tblt; /* current open table scope */

-       char             *base_man; /* base for manpage href */
+       char             *base_man1; /* bases for manpage href */
+       char             *base_man2;

        char             *base_includes; /* base for include href */
        char             *style; /* style-sheet URI */
        struct tag       *metaf; /* current open font scope */
        char             *base_includes; /* base for include href */
        char             *style; /* style-sheet URI */
        struct tag       *metaf; /* current open font scope */


@@ -111,22 +111,28 @@ struct    html {
        enum htmlfont     metac; /* current font mode */
        int               oflags; /* output options */
 #define        HTML_FRAGMENT    (1 << 0) /* don't emit HTML/HEAD/BODY */
        enum htmlfont     metac; /* current font mode */
        int               oflags; /* output options */
 #define        HTML_FRAGMENT    (1 << 0) /* don't emit HTML/HEAD/BODY */

+#define        HTML_TOC         (1 << 1) /* emit a table of contents */

 };
 
 
 };
 
 

+struct roff_node;

 struct tbl_span;
 struct tbl_span;

-struct eqn;
+struct eqn_box;
+
+void             roff_html_pre(struct html *, const struct roff_node *);

 
 

+void             print_gen_comment(struct html *, struct roff_node *);

 void             print_gen_decls(struct html *);
 void             print_gen_head(struct html *);
 void             print_gen_decls(struct html *);
 void             print_gen_head(struct html *);

+void             print_metaf(struct html *, enum mandoc_esc);

 struct tag      *print_otag(struct html *, enum htmltag, const char *, ...);
 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 *);
 struct tag      *print_otag(struct html *, enum htmltag, const char *, ...);
 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_eqn(struct html *, const struct eqn_box *);

 void             print_paragraph(struct html *);
 void             print_endline(struct html *);
 
 void             print_paragraph(struct html *);
 void             print_endline(struct html *);
 

-int              html_strlen(const char *);
+char            *html_make_id(const struct roff_node *, int);