bluecloth 2.0.5-x86-mingw32 → 2.0.6.pre120-x86-mingw32

data/ext/markdown.c

@@ -32,11 +32,11 @@ static struct kw blocktags[] = { KW("!--"), KW("STYLE"), KW("SCRIPT"),
 				 KW("ADDRESS"), KW("BDO"), KW("BLOCKQUOTE"),
 				 KW("CENTER"), KW("DFN"), KW("DIV"), KW("H1"),
 				 KW("H2"), KW("H3"), KW("H4"), KW("H5"),
-				 KW("H6"), KW("IFRAME"), KW("LISTING"), KW("NOBR"),
+				 KW("H6"), KW("LISTING"), KW("NOBR"),
 				 KW("UL"), KW("P"), KW("OL"), KW("DL"),
 				 KW("PLAINTEXT"), KW("PRE"), KW("TABLE"),
 				 KW("WBR"), KW("XMP"), SC("HR"), SC("BR"),
-				 KW("MAP") };
+				 KW("IFRAME"), KW("MAP") };
 #define SZTAGS	(sizeof blocktags / sizeof blocktags[0])
 #define MAXTAG	11 /* sizeof "BLOCKQUOTE" */
 
@@ -230,6 +230,8 @@ htmlblock(Paragraph *p, struct kw *tag)
 			    /* consume trailing gunk in close tag */
 			    c = flogetc(&f);
 			}
+			if ( !f.t )
+			    return 0;
 			ret = f.t->next;
 			f.t->next = 0;
 			return ret;
@@ -259,6 +261,37 @@ comment(Paragraph *p)
 }
 
 
+/* tables look like
+ *   header|header{|header}
+ *   ------|------{|......}
+ *   {body lines}
+ */
+static int
+istable(Line *t)
+{
+    char *p;
+    Line *dashes = t->next;
+    int contains = 0;	/* found character bits; 0x01 is |, 0x02 is - */
+    
+    /* two lines, first must contain | */
+    if ( !(dashes && memchr(T(t->text), '|', S(t->text))) )
+	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)) )
+	    return 0;
+
+    return (contains & 0x03);
+}
+
+
 /* footnotes look like ^<whitespace>{0,3}[stuff]: <content>$
  */
 static int
@@ -554,17 +587,17 @@ szmarkerclass(char *p)
  * marker %[kind:]name%
  */
 static int
-isdivmarker(Line *p)
+isdivmarker(Line *p, int start)
 {
 #if DIV_QUOTE
     char *s = T(p->text);
     int len = S(p->text);
     int i;
 
-    if ( !(len && s[0] == '%' && s[len-1] == '%') ) return 0;
+    if ( !(len && s[start] == '%' && s[len-1] == '%') ) return 0;
 
-    i = szmarkerclass(s+1);
-    --len;
+    i = szmarkerclass(s+start+1)+start;
+    len -= start+1;
 
     while ( ++i < len )
 	if ( !isalnum(s[i]) )
@@ -601,13 +634,15 @@ quoteblock(Paragraph *p)
 	    t->dle = mkd_firstnonblank(t);
 	}
 
-	if ( !(q = skipempty(t->next)) || ((q != t->next) && !isquote(q)) ) {
+	q = skipempty(t->next);
+
+	if ( (q == 0) || ((q != t->next) && (!isquote(q) || isdivmarker(q,1))) ) {
 	    ___mkd_freeLineRange(t, q);
 	    t = q;
 	    break;
 	}
     }
-    if ( isdivmarker(p->text) ) {
+    if ( isdivmarker(p->text,0) ) {
 	char *prefix = "class";
 	int i;
 	
@@ -628,6 +663,25 @@ quoteblock(Paragraph *p)
 }
 
 
+/*
+ * A table block starts with a table header (see istable()), and continues
+ * until EOF or a line that /doesn't/ contain a |.
+ */
+static Line *
+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)) ) {
+	    t->next = 0;
+	    return q;
+	}
+    }
+    return 0;
+}
+
+
 static Paragraph *Pp(ParagraphRoot *, Line *, int);
 static Paragraph *compile(Line *, int, MMIOT *);
 
@@ -659,7 +713,7 @@ listitem(Paragraph *p, int indent)
 	 * need any indentation
 	 */
 	if ( q != t->next ) {
-	    if (q->dle < 4) {
+	    if (q->dle < indent) {
 		q = t->next;
 		t->next = 0;
 		return q;
@@ -684,9 +738,10 @@ listblock(Paragraph *top, int trim, MMIOT *f)
 {
     ParagraphRoot d = { 0, 0 };
     Paragraph *p;
-    Line *q = top->text, *text;
-    Line *label;
-    int para = 0;
+    Line *q = top->text, *text, *label;
+    int isdl = (top->typ == DL),
+	para = 0,
+	ltype;
 
     while (( text = q )) {
 	if ( top->typ == DL ) {
@@ -710,7 +765,8 @@ listblock(Paragraph *top, int trim, MMIOT *f)
 
 	if ( para && (top->typ != DL) && p->down ) p->down->align = PARA;
 
-	if ( !(q = skipempty(text)) || (islist(q, &trim) == 0) )
+	if ( !(q = skipempty(text)) || ((ltype = islist(q, &trim)) == 0)
+				    || (isdl != (ltype == DL)) )
 	    break;
 
 	if ( para = (q != text) ) {
@@ -840,6 +896,64 @@ consume(Line *ptr, int *eaten)
 }
 
 
+/*
+ * top-level compilation; break the document into
+ * style, html, and source blocks with footnote links
+ * weeded out.
+ */
+static Paragraph *
+compile_document(Line *ptr, MMIOT *f)
+{
+    ParagraphRoot d = { 0, 0 };
+    ANCHOR(Line) source = { 0, 0 };
+    Paragraph *p = 0;
+    struct kw *tag;
+    int eaten;
+
+    while ( ptr ) {
+	if ( !(f->flags & DENY_HTML) && (tag = isopentag(ptr)) ) {
+	    /* If we encounter a html/style block, compile and save all
+	     * of the cached source BEFORE processing the html/style.
+	     */
+	    if ( T(source) ) {
+		E(source)->next = 0;
+		p = Pp(&d, 0, SOURCE);
+		p->down = compile(T(source), 1, f);
+		T(source) = E(source) = 0;
+	    }
+	    p = Pp(&d, ptr, strcmp(tag->id, "STYLE") == 0 ? STYLE : HTML);
+	    if ( strcmp(tag->id, "!--") == 0 )
+		ptr = comment(p);
+	    else
+		ptr = htmlblock(p, tag);
+	}
+	else if ( isfootnote(ptr) ) {
+	    /* footnotes, like cats, sleep anywhere; pull them
+	     * out of the input stream and file them away for
+	     * later processing
+	     */
+	    ptr = consume(addfootnote(ptr, f), &eaten);
+	}
+	else {
+	    /* source; cache it up to wait for eof or the
+	     * next html/style block
+	     */
+	    ATTACH(source,ptr);
+	    ptr = ptr->next;
+	}
+    }
+    if ( T(source) ) {
+	/* if there's any cached source at EOF, compile
+	 * it now.
+	 */
+	E(source)->next = 0;
+	p = Pp(&d, 0, SOURCE);
+	p->down = compile(T(source), 1, f);
+    }
+    return T(d);
+}
+
+
 /*
  * break a collection of markdown input into
  * blocks of lists, code, html, and text to
@@ -850,22 +964,15 @@ compile(Line *ptr, int toplevel, MMIOT *f)
 {
     ParagraphRoot d = { 0, 0 };
     Paragraph *p = 0;
-    struct kw *tag;
     Line *r;
     int para = toplevel;
+    int blocks = 0;
     int hdr_type, list_type, indent;
 
     ptr = consume(ptr, &para);
 
     while ( ptr ) {
-	if ( toplevel && !(f->flags & DENY_HTML) && (tag = isopentag(ptr)) ) {
-	    p = Pp(&d, ptr, strcmp(tag->id, "STYLE") == 0 ? STYLE : HTML);
-	    if ( strcmp(tag->id, "!--") == 0 )
-		ptr = comment(p);
-	    else
-		ptr = htmlblock(p, tag);
-	}
-	else if ( iscode(ptr) ) {
+	if ( iscode(ptr) ) {
 	    p = Pp(&d, ptr, CODE);
 	    
 	    if ( f->flags & MKD_1_COMPAT) {
@@ -897,9 +1004,9 @@ compile(Line *ptr, int toplevel, MMIOT *f)
 	    p = Pp(&d, ptr, HDR);
 	    ptr = headerblock(p, hdr_type);
 	}
-	else if ( toplevel && (isfootnote(ptr)) ) {
-	    ptr = consume(addfootnote(ptr, f), &para);
-	    continue;
+	else if ( istable(ptr) && !(f->flags & (STRICT|NOTABLES)) ) {
+	    p = Pp(&d, ptr, TABLE);
+	    ptr = tableblock(p);
 	}
 	else {
 	    p = Pp(&d, ptr, MARKUP);
@@ -909,7 +1016,8 @@ compile(Line *ptr, int toplevel, MMIOT *f)
 	if ( (para||toplevel) && !p->align )
 	    p->align = PARA;
 
-	para = toplevel;
+	blocks++;
+	para = toplevel || (blocks > 1);
 	ptr = consume(ptr, &para);
 
 	if ( para && !p->align )
@@ -960,7 +1068,7 @@ mkd_compile(Document *doc, int flags)
 
     initialize();
 
-    doc->code = compile(T(doc->content), 1, doc->ctx);
+    doc->code = compile_document(T(doc->content), doc->ctx);
     qsort(T(*doc->ctx->footnotes), S(*doc->ctx->footnotes),
 		        sizeof T(*doc->ctx->footnotes)[0],
 			           (stfu)__mkd_footsort);

data/ext/markdown.h

@@ -37,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;
@@ -74,11 +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 AUTOLINK	0x4000
 #define SAFELINK	0x8000
-#define USER_FLAGS	0xF0FF
+#define USER_FLAGS	0xFCFF
 #define EMBEDDED	DENY_A|DENY_IMG|NO_PSEUDO_PROTO|CDATA_OUTPUT
     char *base;
 } MMIOT;

data/ext/mkdio.h

@@ -63,6 +63,7 @@ extern char markdown_version[];
 				 * <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 */

data/lib/bluecloth.rb

@@ -29,13 +29,7 @@
 class BlueCloth
 
 	# Release Version
-	VERSION = '2.0.5'
-
-	# SVN Revision
-	SVNREV = %q$Rev$
-
-	# SVN Id tag
-	SVNID = %q$Id$
+	VERSION = '2.0.6'
 
 	# The defaults for all supported options.
 	DEFAULT_OPTIONS = {
@@ -153,7 +147,16 @@ class BlueCloth
 
 end # class BlueCloth
 
-require 'bluecloth_ext'
+# Load the correct version if it's a Windows binary gem
+if RUBY_PLATFORM =~/(mswin|mingw)/i
+	major_minor = RUBY_VERSION[ /^(\d+\.\d+)/ ] or
+		raise "Oops, can't extract the major/minor version from #{RUBY_VERSION.dump}"
+	require "#{major_minor}/nokogiri"
+else
+	require 'bluecloth_ext'
+end
+
+
 
 # Set the top-level 'Markdown' constant if it isn't already set
 ::Markdown = ::BlueCloth unless defined?( ::Markdown )

data/rake/helpers.rb

@@ -68,13 +68,19 @@ def trace( *msg )
 end
 
 
+### Return the specified args as a string, quoting any that have a space.
+def quotelist( *args )
+	return args.flatten.collect {|part| part =~ /\s/ ? part.inspect : part}
+end
+
+
 ### Run the specified command +cmd+ with system(), failing if the execution
 ### fails.
 def run( *cmd )
 	cmd.flatten!
 
 	if cmd.length > 1
-		trace( cmd.collect {|part| part =~ /\s/ ? part.inspect : part} ) 
+		trace( quotelist(*cmd) )
 	else
 		trace( cmd )
 	end
@@ -90,6 +96,15 @@ def run( *cmd )
 end
 
 
+### Run the given +cmd+ with the specified +args+ without interpolation by the shell and
+### return anything written to its STDOUT.
+def read_command_output( cmd, *args )
+	trace "Reading output from: %s" % [ cmd, quotelist(cmd, *args) ]
+	output = IO.read( '|-' ) or exec cmd, *args
+	return output
+end
+
+
 ### Run a subordinate Rake process with the same options and the specified +targets+.
 def rake( *targets )
 	opts = ARGV.select {|arg| arg[0,1] == '-' }
@@ -410,3 +425,10 @@ def in_subdirectory( subdir )
 end
 
 
+### Make an easily-comparable version vector out of +ver+ and return it.
+def vvec( ver )
+	return ver.split('.').collect {|char| char.to_i }.pack('N*')
+end
+
+
+

data/rake/hg.rb

@@ -1,6 +1,8 @@
 # 
 # Mercurial Rake Tasks
 
+require 'enumerator'
+
 # 
 # Authors:
 # * Michael Granger <ged@FaerieMUD.org>
@@ -27,7 +29,7 @@ unless defined?( HG_DOTDIR )
 
 		### Generate a commit log from a diff and return it as a String.
 		def make_commit_log
-			diff = IO.read( '|-' ) or exec 'hg', 'diff'
+			diff = read_command_output( 'hg', 'diff' )
 			fail "No differences." if diff.empty?
 
 			return diff
@@ -46,25 +48,42 @@ unless defined?( HG_DOTDIR )
 
 		### Generate a changelog.
 		def make_changelog
-			log = IO.read( '|-' ) or exec 'hg', 'log', '--style', 'compact'
+			log = read_command_output( 'hg', 'log', '--style', 'compact' )
 			return log
 		end
 
 		### Get the 'tip' info and return it as a Hash
 		def get_tip_info
-			data = IO.read( '|-' ) or exec 'hg', 'tip'
+			data = read_command_output( 'hg', 'tip' )
 			return YAML.load( data )
 		end
 
 		### Return the ID for the current rev
 		def get_current_rev
-			id = IO.read( '|-' ) or exec 'hg', '-q', 'identify'
+			id = read_command_output( 'hg', '-q', 'identify' )
 			return id.chomp
 		end
 
+		### Read the list of existing tags and return them as an Array
+		def get_tags
+			taglist = read_command_output( 'hg', 'tags' )
+			return taglist.split( /\n/ )
+		end
+
+
+		### Read any remote repo paths known by the current repo and return them as a hash.
+		def get_repo_paths
+			paths = {}
+			pathspec = read_command_output( 'hg', 'paths' )
+			pathspec.split.each_slice( 3 ) do |name, _, url|
+				paths[ name ] = url
+			end
+			return paths
+		end
+
 		### Return the list of files which are of status 'unknown'
 		def get_unknown_files
-			list = IO.read( '|-' ) or exec 'hg', 'status', '-un', '--no-color'
+			list = read_command_output( 'hg', 'status', '-un', '--no-color' )
 			list = list.split( /\n/ )
 
 			trace "New files: %p" % [ list ]
@@ -82,7 +101,7 @@ unless defined?( HG_DOTDIR )
 		end
 
 
-		### Add the list of +pathnames+ to the svn:ignore list.
+		### Add the list of +pathnames+ to the .hgignore list.
 		def hg_ignore_files( *pathnames )
 			patterns = pathnames.flatten.collect do |path|
 				'^' + Regexp.escape(path) + '$'
@@ -128,11 +147,26 @@ unless defined?( HG_DOTDIR )
 
 		desc "Prepare for a new release"
 		task :prep_release do
-			# Get the rev for the tag name
-			# Look for an existing tag with that rev, and if it exists abort
-			# Tag the current rev
+			tags = get_tags()
+			rev = get_current_rev()
+
+			# Look for a tag for the current release version, and if it exists abort
+			if tags.include?( PKG_VERSION )
+				error "Version #{PKG_VERSION} already has a tag. Did you mean " +
+					"to increment the version in #{VERSION_FILE}?"
+				fail
+			end
+
 			# Sign the current rev
+			log "Signing rev #{rev}"
+			run 'hg', 'sign'
+
+			# Tag the current rev
+			log "Tagging rev #{rev} as #{PKG_VERSION}"
+			run 'hg', 'tag', PKG_VERSION
+
 			# Offer to push
+			Rake::Task['hg:push'].invoke
 		end
 
 		desc "Check for new files and offer to add/ignore/delete them."
@@ -174,20 +208,45 @@ unless defined?( HG_DOTDIR )
 		task :add => :newfiles
 
 
+		desc "Pull and update from the default repo"
+		task :pull do
+			paths = get_repo_paths()
+			if origin_url = paths['default']
+				ask_for_confirmation( "Pull and update from '#{origin_url}'?", false ) do
+					run 'hg', 'pull', '-u'
+				end
+			else
+				trace "Skipping pull: No 'default' path."
+			end
+		end
+
 		desc "Check the current code in if tests pass"
-		task :checkin => ['hg:newfiles', 'test', COMMIT_MSG_FILE] do
+		task :checkin => ['hg:pull', 'hg:newfiles', 'test', COMMIT_MSG_FILE] do
 			targets = get_target_args()
 			$stderr.puts '---', File.read( COMMIT_MSG_FILE ), '---'
 			ask_for_confirmation( "Continue with checkin?" ) do
 				run 'hg', 'ci', '-l', COMMIT_MSG_FILE, targets
 				rm_f COMMIT_MSG_FILE
 			end
+			Rake::Task['hg:push'].invoke
 		end
 		task :commit => :checkin
 		task :ci => :checkin
 
 		CLEAN.include( COMMIT_MSG_FILE )
 
+		desc "Push to the default origin repo (if there is one)"
+		task :push do
+			paths = get_repo_paths()
+			if origin_url = paths['default']
+				ask_for_confirmation( "Push to '#{origin_url}'?", false ) do
+					run 'hg', 'push'
+				end
+			else
+				trace "Skipping push: No 'default' path."
+			end
+		end
+
 	end
 
 	if HG_DOTDIR.exist?
@@ -199,7 +258,7 @@ unless defined?( HG_DOTDIR )
 		task :checkin => 'hg:ci'
 
 		desc "Tag and sign revision before a release"
-		task :prep_release => 'hg:tag'
+		task :prep_release => 'hg:prep_release'
 
 		file COMMIT_MSG_FILE do
 			edit_commit_log()