diff options
| author | Michal Nowak <mnowak@startmail.com> | 2019-05-30 07:50:30 +0200 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2019-06-21 14:59:14 -0400 |
| commit | cec8643b41ebefad6c677010fc784dc4bb0550f3 (patch) | |
| tree | c4eca564abb29cbe5a704a1a1b182a6d0cb526fc /usr/src/cmd/mandoc/html.h | |
| parent | 07188943efdbeedd24142a14db7384af1478ba54 (diff) | |
| download | illumos-gate-cec8643b41ebefad6c677010fc784dc4bb0550f3.tar.gz | |
11190 Update mandoc to 1.14.5
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd/mandoc/html.h')
| -rw-r--r-- | usr/src/cmd/mandoc/html.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/usr/src/cmd/mandoc/html.h b/usr/src/cmd/mandoc/html.h index 6d44a47383..a6bf891190 100644 --- a/usr/src/cmd/mandoc/html.h +++ b/usr/src/cmd/mandoc/html.h @@ -1,7 +1,7 @@ -/* $Id: html.h,v 1.92 2018/06/25 16:54:59 schwarze Exp $ */ +/* $Id: html.h,v 1.102 2019/03/01 10:57:18 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2017, 2018, 2019 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 @@ -24,6 +24,7 @@ enum htmltag { TAG_TITLE, TAG_DIV, TAG_IDIV, + TAG_SECTION, TAG_H1, TAG_H2, TAG_SPAN, @@ -39,6 +40,7 @@ enum htmltag { TAG_DL, TAG_DT, TAG_DD, + TAG_P, TAG_PRE, TAG_VAR, TAG_CITE, @@ -72,11 +74,14 @@ enum htmlfont { HTMLFONT_BOLD, HTMLFONT_ITALIC, HTMLFONT_BI, + HTMLFONT_CW, HTMLFONT_MAX }; struct tag { struct tag *next; + int refcnt; + int closed; enum htmltag tag; }; @@ -87,12 +92,12 @@ struct html { #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_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 */ @@ -101,7 +106,8 @@ struct html { struct tag *tag; /* last open tag */ 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 */ @@ -109,6 +115,7 @@ struct html { 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 */ }; @@ -121,6 +128,7 @@ 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_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 *); @@ -128,7 +136,8 @@ 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_box *); -void print_paragraph(struct html *); void print_endline(struct html *); +void html_close_paragraph(struct html *); +enum roff_tok html_fillmode(struct html *, enum roff_tok); char *html_make_id(const struct roff_node *, int); |