rdiscount 1.3.5 → 1.5.5

data/ext/markdown.h

@@ -11,6 +11,7 @@ typedef struct footnote {
     Cstring link;		/* what this footnote points to */
     Cstring title;		/* what it's called (TITLE= attribute) */
     int height, width;		/* dimensions (for image link) */
+    int dealloc;		/* deallocation needed? */
 } Footnote;
 
 /* each input line is read into a Line, which contains the line,
@@ -36,7 +37,7 @@ typedef struct paragraph {
     char *ident;		/* %id% tag for QUOTE */
     enum { WHITESPACE=0, CODE, QUOTE, MARKUP,
 	   HTML, STYLE, DL, UL, OL, AL, LISTITEM,
-	   HDR, HR } typ;
+	   HDR, HR, TABLE, SOURCE } typ;
     enum { IMPLICIT=0, PARA, CENTER} align;
     int hnumber;		/* <Hn> for typ == HDR */
 } Paragraph;
@@ -73,9 +74,12 @@ typedef struct mmiot {
 #define INSIDE_TAG	0x0020
 #define NO_PSEUDO_PROTO	0x0040
 #define CDATA_OUTPUT	0x0080
+#define NOTABLES	0x0400
 #define TOC		0x1000
 #define MKD_1_COMPAT	0x2000
-#define USER_FLAGS	0xF0FF
+#define AUTOLINK	0x4000
+#define SAFELINK	0x8000
+#define USER_FLAGS	0xFCFF
 #define EMBEDDED	DENY_A|DENY_IMG|NO_PSEUDO_PROTO|CDATA_OUTPUT
     char *base;
 } MMIOT;
@@ -104,9 +108,15 @@ extern int  mkd_firstnonblank(Line *);
 extern int  mkd_compile(Document *, int);
 extern int  mkd_document(Document *, char **);
 extern int  mkd_generatehtml(Document *, FILE *);
-extern int  mkd_style(Document *, FILE *);
+extern int  mkd_css(Document *, char **);
+extern int  mkd_generatecss(Document *, FILE *);
+#define mkd_style mkd_generatecss
+extern int  mkd_xml(char *, int , char **);
+extern int  mkd_generatexml(char *, int, FILE *);
 extern void mkd_cleanup(Document *);
-extern int  mkd_text(char *, int, FILE*, int);
+extern int  mkd_line(char *, int, char **, int);
+extern int  mkd_generateline(char *, int, FILE*, int);
+#define mkd_text mkd_generateline
 extern void mkd_basename(Document*, char *);
 extern void mkd_string_to_anchor(char*,int, void(*)(int,void*), void*);
 
@@ -123,6 +133,7 @@ extern Document *mkd_string(char*,int, int);
 extern void ___mkd_freeLine(Line *);
 extern void ___mkd_freeLines(Line *);
 extern void ___mkd_freeParagraph(Paragraph *);
+extern void ___mkd_freefootnote(Footnote *);
 extern void ___mkd_freefootnotes(MMIOT *);
 extern void ___mkd_initmmiot(MMIOT *, void *);
 extern void ___mkd_freemmiot(MMIOT *, void *);
@@ -130,6 +141,6 @@ extern void ___mkd_freeLineRange(Line *, Line *);
 extern void ___mkd_xml(char *, int, FILE *);
 extern void ___mkd_reparse(char *, int, int, MMIOT*);
 extern void ___mkd_emblock(MMIOT*);
-extern void ___mkd_tidy(Line *);
+extern void ___mkd_tidy(Cstring *);
 
 #endif/*_MARKDOWN_D*/

data/ext/mkdio.c

@@ -113,7 +113,7 @@ populate(getc_func getc, void* ctx, int flags)
 	    queue(a, &line);
 	    S(line) = 0;
 	}
-	else
+	else if ( isprint(c) || isspace(c) || (c & 0x80) )
 	    EXPAND(line) = c;
     }
 
@@ -193,7 +193,7 @@ mkd_generatehtml(Document *p, FILE *output)
 
     if ( (szdoc = mkd_document(p, &doc)) != EOF ) {
 	if ( p->ctx->flags & CDATA_OUTPUT )
-	    ___mkd_xml(doc, szdoc, output);
+	    mkd_generatexml(doc, szdoc, output);
 	else
 	    fwrite(doc, szdoc, 1, output);
 	putc('\n', output);
@@ -230,12 +230,74 @@ mkd_basename(Document *document, char *base)
 void
 mkd_string_to_anchor(char *s, int len, void(*outchar)(int,void*), void *out)
 {
-    for ( ; len-- > 0; ++s ) {
-	if ( *s == ' ' || *s == '&' || *s == '<' || *s == '"' )
+    unsigned char c;
+    
+    for ( ; len-- > 0; ) {
+	c = *s++;
+	if ( c == ' ' || c == '&' || c == '<' || c == '"' )
 	    (*outchar)('+', out);
-	else if ( isalnum(*s) || ispunct(*s) )
-	    (*outchar)(*s, out);
+	else if ( isalnum(c) || ispunct(c) || (c & 0x80) )
+	    (*outchar)(c, out);
 	else
 	    (*outchar)('~',out);
     }
 }
+
+
+/*  ___mkd_reparse() a line
+ */
+static void
+mkd_parse_line(char *bfr, int size, MMIOT *f, int flags)
+{
+    ___mkd_initmmiot(f, 0);
+    f->flags = flags & USER_FLAGS;
+    ___mkd_reparse(bfr, size, 0, f);
+    ___mkd_emblock(f);
+}
+
+
+/* ___mkd_reparse() a line, returning it in malloc()ed memory
+ */
+int
+mkd_line(char *bfr, int size, char **res, int flags)
+{
+    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 
+	 * the pointer out of the embedded Cstring.
+	 */
+	*res = T(f.out);
+	T(f.out) = 0;
+	S(f.out) = 0;
+    }
+    else {
+	 *res = 0;
+	 len = EOF;
+     }
+    ___mkd_freemmiot(&f, 0);
+    return len;
+}
+
+
+/* ___mkd_reparse() a line, writing it to a FILE
+ */
+int
+mkd_generateline(char *bfr, int size, FILE *output, int flags)
+{
+    MMIOT f;
+
+    mkd_parse_line(bfr, size, &f, flags);
+    if ( flags & CDATA_OUTPUT )
+	mkd_generatexml(T(f.out), S(f.out), output);
+    else
+	fwrite(T(f.out), S(f.out), 1, output);
+
+    ___mkd_freemmiot(&f, 0);
+    return 0;
+}

data/ext/mkdio.h

@@ -15,19 +15,15 @@ void mkd_basename(MMIOT*,char*);
 /* compilation, debugging, cleanup
  */
 int mkd_compile(MMIOT*, int);
-int mkd_generatehtml(MMIOT*,FILE*);
-int mkd_generatetoc(MMIOT*,FILE*);
-int mkd_xhtmlpage(MMIOT*,int,FILE*);
 int mkd_cleanup(MMIOT*);
 
 /* markup functions
  */
-int mkd_text(char *, int, FILE*, int);
-int mkd_style(MMIOT*, FILE*);
 int mkd_dump(MMIOT*, FILE*, int, char*);
 int markdown(MMIOT*, FILE*, int);
-void mkd_basename(MMIOT*,char*);
+int mkd_line(char *, int, char **, int);
 void mkd_string_to_anchor(char *, int, int (*)(int,void*), void*);
+int mkd_xhtmlpage(MMIOT*,int,FILE*);
 
 /* header block access
  */
@@ -38,6 +34,19 @@ char* mkd_doc_date(MMIOT*);
 /* compiled data access
  */
 int mkd_document(MMIOT*, char**);
+int mkd_toc(MMIOT*, char**);
+int mkd_css(MMIOT*, char **);
+int mkd_xml(char *, int, char **);
+
+/* write-to-file functions
+ */
+int mkd_generatehtml(MMIOT*,FILE*);
+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);
+#define mkd_text mkd_generateline
 
 /* version#.
  */
@@ -50,11 +59,15 @@ extern char markdown_version[];
 #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	/* don't expand `_` and `*` */
+#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_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_EMBED	MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT
 
 /* special flags for mkd_in() and mkd_string()

data/ext/resource.c

@@ -55,6 +55,17 @@ ___mkd_freeParagraph(Paragraph *p)
 }
 
 
+/* bye bye footnote.
+ */
+void
+___mkd_freefootnote(Footnote *f)
+{
+    DELETE(f->tag);
+    DELETE(f->link);
+    DELETE(f->title);
+}
+
+
 /* bye bye footnotes.
  */
 void
@@ -63,11 +74,8 @@ ___mkd_freefootnotes(MMIOT *f)
     int i;
 
     if ( f->footnotes ) {
-	for (i=0; i < S(*f->footnotes); i++) {
-	    DELETE(T(*f->footnotes)[i].tag);
-	    DELETE(T(*f->footnotes)[i].link);
-	    DELETE(T(*f->footnotes)[i].title);
-	}
+	for (i=0; i < S(*f->footnotes); i++)
+	    ___mkd_freefootnote( &T(*f->footnotes)[i] );
 	DELETE(*f->footnotes);
 	free(f->footnotes);
     }
@@ -145,25 +153,3 @@ 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;
-	}
-    }
-}

data/ext/toc.c

@@ -19,7 +19,7 @@
 int
 mkd_toc(Document *p, char **doc)
 {
-    Paragraph *pp;
+    Paragraph *tp, *srcp;
     int last_hnumber = 0;
     Cstring res;
     
@@ -31,27 +31,31 @@ mkd_toc(Document *p, char **doc)
     if ( !(p && p->ctx) ) return -1;
     if ( ! (p->ctx->flags & TOC) ) return 0;
 
-    for ( pp = p->code; pp ; pp = pp->next ) {
-        if ( pp->typ == HDR && pp->text ) {
+    for ( tp = p->code; tp ; tp = tp->next ) {
+	if ( tp->typ == SOURCE ) {
+	    for ( srcp = tp->down; srcp; srcp = srcp->next ) {
+		if ( srcp->typ == HDR && srcp->text ) {
 	    
-	    if ( last_hnumber == pp->hnumber )
-		Csprintf(&res,  "%*s</li>\n", pp->hnumber, "");
-	    else while ( last_hnumber > pp->hnumber ) {
-		Csprintf(&res, "%*s</li>\n%*s</ul>\n",
-				 last_hnumber, "",
-				 last_hnumber-1,"");
-		--last_hnumber;
-	    }
-	    
-	    while ( pp->hnumber > last_hnumber ) {
-		Csprintf(&res, "\n%*s<ul>\n", pp->hnumber, "");
-		++last_hnumber;
+		    if ( last_hnumber == srcp->hnumber )
+			Csprintf(&res,  "%*s</li>\n", srcp->hnumber, "");
+		    else while ( last_hnumber > srcp->hnumber ) {
+			Csprintf(&res, "%*s</li>\n%*s</ul>\n",
+					 last_hnumber, "",
+					 last_hnumber-1,"");
+			--last_hnumber;
+		    }
+
+		    while ( srcp->hnumber > last_hnumber ) {
+			Csprintf(&res, "\n%*s<ul>\n", srcp->hnumber, "");
+			++last_hnumber;
+		    }
+		    Csprintf(&res, "%*s<li><a href=\"#", srcp->hnumber, "");
+		    mkd_string_to_anchor(T(srcp->text->text), S(srcp->text->text), Csputc, &res);
+		    Csprintf(&res, "\">");
+		    Csreparse(&res, T(srcp->text->text), S(srcp->text->text), 0);
+		    Csprintf(&res, "</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>");
         }
     }
 

data/ext/xml.c

@@ -0,0 +1,82 @@
+/* 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 "config.h"
+
+#include "cstring.h"
+#include "markdown.h"
+#include "amalloc.h"
+
+/* return the xml version of a character
+ */
+static char *
+mkd_xmlchar(unsigned char c)
+{
+    switch (c) {
+    case '<':   return "&lt;";
+    case '>':   return "&gt;";
+    case '&':   return "&amp;";
+    case '"':   return "&quot;";
+    case '\'':  return "&apos;";
+    default:    if ( isascii(c) || (c & 0x80) )
+		    return 0;
+		return "";
+    }
+}
+
+
+/* write output in XML format
+ */
+int
+mkd_generatexml(char *p, int size, FILE *out)
+{
+    unsigned char c;
+    char *entity;
+
+    while ( size-- > 0 ) {
+	c = *p++;
+
+	if ( entity = mkd_xmlchar(c) )
+	    fputs(entity, out);
+	else
+	    fputc(c, out);
+    }
+    return 0;
+}
+
+
+/* build a xml'ed version of a string
+ */
+int
+mkd_xml(char *p, int size, char **res)
+{
+    unsigned char c;
+    char *entity;
+    Cstring f;
+
+    CREATE(f);
+    RESERVE(f, 100);
+
+    while ( size-- > 0 ) {
+	c = *p++;
+	if ( entity = mkd_xmlchar(c) )
+	    Cswrite(&f, entity, strlen(entity));
+	else
+	    Csputc(c, &f);
+    }
+			/* HACK ALERT! HACK ALERT! HACK ALERT! */
+    *res = T(f);	/* we know that a T(Cstring) is a character pointer */
+			/* so we can simply pick it up and carry it away, */
+    return S(f);	/* leaving the husk of the Ctring on the stack */
+			/* END HACK ALERT */
+}

data/lib/rdiscount.rb

@@ -4,7 +4,7 @@
 # and passes the Markdown 1.0 test suite. The RDiscount extension makes
 # the Discount processor available via a Ruby C Extension library.
 #
-# === Usage
+# == Usage
 #
 # RDiscount implements the basic protocol popularized by RedCloth and adopted
 # by BlueCloth:
@@ -12,7 +12,7 @@
 #   markdown = RDiscount.new("Hello World!")
 #   puts markdown.to_html
 #
-# === Replacing BlueCloth
+# == Replacing BlueCloth
 #
 # Inject RDiscount into your BlueCloth-using code by replacing your bluecloth
 # require statements with the following:

data/rdiscount.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '1.3.5'
+  s.version = '1.5.5'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  s.date = '2009-07-26'
+  s.date = '2009-11-13'
   s.email = 'r@tomayko.com'
   s.homepage = 'http://github.com/rtomayko/rdiscount'
   s.has_rdoc = true
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
     ext/Csio.c
     ext/amalloc.h
     ext/config.h
+    ext/css.c
     ext/cstring.h
     ext/docheader.c
     ext/dumptree.c
@@ -28,6 +29,7 @@ Gem::Specification.new do |s|
     ext/rdiscount.c
     ext/resource.c
     ext/toc.c
+    ext/xml.c
     lib/markdown.rb
     lib/rdiscount.rb
     rdiscount.gemspec