[geany/geany-plugins] f409c5: Markdown: Replace Discount Markdown library with peg-markdown

-- -+ - /* - * convert an email address to a string of nonsense - */ -@@ -775,7 +775,7 @@ - { - int size, count, c; - int subsize=0, subtick=0; -- -+ - *endticks = ticks; - for (size = 0; (c=peek(f,size+ticks)) != EOF; size ++) { - if ( (c == tickchar) && ( count = nrticks(size+ticks,tickchar,f)) ) { -@@ -836,7 +836,7 @@ - - if ( size > 1 && peek(f, size-1) == ' ' ) --size; - if ( peek(f,i) == ' ' ) ++i, --size; -- -+ - Qstring("<code>", f); - code(f, cursor(f)+(i-1), size); - Qstring("</code>", f); -@@ -873,17 +873,17 @@ - maybe_address(char *p, int size) - { - int ok = 0; -- -+ - for ( ;size && (isalnum(*p) || strchr("._-+*", *p)); ++p, --size) - ; - - if ( ! (size && *p == '@') ) - return 0; -- -+ - --size, ++p; - - if ( size && *p == '.' ) return 0; -- -+ - for ( ;size && (isalnum(*p) || strchr("._-+", *p)); ++p, --size ) - if ( *p == '.' && size > 1 ) ok = 1; - -@@ -902,7 +902,7 @@ - int address= 0; - int mailto = 0; - char *text = cursor(f); -- -+ - if ( f->flags & MKD_NOLINKS ) return 0; - - if ( (size > 7) && strncasecmp(text, "mailto:", 7) == 0 ) { -@@ -912,10 +912,10 @@ - address = 1; - mailto = 7; /* 7 is the length of "mailto:"; we need this */ - } -- else -+ else - address = maybe_address(text, size); - -- if ( address ) { -+ if ( address ) { - Qstring("<a href="", f); - if ( !mailto ) { - /* supply a mailto: protocol if one wasn't attached */ -@@ -982,7 +982,7 @@ - return 0; - else - size++; -- -+ - if ( forbidden_tag(f) ) - return 0; - -@@ -996,7 +996,7 @@ - return 1; - } - } -- -+ - return 0; - } - -@@ -1226,7 +1226,7 @@ - else - Qchar(c, f); - break; -- -+ - case '!': if ( peek(f,1) == '[' ) { - pull(f); - if ( tag_text(f) || !linkylinky(1, f) ) -@@ -1296,7 +1296,7 @@ - Qem(f,c,rep); - } - break; -- -+ - case '~': if ( (f->flags & (MKD_NOSTRIKETHROUGH|MKD_TAGTEXT|MKD_STRICT)) || ! tickhandler(f,c,2,0, delspan) ) - Qchar(c, f); - break; -@@ -1317,7 +1317,7 @@ - } - Qchar(c, f); - break; -- -+ - case ':': case '|': - if ( f->flags & MKD_NOTABLES ) { - Qchar('\', f); -@@ -1326,7 +1326,7 @@ - } - Qchar(c, f); - break; -- -+ - case '>': case '#': case '.': case '-': - case '+': case '{': case '}': case ']': - case '!': case '[': case '*': case '_': -@@ -1413,7 +1413,7 @@ - ___mkd_tidy(&p->text); - if ( T(p->text)[S(p->text)-1] == '|' ) - --S(p->text); -- -+ - Qstring("<tr>\n", f); - while ( idx < S(p->text) ) { - first = idx; -@@ -1474,7 +1474,7 @@ - for (p=T(dash->text), start=dash->dle; start < S(dash->text); ) { - char first, last; - int end; -- -+ - last=first=0; - for (end=start ; (end < S(dash->text)) && p[end] != '|'; ++ end ) { - if ( p[end] == '\' ) -@@ -1569,10 +1569,10 @@ - printhtml(Line *t, MMIOT *f) - { - int blanks; -- -+ - for ( blanks=0; t ; t = t->next ) - if ( S(t->text) ) { -- for ( ; blanks; --blanks ) -+ for ( ; blanks; --blanks ) - Qchar('\n', f); - - Qwrite(T(t->text), S(t->text), f); -@@ -1651,7 +1651,7 @@ - display(Paragraph *p, MMIOT *f) - { - if ( !p ) return 0; -- -+ - switch ( p->typ ) { - case STYLE: - case WHITESPACE: -@@ -1660,15 +1660,15 @@ - case HTML: - printhtml(p->text, f); - break; -- -+ - case CODE: - printcode(p->text, f); - break; -- -+ - case QUOTE: - htmlify(p->down, p->ident ? "div" : "blockquote", p->ident, f); - break; -- -+ - case UL: - case OL: - case AL: -@@ -1694,7 +1694,7 @@ - case SOURCE: - htmlify(p->down, 0, 0, f); - break; -- -+ - default: - printblock(p, f); - break; -@@ -1715,7 +1715,7 @@ - return; - - Csprintf(&m->out, "\n<div class="footnotes">\n<hr/>\n<ol>\n"); -- -+ - for ( i=1; i <= m->reference; i++ ) { - for ( j=0; j < S(*m->footnotes); j++ ) { - t = &T(*m->footnotes)[j]; -@@ -1740,22 +1740,23 @@ - mkd_document(Document *p, char **res) - { - int size; -- -+ - if ( p && p->compiled ) { -- if ( ! p->html ) { -- htmlify(p->code, 0, 0, p->ctx); -- if ( p->ctx->flags & MKD_EXTRA_FOOTNOTE ) -- mkd_extra_footnotes(p->ctx); -- p->html = 1; -- } - -- size = S(p->ctx->out); -- -- if ( (size == 0) || T(p->ctx->out)[size-1] ) -- EXPAND(p->ctx->out) = 0; -- -- *res = T(p->ctx->out); -- return size; -+ if ( ! p->html ) { -+ htmlify(p->code, 0, 0, p->ctx); -+ if ( p->ctx->flags & MKD_EXTRA_FOOTNOTE ) -+ mkd_extra_footnotes(p->ctx); -+ p->html = 1; -+ } -+ -+ size = S(p->ctx->out); -+ -+ if ( (size == 0) || T(p->ctx->out)[size-1] ) -+ EXPAND(p->ctx->out) = 0; -+ -+ *res = T(p->ctx->out); -+ return size; - } - return EOF; - } -Only in discount-2.1.3/: INSTALL -Only in discount-2.1.3/: main.c -Only in discount-2.1.3/: Makefile.in -Only in discount-2.1.3/: makepage.1 -Only in discount-2.1.3/: makepage.c -Only in discount-2.1.3/: markdown.1 -Only in discount-2.1.3/: markdown.3 -Only in discount-2.1.3/: markdown.7 -diff -ru discount-2.1.3/markdown.c discount/markdown.c ---- discount-2.1.3/markdown.c 2012-01-16 13:08:52.000000000 -0800 -+++ discount/markdown.c 2012-07-16 19:52:23.619155626 -0700 -@@ -125,11 +125,11 @@ - * the !-- doesn't need to end in a whitespace - */ - return &comment; -- -+ - /* find how long the tag is so we can check to see if - * it's a block-level tag - */ -- for ( i=1; i < len && T(p->text)[i] != '>' -+ for ( i=1; i < len && T(p->text)[i] != '>' - && T(p->text)[i] != '/' - && !isspace(T(p->text)[i]); ++i ) - ; -@@ -193,7 +193,7 @@ - l->flags |= CHECKED; - l->kind = chk_text; - l->count = 0; -- -+ - if (l->dle >= 4) { l->kind=chk_code; return; } - - for ( eol = S(l->text); eol > l->dle && isspace(T(l->text)[eol-1]); --eol ) -@@ -261,10 +261,10 @@ - int i, closing, depth=0; - - *unclosed = 0; -- -+ - if ( tag == &comment ) - return commentblock(p, unclosed); -- -+ - if ( tag->selfclose ) { - ret = f.t->next; - f.t->next = 0; -@@ -286,7 +286,7 @@ - } - } - } -- else { -+ else { - if ( closing = (c == '/') ) c = flogetc(&f); - - for ( i=0; i < tag->size; c=flogetc(&f) ) { -@@ -369,7 +369,7 @@ - issetext(Line *t, int *htyp) - { - Line *n; -- -+ - /* check for setext-style HEADER - * ====== - */ -@@ -407,10 +407,10 @@ - end_of_block(Line *t) - { - int dummy; -- -+ - if ( !t ) - return 0; -- -+ - return ( (S(t->text) <= t->dle) || ishr(t) || ishdr(t, &dummy) ); - } - -@@ -448,11 +448,11 @@ - is_extra_dt(Line *t, int *clip) - { - #if USE_EXTRA_DL -- -+ - if ( t && t->next && T(t->text)[0] != '=' - && T(t->text)[S(t->text)-1] != '=') { - Line *x; -- -+ - if ( iscode(t) || end_of_block(t) ) - return 0; - -@@ -460,7 +460,7 @@ - *clip = x->dle+2; - return t; - } -- -+ - if ( x=is_extra_dt(t->next, clip) ) - return x; - } -@@ -488,7 +488,7 @@ - { - int i, j; - char *q; -- -+ - if ( end_of_block(t) ) - return 0; - -@@ -514,7 +514,7 @@ - return AL; - } - -- strtoul(T(t->text)+t->dle, &q, 10); -+ unsigned long res = strtoul(T(t->text)+t->dle, &q, 10); - if ( (q > T(t->text)+t->dle) && (q == T(t->text) + (j-1)) ) { - j = nextnonblank(t,j); - *clip = (j > 4) ? 4 : j; -@@ -539,7 +539,7 @@ - /* p->text is header, p->next->text is -'s or ='s - */ - pp->hnumber = (T(p->next->text)[0] == '=') ? 1 : 2; -- -+ - ret = p->next->next; - ___mkd_freeLine(p->next); - p->next = 0; -@@ -614,7 +614,7 @@ - Paragraph *ret; - - first = (*ptr); -- -+ - /* don't allow zero-length code fences - */ - if ( (first->next == 0) || iscodefence(first->next, first->count) ) -@@ -744,7 +744,7 @@ - * it just takes ^> to start a quote, following lines, if quoted, - * assume that the prefix is ``> ''. This means that code needs - * to be indented *5* spaces from the leading '>', but *4* spaces -- * from the start of the line. This does not appear to be -+ * from the start of the line. This does not appear to be - * documented in the reference implementation, but it's the - * way the markdown sample web form at Daring Fireball works. - */ -@@ -782,14 +782,14 @@ - if ( isdivmarker(p->text,0,flags) ) { - char *prefix = "class"; - int i; -- -+ - q = p->text; - p->text = p->text->next; - - if ( (i = szmarkerclass(1+T(q->text))) == 3 ) - /* and this would be an "%id:" prefix */ - prefix="id"; -- -+ - if ( p->ident = malloc(4+strlen(prefix)+S(q->text)) ) - sprintf(p->ident, "%s="%.*s"", prefix, S(q->text)-(i+2), - T(q->text)+(i+1) ); -@@ -861,7 +861,7 @@ - { - ParagraphRoot d = { 0, 0 }; - Paragraph *p; -- Line *q = top->text, *text = 0, *labels; -+ Line *q = top->text, *text = 0, *labels; - int z, para; - - while (( labels = q )) { -@@ -874,8 +874,8 @@ - - if (( para = (text != q->next) )) - ___mkd_freeLineRange(q, text); -- -- q->next = 0; -+ -+ q->next = 0; - if ( kind == 1 /* discount dl */ ) - for ( q = labels; q; q = q->next ) { - CLIP(q->text, 0, 1); -@@ -901,7 +901,7 @@ - anchor.next = text; - ___mkd_freeLineRange(&anchor,q); - text = q; -- -+ - } - - if ( kind == 2 && is_extra_dd(q) ) -@@ -922,7 +922,7 @@ - int para = 0, z; - - while (( text = q )) { -- -+ - p = Pp(&d, text, LISTITEM); - text = listitem(p, clip, f->flags, 0); - -@@ -973,7 +973,7 @@ - Line *np = p->next; - - Footnote *foot = &EXPAND(*f->footnotes); -- -+ - CREATE(foot->tag); - CREATE(foot->link); - CREATE(foot->title); -@@ -1201,14 +1201,14 @@ - while ( ptr ) { - if ( iscode(ptr) ) { - p = Pp(&d, ptr, CODE); -- -+ - if ( f->flags & MKD_1_COMPAT) { - /* HORRIBLE STANDARDS KLUDGE: the first line of every block - * has trailing whitespace trimmed off. - */ - ___mkd_tidy(&p->text->text); - } -- -+ - ptr = codeblock(p); - } - #if WITH_FENCED_CODE -@@ -1276,10 +1276,10 @@ - mkd_compile(Document *doc, DWORD flags) - { - if ( !doc ) -- return 0; -+ return 0; - - if ( doc->compiled ) -- return 1; -+ return 1; - - doc->compiled = 1; - memset(doc->ctx, 0, sizeof(MMIOT) ); -@@ -1300,3 +1300,15 @@ - return 1; - } - -+char *mkd_compile_document(const char *s, DWORD flags) -+{ -+ char *ptr = NULL; -+ Document *doc; -+ -+ doc = mkd_string(s, strlen(s), flags); -+ mkd_compile(doc, 0); -+ mkd_document(doc, &ptr); -+ ptr = mkd_cleanup_return_buffer(doc, NULL); -+ -+ return ptr; -+} -diff -ru discount-2.1.3/markdown.h discount/markdown.h ---- discount-2.1.3/markdown.h 2012-01-16 13:08:52.000000000 -0800 -+++ discount/markdown.h 2012-07-16 19:52:01.611155862 -0700 -@@ -19,7 +19,7 @@ - } Footnote; - - /* each input line is read into a Line, which contains the line, -- * the offset of the first non-space character [this assumes -+ * the offset of the first non-space character [this assumes - * that all tabs will be expanded to spaces!], and a pointer to - * the next line. - */ -@@ -144,6 +144,7 @@ - Callback_data cb; /* callback functions & private data */ - } Document; - -+extern char *mkd_compile_document(const char *, DWORD); - - extern int mkd_firstnonblank(Line *); - extern int mkd_compile(Document *, DWORD); -@@ -155,6 +156,7 @@ - extern int mkd_xml(char *, int , char **); - extern int mkd_generatexml(char *, int, FILE *); - extern void mkd_cleanup(Document *); -+extern char *mkd_cleanup_return_buffer(Document *, long*); - extern int mkd_line(char *, int, char **, DWORD); - extern int mkd_generateline(char *, int, FILE*, DWORD); - #define mkd_text mkd_generateline -@@ -180,6 +182,7 @@ - extern void ___mkd_freefootnotes(MMIOT *); - extern void ___mkd_initmmiot(MMIOT *, void *); - extern void ___mkd_freemmiot(MMIOT *, void *); -+extern char* ___mkd_freemmiot_return_buffer(MMIOT *, void *, long*); - extern void ___mkd_freeLineRange(Line *, Line *); - extern void ___mkd_xml(char *, int, FILE *); - extern void ___mkd_reparse(char *, int, int, MMIOT*); -Only in discount-2.1.3/: mkd2html.1 -Only in discount-2.1.3/: mkd2html.c -Only in discount-2.1.3/: mkd-callbacks.3 -Only in discount-2.1.3/: mkd-extensions.7 -Only in discount-2.1.3/: mkd-functions.3 -diff -ru discount-2.1.3/mkdio.c discount/mkdio.c ---- discount-2.1.3/mkdio.c 2012-01-16 13:08:52.000000000 -0800 -+++ discount/mkdio.c 2012-07-16 18:03:40.619224702 -0700 -@@ -24,11 +24,11 @@ - Document *ret = calloc(sizeof(Document), 1); - - if ( ret ) { -- if (( ret->ctx = calloc(sizeof(MMIOT), 1) )) { -- ret->magic = VALID_DOCUMENT; -- return ret; -- } -- free(ret); -+ if (( ret->ctx = calloc(sizeof(MMIOT), 1) )) { -+ ret->magic = VALID_DOCUMENT; -+ return ret; -+ } -+ free(ret); - } - return 0; - } -@@ -50,22 +50,22 @@ - ATTACH(a->content, p); - - while ( size-- ) { -- if ( (c = *str++) == '\t' ) { -- /* expand tabs into ->tabstop spaces. We use ->tabstop -- * because the ENTIRE FREAKING COMPUTER WORLD uses editors -- * that don't do ^T/^D, but instead use tabs for indentation, -- * and, of course, set their tabs down to 4 spaces -- */ -- do { -- EXPAND(p->text) = ' '; -- } while ( ++xp % a->tabstop ); -- } -- else if ( c >= ' ' ) { -- if ( c == '|' ) -- p->flags |= PIPECHAR; -- EXPAND(p->text) = c; -- ++xp; -- } -+ if ( (c = *str++) == '\t' ) { -+ /* expand tabs into ->tabstop spaces. We use ->tabstop -+ * because the ENTIRE FREAKING COMPUTER WORLD uses editors -+ * that don't do ^T/^D, but instead use tabs for indentation, -+ * and, of course, set their tabs down to 4 spaces -+ */ -+ do { -+ EXPAND(p->text) = ' '; -+ } while ( ++xp % a->tabstop ); -+ } -+ else if ( c >= ' ' ) { -+ if ( c == '|' ) -+ p->flags |= PIPECHAR; -+ EXPAND(p->text) = c; -+ ++xp; -+ } - } - EXPAND(p->text) = 0; - S(p->text)--; -@@ -102,37 +102,37 @@ - CREATE(line); - - while ( (c = (*getc)(ctx)) != EOF ) { -- if ( c == '\n' ) { -- if ( pandoc != EOF && pandoc < 3 ) { -- if ( S(line) && (T(line)[0] == '%') ) -- pandoc++; -- else -- pandoc = EOF; -- } -- queue(a, &line); -- S(line) = 0; -- } -- else if ( isprint(c) || isspace(c) || (c & 0x80) ) -- EXPAND(line) = c; -+ if ( c == '\n' ) { -+ if ( pandoc != EOF && pandoc < 3 ) { -+ if ( S(line) && (T(line)[0] == '%') ) -+ pandoc++; -+ else -+ pandoc = EOF; -+ } -+ queue(a, &line); -+ S(line) = 0; -+ } -+ else if ( isprint(c) || isspace(c) || (c & 0x80) ) -+ EXPAND(line) = c; - } - - if ( S(line) ) -- queue(a, &line); -+ queue(a, &line); - - DELETE(line); - - if ( (pandoc == 3) && !(flags & (MKD_NOHEADER|MKD_STRICT)) ) { -- /* the first three lines started with %, so we have a header. -- * clip the first three lines out of content and hang them -- * off header. -- */ -- Line *headers = T(a->content); -+ /* the first three lines started with %, so we have a header. -+ * clip the first three lines out of content and hang them -+ * off header. -+ */ -+ Line *headers = T(a->content); -+ -+ a->title = headers; header_dle(a->title); -+ a->author= headers->next; header_dle(a->author); -+ a->date = headers->next->next; header_dle(a->date); - -- a->title = headers; header_dle(a->title); -- a->author= headers->next; header_dle(a->author); -- a->date = headers->next->next; header_dle(a->date); -- -- T(a->content) = headers->next->next->next; -+ T(a->content) = headers->next->next->next; - } - - return a; -@@ -227,7 +227,7 @@ - char *line; - - size = mkd_line(s, len, &line, IS_LABEL); -- -+ - if ( labelformat && (size>0) && !isalpha(line[0]) ) - (*outchar)('L',out); - for ( i=0; i < size ; i++ ) { -@@ -241,7 +241,7 @@ - else - (*outchar)(c,out); - } -- -+ - if (line) - free(line); - } -@@ -266,13 +266,13 @@ - { - MMIOT f; - int len; -- -+ - mkd_parse_line(bfr, size, &f, flags); - - if ( len = S(f.out) ) { - /* kludge alert; we know that T(f.out) is malloced memory, - * so we can just steal it away. This is awful -- there -- * should be an opaque method that transparently moves -+ * should be an opaque method that transparently moves - * the pointer out of the embedded Cstring. - */ - EXPAND(f.out) = 0; -Only in discount/: mkdio.h -Only in discount-2.1.3/: mkdio.h.in -Only in discount-2.1.3/: mkd-line.3 -Only in discount-2.1.3/: mktags.c -Only in discount-2.1.3/: pgm_options.c -Only in discount-2.1.3/: pgm_options.h -Only in discount-2.1.3/: Plan9 -Only in discount-2.1.3/: README -diff -ru discount-2.1.3/resource.c discount/resource.c ---- discount-2.1.3/resource.c 2012-01-16 13:08:52.000000000 -0800 -+++ discount/resource.c 2012-07-16 18:40:37.947201222 -0700 -@@ -107,14 +107,33 @@ - void - ___mkd_freemmiot(MMIOT *f, void *footnotes) - { -- if ( f ) { -- DELETE(f->in); -- DELETE(f->out); -- DELETE(f->Q); -- if ( f->footnotes != footnotes ) -- ___mkd_freefootnotes(f); -- memset(f, 0, sizeof *f); -- } -+ if ( f ) { -+ DELETE(f->in); -+ DELETE(f->out); -+ DELETE(f->Q); -+ if ( f->footnotes != footnotes ) -+ ___mkd_freefootnotes(f); -+ memset(f, 0, sizeof *f); -+ } -+} -+ -+/* free the contents of a MMIOT except the output buffer, but leave the -+ * object alone. return the output buffer to the caller. */ -+char * -+___mkd_freemmiot_return_buffer(MMIOT *f, void *footnotes, long *out_len) -+{ -+ char *ptr = NULL; -+ if ( f ) { -+ DELETE(f->in); -+ ptr = T(f->out); /* save pointer */ -+ if (out_len) -+ *out_len = S(f->out); /* save length */ -+ DELETE(f->Q); -+ if ( f->footnotes != footnotes ) -+ ___mkd_freefootnotes(f); -+ memset(f, 0, sizeof *f); -+ } -+ return ptr; - } - - -@@ -140,18 +159,41 @@ - void - mkd_cleanup(Document *doc) - { -- if ( doc && (doc->magic == VALID_DOCUMENT) ) { -- if ( doc->ctx ) { -- ___mkd_freemmiot(doc->ctx, 0); -- free(doc->ctx); -- } -- -- if ( doc->code) ___mkd_freeParagraph(doc->code); -- if ( doc->title) ___mkd_freeLine(doc->title); -- if ( doc->author) ___mkd_freeLine(doc->author); -- if ( doc->date) ___mkd_freeLine(doc->date); -- if ( T(doc->content) ) ___mkd_freeLines(T(doc->content)); -- memset(doc, 0, sizeof doc[0]); -- free(doc); -+ if ( doc && (doc->magic == VALID_DOCUMENT) ) { -+ if ( doc->ctx ) { -+ ___mkd_freemmiot(doc->ctx, 0); -+ free(doc->ctx); -+ } -+ -+ if ( doc->code) ___mkd_freeParagraph(doc->code); -+ if ( doc->title) ___mkd_freeLine(doc->title); -+ if ( doc->author) ___mkd_freeLine(doc->author); -+ if ( doc->date) ___mkd_freeLine(doc->date); -+ if ( T(doc->content) ) ___mkd_freeLines(T(doc->content)); -+ memset(doc, 0, sizeof doc[0]); -+ free(doc); -+ } -+} -+ -+char * -+mkd_cleanup_return_buffer(Document *doc, long *out_len) -+{ -+ char *ptr = NULL; -+ -+ if ( doc && (doc->magic == VALID_DOCUMENT) ) { -+ if ( doc->ctx ) { -+ ptr = ___mkd_freemmiot_return_buffer(doc->ctx, 0, out_len); -+ free(doc->ctx); - } -+ -+ if ( doc->code) ___mkd_freeParagraph(doc->code); -+ if ( doc->title) ___mkd_freeLine(doc->title); -+ if ( doc->author) ___mkd_freeLine(doc->author); -+ if ( doc->date) ___mkd_freeLine(doc->date); -+ if ( T(doc->content) ) ___mkd_freeLines(T(doc->content)); -+ memset(doc, 0, sizeof doc[0]); -+ free(doc); -+ } -+ -+ return ptr; - } -Only in discount-2.1.3/: tests -Only in discount-2.1.3/: theme.1 -Only in discount-2.1.3/: theme.c -Only in discount-2.1.3/: tools -Only in discount-2.1.3/: VERSION -Only in discount/: version.c -Only in discount-2.1.3/: version.c.in Modified: markdown/discount/discount-config.h 35 files changed, 0 insertions(+), 35 deletions(-) =================================================================== @@ -1,35 +0,0 @@ -/* - * In the upstream Discount tree, this file is auto-generated, for the - * Geany plugin it's not. - */ -#ifndef DISCOUNT_CONFIG_H -#define DISCOUNT_CONFIG_H 1 - -#include <glib.h> - -G_BEGIN_DECLS - -#define OS_LINUX G_OS_UNIX -#define USE_DISCOUNT_DL 0 -#define DWORD guint32 -#define WORD guint16 -#define BYTE guint8 -#define HAVE_BASENAME 0 -#define HAVE_LIBGEN_H 0 -#define HAVE_PWD_H 0 -#define HAVE_GETPWUID 0 -#define HAVE_SRANDOM 0 -#define INITRNG(x) srandom((unsigned int)x) -#define HAVE_BZERO 0 -#define HAVE_RANDOM 0 -#define COINTOSS() (random()&1) -#define HAVE_STRCASECMP 0 -#define HAVE_STRNCASECMP 0 -#define HAVE_FCHDIR 0 -#define TABSTOP 4 -#define HAVE_MALLOC_H 0 -#define VERSION "2.1.3" - -G_END_DECLS - -#endif /* DISCOUNT_CONFIG_H */ Modified: markdown/discount/docheader.c 49 files changed, 0 insertions(+), 49 deletions(-) =================================================================== @@ -1,49 +0,0 @@ -/* - * docheader -- get values from the document header - * - * Copyright (C) 2007 David L Parsons. - * The redistribution terms are provided in the COPYRIGHT file that must - * be distributed with this source code. - */ -#include "discount-config.h" -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> - -#include "cstring.h" -#include "markdown.h" -#include "amalloc.h" - -static char * -onlyifset(Line *l) -{ - char *ret = T(l->text) + l->dle; - - return ret[0] ? ret : 0; -} - -char * -mkd_doc_title(Document *doc) -{ - if ( doc && doc->title ) - return onlyifset(doc->title); - return 0; -} - - -char * -mkd_doc_author(Document *doc) -{ - if ( doc && doc->author ) - return onlyifset(doc->author); - return 0; -} - - -char * -mkd_doc_date(Document *doc) -{ - if ( doc && doc->date ) - return onlyifset(doc->date); - return 0; -} Modified: markdown/discount/dumptree.c 152 files changed, 0 insertions(+), 152 deletions(-) =================================================================== @@ -1,152 +0,0 @@ -/* markdown: a C implementation of John Gruber's Markdown markup language. - * - * Copyright (C) 2007 David L Parsons. - * The redistribution terms are provided in the COPYRIGHT file that must - * be distributed with this source code. - */ -#include <stdio.h> -#include "markdown.h" -#include "cstring.h" -#include "amalloc.h" - -struct frame { - int indent; - char c; -}; - -typedef STRING(struct frame) Stack; - -static char * -Pptype(int typ) -{ - switch (typ) { - case WHITESPACE: return "whitespace"; - case CODE : return "code"; - case QUOTE : return "quote"; - case MARKUP : return "markup"; - case HTML : return "html"; - case DL : return "dl"; - case UL : return "ul"; - case OL : return "ol"; - case LISTITEM : return "item"; - case HDR : return "header"; - case HR : return "hr"; - case TABLE : return "table"; - case SOURCE : return "source"; - case STYLE : return "style"; - default : return "mystery node!"; - } -} - -static void -pushpfx(int indent, char c, Stack *sp) -{ - struct frame *q = &EXPAND(*sp); - - q->indent = indent; - q->c = c; -} - - -static void -poppfx(Stack *sp) -{ - S(*sp)--; -} - - -static void -changepfx(Stack *sp, char c) -{ - char ch; - - if ( !S(*sp) ) return; - - ch = T(*sp)[S(*sp)-1].c; - - if ( ch == '+' || ch == '|' ) - T(*sp)[S(*sp)-1].c = c; -} - - -static void -printpfx(Stack *sp, FILE *f) -{ - int i; - char c; - - if ( !S(*sp) ) return; - - c = T(*sp)[S(*sp)-1].c; - - if ( c == '+' || c == '-' ) { - fprintf(f, "--%c", c); - T(*sp)[S(*sp)-1].c = (c == '-') ? ' ' : '|'; - } - else - for ( i=0; i < S(*sp); i++ ) { - if ( i ) - fprintf(f, " "); - fprintf(f, "%*s%c", T(*sp)[i].indent + 2, " ", T(*sp)[i].c); - if ( T(*sp)[i].c == '`' ) - T(*sp)[i].c = ' '; - } - fprintf(f, "--"); -} - - -static void -dumptree(Paragraph *pp, Stack *sp, FILE *f) -{ - int count; - Line *p; - int d; - static char *Begin[] = { 0, "P", "center" }; - - while ( pp ) { - if ( !pp->next ) - changepfx(sp, '`'); - printpfx(sp, f); - - d = fprintf(f, "[%s", Pptype(pp->typ)); - if ( pp->ident ) - d += fprintf(f, " %s", pp->ident); - if ( pp->align > 1 ) - d += fprintf(f, ", <%s>", Begin[pp->align]); - - for (count=0, p=pp->text; p; ++count, (p = p->next) ) - ; - - if ( count ) - d += fprintf(f, ", %d line%s", count, (count==1)?"":"s"); - - d += fprintf(f, "]"); - - if ( pp->down ) { - pushpfx(d, pp->down->next ? '+' : '-', sp); - dumptree(pp->down, sp, f); - poppfx(sp); - } - else fputc('\n', f); - pp = pp->next; - } -} - - -int -mkd_dump(Document *doc, FILE *out, int flags, char *title) -{ - Stack stack; - - if (mkd_compile(doc, flags) ) { - - CREATE(stack); - pushpfx(fprintf(out, "%s", title), doc->code->next ? '+' : '-', &stack); - dumptree(doc->code, &stack, out); - DELETE(stack); - - mkd_cleanup(doc); - return 0; - } - return -1; -} Modified: markdown/discount/emmatch.c 188 files changed, 0 insertions(+), 188 deletions(-) =================================================================== @@ -1,188 +0,0 @@ -/* markdown: a C implementation of John Gruber's Markdown markup language. - * - * Copyright (C) 2010 David L Parsons. - * The redistribution terms are provided in the COPYRIGHT file that must - * be distributed with this source code. - */ -#include <stdio.h> -#include <string.h> -#include <stdarg.h> -#include <stdlib.h> -#include <time.h> -#include <ctype.h> - -#include "discount-config.h" - -#include "cstring.h" -#include "markdown.h" -#include "amalloc.h" - - -/* emmatch: the emphasis mangler that's run after a block - * of html has been generated. - * - * It should create MarkdownTest_1.0 (and _1.0.3) - * compatable emphasis for non-pathological cases - * and it should fail in a standards-compliant way - * when someone attempts to feed it junk. - * - * Emmatching is done after the input has been - * processed into a STRING (f->Q) of text and - * emphasis blocks. After ___mkd_emblock() finishes, - * it truncates f->Q and leaves the rendered paragraph - * if f->out. - */ - - -/* empair() -- find the NEAREST matching emphasis token (or - * subtoken of a 3+ long emphasis token. - */ -static int -empair(MMIOT *f, int first, int last, int match) -{ - - int i; - block *begin, *p; - - begin = &T(f->Q)[first]; - - for (i=first+1; i <= last; i++) { - p = &T(f->Q)[i]; - - if ( (p->b_type != bTEXT) && (p->b_count <= 0) ) - continue; /* break? */ - - if ( p->b_type == begin->b_type ) { - if ( p->b_count == match ) /* exact match */ - return i; - - if ( p->b_count > 2 ) /* fuzzy match */ - return i; - } - } - return 0; -} /* empair */ - - -/* emfill() -- if an emphasis token has leftover stars or underscores, - * convert them back into character and append them to b_text. - */ -static void -emfill(block *p) -{ - int j; - - if ( p->b_type == bTEXT ) - return; - - for (j=0; j < p->b_count; j++) - EXPAND(p->b_text) = p->b_char; - p->b_count = 0; -} /* emfill */ - - -static void -emclose(MMIOT *f, int first, int last) -{ - int j; - - for (j=first+1; j<last-1; j++) - emfill(&T(f->Q)[j]); -} - - -static struct emtags { - char open[10]; - char close[10]; - int size; -} emtags[] = { { "<em>" , "</em>", 5 }, { "<strong>", "</strong>", 9 } }; - - -static void emblock(MMIOT*,int,int); - - -/* emmatch() -- match emphasis for a single emphasis token. - */ -static void -emmatch(MMIOT *f, int first, int last) -{ - block *start = &T(f->Q)[first]; - int e, e2, match; - - switch (start->b_count) { - case 2: if ( e = empair(f,first,last,match=2) ) - break; - case 1: e = empair(f,first,last,match=1); - break; - case 0: return; - default: - e = empair(f,first,last,1); - e2= empair(f,first,last,2); - - if ( e2 >= e ) { - e = e2; - match = 2; - } - else - match = 1; - break; - } - - if ( e ) { - /* if we found emphasis to match, match it, recursively call - * emblock to match emphasis inside the new html block, add - * the emphasis markers for the block, then (tail) recursively - * call ourself to match any remaining emphasis on this token. - */ - block *end = &T(f->Q)[e]; - - end->b_count -= match; - start->b_count -= match; - - emblock(f, first, e); - - MDPREFIX(start->b_text, emtags[match-1].open, emtags[match-1].size-1); - SUFFIX(end->b_post, emtags[match-1].close, emtags[match-1].size); - - emmatch(f, first, last); - } -} /* emmatch */ - - -/* emblock() -- walk a blocklist, attempting to match emphasis - */ -static void -emblock(MMIOT *f, int first, int last) -{ - int i; - - for ( i = first; i <= last; i++ ) - if ( T(f->Q)[i].b_type != bTEXT ) - emmatch(f, i, last); - emclose(f, first, last); -} /* emblock */ - - -/* ___mkd_emblock() -- emblock a string of blocks, then concatenate the - * resulting text onto f->out. - */ -void -___mkd_emblock(MMIOT *f) -{ - int i; - block *p; - - emblock(f, 0, S(f->Q)-1); - - for (i=0; i < S(f->Q); i++) { - p = &T(f->Q)[i]; - emfill(p); - - if ( S(p->b_post) ) { SUFFIX(f->out, T(p->b_post), S(p->b_post)); - DELETE(p->b_post); } - if ( S(p->b_text) ) { SUFFIX(f->out, T(p->b_text), S(p->b_text)); - DELETE(p->b_text); } - } - - S(f->Q) = 0; -} /* ___mkd_emblock */ Modified: markdown/discount/flags.c 84 files changed, 0 insertions(+), 84 deletions(-) =================================================================== @@ -1,84 +0,0 @@ -#include <stdio.h> -#include "markdown.h" - -struct flagnames { - DWORD flag; - char *name; -}; - -static struct flagnames flagnames[] = { - { MKD_NOLINKS, "!LINKS" }, - { MKD_NOIMAGE, "!IMAGE" }, - { MKD_NOPANTS, "!PANTS" }, - { MKD_NOHTML, "!HTML" }, - { MKD_STRICT, "STRICT" }, - { MKD_TAGTEXT, "TAGTEXT" }, - { MKD_NO_EXT, "!EXT" }, - { MKD_CDATA, "CDATA" }, - { MKD_NOSUPERSCRIPT, "!SUPERSCRIPT" }, - { MKD_NORELAXED, "!RELAXED" }, - { MKD_NOTABLES, "!TABLES" }, - { MKD_NOSTRIKETHROUGH,"!STRIKETHROUGH" }, - { MKD_TOC, "TOC" }, - { MKD_1_COMPAT, "MKD_1_COMPAT" }, - { MKD_AUTOLINK, "AUTOLINK" }, - { MKD_SAFELINK, "SAFELINK" }, - { MKD_NOHEADER, "!HEADER" }, - { MKD_TABSTOP, "TABSTOP" }, - { MKD_NODIVQUOTE, "!DIVQUOTE" }, - { MKD_NOALPHALIST, "!ALPHALIST" }, - { MKD_NODLIST, "!DLIST" }, - { MKD_EXTRA_FOOTNOTE, "FOOTNOTE" }, -}; -#define NR(x) (sizeof x/sizeof x[0]) - - -void -mkd_flags_are(FILE *f, DWORD flags, int htmlplease) -{ - int i; - int not, set, even=1; - char *name; - - if ( htmlplease ) - fprintf(f, "<table class="mkd_flags_are">\n"); - for (i=0; i < NR(flagnames); i++) { - set = flags & flagnames[i].flag; - name = flagnames[i].name; - if ( not = (*name == '!') ) { - ++name; - set = !set; - } - - if ( htmlplease ) { - if ( even ) fprintf(f, " <tr>"); - fprintf(f, "<td>"); - } - else - fputc(' ', f); - - if ( !set ) - fprintf(f, htmlplease ? "<s>" : "!"); - - fprintf(f, "%s", name); - - if ( htmlplease ) { - if ( !set ) - fprintf(f, "</s>"); - fprintf(f, "</td>"); - if ( !even ) fprintf(f, "</tr>\n"); - } - even = !even; - } - if ( htmlplease ) { - if ( even ) fprintf(f, "</tr>\n"); - fprintf(f, "</table>\n"); - } -} - -void -mkd_mmiot_flags(FILE *f, MMIOT *m, int htmlplease) -{ - if ( m ) - mkd_flags_are(f, m->flags, htmlplease); -} Modified: markdown/discount/generate.c 1763 files changed, 0 insertions(+), 1763 deletions(-) =================================================================== @@ -1,1763 +0,0 @@ -/* markdown: a C implementation of John Gruber's Markdown markup language. - * - * Copyright (C) 2007 David L Parsons. - * The redistribution terms are provided in the COPYRIGHT file that must - * be distributed with this source code. - */ -#include <stdio.h> -#include <string.h> -#include <stdarg.h> -#include <stdlib.h> -#include <time.h> -#include <ctype.h> - -#include "discount-config.h" - -#include "cstring.h" -#include "markdown.h" -#include "amalloc.h" - -typedef int (*stfu)(const void*,const void*); -typedef void (*spanhandler)(MMIOT*,int); - -/* forward declarations */ -static void text(MMIOT *f); -static Paragraph *display(Paragraph*, MMIOT*); - -/* externals from markdown.c */ -int __mkd_footsort(Footnote *, Footnote *); - -/* - * push text into the generator input buffer - */ -static void -push(char *bfr, int size, MMIOT *f) -{ - while ( size-- > 0 ) - EXPAND(f->in) = *bfr++; -} - - -/* look <i> characters ahead of the cursor. - */ -static inline int -peek(MMIOT *f, int i) -{ - - i += (f->isp-1); - - return (i >= 0) && (i < S(f->in)) ? T(f->in)[i] : EOF; -} - - -/* pull a byte from the input buffer - */ -static inline int -pull(MMIOT *f) -{ - return ( f->isp < S(f->in) ) ? T(f->in)[f->isp++] : EOF; -} - - -/* return a pointer to the current position in the input buffer. - */ -static inline char* -cursor(MMIOT *f) -{ - return T(f->in) + f->isp; -} - - -static inline int -isthisspace(MMIOT *f, int i) -{ - int c = peek(f, i); - - return isspace(c) || (c == EOF); -} - - -static inline int -isthisalnum(MMIOT *f, int i) -{ - int c = peek(f, i); - - return (c != EOF) && isalnum(c); -} - - -static inline int -isthisnonword(MMIOT *f, int i) -{ - return isthisspace(f, i) || ispunct(peek(f,i)); -} - - -/* return/set the current cursor position - */ -#define mmiotseek(f,x) (f->isp = x) -#define mmiottell(f) (f->isp) - - -/* move n characters forward ( or -n characters backward) in the input buffer. - */ -static void -shift(MMIOT *f, int i) -{ - if (f->isp + i >= 0 ) - f->isp += i; -} - - -/* Qchar() - */ -static void -Qchar(int c, MMIOT *f) -{ - block *cur; - - if ( S(f->Q) == 0 ) { - cur = &EXPAND(f->Q); - memset(cur, 0, sizeof *cur); - cur->b_type = bTEXT; - } - else - cur = &T(f->Q)[S(f->Q)-1]; - - EXPAND(cur->b_text) = c; - -} - - -/* Qstring() - */ -static void -Qstring(char *s, MMIOT *f) -{ - while (*s) - Qchar(*s++, f); -} - - -/* Qwrite() - */ -static void -Qwrite(char *s, int size, MMIOT *f) -{ - while (size-- > 0) - Qchar(*s++, f); -} - - -/* Qprintf() - */ -static void -Qprintf(MMIOT *f, char *fmt, ...) -{ - char bfr[80]; - va_list ptr; - - va_start(ptr,fmt); - vsnprintf(bfr, sizeof bfr, fmt, ptr); - va_end(ptr); - Qstring(bfr, f); -} - - -/* Qem() - */ -static void -Qem(MMIOT *f, char c, int count) -{ - block *p = &EXPAND(f->Q); - - memset(p, 0, sizeof *p); - p->b_type = (c == '*') ? bSTAR : bUNDER; - p->b_char = c; - p->b_count = count; - - memset(&EXPAND(f->Q), 0, sizeof(block)); -} - - -/* generate html from a markup fragment - */ -void -___mkd_reparse(char *bfr, int size, int flags, MMIOT *f) -{ - MMIOT sub; - - ___mkd_initmmiot(&sub, f->footnotes); - - sub.flags = f->flags | flags; - sub.cb = f->cb; - sub.ref_prefix = f->ref_prefix; - - push(bfr, size, &sub); - EXPAND(sub.in) = 0; - S(sub.in)--; - - text(&sub); - ___mkd_emblock(&sub); - - Qwrite(T(sub.out), S(sub.out), f); - - ___mkd_freemmiot(&sub, f->footnotes); -} - - -/* - * write out a url, escaping problematic characters - */ -static void -puturl(char *s, int size, MMIOT *f, int display) -{ - unsigned char c; - - while ( size-- > 0 ) { - c = *s++; - - if ( c == '\' && size-- > 0 ) { - c = *s++; - - if ( !( ispunct(c) || isspace(c) ) ) - Qchar('\', f); - } - - if ( c == '&' ) - Qstring("&amp;", f); - else if ( c == '<' ) - Qstring("&lt;", f); - else if ( c == '"' ) - Qstring("%22", f); - else if ( isalnum(c) || ispunct(c) || (display && isspace(c)) ) - Qchar(c, f); - else if ( c == 003 ) /* untokenize ^C */ - Qstring(" ", f); - else - Qprintf(f, "%%%02X", c); - } -} - - -/* advance forward until the next character is not whitespace - */ -static int -eatspace(MMIOT *f) -{ - int c; - - for ( ; ((c=peek(f, 1)) != EOF) && isspace(c); pull(f) ) - ; - return c; -} - - -/* (match (a (nested (parenthetical (string.))))) - */ -static int -parenthetical(int in, int out, MMIOT *f) -{ - int size, indent, c; - - for ( indent=1,size=0; indent; size++ ) { - if ( (c = pull(f)) == EOF ) - return EOF; - else if ( (c == '\') && (peek(f,1) == out || peek(f,1) == in) ) { - ++size; - pull(f); - } - else if ( c == in ) - ++indent; - else if ( c == out ) - --indent; - } - return size ? (size-1) : 0; -} - - -/* extract a []-delimited label from the input stream. - */ -static int -linkylabel(MMIOT *f, Cstring *res) -{ - char *ptr = cursor(f); - int size; - - if ( (size = parenthetical('[',']',f)) != EOF ) { - T(*res) = ptr; - S(*res) = size; - return 1; - } - return 0; -} - - -/* see if the quote-prefixed linky segment is actually a title. - */ -static int -linkytitle(MMIOT *f, char quote, Footnote *ref) -{ - int whence = mmiottell(f); - char *title = cursor(f); - char *e; - register int c; - - while ( (c = pull(f)) != EOF ) { - e = cursor(f); - if ( c == quote ) { - if ( (c = eatspace(f)) == ')' ) { - T(ref->title) = 1+title; - S(ref->title) = (e-title)-2; - return 1; - } - } - } - mmiotseek(f, whence); - return 0; -} - - -/* extract a =HHHxWWW size from the input stream - */ -static int -linkysize(MMIOT *f, Footnote *ref) -{ - int height=0, width=0; - int whence = mmiottell(f); - int c; - - if ( isspace(peek(f,0)) ) { - pull(f); /* eat '=' */ - - for ( c = pull(f); isdigit(c); c = pull(f)) - width = (width * 10) + (c - '0'); - - if ( c == 'x' ) { - for ( c = pull(f); isdigit(c); c = pull(f)) - height = (height*10) + (c - '0'); - - if ( isspace(c) ) - c = eatspace(f); - - if ( (c == ')') || ((c == ''' || c == '"') && linkytitle(f, c, ref)) ) { - ref->height = height; - ref->width = width; - return 1; - } - } - } - mmiotseek(f, whence); - return 0; -} - - -/* extract a <...>-encased url from the input stream. - * (markdown 1.0.2b8 compatibility; older versions - * of markdown treated the < and > as syntactic - * sugar that didn't have to be there. 1.0.2b8 - * requires a closing >, and then falls into the - * title or closing ) - */ -static int -linkybroket(MMIOT *f, int image, Footnote *p) -{ - int c; - int good = 0; - - T(p->link) = cursor(f); - for ( S(p->link)=0; (c = pull(f)) != '>'; ++S(p->link) ) { - /* pull in all input until a '>' is found, or die trying. - */ - if ( c == EOF ) - return 0; - else if ( (c == '\') && ispunct(peek(f,2)) ) { - ++S(p->link); - pull(f); - } - } - - c = eatspace(f); - - /* next nonspace needs to be a title, a size, or ) - */ - if ( ( c == ''' || c == '"' ) && linkytitle(f,c,p) ) - good=1; - else if ( image && (c == '=') && linkysize(f,p) ) - good=1; - else - good=( c == ')' ); - - if ( good ) { - if ( peek(f, 1) == ')' ) - pull(f); - - ___mkd_tidy(&p->link); - } - - return good; -} /* linkybroket */ - - -/* extract a (-prefixed url from the input stream. - * the label is either of the format `<link>`, where I - * extract until I find a >, or it is of the format - * `text`, where I extract until I reach a ')', a quote, - * or (if image) a '=' - */ -static int -linkyurl(MMIOT *f, int image, Footnote *p) -{ - int c; - int mayneedtotrim=0; - - if ( (c = eatspace(f)) == EOF ) - return 0; - - if ( c == '<' ) { - pull(f); - if ( !(f->flags & MKD_1_COMPAT) ) - return linkybroket(f,image,p); - mayneedtotrim=1; - } - - T(p->link) = cursor(f); - for ( S(p->link)=0; (c = peek(f,1)) != ')'; ++S(p->link) ) { - if ( c == EOF ) - return 0; - else if ( (c == '"' || c == ''') && linkytitle(f, c, p) ) - break; - else if ( image && (c == '=') && linkysize(f, p) ) - break; - else if ( (c == '\') && ispunct(peek(f,2)) ) { - ++S(p->link); - pull(f); - } - pull(f); - } - if ( peek(f, 1) == ')' ) - pull(f); - - ___mkd_tidy(&p->link); - - if ( mayneedtotrim && (T(p->link)[S(p->link)-1] == '>') ) - --S(p->link); - - return 1; -} - - - -/* prefixes for <automatic links> - */ -static struct _protocol { - char *name; - int nlen; -} protocol[] = { -#define _aprotocol(x) { x, (sizeof x)-1 } - _aprotocol( "https:" ), - _aprotocol( "http:" ), - _aprotocol( "news:" ), - _aprotocol( "ftp:" ), -#undef _aprotocol -}; -#define NRPROTOCOLS (sizeof protocol / sizeof protocol[0]) - - -static int -isautoprefix(char *text, int size) -{ - int i; - struct _protocol *p; - - for (i=0, p=protocol; i < NRPROTOCOLS; i++, p++) - if ( (size >= p->nlen) && strncasecmp(text, p->name, p->nlen) == 0 ) - return 1; - return 0; -} - - -/* - * all the tag types that linkylinky can produce are - * defined by this structure. - */ -typedef struct linkytype { - char *pat; - int szpat; - char *link_pfx; /* tag prefix and link pointer (eg: "<a href=""" */ - char *link_sfx; /* link suffix (eg: """ */ - int WxH; /* this tag allows width x height arguments */ - char *text_pfx; /* text prefix (eg: ">" */ - char *text_sfx; /* text suffix (eg: "</a>" */ - int flags; /* reparse flags */ - int kind; /* tag is url or something else? */ -#define IS_URL 0x01 -} linkytype; - -static linkytype imaget = { 0, 0, "<img src="", """, - 1, " alt="", "" />", MKD_NOIMAGE|MKD_TAGTEXT, IS_URL }; -static linkytype linkt = { 0, 0, "<a href="", """, - 0, ">", "</a>", MKD_NOLINKS, IS_URL }; - -/* - * pseudo-protocols for [][]; - * - * id: generates <a id="link">tag</a> - * class: generates <span class="link">tag</span> - * raw: just dump the link without any processing - */ -static linkytype specials[] = { - { "id:", 3, "<span id="", """, 0, ">", "</span>", 0, 0 }, - { "raw:", 4, 0, 0, 0, 0, 0, MKD_NOHTML, 0 }, - { "lang:", 5, "<span lang="", """, 0, ">", "</span>", 0, 0 }, - { "abbr:", 5, "<abbr title="", """, 0, ">", "</abbr>", 0, 0 }, - { "class:", 6, "<span class="", """, 0, ">", "</span>", 0, 0 }, -} ; - -#define NR(x) (sizeof x / sizeof x[0]) - -/* see if t contains one of our pseudo-protocols. - */ -static linkytype * -pseudo(Cstring t) -{ - int i; - linkytype *r; - - for ( i=0, r=specials; i < NR(specials); i++,r++ ) { - if ( (S(t) > r->szpat) && (strncasecmp(T(t), r->pat, r->szpat) == 0) ) - return r; - } - return 0; -} - - -/* print out the start of an `img' or `a' tag, applying callbacks as needed. - */ -static void -printlinkyref(MMIOT *f, linkytype *tag, char *link, int size) -{ - char *edit; - - if ( f->flags & IS_LABEL ) - return; - - Qstring(tag->link_pfx, f); - - if ( tag->kind & IS_URL ) { - if ( f->cb && f->cb->e_url && (edit = (*f->cb->e_url)(link, size, f->cb->e_data)) ) { - puturl(edit, strlen(edit), f, 0); - if ( f->cb->e_free ) (*f->cb->e_free)(edit, f->cb->e_data); - } - else - puturl(link + tag->szpat, size - tag->szpat, f, 0); - } - else - ___mkd_reparse(link + tag->szpat, size - tag->szpat, MKD_TAGTEXT, f); - - Qstring(tag->link_sfx, f); - - if ( f->cb && f->cb->e_flags && (edit = (*f->cb->e_flags)(link, size, f->cb->e_data)) ) { - Qchar(' ', f); - Qstring(edit, f); - if ( f->cb->e_free ) (*f->cb->e_free)(edit, f->cb->e_data); - } -} /* printlinkyref */ - - -/* helper function for php markdown extra footnotes; allow the user to - * define a prefix tag instead of just `fn` - */ -static char * -p_or_nothing(p) -MMIOT *p; -{ - return p->ref_prefix ? p->ref_prefix : "fn"; -} - - -/* php markdown extra/daring fireball style print footnotes - */ -static int -extra_linky(MMIOT *f, Cstring text, Footnote *ref) -{ - if ( ref->flags & REFERENCED ) - return 0; - - if ( f->flags & IS_LABEL ) - ___mkd_reparse(T(text), S(text), linkt.flags, f); - else { - ref->flags |= REFERENCED; - ref->refnumber = ++ f->reference; - Qprintf(f, "<sup id="%sref:%d"><a href="#%s:%d" rel="footnote">%d</a></sup>", - p_or_nothing(f), ref->refnumber, - p_or_nothing(f), ref->refnumber, ref->refnumber); - } - return 1; -} /* extra_linky */ - - -/* print out a linky (or fail if it's Not Allowed) - */ -static int -linkyformat(MMIOT *f, Cstring text, int image, Footnote *ref) -{ - linkytype *tag; - - if ( image || (ref == 0) ) - tag = &imaget; - else if ( tag = pseudo(ref->link) ) { - if ( f->flags & (MKD_NO_EXT|MKD_SAFELINK) ) - return 0; - } - else if ( (f->flags & MKD_SAFELINK) && T(ref->link) - && (T(ref->link)[0] != '/') - && !isautoprefix(T(ref->link), S(ref->link)) ) - /* if MKD_SAFELINK, only accept links that are local or - * a well-known protocol - */ - return 0; - else - tag = &linkt; - - if ( f->flags & tag->flags ) - return 0; - - if ( f->flags & IS_LABEL ) - ___mkd_reparse(T(text), S(text), tag->flags, f); - else if ( tag->link_pfx ) { - printlinkyref(f, tag, T(ref->link), S(ref->link)); - - if ( tag->WxH ) { - if ( ref->height ) Qprintf(f," height="%d"", ref->height); - if ( ref->width ) Qprintf(f, " width="%d"", ref->width); - } - - if ( S(ref->title) ) { - Qstring(" title="", f); - ___mkd_reparse(T(ref->title), S(ref->title), MKD_TAGTEXT, f); - Qchar('"', f); - } - - Qstring(tag->text_pfx, f); - ___mkd_reparse(T(text), S(text), tag->flags, f); - Qstring(tag->text_sfx, f); - } - else - Qwrite(T(ref->link) + tag->szpat, S(ref->link) - tag->szpat, f); - - return 1; -} /* linkyformat */ - - -/* - * process embedded links and images - */ -static int -linkylinky(int image, MMIOT *f) -{ - int start = mmiottell(f); - Cstring name; - Footnote key, *ref; - - int status = 0; - int extra_footnote = 0; - - CREATE(name); - memset(&key, 0, sizeof key); - - if ( linkylabel(f, &name) ) { - if ( peek(f,1) == '(' ) { - pull(f); - if ( linkyurl(f, image, &key) ) - status = linkyformat(f, name, image, &key); - } - else { - int goodlink, implicit_mark = mmiottell(f); - - if ( isspace(peek(f,1)) ) - pull(f); - - if ( peek(f,1) == '[' ) { - pull(f); /* consume leading '[' */ - goodlink = linkylabel(f, &key.tag); - } - else { - /* new markdown implicit name syntax doesn't - * require a second [] - */ - mmiotseek(f, implicit_mark); - goodlink = !(f->flags & MKD_1_COMPAT); - - if ( (f->flags & MKD_EXTRA_FOOTNOTE) && (!image) && S(name) && T(name)[0] == '^' ) - extra_footnote = 1; - } - - if ( goodlink ) { - if ( !S(key.tag) ) { - DELETE(key.tag); - T(key.tag) = T(name); - S(key.tag) = S(name); - } - - if ( ref = bsearch(&key, T(*f->footnotes), S(*f->footnotes), - sizeof key, (stfu)__mkd_footsort) ) { - if ( extra_footnote ) - status = extra_linky(f,name,ref); - else - status = linkyformat(f, name, image, ref); - } - else if ( f->flags & IS_LABEL ) - status = linkyformat(f, name, image, 0); - } - } - } - - DELETE(name); - ___mkd_freefootnote(&key); - - if ( status == 0 ) - mmiotseek(f, start); - - return status; -} - - -/* write a character to output, doing text escapes ( & -> &amp;, - * > -> &gt; < -> &lt; ) - */ -static void -cputc(int c, MMIOT *f) -{ - switch (c) { - case '&': Qstring("&amp;", f); break; - case '>': Qstring("&gt;", f); break; - case '<': Qstring("&lt;", f); break; - default : Qchar(c, f); break; - } -} - - -/* - * convert an email address to a string of nonsense - */ -static void -mangle(char *s, int len, MMIOT *f) -{ - while ( len-- > 0 ) { - Qstring("&#", f); - Qprintf(f, COINTOSS() ? "x%02x;" : "%02d;", *((unsigned char*)(s++)) ); - } -} - - -/* nrticks() -- count up a row of tick marks - */ -static int -nrticks(int offset, int tickchar, MMIOT *f) -{ - int tick = 0; - - while ( peek(f, offset+tick) == tickchar ) tick++; - - return tick; -} /* nrticks */ - - -/* matchticks() -- match a certain # of ticks, and if that fails - * match the largest subset of those ticks. - * - * if a subset was matched, return the # of ticks - * that were matched. - */ -static int -matchticks(MMIOT *f, int tickchar, int ticks, int *endticks) -{ - int size, count, c; - int subsize=0, subtick=0; - - *endticks = ticks; - for (size = 0; (c=peek(f,size+ticks)) != EOF; size ++) { - if ( (c == tickchar) && ( count = nrticks(size+ticks,tickchar,f)) ) { - if ( count == ticks ) - return size; - else if ( count ) { - if ( (count > subtick) && (count < ticks) ) { - subsize = size; - subtick = count; - } - size += count; - } - } - } - if ( subsize ) { - *endticks = subtick; - return subsize; - } - return 0; -} /* matchticks */ - - -/* code() -- write a string out as code. The only characters that have - * special meaning in a code block are * `<' and `&' , which - * are /always/ expanded to &lt; and &amp; - */ -static void -code(MMIOT *f, char *s, int length) -{ - int i,c; - - for ( i=0; i < length; i++ ) - if ( (c = s[i]) == 003) /* ^C: expand back to 2 spaces */ - Qstring(" ", f); - else - cputc(c, f); -} /* code */ - - -/* delspan() -- write out a chunk of text, blocking with <del>...</del> - */ -static void -delspan(MMIOT *f, int size) -{ - Qstring("<del>", f); - ___mkd_reparse(cursor(f)-1, size, 0, f); - Qstring("</del>", f); -} - - -/* codespan() -- write out a chunk of text as code, trimming one - * space off the front and/or back as appropriate. - */ -static void -codespan(MMIOT *f, int size) -{ - int i=0; - - if ( size > 1 && peek(f, size-1) == ' ' ) --size; - if ( peek(f,i) == ' ' ) ++i, --size; - - Qstring("<code>", f); - code(f, cursor(f)+(i-1), size); - Qstring("</code>", f); -} /* codespan */ - - -/* before letting a tag through, validate against - * MKD_NOLINKS and MKD_NOIMAGE - */ -static int -forbidden_tag(MMIOT *f) -{ - int c = toupper(peek(f, 1)); - - if ( f->flags & MKD_NOHTML ) - return 1; - - if ( c == 'A' && (f->flags & MKD_NOLINKS) && !isthisalnum(f,2) ) - return 1; - if ( c == 'I' && (f->flags & MKD_NOIMAGE) - && strncasecmp(cursor(f)+1, "MG", 2) == 0 - && !isthisalnum(f,4) ) - return 1; - return 0; -} - - -/* Check a string to see if it looks like a mail address - * "looks like a mail address" means alphanumeric + some - * specials, then a `@`, then alphanumeric + some specials, - * but with a `.` - */ -static int -maybe_address(char *p, int size) -{ - int ok = 0; - - for ( ;size && (isalnum(*p) || strchr("._-+*", *p)); ++p, --size) - ; - - if ( ! (size && *p == '@') ) - return 0; - - --size, ++p; - - if ( size && *p == '.' ) return 0; - - for ( ;size && (isalnum(*p) || strchr("._-+", *p)); ++p, --size ) - if ( *p == '.' && size > 1 ) ok = 1; - - return size ? 0 : ok; -} - - -/* The size-length token at cursor(f) is either a mailto:, an - * implicit mailto:, one of the approved url protocols, or just - * plain old text. If it's a mailto: or an approved protocol, - * linkify it, otherwise say "no" - */ -static int -process_possible_link(MMIOT *f, int size) -{ - int address= 0; - int mailto = 0; - char *text = cursor(f); - - if ( f->flags & MKD_NOLINKS ) return 0; - - if ( (size > 7) && strncasecmp(text, "mailto:", 7) == 0 ) { - /* if it says it's a mailto, it's a mailto -- who am - * I to second-guess the user? - */ - address = 1; - mailto = 7; /* 7 is the length of "mailto:"; we need this */ - } - else - address = maybe_address(text, size); - - if ( address ) { - Qstring("<a href="", f); - if ( !mailto ) { - /* supply a mailto: protocol if one wasn't attached */ - mangle("mailto:", 7, f); - } - mangle(text, size, f); - Qstring("">", f); - mangle(text+mailto, size-mailto, f); - Qstring("</a>", f); - return 1; - } - else if ( isautoprefix(text, size) ) { - printlinkyref(f, &linkt, text, size); - Qchar('>', f); - puturl(text,size,f, 1); - Qstring("</a>", f); - return 1; - } - return 0; -} /* process_possible_link */ - - -/* a < may be just a regular character, the start of an embedded html - * tag, or the start of an <automatic link>. If it's an automatic - * link, we also need to know if it's an email address because if it - * is we need to mangle it in our futile attempt to cut down on the - * spaminess of the rendered page. - */ -static int -maybe_tag_or_link(MMIOT *f) -{ - int c, size; - int maybetag = 1; - - if ( f->flags & MKD_TAGTEXT ) - return 0; - - for ( size=0; (c = peek(f, size+1)) != '>'; size++) { - if ( c == EOF ) - return 0; - else if ( c == '\' ) { - maybetag=0; - if ( peek(f, size+2) != EOF ) - size++; - } - else if ( isspace(c) ) - break; -#if WITH_GITHUB_TAGS - else if ( ! (c == '/' || c == '-' || c == '_' || isalnum(c) ) ) -#else - else if ( ! (c == '/' || isalnum(c) ) ) -#endif - maybetag=0; - } - - if ( size ) { - if ( maybetag || (size >= 3 && strncmp(cursor(f), "!--", 3) == 0) ) { - - /* It is not a html tag unless we find the closing '>' in - * the same block. - */ - while ( (c = peek(f, size+1)) != '>' ) - if ( c == EOF ) - return 0; - else - size++; - - if ( forbidden_tag(f) ) - return 0; - - Qchar('<', f); - while ( ((c = peek(f, 1)) != EOF) && (c != '>') ) - Qchar(pull(f), f); - return 1; - } - else if ( !isspace(c) && process_possible_link(f, size) ) { - shift(f, size+1); - return 1; - } - } - - return 0; -} - - -/* autolinking means that all inline html is <a href'ified>. A - * autolink url is alphanumerics, slashes, periods, underscores, - * the at sign, colon, and the % character. - */ -static int -maybe_autolink(MMIOT *f) -{ - register int c; - int size; - - /* greedily scan forward for the end of a legitimate link. - */ - for ( size=0; (c=peek(f, size+1)) != EOF; size++ ) - if ( c == '\' ) { - if ( peek(f, size+2) != EOF ) - ++size; - } - else if ( isspace(c) || strchr("'"()[]{}<>`", c) ) - break; - - if ( (size > 1) && process_possible_link(f, size) ) { - shift(f, size); - return 1; - } - return 0; -} - - -/* smartyquote code that's common for single and double quotes - */ -static int -smartyquote(int *flags, char typeofquote, MMIOT *f) -{ - int bit = (typeofquote == 's') ? 0x01 : 0x02; - - if ( bit & (*flags) ) { - if ( isthisnonword(f,1) ) { - Qprintf(f, "&r%cquo;", typeofquote); - (*flags) &= ~bit; - return 1; - } - } - else if ( isthisnonword(f,-1) && peek(f,1) != EOF ) { - Qprintf(f, "&l%cquo;", typeofquote); - (*flags) |= bit; - return 1; - } - return 0; -} - - -static int -islike(MMIOT *f, char *s) -{ - int len; - int i; - - if ( s[0] == '<' ) { - if ( !isthisnonword(f, -1) ) - return 0; - ++s; - } - - if ( !(len = strlen(s)) ) - return 0; - - if ( s[len-1] == '>' ) { - if ( !isthisnonword(f,len-1) ) - return 0; - len--; - } - - for (i=1; i < len; i++) - if (tolower(peek(f,i)) != s[i]) - return 0; - return 1; -} - - -static struct smarties { - char c0; - char *pat; - char *entity; - int shift; -} smarties[] = { - { ''', "'s>", "rsquo", 0 }, - { ''', "'t>", "rsquo", 0 }, - { ''', "'re>", "rsquo", 0 }, - { ''', "'ll>", "rsquo", 0 }, - { ''', "'ve>", "rsquo", 0 }, - { ''', "'m>", "rsquo", 0 }, - { ''', "'d>", "rsquo", 0 }, - { '-', "---", "mdash", 2 }, - { '-', "--", "ndash", 1 }, - { '.', "...", "hellip", 2 }, - { '.', ". . .", "hellip", 4 }, - { '(', "(c)", "copy", 2 }, - { '(', "(r)", "reg", 2 }, - { '(', "(tm)", "trade", 3 }, - { '3', "<3/4>", "frac34", 2 }, - { '3', "<3/4ths>", "frac34", 2 }, - { '1', "<1/2>", "frac12", 2 }, - { '1', "<1/4>", "frac14", 2 }, - { '1', "<1/4th>", "frac14", 2 }, - { '&', "&#0;", 0, 3 }, -} ; -#define NRSMART ( sizeof smarties / sizeof smarties[0] ) - - -/* Smarty-pants-style chrome for quotes, -, ellipses, and (r)(c)(tm) - */ -static int -smartypants(int c, int *flags, MMIOT *f) -{ - int i; - - if ( f->flags & (MKD_NOPANTS|MKD_TAGTEXT|IS_LABEL) ) - return 0; - - for ( i=0; i < NRSMART; i++) - if ( (c == smarties[i].c0) && islike(f, smarties[i].pat) ) { - if ( smarties[i].entity ) - Qprintf(f, "&%s;", smarties[i].entity); - shift(f, smarties[i].shift); - return 1; - } - - switch (c) { - case '<' : return 0; - case ''': if ( smartyquote(flags, 's', f) ) return 1; - break; - - case '"': if ( smartyquote(flags, 'd', f) ) return 1; - break; - - case '`': if ( peek(f, 1) == '`' ) { - int j = 2; - - while ( (c=peek(f,j)) != EOF ) { - if ( c == '\' ) - j += 2; - else if ( c == '`' ) - break; - else if ( c == ''' && peek(f, j+1) == ''' ) { - Qstring("&ldquo;", f); - ___mkd_reparse(cursor(f)+1, j-2, 0, f); - Qstring("&rdquo;", f); - shift(f,j+1); - return 1; - } - else ++j; - } - - } - break; - } - return 0; -} /* smartypants */ - - -/* process a body of text encased in some sort of tick marks. If it - * works, generate the output and return 1, otherwise just return 0 and - * let the caller figure it out. - */ -static int -tickhandler(MMIOT *f, int tickchar, int minticks, int allow_space, spanhandler spanner) -{ - int endticks, size; - int tick = nrticks(0, tickchar, f); - - if ( !allow_space && isspace(peek(f,tick)) ) - return 0; - - if ( (tick >= minticks) && (size = matchticks(f,tickchar,tick,&endticks)) ) { - if ( endticks < tick ) { - size += (tick - endticks); - tick = endticks; - } - - shift(f, tick); - (*spanner)(f,size); - shift(f, size+tick-1); - return 1; - } - return 0; -} - -#define tag_text(f) (f->flags & MKD_TAGTEXT) - - -static void -text(MMIOT *f) -{ - int c, j; - int rep; - int smartyflags = 0; - - while (1) { - if ( (f->flags & MKD_AUTOLINK) && isalpha(peek(f,1)) && !tag_text(f) ) - maybe_autolink(f); - - c = pull(f); - - if (c == EOF) - break; - - if ( smartypants(c, &smartyflags, f) ) - continue; - switch (c) { - case 0: break; - - case 3: Qstring(tag_text(f) ? " " : "<br/>", f); - break; - - case '>': if ( tag_text(f) ) - Qstring("&gt;", f); - else - Qchar(c, f); - break; - - case '"': if ( tag_text(f) ) - Qstring("&quot;", f); - else - Qchar(c, f); - break; - - case '!': if ( peek(f,1) == '[' ) { - pull(f); - if ( tag_text(f) || !linkylinky(1, f) ) - Qstring("![", f); - } - else - Qchar(c, f); - break; - case '[': if ( tag_text(f) || !linkylinky(0, f) ) - Qchar(c, f); - break; - /* A^B -> A^B */ - case '^': if ( (f->flags & (MKD_NOSUPERSCRIPT|MKD_STRICT|MKD_TAGTEXT)) - || (isthisnonword(f,-1) && peek(f,-1) != ')') - || isthisspace(f,1) ) - Qchar(c,f); - else { - char *sup = cursor(f); - int len = 0; - - if ( peek(f,1) == '(' ) { - int here = mmiottell(f); - pull(f); - - if ( (len = parenthetical('(',')',f)) <= 0 ) { - mmiotseek(f,here); - Qchar(c, f); - break; - } - sup++; - } - else { - while ( isthisalnum(f,1+len) ) - ++len; - if ( !len ) { - Qchar(c,f); - break; - } - shift(f,len); - } - Qstring("^{",f); - ___mkd_reparse(sup, len, 0, f); - Qstring("}", f); - } - break; - case '_': - /* Underscores don't count if they're in the middle of a word */ - if ( !(f->flags & (MKD_NORELAXED|MKD_STRICT)) - && isthisalnum(f,-1) - && isthisalnum(f,1) ) { - Qchar(c, f); - break; - } - case '*': - /* Underscores & stars don't count if they're out in the middle - * of whitespace */ - if ( isthisspace(f,-1) && isthisspace(f,1) ) { - Qchar(c, f); - break; - } - /* else fall into the regular old emphasis case */ - if ( tag_text(f) ) - Qchar(c, f); - else { - for (rep = 1; peek(f,1) == c; pull(f) ) - ++rep; - Qem(f,c,rep); - } - break; - - case '~': if ( (f->flags & (MKD_NOSTRIKETHROUGH|MKD_TAGTEXT|MKD_STRICT)) || ! tickhandler(f,c,2,0, delspan) ) - Qchar(c, f); - break; - - case '`': if ( tag_text(f) || !tickhandler(f,c,1,1,codespan) ) - Qchar(c, f); - break; - - case '\': switch ( c = pull(f) ) { - case '&': Qstring("&amp;", f); - break; - case '<': Qstring("&lt;", f); - break; - case '^': if ( f->flags & (MKD_STRICT|MKD_NOSUPERSCRIPT) ) { - Qchar('\', f); - shift(f,-1); - break; - } - Qchar(c, f); - break; - - case ':': case '|': - if ( f->flags & MKD_NOTABLES ) { - Qchar('\', f); - shift(f,-1); - break; - } - Qchar(c, f); - break; - - case '>': case '#': case '.': case '-': - case '+': case '{': case '}': case ']': - case '!': case '[': case '*': case '_': - case '\':case '(': case ')': - case '`': Qchar(c, f); - break; - default: - Qchar('\', f); - if ( c != EOF ) - shift(f,-1); - break; - } - break; - - case '<': if ( !maybe_tag_or_link(f) ) - Qstring("&lt;", f); - break; - - case '&': j = (peek(f,1) == '#' ) ? 2 : 1; - while ( isthisalnum(f,j) ) - ++j; - - if ( peek(f,j) != ';' ) - Qstring("&amp;", f); - else - Qchar(c, f); - break; - - default: Qchar(c, f); - break; - } - } - /* truncate the input string after we've finished processing it */ - S(f->in) = f->isp = 0; -} /* text */ - - -/* print a header block - */ -static void -printheader(Paragraph *pp, MMIOT *f) -{ -#if WITH_ID_ANCHOR - Qprintf(f, "<h%d", pp->hnumber); - if ( f->flags & MKD_TOC ) { - Qstring(" id="", f); - mkd_string_to_anchor(T(pp->text->text), - S(pp->text->text), - (mkd_sta_function_t)Qchar, f, 1); - Qchar('"', f); - } - Qchar('>', f); -#else - if ( f->flags & MKD_TOC ) { - Qstring("<a name="", f); - mkd_string_to_anchor(T(pp->text->text), - S(pp->text->text), - (mkd_sta_function_t)Qchar, f, 1); - Qstring(""></a>\n", f); - } - Qprintf(f, "<h%d>", pp->hnumber); -#endif - push(T(pp->text->text), S(pp->text->text), f); - text(f); - Qprintf(f, "</h%d>", pp->hnumber); -} - - -enum e_alignments { a_NONE, a_CENTER, a_LEFT, a_RIGHT }; - -static char* alignments[] = { "", " align="center"", " align="left"", - " align="right"" }; - -typedef STRING(int) Istring; - -static int -splat(Line *p, char *block, Istring align, int force, MMIOT *f) -{ - int first, - idx = p->dle, - colno = 0; - - - ___mkd_tidy(&p->text); - if ( T(p->text)[S(p->text)-1] == '|' ) - --S(p->text); - - Qstring("<tr>\n", f); - while ( idx < S(p->text) ) { - first = idx; - if ( force && (colno >= S(align)-1) ) - idx = S(p->text); - else - while ( (idx < S(p->text)) && (T(p->text)[idx] != '|') ) { - if ( T(p->text)[idx] == '\' ) - ++idx; - ++idx; - } - - Qprintf(f, "<%s%s>", - block, - alignments[ (colno < S(align)) ? T(align)[colno] : a_NONE ]); - ___mkd_reparse(T(p->text)+first, idx-first, 0, f); - Qprintf(f, "</%s>\n", block); - idx++; - colno++; - } - if ( force ) - while (colno < S(align) ) { - Qprintf(f, "<%s></%s>\n", block, block); - ++colno; - } - Qstring("</tr>\n", f); - return colno; -} - - -static int -printtable(Paragraph *pp, MMIOT *f) -{ - /* header, dashes, then lines of content */ - - Line *hdr, *dash, *body; - Istring align; - int hcols,start; - char *p; - enum e_alignments it; - - hdr = pp->text; - dash= hdr->next; - body= dash->next; - - if ( T(hdr->text)[hdr->dle] == '|' ) { - /* trim leading pipe off all lines - */ - Line *r; - for ( r = pp->text; r; r = r->next ) - r->dle ++; - } - - /* figure out cell alignments */ - - CREATE(align); - - for (p=T(dash->text), start=dash->dle; start < S(dash->text); ) { - char first, last; - int end; - - last=first=0; - for (end=start ; (end < S(dash->text)) && p[end] != '|'; ++ end ) { - if ( p[end] == '\' ) - ++ end; - else if ( !isspace(p[end]) ) { - if ( !first) first = p[end]; - last = p[end]; - } - } - it = ( first == ':' ) ? (( last == ':') ? a_CENTER : a_LEFT) - : (( last == ':') ? a_RIGHT : a_NONE ); - - EXPAND(align) = it; - start = 1+end; - } - - Qstring("<table>\n", f); - Qstring("<thead>\n", f); - hcols = splat(hdr, "th", align, 0, f); - Qstring("</thead>\n", f); - - if ( hcols < S(align) ) - S(align) = hcols; - else - while ( hcols > S(align) ) - EXPAND(align) = a_NONE; - - Qstring("<tbody>\n", f); - for ( ; body; body = body->next) - splat(body, "td", align, 1, f); - Qstring("</tbody>\n", f); - Qstring("</table>\n", f); - - DELETE(align); - return 1; -} - - -static int -printblock(Paragraph *pp, MMIOT *f) -{ - Line *t = pp->text; - static char *Begin[] = { "", "<p>", "<p style="text-align:center;">" }; - static char *End[] = { "", "</p>","</p>" }; - - while (t) { - if ( S(t->text) ) { - if ( t->next && S(t->text) > 2 - && T(t->text)[S(t->text)-2] == ' ' - && T(t->text)[S(t->text)-1] == ' ' ) { - push(T(t->text), S(t->text)-2, f); - push("\003\n", 2, f); - } - else { - ___mkd_tidy(&t->text); - push(T(t->text), S(t->text), f); - if ( t->next ) - push("\n", 1, f); - } - } - t = t->next; - } - Qstring(Begin[pp->align], f); - text(f); - Qstring(End[pp->align], f); - return 1; -} - - -static void -printcode(Line *t, MMIOT *f) -{ - int blanks; - - Qstring("<pre><code>", f); - for ( blanks = 0; t ; t = t->next ) { - if ( S(t->text) > t->dle ) { - while ( blanks ) { - Qchar('\n', f); - --blanks; - } - code(f, T(t->text), S(t->text)); - Qchar('\n', f); - } - else blanks++; - } - Qstring("</code></pre>", f); -} - - -static void -printhtml(Line *t, MMIOT *f) -{ - int blanks; - - for ( blanks=0; t ; t = t->next ) - if ( S(t->text) ) { - for ( ; blanks; --blanks ) - Qchar('\n', f); - - Qwrite(T(t->text), S(t->text), f); - Qchar('\n', f); - } - else - blanks++; -} - - -static void -htmlify(Paragraph *p, char *block, char *arguments, MMIOT *f) -{ - ___mkd_emblock(f); - if ( block ) - Qprintf(f, arguments ? "<%s %s>" : "<%s>", block, arguments); - ___mkd_emblock(f); - - while (( p = display(p, f) )) { - ___mkd_emblock(f); - Qstring("\n\n", f); - } - - if ( block ) - Qprintf(f, "</%s>", block); - ___mkd_emblock(f); -} - - -static void -definitionlist(Paragraph *p, MMIOT *f) -{ - Line *tag; - - if ( p ) { - Qstring("<dl>\n", f); - - for ( ; p ; p = p->next) { - for ( tag = p->text; tag; tag = tag->next ) { - Qstring("<dt>", f); - ___mkd_reparse(T(tag->text), S(tag->text), 0, f); - Qstring("</dt>\n", f); - } - - htmlify(p->down, "dd", p->ident, f); - Qchar('\n', f); - } - - Qstring("</dl>", f); - } -} - - -static void -listdisplay(int typ, Paragraph *p, MMIOT* f) -{ - if ( p ) { - Qprintf(f, "<%cl", (typ==UL)?'u':'o'); - if ( typ == AL ) - Qprintf(f, " type="a""); - Qprintf(f, ">\n"); - - for ( ; p ; p = p->next ) { - htmlify(p->down, "li", p->ident, f); - Qchar('\n', f); - } - - Qprintf(f, "</%cl>\n", (typ==UL)?'u':'o'); - } -} - - -/* dump out a Paragraph in the desired manner - */ -static Paragraph* -display(Paragraph *p, MMIOT *f) -{ - if ( !p ) return 0; - - switch ( p->typ ) { - case STYLE: - case WHITESPACE: - break; - - case HTML: - printhtml(p->text, f); - break; - - case CODE: - printcode(p->text, f); - break; - - case QUOTE: - htmlify(p->down, p->ident ? "div" : "blockquote", p->ident, f); - break; - - case UL: - case OL: - case AL: - listdisplay(p->typ, p->down, f); - break; - - case DL: - definitionlist(p->down, f); - break; - - case HR: - Qstring("<hr />", f); - break; - - case HDR: - printheader(p, f); - break; - - case TABLE: - printtable(p, f); - break; - - case SOURCE: - htmlify(p->down, 0, 0, f); - break; - - default: - printblock(p, f); - break; - } - return p->next; -} - - -/* dump out a list of footnotes - */ -static void -mkd_extra_footnotes(MMIOT *m) -{ - int j, i; - Footnote *t; - - if ( m->reference == 0 ) - return; - - Csprintf(&m->out, "\n<div class="footnotes">\n<hr/>\n<ol>\n"); - - for ( i=1; i <= m->reference; i++ ) { - for ( j=0; j < S(*m->footnotes); j++ ) { - t = &T(*m->footnotes)[j]; - if ( (t->refnumber == i) && (t->flags & REFERENCED) ) { - Csprintf(&m->out, "<li id="%s:%d">\n<p>", - p_or_nothing(m), t->refnumber); - Csreparse(&m->out, T(t->title), S(t->title), 0); - Csprintf(&m->out, "<a href="#%sref:%d" rev="footnote">&#8617;</a>", - p_or_nothing(m), t->refnumber); - Csprintf(&m->out, "</p></li>\n"); - } - } - } - Csprintf(&m->out, "</ol>\n</div>\n"); -} - - -/* return a pointer to the compiled markdown - * document. - */ -int -mkd_document(Document *p, char **res) -{ - int size; - - if ( p && p->compiled ) { - - if ( ! p->html ) { - htmlify(p->code, 0, 0, p->ctx); - if ( p->ctx->flags & MKD_EXTRA_FOOTNOTE ) - mkd_extra_footnotes(p->ctx); - p->html = 1; - } - - size = S(p->ctx->out); - - if ( (size == 0) || T(p->ctx->out)[size-1] ) - EXPAND(p->ctx->out) = 0; - - *res = T(p->ctx->out); - return size; - } - return EOF; -} - Modified: markdown/discount/html5.c 22 files changed, 0 insertions(+), 22 deletions(-) =================================================================== @@ -1,22 +0,0 @@ -/* block-level tags for passing html5 blocks through the blender - */ -#include "tags.h" - -void -mkd_with_html5_tags() -{ - static int populated = 0; - - if ( populated ) return; - populated = 1; - - mkd_define_tag("ASIDE", 0); - mkd_define_tag("FOOTER", 0); - mkd_define_tag("HEADER", 0); - mkd_define_tag("HGROUP", 0); - mkd_define_tag("NAV", 0); - mkd_define_tag("SECTION", 0); - mkd_define_tag("ARTICLE", 0); - - mkd_sort_tags(); -} Modified: markdown/discount/markdown.c 1314 files changed, 0 insertions(+), 1314 deletions(-) =================================================================== @@ -1,1314 +0,0 @@ -/* markdown: a C implementation of John Gruber's Markdown markup language. - * - * Copyright (C) 2007 David L Parsons. - * The redistribution terms are provided in the COPYRIGHT file that must - * be distributed with this source code. - */ -#include "discount-config.h" - -#include <stdio.h> -#include <string.h> -#include <stdarg.h> -#include <stdlib.h> -#include <time.h> -#include <ctype.h> - -#include "cstring.h" -#include "markdown.h" -#include "amalloc.h" -#include "tags.h" - -typedef int (*stfu)(const void*,const void*); - -typedef ANCHOR(Paragraph) ParagraphRoot; - -static Paragraph *Pp(ParagraphRoot *, Line *, int); -static Paragraph *compile(Line *, int, MMIOT *); - -/* case insensitive string sort for Footnote tags. - */ -int -__mkd_footsort(Footnote *a, Footnote *b) -{ - int i; - char ac, bc; - - if ( S(a->tag) != S(b->tag) ) - return S(a->tag) - S(b->tag); - - for ( i=0; i < S(a->tag); i++) { - ac = tolower(T(a->tag)[i]); - bc = tolower(T(b->tag)[i]); - - if ( isspace(ac) && isspace(bc) ) - continue; - if ( ac != bc ) - return ac - bc; - } - return 0; -} - - -/* find the first blank character after position <i> - */ -static int -nextblank(Line *t, int i) -{ - while ( (i < S(t->text)) && !isspace(T(t->text)[i]) ) - ++i; - return i; -} - - -/* find the next nonblank character after position <i> - */ -static int -nextnonblank(Line *t, int i) -{ - while ( (i < S(t->text)) && isspace(T(t->text)[i]) ) - ++i; - return i; -} - - -/* find the first nonblank character on the Line. - */ -int -mkd_firstnonblank(Line *p) -{ - return nextnonblank(p,0); -} - - -static inline int -blankline(Line *p) -{ - return ! (p && (S(p->text) > p->dle) ); -} - - -static Line * -skipempty(Line *p) -{ - while ( p && (p->dle == S(p->text)) ) - p = p->next; - return p; -} - - -void -___mkd_tidy(Cstring *t) -{ - while ( S(*t) && isspace(T(*t)[S(*t)-1]) ) - --S(*t); -} - - -static struct kw comment = { "!--", 3, 0 }; - -static struct kw * -isopentag(Line *p) -{ - int i=0, len; - char *line; - - if ( !p ) return 0; - - line = T(p->text); - len = S(p->text); - - if ( len < 3 || line[0] != '<' ) - return 0; - - if ( line[1] == '!' && line[2] == '-' && line[3] == '-' ) - /* comments need special case handling, because - * the !-- doesn't need to end in a whitespace - */ - return &comment; - - /* find how long the tag is so we can check to see if - * it's a block-level tag - */ - for ( i=1; i < len && T(p->text)[i] != '>' - && T(p->text)[i] != '/' - && !isspace(T(p->text)[i]); ++i ) - ; - - - return mkd_search_tags(T(p->text)+1, i-1); -} - - -typedef struct _flo { - Line *t; - int i; -} FLO; - -#define floindex(x) (x.i) - - -static int -flogetc(FLO *f) -{ - if ( f && f->t ) { - if ( f->i < S(f->t->text) ) - return T(f->t->text)[f->i++]; - f->t = f->t->next; - f->i = 0; - return flogetc(f); - } - return EOF; -} - - -static void -splitline(Line *t, int cutpoint) -{ - if ( t && (cutpoint < S(t->text)) ) { - Line *tmp = calloc(1, sizeof *tmp); - - tmp->next = t->next; - t->next = tmp; - - tmp->dle = t->dle; - SUFFIX(tmp->text, T(t->text)+cutpoint, S(t->text)-cutpoint); - S(t->text) = cutpoint; - } -} - -#define UNCHECK(l) ((l)->flags &= ~CHECKED) - -/* - * walk a line, seeing if it's any of half a dozen interesting regular - * types. - */ -static void -checkline(Line *l) -{ - int eol, i; - int dashes = 0, spaces = 0, - equals = 0, underscores = 0, - stars = 0, tildes = 0; - - l->flags |= CHECKED; - l->kind = chk_text; - l->count = 0; - - if (l->dle >= 4) { l->kind=chk_code; return; } - - for ( eol = S(l->text); eol > l->dle && isspace(T(l->text)[eol-1]); --eol ) - ; - - for (i=l->dle; i<eol; i++) { - register int c = T(l->text)[i]; - - if ( c != ' ' ) l->count++; - - switch (c) { - case '-': dashes = 1; break; - case ' ': spaces = 1; break; - case '=': equals = 1; break; - case '_': underscores = 1; break; - case '*': stars = 1; break; - case '~': tildes = 1; break; - default: return; - } - } - - if ( dashes + equals + underscores + stars + tildes > 1 ) - return; - - if ( spaces ) { - if ( (underscores || stars || dashes) ) - l->kind = chk_hr; - return; - } - - if ( stars || underscores ) { l->kind = chk_hr; } - else if ( dashes ) { l->kind = chk_dash; } - else if ( tildes ) { l->kind = chk_tilde; } - else if ( equals ) { l->kind = chk_equal; } -} - - - -static Line * -commentblock(Paragraph *p, int *unclosed) -{ - Line *t, *ret; - char *end; - - for ( t = p->text; t ; t = t->next) { - if ( end = strstr(T(t->text), "-->") ) { - splitline(t, 3 + (end - T(t->text)) ); - ret = t->next; - t->next = 0; - return ret; - } - } - *unclosed = 1; - return t; - -} - - -static Line * -htmlblock(Paragraph *p, struct kw *tag, int *unclosed) -{ - Line *ret; - FLO f = { p->text, 0 }; - int c; - int i, closing, depth=0; - - *unclosed = 0; - - if ( tag == &comment ) - return commentblock(p, unclosed); - - if ( tag->selfclose ) { - ret = f.t->next; - f.t->next = 0; - return ret; - } - - while ( (c = flogetc(&f)) != EOF ) { - if ( c == '<' ) { - /* tag? */ - c = flogetc(&f); - if ( c == '!' ) { /* comment? */ - if ( flogetc(&f) == '-' && flogetc(&f) == '-' ) { - /* yes */ - while ( (c = flogetc(&f)) != EOF ) { - if ( c == '-' && flogetc(&f) == '-' - && flogetc(&f) == '>') - /* consumed whole comment */ - break; - } - } - } - else { - if ( closing = (c == '/') ) c = flogetc(&f); - - for ( i=0; i < tag->size; c=flogetc(&f) ) { - if ( tag->id[i++] != toupper(c) ) - break; - } - - if ( (i == tag->size) && !isalnum(c) ) { - depth = depth + (closing ? -1 : 1); - if ( depth == 0 ) { - while ( c != EOF && c != '>' ) { - /* consume trailing gunk in close tag */ - c = flogetc(&f); - } - if ( c == EOF ) - break; - if ( !f.t ) - return 0; - splitline(f.t, floindex(f)); - ret = f.t->next; - f.t->next = 0; - return ret; - } - } - } - } - } - *unclosed = 1; - return 0; -} - - -/* footnotes look like ^<whitespace>{0,3}[stuff]: <content>$ - */ -static int -isfootnote(Line *t) -{ - int i; - - if ( ( (i = t->dle) > 3) || (T(t->text)[i] != '[') ) - return 0; - - for ( ++i; i < S(t->text) ; ++i ) { - if ( T(t->text)[i] == '[' ) - return 0; - else if ( T(t->text)[i] == ']' ) - return ( T(t->text)[i+1] == ':' ) ; - } - return 0; -} - - -static inline int -isquote(Line *t) -{ - return (t->dle < 4 && T(t->text)[t->dle] == '>'); -} - - -static inline int -iscode(Line *t) -{ - return (t->dle@@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).