=================================================================== RCS file: /cvs/mandoc/html.h,v retrieving revision 1.96 retrieving revision 1.101 diff -u -p -r1.96 -r1.101 --- mandoc/html.h 2018/12/16 00:17:02 1.96 +++ mandoc/html.h 2019/01/18 14:36:21 1.101 @@ -1,7 +1,7 @@ -/* $Id: html.h,v 1.96 2018/12/16 00:17:02 schwarze Exp $ */ +/* $Id: html.h,v 1.101 2019/01/18 14:36:21 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons - * Copyright (c) 2017, 2018 Ingo Schwarze + * Copyright (c) 2017, 2018, 2019 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -39,6 +39,7 @@ enum htmltag { TAG_DL, TAG_DT, TAG_DD, + TAG_P, TAG_PRE, TAG_VAR, TAG_CITE, @@ -78,6 +79,8 @@ enum htmlfont { struct tag { struct tag *next; + int refcnt; + int closed; enum htmltag tag; }; @@ -88,7 +91,6 @@ 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.,
) 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 */
@@ -133,7 +135,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);