===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.55
retrieving revision 1.59
diff -u -p -r1.55 -r1.59
--- mandoc/main.c	2009/11/02 08:08:23	1.55
+++ mandoc/main.c	2010/01/29 14:39:38	1.59
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.55 2009/11/02 08:08:23 kristaps Exp $ */
+/*	$Id: main.c,v 1.59 2010/01/29 14:39:38 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/stat.h>
 
 #include <assert.h>
@@ -33,14 +37,11 @@
 /* FIXME: Intel's compiler?  LLVM?  pcc?  */
 
 #if !defined(__GNUC__) || (__GNUC__ < 2)
-# define __attribute__(x)
+# if !defined(lint)
+#  define __attribute__(x)
+# endif
 #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
 
-#ifdef __linux__
-extern	int		  getsubopt(char **, char * const *, char **);
-extern	size_t	  	  strlcat(char *, const char *, size_t);
-#endif
-
 typedef	void		(*out_mdoc)(void *, const struct mdoc *);
 typedef	void		(*out_man)(void *, const struct man *);
 typedef	void		(*out_free)(void *);
@@ -60,6 +61,7 @@ enum	outt {
 	OUTT_ASCII = 0,
 	OUTT_TREE,
 	OUTT_HTML,
+	OUTT_XHTML,
 	OUTT_LINT
 };
 
@@ -427,6 +429,12 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse
 
 	if ( ! (curp->outman && curp->outmdoc)) {
 		switch (curp->outtype) {
+		case (OUTT_XHTML):
+			curp->outdata = xhtml_alloc(curp->outopts);
+			curp->outman = html_man;
+			curp->outmdoc = html_mdoc;
+			curp->outfree = html_free;
+			break;
 		case (OUTT_HTML):
 			curp->outdata = html_alloc(curp->outopts);
 			curp->outman = html_man;
@@ -529,7 +537,7 @@ moptions(enum intt *tflags, char *arg)
 	else if (0 == strcmp(arg, "an"))
 		*tflags = INTT_MAN;
 	else {
-		fprintf(stderr, "%s: Bad argument", arg);
+		fprintf(stderr, "%s: Bad argument\n", arg);
 		return(0);
 	}
 
@@ -549,8 +557,10 @@ toptions(enum outt *tflags, char *arg)
 		*tflags = OUTT_TREE;
 	else if (0 == strcmp(arg, "html"))
 		*tflags = OUTT_HTML;
+	else if (0 == strcmp(arg, "xhtml"))
+		*tflags = OUTT_XHTML;
 	else {
-		fprintf(stderr, "%s: Bad argument", arg);
+		fprintf(stderr, "%s: Bad argument\n", arg);
 		return(0);
 	}
 
@@ -599,7 +609,7 @@ foptions(int *fflags, char *arg)
 			*fflags &= ~NO_IGN_ESCAPE;
 			break;
 		default:
-			fprintf(stderr, "%s: Bad argument", o);
+			fprintf(stderr, "%s: Bad argument\n", o);
 			return(0);
 		}
 	}
@@ -628,7 +638,7 @@ woptions(int *wflags, char *arg)
 			*wflags |= WARN_WERR;
 			break;
 		default:
-			fprintf(stderr, "%s: Bad argument", o);
+			fprintf(stderr, "%s: Bad argument\n", o);
 			return(0);
 		}
 	}