bluecloth 2.0.11 → 2.1.0

data/Rakefile

@@ -52,8 +52,6 @@ hoespec = Hoe.spec 'bluecloth' do
 	self.require_ruby_version( '>=1.8.7' )
 
 	self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= )
-	self.yard_opts = [ '--protected', '--verbose' ] if self.respond_to?( :yard_opts= )
-
 	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
 end
 

data/ext/VERSION

@@ -1 +1 @@
-2.0.5
+2.0.8

data/ext/bluecloth.c

@@ -1,6 +1,6 @@
 /* 
  * BlueCloth -- a Ruby implementation of Markdown
- * $Id: bluecloth.c,v a12b01a92197 2011/01/17 17:13:22 ged $
+ * $Id: bluecloth.c,v 463bb88e4d08 2011/03/12 17:58:01 ged $
  * 
  * = Authors
  * 
@@ -333,7 +333,7 @@ void Init_bluecloth_ext( void ) {
 	mkd_initialize();
 
 	rb_define_alloc_func( bluecloth_cBlueCloth, bluecloth_s_allocate );
-	rb_define_singleton_method( bluecloth_cBlueCloth, "discount_version", 
+	rb_define_singleton_method( bluecloth_cBlueCloth, "discount_version",
 		bluecloth_s_discount_version, 0 );
 
 	rb_define_method( bluecloth_cBlueCloth, "initialize", bluecloth_initialize, -1 );
@@ -417,6 +417,9 @@ void Init_bluecloth_ext( void ) {
 	/* Forbid definition lists */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_NODLIST", INT2FIX(MKD_NODLIST) );
 
+	/* Markdown-extra Footnotes */
+	rb_define_const( bluecloth_cBlueCloth, "MKD_EXTRA_FOOTNOTE", INT2FIX(MKD_EXTRA_FOOTNOTE) );
+
 
 	/* Make sure the Ruby side is loaded */
 	rb_require( "bluecloth" );

data/ext/config.h

@@ -61,6 +61,8 @@
 #define DL_TAG_EXTENSION 1
 #define PANDOC_HEADER 1
 #define ALPHA_LIST 1
+#define USE_DISCOUNT_DL 1
+#define USE_EXTRA_DL 1
 
 #endif /* end of include guard: CONFIG_H_RZLE3ADO */
 

data/ext/extconf.rb

@@ -24,7 +24,6 @@ if ENV['MAINTAINER_MODE']
 	$CFLAGS << ' -ggdb' << ' -DDEBUG'
 end
 
-
 # Stuff from configure.sh
 have_func( "srand" ) || have_func( "srandom" )
 have_func( "random" ) || have_func( "rand" )

data/ext/generate.c

@@ -191,6 +191,7 @@ ___mkd_reparse(char *bfr, int size, int flags, MMIOT *f)
     
     sub.flags = f->flags | flags;
     sub.cb = f->cb;
+    sub.ref_prefix = f->ref_prefix;
 
     push(bfr, size, &sub);
     EXPAND(sub.in) = 0;
@@ -564,6 +565,38 @@ printlinkyref(MMIOT *f, linkytype *tag, char *link, int size)
 } /* 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
@@ -628,6 +661,7 @@ linkylinky(int image, MMIOT *f)
     Footnote key, *ref;
 		
     int status = 0;
+    int extra_footnote = 0;
 
     CREATE(name);
     memset(&key, 0, sizeof key);
@@ -654,6 +688,9 @@ linkylinky(int image, MMIOT *f)
 		 */
 		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 ) {
@@ -664,8 +701,12 @@ linkylinky(int image, MMIOT *f)
 		}
 
 		if ( ref = bsearch(&key, T(*f->footnotes), S(*f->footnotes),
-					  sizeof key, (stfu)__mkd_footsort) )
-		    status = linkyformat(f, name, image, ref);
+					  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);
 	    }
@@ -922,7 +963,11 @@ maybe_tag_or_link(MMIOT *f)
 	}
 	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;
     }
 
@@ -1270,6 +1315,15 @@ text(MMIOT *f)
 				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 '_':
@@ -1312,12 +1366,26 @@ text(MMIOT *f)
 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), Qchar, f, 1);
+	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);
@@ -1344,8 +1412,11 @@ splat(Line *p, char *block, Istring align, int force, MMIOT *f)
 	if ( force && (colno >= S(align)-1) )
 	    idx = S(p->text);
 	else
-	    while ( (idx < S(p->text)) && (T(p->text)[idx] != '|') )
+	    while ( (idx < S(p->text)) && (T(p->text)[idx] != '|') ) {
+		if ( T(p->text)[idx] == '\\' )
+		    ++idx;
 		++idx;
+	    }
 
 	Qprintf(f, "<%s%s>",
 		   block,
@@ -1393,7 +1464,9 @@ printtable(Paragraph *pp, MMIOT *f)
 	
 	last=first=0;
 	for (end=start ; (end < S(dash->text)) && p[end] != '|'; ++ end ) {
-	    if ( !isspace(p[end]) ) {
+	    if ( p[end] == '\\' )
+		++ end;
+	    else if ( !isspace(p[end]) ) {
 		if ( !first) first = p[end];
 		last = p[end];
 	    }
@@ -1615,6 +1688,36 @@ display(Paragraph *p, MMIOT *f)
 }
 
 
+/* 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.
  */
@@ -1626,6 +1729,8 @@ mkd_document(Document *p, char **res)
     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;
 	}
 

data/ext/markdown.c

@@ -270,25 +270,35 @@ static int
 istable(Line *t)
 {
     char *p;
-    Line *dashes = t->next;
-    int contains = 0;	/* found character bits; 0x01 is |, 0x02 is - */
+    Line *dashes, *body;
+    int l;
+    int dashed = 0;
     
-    /* two lines, first must contain | */
-    if ( !(dashes && memchr(T(t->text), '|', S(t->text))) )
+    /* three lines, first must contain |,
+		    second must be ---|---,
+		    third must contain |
+     */
+    if ( !(t->flags & PIPECHAR) )
+	return 0;
+	
+    dashes = t->next;
+    if ( !(dashes && (dashes->flags & PIPECHAR)) )
+	return 0;
+
+    body = dashes->next;
+    if ( !(body && (body->flags & PIPECHAR)) )
 	return 0;
 
     /* second line must contain - or | and nothing
      * else except for whitespace or :
      */
-    for ( p = T(dashes->text)+S(dashes->text)-1; p >= T(dashes->text); --p)
-	if ( *p == '|' )
-	    contains |= 0x01;
-	else if ( *p == '-' )
-	    contains |= 0x02;
-	else if ( ! ((*p == ':') || isspace(*p)) )
+    for ( p = T(dashes->text), l = S(dashes->text); l > 0; ++p, --l)
+	if ( *p == '-' )
+	    dashed = 1;
+	else if ( ! ((*p == '|') || (*p == ':') || isspace(*p)) )
 	    return 0;
 
-    return (contains & 0x03);
+    return dashed;
 }
 
 
@@ -770,7 +780,7 @@ tableblock(Paragraph *p)
     Line *t, *q;
 
     for ( t = p->text; t && (q = t->next); t = t->next ) {
-	if ( !memchr(T(q->text), '|', S(q->text)) ) {
+	if ( !(t->flags & PIPECHAR) ) {
 	    t->next = 0;
 	    return q;
 	}
@@ -957,7 +967,7 @@ addfootnote(Line *p, MMIOT* f)
     CREATE(foot->tag);
     CREATE(foot->link);
     CREATE(foot->title);
-    foot->height = foot->width = 0;
+    foot->flags = foot->height = foot->width = 0;
 
     for (j=i=p->dle+1; T(p->text)[j] != ']'; j++)
 	EXPAND(foot->tag) = T(p->text)[j];
@@ -966,6 +976,12 @@ addfootnote(Line *p, MMIOT* f)
     S(foot->tag)--;
     j = nextnonblank(p, j+2);
 
+    if ( (f->flags & MKD_EXTRA_FOOTNOTE) && (T(foot->tag)[0] == '^') ) {
+	while ( j < S(p->text) )
+	    EXPAND(foot->title) = T(p->text)[j++];
+	goto skip_to_end;
+    }
+
     while ( (j < S(p->text)) && !isspace(T(p->text)[j]) )
 	EXPAND(foot->link) = T(p->text)[j++];
     EXPAND(foot->link) = 0;
@@ -1005,6 +1021,7 @@ addfootnote(Line *p, MMIOT* f)
 	--S(foot->title);
     }
 
+skip_to_end:
     ___mkd_freeLine(p);
     return np;
 }
@@ -1201,6 +1218,7 @@ mkd_compile(Document *doc, DWORD flags)
 
     doc->compiled = 1;
     memset(doc->ctx, 0, sizeof(MMIOT) );
+    doc->ctx->ref_prefix= doc->ref_prefix;
     doc->ctx->cb        = &(doc->cb);
     doc->ctx->flags     = flags & USER_FLAGS;
     CREATE(doc->ctx->in);

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,
@@ -22,7 +26,9 @@ typedef struct footnote {
 typedef struct line {
     Cstring text;
     struct line *next;
-    int dle;
+    int dle;			/* leading indent on the line */
+    int flags;			/* special attributes for this line */
+#define PIPECHAR	0x01		/* line contains a | */
 } Line;
 
 
@@ -75,6 +81,8 @@ typedef struct mmiot {
     Cstring in;
     Qblock Q;
     int isp;
+    int reference;
+    char *ref_prefix;
     STRING(Footnote) *footnotes;
     DWORD flags;
 #define MKD_NOLINKS	0x00000001
@@ -98,6 +106,7 @@ typedef struct mmiot {
 #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)
@@ -124,6 +133,7 @@ typedef struct document {
     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;
@@ -143,14 +153,18 @@ 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*, 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);
+extern Document *mkd_string(const char*,int, DWORD);
 
 extern void mkd_initialize();
 extern void mkd_shlib_destructor();
 
+extern void mkd_ref_prefix(Document*, char*);
+
 /* internal resource handling functions.
  */
 extern void ___mkd_freeLine(Line *);

data/ext/mkdio.c

@@ -34,7 +34,8 @@ new_Document()
 }
 
 
-/* add a line to the markdown input chain
+/* add a line to the markdown input chain, expanding tabs and
+ * noting the presence of special characters as we go.
  */
 static void
 queue(Document* a, Cstring *line)
@@ -60,6 +61,8 @@ queue(Document* a, Cstring *line)
 	    } while ( ++xp % a->tabstop );
 	}
 	else if ( c >= ' ' ) {
+	    if ( c == '|' )
+		p->flags |= PIPECHAR;
 	    EXPAND(p->text) = c;
 	    ++xp;
 	}
@@ -148,7 +151,7 @@ mkd_in(FILE *f, DWORD flags)
 /* return a single character out of a buffer
  */
 struct string_ctx {
-    char *data;		/* the unread data */
+    const char *data;	/* the unread data */
     int   size;		/* and how much is there? */
 } ;
 
@@ -167,7 +170,7 @@ strget(struct string_ctx *in)
 /* convert a block of text into a linked list
  */
 Document *
-mkd_string(char *buf, int len, DWORD flags)
+mkd_string(const char *buf, int len, DWORD flags)
 {
     struct string_ctx about;
 
@@ -215,7 +218,7 @@ 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*),
+mkd_string_to_anchor(char *s, int len, mkd_sta_function_t outchar,
 				       void *out, int labelformat)
 {
     unsigned char c;
@@ -233,7 +236,7 @@ mkd_string_to_anchor(char *s, int len, void(*outchar)(int,void*),
 	    if ( isalnum(c) || (c == '_') || (c == ':') || (c == '-') || (c == '.' ) )
 		(*outchar)(c, out);
 	    else
-		(*outchar)('.',out);
+		(*outchar)('.', out);
 	}
 	else
 	    (*outchar)(c,out);
@@ -342,3 +345,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

@@ -10,11 +10,12 @@ typedef unsigned int mkd_flag_t;
 /* line builder for markdown()
  */
 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 */
+MMIOT *mkd_string(const 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
@@ -27,7 +28,8 @@ int mkd_cleanup(MMIOT*);
 int mkd_dump(MMIOT*, FILE*, int, char*);
 int markdown(MMIOT*, FILE*, mkd_flag_t);
 int mkd_line(char *, int, char **, mkd_flag_t);
-void mkd_string_to_anchor(char *, int, int (*)(int,void*), void*, int);
+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
@@ -66,6 +68,11 @@ 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()
  */
@@ -91,6 +98,7 @@ extern char markdown_version[];
 #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()

data/ext/version.c

@@ -1,28 +1,27 @@
 #include "config.h"
 
 char markdown_version[] = VERSION
-#if DL_TAG_EXTENSION
-		" DL_TAG"
-#endif
-#if PANDOC_HEADER
-		" HEADER"
-#endif
 #if 4 != 4
 		" TAB=4"
 #endif
 #if USE_AMALLOC
 		" DEBUG"
 #endif
-#if SUPERSCRIPT
-		" SUPERSCRIPT"
-#endif
-#if RELAXED_EMPHASIS
-		" RELAXED"
-#endif
-#if DIV_QUOTE
-		" DIV"
-#endif
-#if ALPHA_LIST
-		" AL"
+#if USE_DISCOUNT_DL
+# if USE_EXTRA_DL
+		" DL=BOTH"
+# else
+		" DL=DISCOUNT"
+# endif
+#elif USE_EXTRA_DL
+		" DL=EXTRA"
+#else
+		" DL=NONE"
+#endif
+#if WITH_ID_ANCHOR
+		" ID-ANCHOR"
+#endif
+#if WITH_GITHUB_TAGS
+		" GITHUB-TAGS"
 #endif
 		;

data/lib/bluecloth.rb

@@ -18,18 +18,49 @@
 # 
 # == Version
 #
-#  $Id: bluecloth.rb,v 20ece393cda0 2011/02/10 01:37:48 ged $
+# 2.1.0
+#
+# == Revision
 # 
+# $Revision: 463bb88e4d08 $
+#
 # == License
-# 
-# :include: LICENSE
-#--
-# Please see the LICENSE file included in the distribution for copyright and licensing details.
-# 
+#
+# Copyright (c) 2004-2011, Michael Granger
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# * Neither the name of the author/s, nor the names of the project's
+#   contributors may be used to endorse or promote products derived from this
+#   software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
 class BlueCloth
 
 	# Release Version
-	VERSION = '2.0.11'
+	VERSION = '2.1.0'
+
+	# Version control revision
+	REVISION = %q$Revision: 463bb88e4d08 $
 
 	# The defaults for all supported options.
 	DEFAULT_OPTIONS = {
@@ -54,6 +85,7 @@ class BlueCloth
 		:tables           => false,
 		:tagtext_mode     => false,
 		:xml_cdata        => false,
+		:footnotes        => false,
 	}.freeze
 
 	# The number of characters of the original markdown source to include in the 
@@ -103,6 +135,7 @@ class BlueCloth
 		if ! opthash[:divquotes]        then flags |= MKD_NODIVQUOTE;      end
 		if ! opthash[:alphalists]       then flags |= MKD_NOALPHALIST;     end
 		if ! opthash[:definition_lists] then flags |= MKD_NODLIST;         end
+		if   opthash[:footnotes]        then flags |= MKD_EXTRA_FOOTNOTE;  end
 
 		return flags
 	end
@@ -134,6 +167,7 @@ class BlueCloth
 		if !( flags & MKD_NODIVQUOTE      ).nonzero? then opthash[:divquotes]        = true; end
 		if !( flags & MKD_NOALPHALIST     ).nonzero? then opthash[:alphalists]       = true; end
 		if !( flags & MKD_NODLIST         ).nonzero? then opthash[:definition_lists] = true; end
+		if  ( flags & MKD_EXTRA_FOOTNOTE  ).nonzero? then opthash[:footnotes]        = true; end
 
 		return opthash
 	end
@@ -155,25 +189,6 @@ class BlueCloth
 		]
 	end
 
-
-	### Backward-compatible method: return +true+ if the object's :escape_html option was
-	### set.
-	def filter_html
-		return self.options[:escape_html]
-	end
-
-
-	### Backward-compatible method: raises an appropriate error notifying the user that
-	### BlueCloth2 doesn't support this option.
-	def filter_html=( arg )
-		raise NotImplementedError,
-			"Sorry, this version of BlueCloth no longer supports toggling of HTML filtering" +
-			"via #filter_html=. You now must create the BlueCloth object with the :escape_html" +
-			"option set to true instead."
-	end
-
-
-
 end # class BlueCloth
 
 begin

data/spec/bluecloth/entities_spec.rb

@@ -4,10 +4,10 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	
+
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
-	
+
 	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
@@ -57,6 +57,24 @@ describe BlueCloth, "document with entities" do
 		---
 	end
 
+	it "handles a mix of entities in code spans and not in code spans (issue #73)" do
+		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
+		# HTML Text is Unicode #
+
+		* You can either use character entities or character codes for foreign language characters and symbols:
+		* ``&eacute;`` or ``&#233;`` is e-acute (&eacute;)
+		* ``&copy;`` or ``&#169;`` is the copyright symbol &copy;
+		---
+		<h1>HTML Text is Unicode</h1>
+
+		<ul>
+		<li>You can either use character entities or character codes for foreign language characters and symbols:</li>
+		<li><code>&amp;eacute;</code> or <code>&amp;#233;</code> is e-acute (&eacute;)</li>
+		<li><code>&amp;copy;</code> or <code>&amp;#169;</code> is the copyright symbol &copy;</li>
+		</ul>
+		---
+	end
+
 end
 
 

data/spec/bluecloth_spec.rb

@@ -43,7 +43,7 @@ describe BlueCloth do
 	end
 
 	it "knows what version of Discount was used to build it" do
-		BlueCloth.discount_version.should =~ /^\d+\.\d+\.\d+.*RELAXED/
+		BlueCloth.discount_version.should =~ /^\d+\.\d+\.\d+.*DL=BOTH/
 	end
 
 	it "can build a flags bitmask out of an options hash" do

data/spec/contributions_spec.rb

@@ -3,10 +3,10 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent
-	
+
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
-	
+
 	$LOAD_PATH.unshift( basedir ) unless $LOAD_PATH.include?( basedir )
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
@@ -44,23 +44,16 @@ describe BlueCloth, "contributed features: " do
 		### Test the :filter_html restriction
 		it "can be configured with html filtering when created" do
 			bc = BlueCloth.new( 'foo', :filter_html )
-			bc.filter_html.should be_true()
+			bc.options.should include( :escape_html )
 		end
-	
-	
+
+
 		it "can be configured with html filtering (via an Array of options) when created" do
 			bc = BlueCloth.new( 'foo', [:filter_html] )
-			bc.filter_html.should be_true()
+			bc.options.should include( :escape_html )
 		end
-	
-	
-		it "raises an appropriate error when #filter_html= is called" do
-			lambda {
-				BlueCloth.new( 'foo' ).filter_html = true
-			}.should raise_error( NotImplementedError, /sorry/i )
-		end
-	
-	
+
+
 		it "can escape any existing HTML in the input if configured to do so" do
 			the_markdown( DANGEROUS_HTML, :filter_html ).
 				should be_transformed_into( DANGEROUS_HTML_OUTPUT )

data/spec/discount_spec.rb

@@ -217,6 +217,208 @@ describe BlueCloth, "implementation of Discount-specific features" do
 
 	end
 
+
+	describe "definition lists" do
+
+		describe "(discount style)" do
+			it "aren't rendered by default" do
+				the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
+				=hey!=
+				    This is a definition list
+				---
+				<p>=hey!=</p>
+
+				<pre><code>This is a definition list
+				</code></pre>
+				---
+			end
+
+			it "are rendered if the :definition_lists option is true" do
+				the_indented_markdown( <<-"---", :definition_lists => true ).should be_transformed_into(<<-"---").without_indentation
+				=hey!=
+				    This is a definition list
+				---
+				<dl>
+				<dt>hey!</dt>
+				<dd>This is a definition list</dd>
+				</dl>
+				---
+			end
+
+			it "supports multiple-term list items" do
+				the_indented_markdown( <<-"---", :definition_lists => true ).should be_transformed_into(<<-"---").without_indentation
+				=tag1=
+				=tag2=
+				    data.
+				---
+				<dl>
+				<dt>tag1</dt>
+				<dt>tag2</dt>
+				<dd>data.</dd>
+				</dl>
+				---
+			end
+		end
+
+		describe "(markdown-extra style)" do
+			it "aren't rendered by default" do
+				the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
+				Apple
+				:   Pomaceous fruit of plants of the genus Malus in 
+				    the family Rosaceae.
+
+				Orange
+				:   The fruit of an evergreen tree of the genus Citrus.
+				---
+				<p>Apple
+				:   Pomaceous fruit of plants of the genus Malus in</p>
+
+				<pre><code>the family Rosaceae.
+				</code></pre>
+
+				<p>Orange
+				:   The fruit of an evergreen tree of the genus Citrus.</p>
+				---
+			end
+
+			it "are rendered if the :definition_lists option is true" do
+				the_indented_markdown( <<-"---", :definition_lists => true ).should be_transformed_into(<<-"---").without_indentation
+				Apple
+				:   Pomaceous fruit of plants of the genus Malus in 
+				    the family Rosaceae.
+
+				Orange
+				:   The fruit of an evergreen tree of the genus Citrus.
+				---
+				<dl>
+				<dt>Apple</dt>
+				<dd>  Pomaceous fruit of plants of the genus Malus in
+				  the family Rosaceae.</dd>
+				<dt>Orange</dt>
+				<dd>  The fruit of an evergreen tree of the genus Citrus.</dd>
+				</dl>
+				---
+			end
+
+			it "are rendered if the :definition_lists option is true" do
+				the_indented_markdown( <<-"---", :definition_lists => true ).should be_transformed_into(<<-"---").without_indentation
+				Apple
+				:   Pomaceous fruit of plants of the genus Malus in 
+				the family Rosaceae.
+
+				Orange
+				:   The fruit of an evergreen tree of the genus Citrus.
+				---
+				<dl>
+				<dt>Apple</dt>
+				<dd>  Pomaceous fruit of plants of the genus Malus in
+				the family Rosaceae.</dd>
+				<dt>Orange</dt>
+				<dd>  The fruit of an evergreen tree of the genus Citrus.</dd>
+				</dl>
+				---
+			end
+		end
+
+	end
+
+
+	describe "footnotes" do
+
+		it "aren't rendered by default" do
+			the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
+			That's some text with a footnote.[^1]
+
+			[^1]: And that's the footnote.
+			---
+			<p>That's some text with a footnote.<a href=\"And\">^1</a></p>
+			---
+		end
+
+		it "are rendered if the :footnotes option is true" do
+			the_indented_markdown( <<-"---", :footnotes => true ).should be_transformed_into(<<-"---").without_indentation
+			That's some text with a footnote.[^1]
+
+			[^1]: And that's the footnote.
+			---
+			<p>That's some text with a footnote.<sup id="fnref:1"><a href="#fn:1" rel="footnote">1</a></sup></p>
+			<div class="footnotes">
+			<hr/>
+			<ol>
+			<li id="fn:1">
+			<p>And that&rsquo;s the footnote.<a href="#fnref:1" rev="footnote">&#8617;</a></p></li>
+			</ol>
+			</div>
+			---
+		end
+
+		it "renders a second link to the same footnote as plain text" do
+			the_indented_markdown( <<-"---", :footnotes => true ).should be_transformed_into(<<-"---").without_indentation
+			That's some text with a footnote.[^afootnote]
+			And here's another.[^afootnote]
+
+			[^afootnote]: And that's the footnote.
+			---
+			<p>That's some text with a footnote.<sup id=\"fnref:1\"><a href=\"#fn:1\" rel=\"footnote\">1</a></sup>
+			And here's another.[^afootnote]</p>
+			<div class=\"footnotes\">
+			<hr/>
+			<ol>
+			<li id=\"fn:1\">
+			<p>And that&rsquo;s the footnote.<a href=\"#fnref:1\" rev=\"footnote\">&#8617;</a></p></li>
+			</ol>
+			</div>
+			---
+		end
+
+		it "support multiple block-level elements via indentation", :pedantic => true do
+			pending "not yet implemented by Discount" do
+				the_indented_markdown( <<-"---", :footnotes => true ).should be_transformed_into(<<-"---").without_indentation
+				That's some text with a footnote.[^1]
+
+				[^1]: And that's the footnote.
+
+				    That's the second paragraph.
+				---
+				<p>That's some text with a footnote.<sup id="fnref:1"><a href="#fn:1" rel="footnote">1</a></sup></p>
+				<div class="footnotes">
+				<hr/>
+				<ol>
+				<li id="fn:1">
+				<p>And that&rsquo;s the footnote.</p>
+				<p>That&rsquo;s the second paragraph.<a href="#fnref:1" rev="footnote">&#8617;</a></p></li>
+				</ol>
+				</div>
+				---
+			end
+		end
+
+		it "support multiple block-level elements with an empty first line", :pedantic => true do
+			pending "not yet implemented by Discount" do
+				the_indented_markdown( <<-"---", :footnotes => true ).should be_transformed_into(<<-"---").without_indentation
+				That's some text with a footnote.[^cows]
+
+				[^cows]:
+				    And that's the footnote.
+
+				    That's the second paragraph.
+				---
+				<p>That's some text with a footnote.<sup id="fnref:cows"><a href="#fn:cows" rel="footnote">1</a></sup></p>
+				<div class="footnotes">
+				<hr />
+				<ol>
+				<li id="fn:cows">
+				<p>And that's the footnote.</p>
+				<p>That's the second paragraph.&#160;<a href="#fnref:cows" rev="footnote">&#8617;</a></p>
+				</li>
+				</ol>
+				</div>
+				---
+			end
+		end
+
+	end
+
 end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bluecloth
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 11
   prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 11
-  version: 2.0.11
+  version: 2.1.0
 platform: ruby
 authors: 
 - Michael Granger
@@ -35,7 +35,7 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2011-02-10 00:00:00 -08:00
+date: 2011-03-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -277,10 +277,9 @@ licenses:
 - BSD
 post_install_message: 
 rdoc_options: 
-- --protected
-- --verbose
 - --title
 - Bluecloth Documentation
+- --quiet
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -306,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bluecloth
-rubygems_version: 1.4.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: BlueCloth is a Ruby implementation of John Gruber's [Markdown][markdown], a text-to-HTML conversion tool for web writers