===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/html.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -c -r1.64 -r1.65
*** src/usr.bin/mandoc/html.h	2019/03/01 10:48:58	1.64
--- src/usr.bin/mandoc/html.h	2019/04/30 15:52:42	1.65
***************
*** 1,4 ****
! /*	$OpenBSD: html.h,v 1.64 2019/03/01 10:48:58 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2017, 2018, 2019 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: html.h,v 1.65 2019/04/30 15:52:42 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2017, 2018, 2019 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 69,83 ****
  	TAG_MAX
  };
  
- enum	htmlfont {
- 	HTMLFONT_NONE = 0,
- 	HTMLFONT_BOLD,
- 	HTMLFONT_ITALIC,
- 	HTMLFONT_BI,
- 	HTMLFONT_CW,
- 	HTMLFONT_MAX
- };
- 
  struct	tag {
  	struct tag	 *next;
  	int		  refcnt;
--- 69,74 ----
***************
*** 111,118 ****
  	char		 *base_includes; /* base for include href */
  	char		 *style; /* style-sheet URI */
  	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 */
  #define	HTML_TOC	 (1 << 1) /* emit a table of contents */
--- 102,109 ----
  	char		 *base_includes; /* base for include href */
  	char		 *style; /* style-sheet URI */
  	struct tag	 *metaf; /* current open font scope */
! 	enum mandoc_esc	  metal; /* last used font */
! 	enum mandoc_esc	  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 */
***************
*** 128,134 ****
  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 *);
--- 119,124 ----
***************
*** 141,143 ****
--- 131,134 ----
  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);
+ int		  html_setfont(struct html *, enum mandoc_esc);