rdiscount 1.3.1.1 → 1.3.4

data/Rakefile

@@ -99,14 +99,17 @@ end
 desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0)'
 task 'test:conformance' => [:build] do |t|
   script = "#{pwd}/bin/rdiscount"
-  test_version = ENV['MARKDOWN_TEST_VER'] || '1.0'
+  test_version = ENV['MARKDOWN_TEST_VER'] || '1.0.3'
   chdir("test/MarkdownTest_#{test_version}") do
     sh "./MarkdownTest.pl --script='#{script}' --tidy"
   end
 end
 
 desc 'Run version 1.0 conformance suite'
-task 'test:conformance:1.0' => 'test:conformance'
+task 'test:conformance:1.0' => [:build] do |t|
+  ENV['MARKDOWN_TEST_VER'] = '1.0'
+  Rake::Task['test:conformance'].invoke
+end
 
 desc 'Run 1.0.3 conformance suite'
 task 'test:conformance:1.0.3' => [:build] do |t|
@@ -172,7 +175,7 @@ task :gather => 'discount' do |t|
   files =
     FileList[
       'discount/{markdown,mkdio,amalloc,cstring}.h',
-      'discount/{markdown,docheader,dumptree,generate,mkdio,resource}.c'
+      'discount/{markdown,docheader,dumptree,generate,mkdio,resource,toc,Csio}.c'
     ]
   cp files, 'ext/',
     :preserve => true,

data/ext/Csio.c

@@ -0,0 +1,49 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include "cstring.h"
+#include "markdown.h"
+#include "amalloc.h"
+
+
+/* putc() into a cstring
+ */
+void
+Csputc(int c, Cstring *iot)
+{
+    EXPAND(*iot) = c;
+}
+
+
+/* printf() into a cstring
+ */
+int
+Csprintf(Cstring *iot, char *fmt, ...)
+{
+    va_list ptr;
+    int siz=100;
+
+    do {
+	RESERVE(*iot, siz);
+	va_start(ptr, fmt);
+	siz = vsnprintf(T(*iot)+S(*iot), ALL(*iot)-S(*iot), fmt, ptr);
+	va_end(ptr);
+    } while ( siz > (ALL(*iot)-S(*iot)) );
+
+    S(*iot) += siz;
+    return siz;
+}
+
+
+/* reparse() into a cstring
+ */
+void
+Csreparse(Cstring *iot, char *buf, int size, int flags)
+{
+    MMIOT f;
+    ___mkd_initmmiot(&f, 0);
+    ___mkd_reparse(buf, size, 0, &f);
+    ___mkd_emblock(&f);
+    SUFFIX(*iot, T(f.out), S(f.out));
+    ___mkd_freemmiot(&f, 0);
+}

data/ext/cstring.h

@@ -50,6 +50,7 @@
  */
 #define T(x)		(x).text
 #define S(x)		(x).size
+#define ALL(x)		(x).alloc
 
 /* abstract anchor type that defines a list base
  * with a function that attaches an element to
@@ -65,4 +66,8 @@
 
 typedef STRING(char) Cstring;
 
+extern void Csputc(int, Cstring *);
+extern int Csprintf(Cstring *, char *, ...);
+extern void Csreparse(Cstring *, char *, int, int);
+
 #endif/*_CSTRING_D*/

data/ext/extconf.rb

@@ -4,11 +4,5 @@ dir_config('rdiscount')
 
 HAVE_RANDOM = have_func('random')
 HAVE_SRANDOM = have_func('srandom')
-HAVE_FUNOPEN = have_func('funopen')
-HAVE_FOPENCOOKIE = have_func('fopencookie')
-
-unless HAVE_FUNOPEN || HAVE_FOPENCOOKIE
-  fail "No funopen or fopencookie support available."
-end
 
 create_makefile('rdiscount')

data/ext/generate.c

@@ -277,10 +277,10 @@ emmatch(MMIOT *f, int go)
 }
 
 
-/* emblock()
+/* ___mkd_emblock()
  */
-static void
-emblock(MMIOT *f)
+void
+___mkd_emblock(MMIOT *f)
 {
     int i;
     block *p;
@@ -301,8 +301,8 @@ emblock(MMIOT *f)
 
 /* generate html from a markup fragment
  */
-static void
-reparse(char *bfr, int size, int flags, MMIOT *f)
+void
+___mkd_reparse(char *bfr, int size, int flags, MMIOT *f)
 {
     MMIOT sub;
 
@@ -316,7 +316,7 @@ reparse(char *bfr, int size, int flags, MMIOT *f)
     S(sub.in)--;
     
     text(&sub);
-    emblock(&sub);
+    ___mkd_emblock(&sub);
     
     Qwrite(T(sub.out), S(sub.out), f);
 
@@ -497,12 +497,14 @@ linkykey(int image, Footnote *val, MMIOT *f)
 {
     Footnote *ret;
     Cstring mylabel;
+    int here;
 
     memset(val, 0, sizeof *val);
 
     if ( (T(val->tag) = linkylabel(f, &S(val->tag))) == 0 )
 	return 0;
 
+    here = mmiottell(f);
     eatspace(f);
     switch ( pull(f) ) {
     case '(':
@@ -517,14 +519,21 @@ linkykey(int image, Footnote *val, MMIOT *f)
 
 	return peek(f,0) == ')';
 
-    case '[':
+    case '[':		/* footnote links /as defined in the standard/ */
+    default:		/* footnote links -- undocumented extension */
 	/* footnote link */
 	mylabel = val->tag;
-	if ( (T(val->tag) = linkylabel(f, &S(val->tag))) == 0 )
-	    return 0;
+	if ( peek(f,0) == '[' ) {
+	    if ( (T(val->tag) = linkylabel(f, &S(val->tag))) == 0 )
+		return 0;
 
-	if ( !S(val->tag) )
-	    val->tag = mylabel;
+	    if ( !S(val->tag) )
+		val->tag = mylabel;
+	}
+	else if ( f->flags & MKD_1_COMPAT )
+	    break;
+	else
+	    mmiotseek(f,here);
 
 	ret = bsearch(val, T(*f->footnotes), S(*f->footnotes),
 	               sizeof *val, (stfu)__mkd_footsort);
@@ -633,12 +642,12 @@ linkylinky(int image, MMIOT *f)
 
 	if ( S(link.title) ) {
 	    Qstring(" title=\"", f);
-	    reparse(T(link.title), S(link.title), INSIDE_TAG, f);
+	    ___mkd_reparse(T(link.title), S(link.title), INSIDE_TAG, f);
 	    Qchar('"', f);
 	}
 
 	Qstring(tag->text_pfx, f);
-	reparse(T(link.tag), S(link.tag), tag->flags, f);
+	___mkd_reparse(T(link.tag), S(link.tag), tag->flags, f);
 	Qstring(tag->text_sfx, f);
     }
     else
@@ -885,7 +894,7 @@ smartypants(int c, int *flags, MMIOT *f)
 			    break;
 			else if ( c == '\'' && peek(f, j+1) == '\'' ) {
 			    Qstring("“", f);
-			    reparse(cursor(f)+1, j-2, 0, f);
+			    ___mkd_reparse(cursor(f)+1, j-2, 0, f);
 			    Qstring("”", f);
 			    shift(f,j+1);
 			    return 1;
@@ -951,7 +960,7 @@ text(MMIOT *f)
 			    ++len;
 			}
 			shift(f,len);
-			reparse(sup, len, 0, f);
+			___mkd_reparse(sup, len, 0, f);
 			Qstring("</sup>", f);
 		    }
 		    break;
@@ -1134,6 +1143,7 @@ printblock(Paragraph *pp, MMIOT *f)
 		push("<br/>\n", 6, f);
 	    }
 	    else {
+		___mkd_tidy(t);
 		push(T(t->text), S(t->text), f);
 		if ( t->next )
 		    push("\n", 1, f);
@@ -1191,19 +1201,19 @@ printhtml(Line *t, MMIOT *f)
 static void
 htmlify(Paragraph *p, char *block, char *arguments, MMIOT *f)
 {
-    emblock(f);
+    ___mkd_emblock(f);
     if ( block )
 	Qprintf(f, arguments ? "<%s %s>" : "<%s>", block, arguments);
-    emblock(f);
+    ___mkd_emblock(f);
 
     while (( p = display(p, f) )) {
-	emblock(f);
+	___mkd_emblock(f);
 	Qstring("\n\n", f);
     }
 
     if ( block )
 	 Qprintf(f, "</%s>", block);
-    emblock(f);
+    ___mkd_emblock(f);
 }
 
 
@@ -1219,7 +1229,7 @@ definitionlist(Paragraph *p, MMIOT *f)
 	for ( ; p ; p = p->next) {
 	    for ( tag = p->text; tag; tag = tag->next ) {
 		Qstring("<dt>", f);
-		reparse(T(tag->text), S(tag->text), 0, f);
+		___mkd_reparse(T(tag->text), S(tag->text), 0, f);
 		Qstring("</dt>\n", f);
 	    }
 
@@ -1345,7 +1355,7 @@ mkd_document(Document *p, char **res)
 }
 
 
-/*  public interface for reparse()
+/*  public interface for ___mkd_reparse()
  */
 int
 mkd_text(char *bfr, int size, FILE *output, int flags)
@@ -1355,8 +1365,8 @@ mkd_text(char *bfr, int size, FILE *output, int flags)
     ___mkd_initmmiot(&f, 0);
     f.flags = flags & USER_FLAGS;
     
-    reparse(bfr, size, 0, &f);
-    emblock(&f);
+    ___mkd_reparse(bfr, size, 0, &f);
+    ___mkd_emblock(&f);
     if ( flags & CDATA_OUTPUT )
 	___mkd_xml(T(f.out), S(f.out), output);
     else

data/ext/markdown.c

@@ -124,6 +124,14 @@ skipempty(Line *p)
 }
 
 
+void
+___mkd_tidy(Line *t)
+{
+    while ( S(t->text) && isspace(T(t->text)[S(t->text)-1]) )
+	--S(t->text);
+}
+
+
 static char *
 isopentag(Line *p)
 {
@@ -434,12 +442,6 @@ codeblock(Paragraph *p)
 {
     Line *t = p->text, *r;
 
-    /* HORRIBLE STANDARDS KLUDGE: the first line of every block
-     * has trailing whitespace trimmed off.
-     */
-    while ( S(t->text) && isspace(T(t->text)[S(t->text)-1]) )
-	--S(t->text);
-
     for ( ; t; t = r ) {
 	CLIP(t->text,0,4);
 	t->dle = mkd_firstnonblank(t);
@@ -492,12 +494,13 @@ textblock(Paragraph *p, int toplevel)
 {
     Line *t, *next;
 
-    for ( t = p->text; t ; t = next )
+    for ( t = p->text; t ; t = next ) {
 	if ( ((next = t->next) == 0) || endoftextblock(next, toplevel) ) {
 	    p->align = centered(p->text, t);
 	    t->next = 0;
 	    return next;
 	}
+    }
     return t;
 }
 
@@ -833,6 +836,14 @@ compile(Line *ptr, int toplevel, MMIOT *f)
 	}
 	else 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);
+	    }
+	    
 	    ptr = codeblock(p);
 	}
 	else if ( ishr(ptr) ) {

data/ext/markdown.h

@@ -74,6 +74,7 @@ typedef struct mmiot {
 #define NO_PSEUDO_PROTO	0x0040
 #define CDATA_OUTPUT	0x0080
 #define TOC		0x1000
+#define MKD_1_COMPAT	0x2000
 #define USER_FLAGS	0xF0FF
 #define EMBEDDED	DENY_A|DENY_IMG|NO_PSEUDO_PROTO|CDATA_OUTPUT
     char *base;
@@ -127,5 +128,8 @@ extern void ___mkd_initmmiot(MMIOT *, void *);
 extern void ___mkd_freemmiot(MMIOT *, void *);
 extern void ___mkd_freeLineRange(Line *, Line *);
 extern void ___mkd_xml(char *, int, FILE *);
+extern void ___mkd_reparse(char *, int, int, MMIOT*);
+extern void ___mkd_emblock(MMIOT*);
+extern void ___mkd_tidy(Line *);
 
 #endif/*_MARKDOWN_D*/

data/ext/mkdio.h

@@ -54,6 +54,7 @@ extern char markdown_version[];
 #define MKD_NO_EXT	0x0040	/* don't allow pseudo-protocols */
 #define MKD_CDATA	0x0080	/* generate code for xml ![CDATA[...]] */
 #define MKD_TOC		0x1000	/* do table-of-contents processing */
+#define MKD_1_COMPAT	0x2000	/* compatability with MarkdownTest_1.0 */
 #define MKD_EMBED	MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT
 
 /* special flags for mkd_in() and mkd_string()

data/ext/rdiscount.c

@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include "ruby.h"
 #include "mkdio.h"
-#include "rbstrio.h"
 
 static VALUE rb_cRDiscount;
 
@@ -9,19 +8,25 @@ static VALUE
 rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
 {
     /* grab char pointer to markdown input text */
+    char *res;
+    int szres;
     VALUE text = rb_funcall(self, rb_intern("text"), 0);
+    VALUE buf = rb_str_buf_new(1024);
     Check_Type(text, T_STRING);
 
-    /* allocate a ruby string buffer and wrap it in a stream */
-    VALUE buf = rb_str_buf_new(4096);
-    FILE *stream = rb_str_io_new(buf);
-
     int flags = rb_rdiscount__get_flags(self);
 
     MMIOT *doc = mkd_string(RSTRING_PTR(text), RSTRING_LEN(text), flags);
-    markdown(doc, stream, flags);
 
-    fclose(stream);
+    if ( mkd_compile(doc, flags) ) {
+        szres = mkd_document(doc, &res);
+
+        if ( szres != EOF ) {
+            rb_str_cat(buf, res, szres);
+            rb_str_cat(buf, "\n", 1);
+        }
+    }
+    mkd_cleanup(doc);
 
     return buf;
 }
@@ -29,6 +34,9 @@ rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
 static VALUE
 rb_rdiscount_toc_content(int argc, VALUE *argv, VALUE self)
 {
+    char *res;
+    int szres;
+
     int flags = rb_rdiscount__get_flags(self);
 
     /* grab char pointer to markdown input text */
@@ -37,13 +45,18 @@ rb_rdiscount_toc_content(int argc, VALUE *argv, VALUE self)
 
     /* allocate a ruby string buffer and wrap it in a stream */
     VALUE buf = rb_str_buf_new(4096);
-    FILE *stream = rb_str_io_new(buf);
 
     MMIOT *doc = mkd_string(RSTRING_PTR(text), RSTRING_LEN(text), flags);
-    mkd_compile(doc, flags);
-    mkd_generatetoc(doc, stream);
 
-    fclose(stream);
+    if ( mkd_compile(doc, flags) ) {
+        szres = mkd_toc(doc, &res);
+
+        if ( szres != EOF ) {
+            rb_str_cat(buf, res, szres);
+            rb_str_cat(buf, "\n", 1);
+        }
+    }
+    mkd_cleanup(doc);
 
     return buf;
 }

data/ext/toc.c

@@ -17,12 +17,16 @@
 /* write an header index
  */
 int
-mkd_generatetoc(Document *p, FILE *output)
+mkd_toc(Document *p, char **doc)
 {
     Paragraph *pp;
+    int last_hnumber = 0;
+    Cstring res;
+    
+    CREATE(res);
+    RESERVE(res, 100);
 
-    int last_hnumber = 0,
-	first_hnumber = 0;
+    *doc = 0;
 
     if ( !(p && p->ctx) ) return -1;
     if ( ! (p->ctx->flags & TOC) ) return 0;
@@ -31,32 +35,52 @@ mkd_generatetoc(Document *p, FILE *output)
         if ( pp->typ == HDR && pp->text ) {
 	    
 	    if ( last_hnumber == pp->hnumber )
-		fprintf(output, "%*s</li>\n", pp->hnumber, "");
+		Csprintf(&res,  "%*s</li>\n", pp->hnumber, "");
 	    else while ( last_hnumber > pp->hnumber ) {
-		fprintf(output, "%*s</li>\n%*s</ul>\n",
+		Csprintf(&res, "%*s</li>\n%*s</ul>\n",
 				 last_hnumber, "",
 				 last_hnumber-1,"");
 		--last_hnumber;
 	    }
 	    
 	    while ( pp->hnumber > last_hnumber ) {
-		fprintf(output, "\n%*s<ul>\n", pp->hnumber, "");
+		Csprintf(&res, "\n%*s<ul>\n", pp->hnumber, "");
 		++last_hnumber;
 	    }
-	    fprintf(output, "%*s<li><a href=\"#", pp->hnumber, "");
-	    mkd_string_to_anchor(T(pp->text->text), S(pp->text->text), putc, output);
-	    fprintf(output, "\">");
-	    mkd_text(T(pp->text->text), S(pp->text->text), output, 0);
-	    fprintf(output, "</a>");
+	    Csprintf(&res, "%*s<li><a href=\"#", pp->hnumber, "");
+	    mkd_string_to_anchor(T(pp->text->text), S(pp->text->text), Csputc, &res);
+	    Csprintf(&res, "\">");
+	    Csreparse(&res, T(pp->text->text), S(pp->text->text), 0);
+	    Csprintf(&res, "</a>");
         }
     }
 
     while ( last_hnumber > 0 ) {
-        fprintf(output, "%*s</li>\n%*s</ul>\n",
+	Csprintf(&res, "%*s</li>\n%*s</ul>\n",
 			last_hnumber, "", last_hnumber, "");
 	--last_hnumber;
     }
-
-    return 0;
+			/* HACK ALERT! HACK ALERT! HACK ALERT! */
+    *doc = T(res);	/* we know that a T(Cstring) is a character pointer */
+			/* so we can simply pick it up and carry it away, */
+    return S(res);	/* leaving the husk of the Ctring on the stack */
+			/* END HACK ALERT */
 }
 
+
+/* write an header index
+ */
+int
+mkd_generatetoc(Document *p, FILE *out)
+{
+    char *buf = 0;
+    int sz = mkd_toc(p, &buf);
+    int ret = EOF;
+
+    if ( sz > 0 )
+	ret = fwrite(buf, sz, 1, out);
+
+    if ( buf ) free(buf);
+
+    return ret;
+}

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '1.3.1.1'
+  VERSION = '1.3.4'
 
   # Original Markdown formatted text.
   attr_reader :text

data/rdiscount.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '1.3.1.1'
+  s.version = '1.3.4'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  s.date = '2009-01-31'
+  s.date = '2009-03-04'
   s.email = 'r@tomayko.com'
   s.homepage = 'http://github.com/rtomayko/rdiscount'
   s.has_rdoc = true
@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
     README.markdown
     Rakefile
     bin/rdiscount
+    ext/Csio.c
     ext/amalloc.h
     ext/config.h
     ext/cstring.h
@@ -24,8 +25,6 @@ Gem::Specification.new do |s|
     ext/markdown.h
     ext/mkdio.c
     ext/mkdio.h
-    ext/rbstrio.c
-    ext/rbstrio.h
     ext/rdiscount.c
     ext/resource.c
     ext/toc.c

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdiscount
 version: !ruby/object:Gem::Version 
-  version: 1.3.1.1
+  version: 1.3.4
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-31 00:00:00 -08:00
+date: 2009-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ files:
 - README.markdown
 - Rakefile
 - bin/rdiscount
+- ext/Csio.c
 - ext/amalloc.h
 - ext/config.h
 - ext/cstring.h
@@ -38,8 +39,6 @@ files:
 - ext/markdown.h
 - ext/mkdio.c
 - ext/mkdio.h
-- ext/rbstrio.c
-- ext/rbstrio.h
 - ext/rdiscount.c
 - ext/resource.c
 - ext/toc.c

data/ext/rbstrio.c

@@ -1,48 +0,0 @@
-#if defined(HAVE_FOPENCOOKIE)
-#    define _GNU_SOURCE
-#endif
-
-#include <stdlib.h>
-#include "rbstrio.h"
-
-#define INCREMENT 1024
-
-/* called when data is written to the stream. */
-static int rb_str_io_write(void *cookie, const char *data, int len) {
-    VALUE buf = (VALUE)cookie;
-    rb_str_cat(buf, data, len);
-    return len;
-}
-
-/* called when the stream is closed */
-static int rb_str_io_close(void *cookie) {
-    VALUE buf = (VALUE)cookie;
-    rb_gc_unregister_address(&buf);
-    return 0;
-}
-
-#if defined(HAVE_FOPENCOOKIE)
-cookie_io_functions_t rb_str_io_functions =
-{
-    (cookie_read_function_t*)NULL,
-    (cookie_write_function_t*)rb_str_io_write,
-    (cookie_seek_function_t*)NULL,
-    (cookie_close_function_t*)rb_str_io_close
-};
-#endif
-
-/* create a stream backed by a Ruby string. */
-FILE *rb_str_io_new(VALUE buf) {
-    FILE *rv;
-    Check_Type(buf, T_STRING);
-#if defined(HAVE_FOPENCOOKIE)
-    rv = fopencookie((void*)buf, "w", rb_str_io_functions);
-#else
-    rv = funopen((void*)buf, NULL, rb_str_io_write, NULL, rb_str_io_close);
-#endif
-    /* TODO if (rv == NULL) */
-    rb_gc_register_address(&buf);
-    return rv;
-}
-
-/* vim: set ts=4 sw=4: */

data/ext/rbstrio.h

@@ -1,4 +0,0 @@
-#include <stdio.h>
-#include "ruby.h"
-
-FILE *rb_str_io_new(VALUE buf);