Forgot to let mkd_text() write data in xml format.

This commit is contained in:
david parsons
2008-04-14 23:52:23 -07:00
parent 59925326bd
commit e37a9b1015
5 changed files with 30 additions and 18 deletions
+1 -1
View File
@@ -1 +1 @@
1.2.2
1.2.3
+4 -1
View File
@@ -1296,7 +1296,10 @@ mkd_text(char *bfr, int size, FILE *output, int flags)
reparse(bfr, size, 0, &f);
emblock(&f);
fwrite(T(f.out), S(f.out), 1, output);
if ( flags & CDATA_OUTPUT )
___mkd_xml(T(f.out), S(f.out), output);
else
fwrite(T(f.out), S(f.out), 1, output);
___mkd_freemmiot(&f, 0);
return 0;
+1
View File
@@ -120,5 +120,6 @@ extern void ___mkd_freefootnotes(MMIOT *);
extern void ___mkd_initmmiot(MMIOT *, void *);
extern void ___mkd_freemmiot(MMIOT *, void *);
extern void ___mkd_freeLineRange(Line *, Line *);
extern void ___mkd_xml(char *, int, FILE *);
#endif/*_MARKDOWN_D*/
+2 -16
View File
@@ -190,22 +190,8 @@ mkd_generatehtml(Document *p, FILE *output)
int szdoc;
if ( (szdoc = mkd_document(p, &doc)) != EOF ) {
if ( p->ctx->flags & CDATA_OUTPUT ) {
char c;
while ( szdoc-- > 0 ) {
if ( !isascii(c = *doc++) )
continue;
switch (c) {
case '<': fputs("&lt;", output); break;
case '>': fputs("&gt;", output); break;
case '&': fputs("&amp;", output); break;
case '"': fputs("&quot;", output); break;
case '\'':fputs("&apos;", output); break;
default: putc(c,output); break;
}
}
}
if ( p->ctx->flags & CDATA_OUTPUT )
___mkd_xml(doc, szdoc, output);
else
fwrite(doc, szdoc, 1, output);
putc('\n', output);
+22
View File
@@ -143,3 +143,25 @@ mkd_cleanup(Document *doc)
free(doc);
}
}
/* write output in XML format
*/
void
___mkd_xml(char *p, int size, FILE *out)
{
char c;
while ( size-- > 0 ) {
if ( !isascii(c = *p++) )
continue;
switch (c) {
case '<': fputs("&lt;", out); break;
case '>': fputs("&gt;", out); break;
case '&': fputs("&amp;", out); break;
case '"': fputs("&quot;", out); break;
case '\'':fputs("&apos;", out); break;
default: putc(c,out); break;
}
}
}