===================================================================
RCS file: /cvs/mandoc/Attic/libmdocml.c,v
retrieving revision 1.15
retrieving revision 1.18
diff -u -p -r1.15 -r1.18
--- mandoc/Attic/libmdocml.c	2008/11/30 20:53:34	1.15
+++ mandoc/Attic/libmdocml.c	2008/12/03 14:39:59	1.18
@@ -1,4 +1,4 @@
-/* $Id: libmdocml.c,v 1.15 2008/11/30 20:53:34 kristaps Exp $ */
+/* $Id: libmdocml.c,v 1.18 2008/12/03 14:39:59 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -139,18 +139,18 @@ md_run_leave(const struct md_args *args, struct md_mbu
 
 	/* Run exiters. */
 	switch (args->type) {
-	case (MD_HTML4_STRICT):
-		if ( ! md_exit_html4_strict(data, -1 == c ? 0 : 1))
+	case (MD_HTML):
+		if ( ! md_exit_html(data, -1 == c ? 0 : 1))
 			c = -1;
 		break;
 	default:
-		if ( ! md_exit_valid(data, -1 == c ? 0 : 1))
+		if ( ! md_exit_xml(data, -1 == c ? 0 : 1))
 			c = -1;
 		break;
 	}
 
 	/* Make final flush of buffer. */
-	if ( ! md_buf_flush(mbuf))
+	if (-1 != c && ! md_buf_flush(mbuf))
 		return(-1);
 
 	return(c);
@@ -172,11 +172,11 @@ md_run_enter(const struct md_args *args, struct md_mbu
 
 	/* Function ptrs to line-parsers. */
 	switch (args->type) {
-	case (MD_HTML4_STRICT):
-		fp = md_line_html4_strict;
+	case (MD_HTML):
+		fp = md_line_html;
 		break;
 	default:
-		fp = md_line_valid;
+		fp = md_line_xml;
 		break;
 	}
 
@@ -242,13 +242,11 @@ md_run(const struct md_args *args,
 
 	/* Run initialisers. */
 	switch (args->type) {
-	case (MD_HTML4_STRICT):
-		data = md_init_html4_strict
-			(args, &mbuf, &rbuf);
+	case (MD_HTML):
+		data = md_init_html(args, &mbuf, &rbuf);
 		break;
 	default:
-		data = md_init_valid
-			(args, &mbuf, &rbuf);
+		data = md_init_xml(args, &mbuf, &rbuf);
 		break;
 	}