=================================================================== RCS file: /cvs/mandoc/html.h,v retrieving revision 1.77 retrieving revision 1.84 diff -u -p -r1.77 -r1.84 --- mandoc/html.h 2017/01/19 01:00:14 1.77 +++ mandoc/html.h 2017/03/15 11:29:53 1.84 @@ -1,4 +1,4 @@ -/* $Id: html.h,v 1.77 2017/01/19 01:00:14 schwarze Exp $ */ +/* $Id: html.h,v 1.84 2017/03/15 11:29:53 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons * Copyright (c) 2017 Ingo Schwarze @@ -30,7 +30,7 @@ enum htmltag { TAG_BR, TAG_A, TAG_TABLE, - TAG_TBODY, + TAG_COLGROUP, TAG_COL, TAG_TR, TAG_TD, @@ -40,8 +40,9 @@ enum htmltag { TAG_DL, TAG_DT, TAG_DD, - TAG_BLOCKQUOTE, TAG_PRE, + TAG_VAR, + TAG_CITE, TAG_B, TAG_I, TAG_CODE, @@ -79,10 +80,6 @@ struct tag { enum htmltag tag; }; -struct tagq { - struct tag *head; -}; - struct html { int flags; #define HTML_NOSPACE (1 << 0) /* suppress next space */ @@ -101,7 +98,7 @@ struct html { 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 */ char *base_man; /* base for manpage href */ @@ -115,6 +112,7 @@ struct html { }; +struct roff_node; struct tbl_span; struct eqn; @@ -128,5 +126,7 @@ 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 print_endline(struct html *); +char *html_make_id(const struct roff_node *); int html_strlen(const char *);