rdiscount 1.6.8 → 2.0.7

data/ext/markdown.h

@@ -12,6 +12,10 @@ typedef struct footnote {
     Cstring title;		/* what it's called (TITLE= attribute) */
     int height, width;		/* dimensions (for image link) */
     int dealloc;		/* deallocation needed? */
+    int refnumber;
+    int flags;
+#define EXTRA_BOOKMARK	0x01
+#define REFERENCED	0x02
 } Footnote;
 
 /* each input line is read into a Line, which contains the line,
@@ -75,24 +79,36 @@ typedef struct mmiot {
     Cstring in;
     Qblock Q;
     int isp;
+    int reference;
+    char *ref_prefix;
     STRING(Footnote) *footnotes;
-    int flags;
-#define DENY_A		0x0001
-#define DENY_IMG	0x0002
-#define DENY_SMARTY	0x0004
-#define DENY_HTML	0x0008
-#define STRICT		0x0010
-#define INSIDE_TAG	0x0020
-#define NO_PSEUDO_PROTO	0x0040
-#define CDATA_OUTPUT	0x0080
-#define NOTABLES	0x0400
-#define NOSTRIKETHROUGH	0x0800
-#define TOC		0x1000
-#define MKD_1_COMPAT	0x2000
-#define AUTOLINK	0x4000
-#define SAFELINK	0x8000
-#define USER_FLAGS	0xFCFF
-#define EMBEDDED	DENY_A|DENY_IMG|NO_PSEUDO_PROTO|CDATA_OUTPUT
+    DWORD flags;
+#define MKD_NOLINKS	0x00000001
+#define MKD_NOIMAGE	0x00000002
+#define MKD_NOPANTS	0x00000004
+#define MKD_NOHTML	0x00000008
+#define MKD_STRICT	0x00000010
+#define MKD_TAGTEXT	0x00000020
+#define MKD_NO_EXT	0x00000040
+#define MKD_CDATA	0x00000080
+#define MKD_NOSUPERSCRIPT 0x00000100
+#define MKD_NORELAXED	0x00000200
+#define MKD_NOTABLES	0x00000400
+#define MKD_NOSTRIKETHROUGH 0x00000800
+#define MKD_TOC		0x00001000
+#define MKD_1_COMPAT	0x00002000
+#define MKD_AUTOLINK	0x00004000
+#define MKD_SAFELINK	0x00008000
+#define MKD_NOHEADER	0x00010000
+#define MKD_TABSTOP	0x00020000
+#define MKD_NODIVQUOTE	0x00040000
+#define MKD_NOALPHALIST	0x00080000
+#define MKD_NODLIST	0x00100000
+#define MKD_EXTRA_FOOTNOTE 0x00200000
+#define IS_LABEL	0x08000000
+#define USER_FLAGS	0x0FFFFFFF
+#define INPUT_MASK	(MKD_NOHEADER|MKD_TABSTOP)
+
     Callback_data *cb;
 } MMIOT;
 
@@ -107,19 +123,22 @@ typedef struct mmiot {
 typedef struct document {
     int magic;			/* "I AM VALID" magic number */
 #define VALID_DOCUMENT		0x19600731
-    Line *headers;		/* title -> author(s) -> date */
+    Line *title;
+    Line *author;
+    Line *date;
     ANCHOR(Line) content;	/* uncompiled text, not valid after compile() */
     Paragraph *code;		/* intermediate code generated by compile() */
     int compiled;		/* set after mkd_compile() */
     int html;			/* set after (internal) htmlify() */
     int tabstop;		/* for properly expanding tabs (ick) */
+    char *ref_prefix;
     MMIOT *ctx;			/* backend buffers, flags, and structures */
     Callback_data cb;		/* callback functions & private data */
 } Document;
 
 
 extern int  mkd_firstnonblank(Line *);
-extern int  mkd_compile(Document *, int);
+extern int  mkd_compile(Document *, DWORD);
 extern int  mkd_document(Document *, char **);
 extern int  mkd_generatehtml(Document *, FILE *);
 extern int  mkd_css(Document *, char **);
@@ -128,19 +147,21 @@ extern int  mkd_generatecss(Document *, FILE *);
 extern int  mkd_xml(char *, int , char **);
 extern int  mkd_generatexml(char *, int, FILE *);
 extern void mkd_cleanup(Document *);
-extern int  mkd_line(char *, int, char **, int);
-extern int  mkd_generateline(char *, int, FILE*, int);
+extern int  mkd_line(char *, int, char **, DWORD);
+extern int  mkd_generateline(char *, int, FILE*, DWORD);
 #define mkd_text mkd_generateline
 extern void mkd_basename(Document*, char *);
-extern void mkd_string_to_anchor(char*,int, void(*)(int,void*), void*);
 
-extern Document *mkd_in(FILE *, int);
-extern Document *mkd_string(char*,int, int);
+typedef int (*mkd_sta_function_t)(const int,const void*);
+extern void mkd_string_to_anchor(char*,int, mkd_sta_function_t, void*, int);
+
+extern Document *mkd_in(FILE *, DWORD);
+extern Document *mkd_string(char*,int, DWORD);
 
-#define NO_HEADER	0x0100
-#define STD_TABSTOP	0x0200
-#define INPUT_MASK	(NO_HEADER|STD_TABSTOP)
+extern void mkd_initialize();
+extern void mkd_shlib_destructor();
 
+extern void mkd_ref_prefix(Document*, char*);
 
 /* internal resource handling functions.
  */

data/ext/mkdio.c

@@ -70,16 +70,14 @@ queue(Document* a, Cstring *line)
 }
 
 
-#ifdef PANDOC_HEADER
 /* trim leading blanks from a header line
  */
 static void
-snip(Line *p)
+header_dle(Line *p)
 {
     CLIP(p->text, 0, 1);
     p->dle = mkd_firstnonblank(p);
 }
-#endif
 
 
 /* build a Document from any old input.
@@ -92,26 +90,22 @@ populate(getc_func getc, void* ctx, int flags)
     Cstring line;
     Document *a = new_Document();
     int c;
-#ifdef PANDOC_HEADER
     int pandoc = 0;
-#endif
 
     if ( !a ) return 0;
 
-    a->tabstop = (flags & STD_TABSTOP) ? 4 : TABSTOP;
+    a->tabstop = (flags & MKD_TABSTOP) ? 4 : TABSTOP;
 
     CREATE(line);
 
     while ( (c = (*getc)(ctx)) != EOF ) {
 	if ( c == '\n' ) {
-#ifdef PANDOC_HEADER
 	    if ( pandoc != EOF && pandoc < 3 ) {
 		if ( S(line) && (T(line)[0] == '%') )
 		    pandoc++;
 		else
 		    pandoc = EOF;
 	    }
-#endif
 	    queue(a, &line);
 	    S(line) = 0;
 	}
@@ -124,20 +118,19 @@ populate(getc_func getc, void* ctx, int flags)
 
     DELETE(line);
 
-#ifdef PANDOC_HEADER
-    if ( (pandoc == 3) && !(flags & NO_HEADER) ) {
+    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.
 	 */
-	a->headers = T(a->content);
-	T(a->content) = a->headers->next->next->next;
-	a->headers->next->next->next = 0;
-	snip(a->headers);
-	snip(a->headers->next);
-	snip(a->headers->next->next);
+	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);
+
+	T(a->content) = headers->next->next->next;
     }
-#endif
 
     return a;
 }
@@ -146,7 +139,7 @@ populate(getc_func getc, void* ctx, int flags)
 /* convert a file into a linked list
  */
 Document *
-mkd_in(FILE *f, int flags)
+mkd_in(FILE *f, DWORD flags)
 {
     return populate((getc_func)fgetc, f, flags & INPUT_MASK);
 }
@@ -174,7 +167,7 @@ strget(struct string_ctx *in)
 /* convert a block of text into a linked list
  */
 Document *
-mkd_string(char *buf, int len, int flags)
+mkd_string(char *buf, int len, DWORD flags)
 {
     struct string_ctx about;
 
@@ -194,7 +187,7 @@ mkd_generatehtml(Document *p, FILE *output)
     int szdoc;
 
     if ( (szdoc = mkd_document(p, &doc)) != EOF ) {
-	if ( p->ctx->flags & CDATA_OUTPUT )
+	if ( p->ctx->flags & MKD_CDATA )
 	    mkd_generatexml(doc, szdoc, output);
 	else
 	    fwrite(doc, szdoc, 1, output);
@@ -222,19 +215,32 @@ markdown(Document *document, FILE *out, int flags)
 /* write out a Cstring, mangled into a form suitable for `<a href=` or `<a id=`
  */
 void
-mkd_string_to_anchor(char *s, int len, void(*outchar)(int,void*), void *out)
+mkd_string_to_anchor(char *s, int len, mkd_sta_function_t outchar,
+				       void *out, int labelformat)
 {
     unsigned char c;
+
+    int i, size;
+    char *line;
+
+    size = mkd_line(s, len, &line, IS_LABEL);
     
-    for ( ; len-- > 0; ) {
-	c = *s++;
-	if ( c == ' ' || c == '&' || c == '<' || c == '"' )
-	    (*outchar)('+', out);
-	else if ( isalnum(c) || ispunct(c) || (c & 0x80) )
-	    (*outchar)(c, out);
+    if ( labelformat && size && !isalpha(line[0]) )
+	(*outchar)('L',out);
+    for ( i=0; i < size ; i++ ) {
+	c = line[i];
+	if ( labelformat ) {
+	    if ( isalnum(c) || (c == '_') || (c == ':') || (c == '-') || (c == '.' ) )
+		(*outchar)(c, out);
+	    else
+		(*outchar)('.',out);
+	}
 	else
-	    (*outchar)('~',out);
+	    (*outchar)(c,out);
     }
+	
+    if (line)
+	free(line);
 }
 
 
@@ -253,7 +259,7 @@ mkd_parse_line(char *bfr, int size, MMIOT *f, int flags)
 /* ___mkd_reparse() a line, returning it in malloc()ed memory
  */
 int
-mkd_line(char *bfr, int size, char **res, int flags)
+mkd_line(char *bfr, int size, char **res, DWORD flags)
 {
     MMIOT f;
     int len;
@@ -266,9 +272,10 @@ mkd_line(char *bfr, int size, char **res, int flags)
 	 * should be an opaque method that transparently moves 
 	 * the pointer out of the embedded Cstring.
 	 */
+	EXPAND(f.out) = 0;
 	*res = T(f.out);
 	T(f.out) = 0;
-	S(f.out) = 0;
+	S(f.out) = ALLOCATED(f.out) = 0;
     }
     else {
 	 *res = 0;
@@ -282,12 +289,12 @@ mkd_line(char *bfr, int size, char **res, int flags)
 /* ___mkd_reparse() a line, writing it to a FILE
  */
 int
-mkd_generateline(char *bfr, int size, FILE *output, int flags)
+mkd_generateline(char *bfr, int size, FILE *output, DWORD flags)
 {
     MMIOT f;
 
     mkd_parse_line(bfr, size, &f, flags);
-    if ( flags & CDATA_OUTPUT )
+    if ( flags & MKD_CDATA )
 	mkd_generatexml(T(f.out), S(f.out), output);
     else
 	fwrite(T(f.out), S(f.out), 1, output);
@@ -335,3 +342,13 @@ mkd_e_data(Document *f, void *data)
     if ( f )
 	f->cb.e_data = data;
 }
+
+
+/* set the href prefix for markdown extra style footnotes
+ */
+void
+mkd_ref_prefix(Document *f, char *data)
+{
+    if ( f )
+	f->ref_prefix = data;
+}

data/ext/mkdio.h

@@ -5,24 +5,31 @@
 
 typedef void MMIOT;
 
+typedef unsigned int mkd_flag_t;
+
 /* line builder for markdown()
  */
-MMIOT *mkd_in(FILE*,int);		/* assemble input from a file */
-MMIOT *mkd_string(char*,int,int);	/* assemble input from a buffer */
+MMIOT *mkd_in(FILE*,mkd_flag_t);		/* assemble input from a file */
+MMIOT *mkd_string(char*,int,mkd_flag_t);	/* assemble input from a buffer */
 
 void mkd_basename(MMIOT*,char*);
 
+void mkd_initialize();
+void mkd_with_html5_tags();
+void mkd_shlib_destructor();
+
 /* compilation, debugging, cleanup
  */
-int mkd_compile(MMIOT*, int);
+int mkd_compile(MMIOT*, mkd_flag_t);
 int mkd_cleanup(MMIOT*);
 
 /* markup functions
  */
 int mkd_dump(MMIOT*, FILE*, int, char*);
-int markdown(MMIOT*, FILE*, int);
-int mkd_line(char *, int, char **, int);
-void mkd_string_to_anchor(char *, int, int (*)(int,void*), void*);
+int markdown(MMIOT*, FILE*, mkd_flag_t);
+int mkd_line(char *, int, char **, mkd_flag_t);
+typedef int (*mkd_sta_function_t)(const int,const void*);
+void mkd_string_to_anchor(char *, int, mkd_sta_function_t, void*, int);
 int mkd_xhtmlpage(MMIOT*,int,FILE*);
 
 /* header block access
@@ -45,7 +52,7 @@ int mkd_generatetoc(MMIOT*,FILE*);
 int mkd_generatexml(char *, int,FILE*);
 int mkd_generatecss(MMIOT*,FILE*);
 #define mkd_style mkd_generatecss
-int mkd_generateline(char *, int, FILE*, int);
+int mkd_generateline(char *, int, FILE*, mkd_flag_t);
 #define mkd_text mkd_generateline
 
 /* url generator callbacks
@@ -61,30 +68,41 @@ void mkd_e_data(void *, void *);
 /* version#.
  */
 extern char markdown_version[];
+void mkd_mmiot_flags(FILE *, MMIOT *, int);
+void mkd_flags_are(FILE*, mkd_flag_t, int);
+
+void mkd_ref_prefix(MMIOT*, char*);
+
 
 /* special flags for markdown() and mkd_text()
  */
-#define MKD_NOLINKS	0x0001	/* don't do link processing, block <a> tags  */
-#define MKD_NOIMAGE	0x0002	/* don't do image processing, block <img> */
-#define MKD_NOPANTS	0x0004	/* don't run smartypants() */
-#define MKD_NOHTML	0x0008	/* don't allow raw html through AT ALL */
-#define MKD_STRICT	0x0010	/* disable SUPERSCRIPT, RELAXED_EMPHASIS */
-#define MKD_TAGTEXT	0x0020	/* process text inside an html tag; no
-				 * <em>, no <bold>, no html or [] expansion */
-#define MKD_NO_EXT	0x0040	/* don't allow pseudo-protocols */
-#define MKD_CDATA	0x0080	/* generate code for xml ![CDATA[...]] */
-#define MKD_NOTABLES	0x0400	/* disallow tables */
-#define MKD_NOSTRIKETHROUGH 0x0800/* forbid ~~strikethrough~~ */
-#define MKD_TOC		0x1000	/* do table-of-contents processing */
-#define MKD_1_COMPAT	0x2000	/* compatability with MarkdownTest_1.0 */
-#define MKD_AUTOLINK	0x4000	/* make http://foo.com link even without <>s */
-#define MKD_SAFELINK	0x8000	/* paranoid check for link protocol */
+#define MKD_NOLINKS	0x00000001	/* don't do link processing, block <a> tags  */
+#define MKD_NOIMAGE	0x00000002	/* don't do image processing, block <img> */
+#define MKD_NOPANTS	0x00000004	/* don't run smartypants() */
+#define MKD_NOHTML	0x00000008	/* don't allow raw html through AT ALL */
+#define MKD_STRICT	0x00000010	/* disable SUPERSCRIPT, RELAXED_EMPHASIS */
+#define MKD_TAGTEXT	0x00000020	/* process text inside an html tag; no
+					 * <em>, no <bold>, no html or [] expansion */
+#define MKD_NO_EXT	0x00000040	/* don't allow pseudo-protocols */
+#define MKD_CDATA	0x00000080	/* generate code for xml ![CDATA[...]] */
+#define MKD_NOSUPERSCRIPT 0x00000100	/* no A^B */
+#define MKD_NORELAXED	0x00000200	/* emphasis happens /everywhere/ */
+#define MKD_NOTABLES	0x00000400	/* disallow tables */
+#define MKD_NOSTRIKETHROUGH 0x00000800	/* forbid ~~strikethrough~~ */
+#define MKD_TOC		0x00001000	/* do table-of-contents processing */
+#define MKD_1_COMPAT	0x00002000	/* compatibility with MarkdownTest_1.0 */
+#define MKD_AUTOLINK	0x00004000	/* make http://foo.com link even without <>s */
+#define MKD_SAFELINK	0x00008000	/* paranoid check for link protocol */
+#define MKD_NOHEADER	0x00010000	/* don't process header blocks */
+#define MKD_TABSTOP	0x00020000	/* expand tabs to 4 spaces */
+#define MKD_NODIVQUOTE	0x00040000	/* forbid >%class% blocks */
+#define MKD_NOALPHALIST	0x00080000	/* forbid alphabetic lists */
+#define MKD_NODLIST	0x00100000	/* forbid definition lists */
+#define MKD_EXTRA_FOOTNOTE 0x00200000	/* enable markdown extra-style footnotes */
 #define MKD_EMBED	MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT
 
 /* special flags for mkd_in() and mkd_string()
  */
-#define MKD_NOHEADER	0x0100	/* don't process header blocks */
-#define MKD_TABSTOP	0x0200	/* expand tabs to 4 spaces */
 
 
 #endif/*_MKDIO_D*/

data/ext/rdiscount.c

@@ -82,6 +82,10 @@ int rb_rdiscount__get_flags(VALUE ruby_obj)
   if ( rb_funcall(ruby_obj, rb_intern("filter_html"), 0) == Qtrue )
       flags = flags | MKD_NOHTML;
 
+  /* footnotes */
+  if ( rb_funcall(ruby_obj, rb_intern("footnotes"), 0) == Qtrue )
+      flags = flags | MKD_EXTRA_FOOTNOTE;
+
   /* generate_toc */
   if ( rb_funcall(ruby_obj, rb_intern("generate_toc"), 0) == Qtrue)
     flags = flags | MKD_TOC;

data/ext/resource.c

@@ -147,7 +147,9 @@ mkd_cleanup(Document *doc)
 	}
 
 	if ( doc->code) ___mkd_freeParagraph(doc->code);
-	if ( doc->headers ) ___mkd_freeLines(doc->headers);
+	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);

data/ext/setup.c

@@ -0,0 +1,47 @@
+/* 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 "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"
+    
+static int need_to_setup = 1;
+static int need_to_initrng = 1;
+
+void
+mkd_initialize()
+{
+
+    if ( need_to_initrng ) {
+	need_to_initrng = 0;
+	INITRNG(time(0));
+    }
+    if ( need_to_setup ) {
+	need_to_setup = 0;
+	mkd_prepare_tags();
+    }
+}
+
+
+void
+mkd_shlib_destructor()
+{
+    if ( !need_to_setup ) {
+	need_to_setup = 1;
+	mkd_deallocate_tags();
+    }
+}
+