=================================================================== RCS file: /cvs/mandoc/Attic/xml.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- mandoc/Attic/xml.c 2008/12/03 14:39:59 1.10 +++ mandoc/Attic/xml.c 2008/12/03 19:21:58 1.11 @@ -1,4 +1,4 @@ -/* $Id: xml.c,v 1.10 2008/12/03 14:39:59 kristaps Exp $ */ +/* $Id: xml.c,v 1.11 2008/12/03 19:21:58 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -31,7 +31,42 @@ static ssize_t xml_begintag(struct md_mbuf *, const struct md_args *, enum md_ns, int, const int *, const char **); +static int xml_begin(struct md_mbuf *, + const struct md_args *); +static int xml_end(struct md_mbuf *, + const struct md_args *); + +static int +xml_begin(struct md_mbuf *mbuf, const struct md_args *args) +{ + size_t res; + + if ( ! ml_puts(mbuf, "\n", &res)) + return(0); + if ( ! ml_puts(mbuf, "", &res)) + return(0); + + return(1); +} + + +static int +xml_end(struct md_mbuf *mbuf, const struct md_args *args) +{ + size_t res; + + res = 0; + if ( ! ml_puts(mbuf, "", &res)) + return(0); + + return(1); +} + + static ssize_t xml_begintag(struct md_mbuf *mbuf, const struct md_args *args, enum md_ns ns, int tok, @@ -46,14 +81,20 @@ xml_begintag(struct md_mbuf *mbuf, const struct md_arg if ( ! ml_nputs(mbuf, "block:", 6, &res)) return(-1); break; + case (MD_NS_BODY): + if ( ! ml_nputs(mbuf, "body:", 5, &res)) + return(-1); + break; + case (MD_NS_HEAD): + if ( ! ml_nputs(mbuf, "head:", 5, &res)) + return(-1); + break; case (MD_NS_INLINE): if ( ! ml_nputs(mbuf, "inline:", 7, &res)) return(-1); break; default: - if ( ! ml_nputs(mbuf, "mbuf", 4, &res)) - return(-1); - return((ssize_t)res); + break; } if ( ! ml_nputs(mbuf, toknames[tok], @@ -81,10 +122,16 @@ xml_endtag(struct md_mbuf *mbuf, const struct md_args if ( ! ml_nputs(mbuf, "inline:", 7, &res)) return(-1); break; - default: - if ( ! ml_nputs(mbuf, "mbuf", 4, &res)) + case (MD_NS_BODY): + if ( ! ml_nputs(mbuf, "body:", 5, &res)) return(-1); - return((ssize_t)res); + break; + case (MD_NS_HEAD): + if ( ! ml_nputs(mbuf, "head:", 5, &res)) + return(-1); + break; + default: + break; } if ( ! ml_nputs(mbuf, toknames[tok], @@ -116,6 +163,7 @@ md_init_xml(const struct md_args *args, struct md_mbuf *mbuf, const struct md_rbuf *rbuf) { - return(mlg_alloc(args, rbuf, mbuf, xml_begintag, xml_endtag)); + return(mlg_alloc(args, rbuf, mbuf, xml_begintag, + xml_endtag, xml_begin, xml_end)); }