*** empty log message ***

[mandoc.git] / libmdocml.c

diff --git a/libmdocml.c b/libmdocml.c
index d942f189b4e6a4abcc528d232f9eeba786bf7acf..f419c1f55a17628445283de868d3b962c81e35d4 100644 (file)
--- a/libmdocml.c
+++ b/libmdocml.c
@@ -1,4 +1,4 @@
-/* $Id: libmdocml.c,v 1.14 2008/11/29 14:14:21 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_mbuf *mbuf,
 
        /* 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_mbuf *mbuf,
 
        /* 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;
        }
 
@@ -210,7 +210,7 @@ again:
                        return(md_run_leave(args, mbuf, rbuf, -1, p));
                }
 
-               line[pos] = 0;
+               line[(int)pos] = 0;
                if ( ! (*fp)(p, line))
                        return(md_run_leave(args, mbuf, rbuf, -1, p));
                rbuf->line++;
@@ -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;
        }