mirrors/discount
2
0
Fork 0
mirror of https://github.com/Orc/discount.git synced 2026-09-25 04:10:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Redo toc.c to add the new function mkd_toc(), which writes the

Browse Source 
generate toc to a string.   Documented in `markdown.3`
and `mkd-functions.3`, requires a new file (`Csio.c`) that has
functions for writing to a Cstring, requires that some of the
internal functions in `generate.c` be exposed (and renaed to
`__mkd_`*function* to reduce namespace collisions.

The new functions in Csio (particularly `Csprintf()` should make
it easier to convert many of the other "we print to a `FILE*` and
you need to lump it" functions into a pair of "print to a string"
and "print to a file" functions.
This commit is contained in:
David Parsons
2009-02-27 16:47:02 -08:00
parent 99632b67e0
commit 9397c0a5c7
8 changed files with 143 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toc.c
+39 -13
View File
@@ -17,12 +17,18 @@
/* write an header index
*/
int
mkd_generatetoc(Document *p, FILE *output)
mkd_toc(Document *p, char **doc)
{
Paragraph *pp;
int last_hnumber = 0,
first_hnumber = 0;
Cstring res;
char bfr[200];
CREATE(res);
RESERVE(res, 100);
*doc = 0;
if ( !(p && p->ctx) ) return -1;
if ( ! (p->ctx->flags & TOC) ) return 0;
@@ -31,32 +37,52 @@ mkd_generatetoc(Document *p, FILE *output)
if ( pp->typ == HDR && pp->text ) {
if ( last_hnumber == pp->hnumber )
fprintf(output, "%*s</li>\n", pp->hnumber, "");
Csprintf(&res, "%*s</li>\n", pp->hnumber, "");
else while ( last_hnumber > pp->hnumber ) {
fprintf(output, "%*s</li>\n%*s</ul>\n",
Csprintf(&res, "%*s</li>\n%*s</ul>\n",
last_hnumber, "",
last_hnumber-1,"");
--last_hnumber;
}
while ( pp->hnumber > last_hnumber ) {
fprintf(output, "\n%*s<ul>\n", pp->hnumber, "");
Csprintf(&res, "\n%*s<ul>\n", pp->hnumber, "");
++last_hnumber;
}
fprintf(output, "%*s<li><a href=\"#", pp->hnumber, "");
mkd_string_to_anchor(T(pp->text->text), S(pp->text->text), putc, output);
fprintf(output, "\">");
mkd_text(T(pp->text->text), S(pp->text->text), output, 0);
fprintf(output, "</a>");
Csprintf(&res, "%*s<li><a href=\"#", pp->hnumber, "");
mkd_string_to_anchor(T(pp->text->text), S(pp->text->text), Csputc, &res);
Csprintf(&res, "\">");
Csreparse(&res, T(pp->text->text), S(pp->text->text), 0);
Csprintf(&res, "</a>");
}
}
while ( last_hnumber > 0 ) {
fprintf(output, "%*s</li>\n%*s</ul>\n",
Csprintf(&res, "%*s</li>\n%*s</ul>\n",
last_hnumber, "", last_hnumber, "");
--last_hnumber;
}
return 0;
/* HACK ALERT! HACK ALERT! HACK ALERT! */
*doc = T(res); /* we know that a T(Cstring) is a character pointer */
/* so we can simply pick it up and carry it away, */
return S(res); /* leaving the husk of the Ctring on the stack */
/* END HACK ALERT */
}
/* write an header index
*/
int
mkd_generatetoc(Document *p, FILE *out)
{
char *buf = 0;
int sz = mkd_toc(p, &buf);
int ret = EOF;
if ( sz > 0 )
ret = fwrite(buf, sz, 1, out);
if ( buf ) free(buf);
return ret;
}