===================================================================
RCS file: /cvs/mandoc/Attic/mdocml.c,v
retrieving revision 1.16
retrieving revision 1.20
diff -u -p -r1.16 -r1.20
--- mandoc/Attic/mdocml.c	2008/12/03 19:21:58	1.16
+++ mandoc/Attic/mdocml.c	2008/12/10 14:42:46	1.20
@@ -1,4 +1,4 @@
-/* $Id: mdocml.c,v 1.16 2008/12/03 19:21:58 kristaps Exp $ */
+/* $Id: mdocml.c,v 1.20 2008/12/10 14:42:46 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -33,6 +33,12 @@
 #define	BUFFER_IN_DEF	BUFSIZ	 /* See begin_bufs. */
 #define	BUFFER_OUT_DEF	BUFSIZ	 /* See begin_bufs. */
 
+#ifdef	DEBUG
+#define	CSS		"mdocml.css"
+#else
+#define	CSS		"/usr/local/share/mdocml/mdocml.css"
+#endif
+
 static	void		 usage(void);
 
 static	int		 begin_io(const struct md_args *, 
@@ -44,24 +50,50 @@ static	int		 begin_bufs(const struct md_args *,
 static int		 leave_bufs(const struct md_buf *, 
 				const struct md_buf *, int);
 
+#ifdef __linux__
+extern	int		 getsubopt(char **, char *const *, char **);
+#endif
+
 int
 main(int argc, char *argv[])
 {
 	int		 c;
-	char		*out, *in, *filter;
+	char		*out, *in, *opts, *v;
 	struct md_args	 args;
+#define ALL     	 0
+#define ERROR     	 1
+	char		*toks[] = { "all", "error", NULL };
 
 	extern char	*optarg;
 	extern int	 optind;
 
-	out = in = filter = NULL;
+	out = in = NULL;
 
 	(void)memset(&args, 0, sizeof(struct md_args));
-	
-	while (-1 != (c = getopt(argc, argv, "f:o:vW")))
+
+	args.type = MD_NOOP;
+
+	while (-1 != (c = getopt(argc, argv, "c:ef:o:vW:")))
 		switch (c) {
+		case ('c'):
+			if (args.type != MD_HTML)
+				errx(1, "-c only valid for -fhtml");
+			args.params.html.css = optarg;
+			break;
+		case ('e'):
+			if (args.type != MD_HTML)
+				errx(1, "-e only valid for -fhtml");
+			args.params.html.flags |= HTML_CSS_EMBED;
+			break;
 		case ('f'):
-			filter = optarg;
+			if (0 == strcmp(optarg, "html"))
+				args.type = MD_HTML;
+			else if (0 == strcmp(optarg, "xml"))
+				args.type = MD_XML;
+			else if (0 == strcmp(optarg, "noop"))
+				args.type = MD_NOOP;
+			else
+				errx(1, "invalid filter type");
 			break;
 		case ('o'):
 			out = optarg;
@@ -70,29 +102,35 @@ main(int argc, char *argv[])
 			args.verbosity++;
 			break;
 		case ('W'):
-			args.warnings |= MD_WARN_ALL;
+			opts = optarg;
+			while (*opts) 
+				switch (getsubopt(&opts, toks, &v)) {
+				case (ALL):
+					args.warnings |= MD_WARN_ALL;
+					break;
+				case (ERROR):
+					args.warnings |= MD_WARN_ERROR;
+					break;
+				default:
+					usage();
+					return(1);
+				}
 			break;
 		default:
 			usage();
 			return(1);
 		}
 
+	if (MD_HTML == args.type)
+		if (NULL == args.params.html.css) 
+			args.params.html.css = CSS;
+
 	argv += optind;
 	argc -= optind;
 
 	if (1 == argc)
 		in = *argv++;
 
-	if (filter) {
-		if (0 == strcmp(filter, "html"))
-			args.type = MD_HTML;
-		else if (0 == strcmp(filter, "xml"))
-			args.type = MD_XML;
-		else
-			errx(1, "invalid filter type");
-	} else
-		args.type = MD_XML;
-
 	return(begin_io(&args, out ? out : "-", in ? in : "-"));
 }
 
@@ -233,6 +271,8 @@ usage(void)
 {
 	extern char	*__progname;
 
-	(void)printf("usage: %s [-vW] [-f filter] [-o outfile] "
-			"[infile]\n", __progname);
+	(void)fprintf(stderr, "usage: %s [-v] [-Wwarn...]  "
+			"[-f filter] [-o outfile] [infile]\n", 
+			__progname);
 }
+