===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.41
retrieving revision 1.44
diff -u -p -r1.41 -r1.44
--- mandoc/main.c	2009/07/28 10:15:12	1.41
+++ mandoc/main.c	2009/09/21 13:06:13	1.44
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.41 2009/07/28 10:15:12 kristaps Exp $ */
+/*	$Id: main.c,v 1.44 2009/09/21 13:06:13 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -40,8 +40,8 @@ extern	int		  getsubopt(char **, char * const *, char 
 # endif
 #endif
 
-typedef	int		(*out_mdoc)(void *, const struct mdoc *);
-typedef	int		(*out_man)(void *, const struct man *);
+typedef	void		(*out_mdoc)(void *, const struct mdoc *);
+typedef	void		(*out_man)(void *, const struct man *);
 typedef	void		(*out_free)(void *);
 
 struct	buf {
@@ -58,6 +58,7 @@ enum	intt {
 enum	outt {
 	OUTT_ASCII = 0,
 	OUTT_TREE,
+	OUTT_HTML,
 	OUTT_LINT
 };
 
@@ -83,13 +84,18 @@ struct	curparse {
 	out_man	  	  outman;
 	out_free	  outfree;
 	void		 *outdata;
+	char		 *outopts;
 };
 
+extern	void		 *html_alloc(char *);
+extern	void		  html_mdoc(void *, const struct mdoc *);
+extern	void		  html_man(void *, const struct man *);
+extern	void		  html_free(void *);
 extern	void		 *ascii_alloc(void);
-extern	int		  tree_mdoc(void *, const struct mdoc *);
-extern	int		  tree_man(void *, const struct man *);
-extern	int		  terminal_mdoc(void *, const struct mdoc *);
-extern	int		  terminal_man(void *, const struct man *);
+extern	void		  tree_mdoc(void *, const struct mdoc *);
+extern	void		  tree_man(void *, const struct man *);
+extern	void		  terminal_mdoc(void *, const struct mdoc *);
+extern	void		  terminal_man(void *, const struct man *);
 extern	void		  terminal_free(void *);
 
 static	int		  foptions(int *, char *);
@@ -125,7 +131,7 @@ main(int argc, char *argv[])
 	curp.outtype = OUTT_ASCII;
 
 	/* LINTED */
-	while (-1 != (c = getopt(argc, argv, "f:m:VW:T:")))
+	while (-1 != (c = getopt(argc, argv, "f:m:o:T:VW:")))
 		switch (c) {
 		case ('f'):
 			if ( ! foptions(&curp.fflags, optarg))
@@ -135,6 +141,9 @@ main(int argc, char *argv[])
 			if ( ! moptions(&curp.inttype, optarg))
 				return(EXIT_FAILURE);
 			break;
+		case ('o'):
+			curp.outopts = optarg;
+			break;
 		case ('T'):
 			if ( ! toptions(&curp.outtype, optarg))
 				return(EXIT_FAILURE);
@@ -432,6 +441,12 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse
 
 	if ( ! (curp->outman && curp->outmdoc)) {
 		switch (curp->outtype) {
+		case (OUTT_HTML):
+			curp->outdata = html_alloc(curp->outopts);
+			curp->outman = html_man;
+			curp->outmdoc = html_mdoc;
+			curp->outfree = html_free;
+			break;
 		case (OUTT_TREE):
 			curp->outman = tree_man;
 			curp->outmdoc = tree_mdoc;
@@ -450,11 +465,9 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse
 	/* Execute the out device, if it exists. */
 
 	if (man && curp->outman)
-		if ( ! (*curp->outman)(curp->outdata, man))
-			return(-1);
+		(*curp->outman)(curp->outdata, man);
 	if (mdoc && curp->outmdoc)
-		if ( ! (*curp->outmdoc)(curp->outdata, mdoc))
-			return(-1);
+		(*curp->outmdoc)(curp->outdata, mdoc);
 
 	return(1);
 }
@@ -548,6 +561,8 @@ toptions(enum outt *tflags, char *arg)
 		*tflags = OUTT_LINT;
 	else if (0 == strcmp(arg, "tree"))
 		*tflags = OUTT_TREE;
+	else if (0 == strcmp(arg, "html"))
+		*tflags = OUTT_HTML;
 	else {
 		warnx("bad argument: -T%s", arg);
 		return(0);