bluecloth 2.0.7-x86-mswin32 → 2.0.11pre158-x86-mswin32

data/ext/resource.c

@@ -140,14 +140,16 @@ ___mkd_freeLineRange(Line *anchor, Line *stop)
 void
 mkd_cleanup(Document *doc)
 {
-    if ( doc ) {
+    if ( doc && (doc->magic == VALID_DOCUMENT) ) {
 	if ( doc->ctx ) {
 	    ___mkd_freemmiot(doc->ctx, 0);
 	    free(doc->ctx);
 	}
 
 	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();
+    }
+}
+

data/ext/tags.c

@@ -0,0 +1,123 @@
+/* block-level tags for passing html blocks through the blender
+ */
+#define __WITHOUT_AMALLOC 1
+#include "cstring.h"
+#include "tags.h"
+
+STRING(struct kw) blocktags;
+
+
+/* define a html block tag
+ */
+void
+mkd_define_tag(char *id, int selfclose)
+{
+    struct kw *p = &EXPAND(blocktags);
+
+    p->id = id;
+    p->size = strlen(id);
+    p->selfclose = selfclose;
+}
+
+
+/* case insensitive string sort (for qsort() and bsearch() of block tags)
+ */
+static int
+casort(struct kw *a, struct kw *b)
+{
+    if ( a->size != b->size )
+	return a->size - b->size;
+    return strncasecmp(a->id, b->id, b->size);
+}
+
+
+/* stupid cast to make gcc shut up about the function types being
+ * passed into qsort() and bsearch()
+ */
+typedef int (*stfu)(const void*,const void*);
+
+
+/* sort the list of html block tags for later searching
+ */
+void
+mkd_sort_tags()
+{
+    qsort(T(blocktags), S(blocktags), sizeof(struct kw), (stfu)casort);
+}
+
+
+
+/* look for a token in the html block tag list
+ */
+struct kw*
+mkd_search_tags(char *pat, int len)
+{
+    struct kw key;
+    
+    key.id = pat;
+    key.size = len;
+    
+    return bsearch(&key, T(blocktags), S(blocktags), sizeof key, (stfu)casort);
+}
+
+
+static int populated = 0;
+
+
+/* load in the standard collection of html tags that markdown supports
+ */
+void
+mkd_prepare_tags()
+{
+
+#define KW(x)	mkd_define_tag(x, 0)
+#define SC(x)	mkd_define_tag(x, 1)
+
+    if ( populated ) return;
+    populated = 1;
+    
+    KW("STYLE");
+    KW("SCRIPT");
+    KW("ADDRESS");
+    KW("BDO");
+    KW("BLOCKQUOTE");
+    KW("CENTER");
+    KW("DFN");
+    KW("DIV");
+    KW("OBJECT");
+    KW("H1");
+    KW("H2");
+    KW("H3");
+    KW("H4");
+    KW("H5");
+    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("IFRAME");
+    KW("MAP");
+
+    mkd_sort_tags();
+} /* mkd_prepare_tags */
+
+
+/* destroy the blocktags list (for shared libraries)
+ */
+void
+mkd_deallocate_tags()
+{
+    if ( S(blocktags) > 0 ) {
+	populated = 0;
+	DELETE(blocktags);
+    }
+} /* mkd_deallocate_tags */

data/ext/tags.h

@@ -0,0 +1,19 @@
+/* block-level tags for passing html blocks through the blender
+ */
+#ifndef _TAGS_D
+#define _TAGS_D
+
+struct kw {
+    char *id;
+    int  size;
+    int  selfclose;
+} ;
+
+
+struct kw* mkd_search_tags(char *, int);
+void mkd_prepare_tags();
+void mkd_deallocate_tags();
+void mkd_sort_tags();
+void mkd_define_tag(char *, int);
+
+#endif

data/lib/bluecloth.rb

@@ -18,7 +18,7 @@
 # 
 # == Version
 #
-#  $Id$
+#  $Id: bluecloth.rb,v fd890510cecf 2011/02/10 15:39:54 ged $
 # 
 # == License
 # 
@@ -29,20 +29,31 @@
 class BlueCloth
 
 	# Release Version
-	VERSION = '2.0.7'
+	VERSION = '2.0.11'
 
 	# The defaults for all supported options.
 	DEFAULT_OPTIONS = {
-		:remove_links    => false,
-		:remove_images   => false,
-		:smartypants     => true,
-		:pseudoprotocols => false,
-		:pandoc_headers  => false,
-		:header_labels   => false,
-		:escape_html     => false,
-		:strict_mode     => true,
-		:auto_links      => false,
-		:safe_links      => false,
+		:alphalists       => true,
+		:auto_links       => false,
+		:definition_lists => false,
+		:divquotes        => false,
+		:escape_html      => false,
+		:expand_tabs      => true,
+		:header_labels    => false,
+		:mdtest_1_compat  => false,
+		:pandoc_headers   => false,
+		:pseudoprotocols  => false,
+		:relaxed          => false,
+		:remove_images    => false,
+		:remove_links     => false,
+		:safe_links       => false,
+		:smartypants      => true,
+		:strict_mode      => true,
+		:strikethrough    => true,
+		:superscript      => false,
+		:tables           => false,
+		:tagtext_mode     => false,
+		:xml_cdata        => false,
 	}.freeze
 
 	# The number of characters of the original markdown source to include in the 
@@ -71,18 +82,27 @@ class BlueCloth
 
 		flags = 0
 
-        if   opthash[:remove_links]    then flags |= MKD_NOLINKS;  end
-        if   opthash[:remove_images]   then flags |= MKD_NOIMAGE;  end
-        if ! opthash[:smartypants]     then flags |= MKD_NOPANTS;  end
-        if ! opthash[:pseudoprotocols] then flags |= MKD_NO_EXT;   end
-        if ! opthash[:pandoc_headers]  then flags |= MKD_NOHEADER; end
-        if   opthash[:header_labels]   then flags |= MKD_TOC;      end
-        if   opthash[:mdtest_1_compat] then flags |= MKD_1_COMPAT; end
-        if   opthash[:escape_html]     then flags |= MKD_NOHTML;   end
-        if   opthash[:strict_mode]     then flags |= MKD_STRICT;   end
-        if   opthash[:tagtext_mode]    then flags |= MKD_TAGTEXT;  end
-        if   opthash[:auto_links]      then flags |= MKD_AUTOLINK; end
-        if   opthash[:safe_links]      then flags |= MKD_SAFELINK; end
+		if   opthash[:remove_links]     then flags |= MKD_NOLINKS;         end
+		if   opthash[:remove_images]    then flags |= MKD_NOIMAGE;         end
+		if ! opthash[:smartypants]      then flags |= MKD_NOPANTS;         end
+		if   opthash[:escape_html]      then flags |= MKD_NOHTML;          end
+		if   opthash[:strict_mode]      then flags |= MKD_STRICT;          end
+		if   opthash[:tagtext_mode]     then flags |= MKD_TAGTEXT;         end
+		if ! opthash[:pseudoprotocols]  then flags |= MKD_NO_EXT;          end
+		if   opthash[:xml_cdata]        then flags |= MKD_CDATA;           end
+		if ! opthash[:superscript]      then flags |= MKD_NOSUPERSCRIPT;   end
+		if ! opthash[:relaxed]          then flags |= MKD_NORELAXED;       end
+		if ! opthash[:tables]           then flags |= MKD_NOTABLES;        end
+		if ! opthash[:strikethrough]    then flags |= MKD_NOSTRIKETHROUGH; end
+		if   opthash[:header_labels]    then flags |= MKD_TOC;             end
+		if   opthash[:mdtest_1_compat]  then flags |= MKD_1_COMPAT;        end
+		if   opthash[:auto_links]       then flags |= MKD_AUTOLINK;        end
+		if   opthash[:safe_links]       then flags |= MKD_SAFELINK;        end
+		if ! opthash[:pandoc_headers]   then flags |= MKD_NOHEADER;        end
+		if   opthash[:expand_tabs]      then flags |= MKD_TABSTOP;         end
+		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
 
 		return flags
 	end
@@ -93,18 +113,27 @@ class BlueCloth
 		flags = flags.to_i
 
 		opthash = {}
-        if  ( flags & MKD_NOLINKS  ).nonzero? then opthash[:remove_links]    = true; end
-        if  ( flags & MKD_NOIMAGE  ).nonzero? then opthash[:remove_images]   = true; end
-        if !( flags & MKD_NOPANTS  ).nonzero? then opthash[:smartypants]     = true; end
-        if !( flags & MKD_NO_EXT   ).nonzero? then opthash[:pseudoprotocols] = true; end
-        if !( flags & MKD_NOHEADER ).nonzero? then opthash[:pandoc_headers]  = true; end
-        if  ( flags & MKD_TOC      ).nonzero? then opthash[:header_labels]   = true; end
-        if  ( flags & MKD_1_COMPAT ).nonzero? then opthash[:mdtest_1_compat] = true; end
-        if  ( flags & MKD_NOHTML   ).nonzero? then opthash[:escape_html]     = true; end
-        if  ( flags & MKD_STRICT   ).nonzero? then opthash[:strict_mode]     = true; end
-        if  ( flags & MKD_TAGTEXT  ).nonzero? then opthash[:tagtext_mode]    = true; end
-        if  ( flags & MKD_AUTOLINK ).nonzero? then opthash[:auto_links]      = true; end
-        if  ( flags & MKD_SAFELINK ).nonzero? then opthash[:safe_links]      = true; end
+		if  ( flags & MKD_NOLINKS         ).nonzero? then opthash[:remove_links]     = true; end
+		if  ( flags & MKD_NOIMAGE         ).nonzero? then opthash[:remove_images]    = true; end
+		if !( flags & MKD_NOPANTS         ).nonzero? then opthash[:smartypants]      = true; end
+		if  ( flags & MKD_NOHTML          ).nonzero? then opthash[:escape_html]      = true; end
+		if  ( flags & MKD_STRICT          ).nonzero? then opthash[:strict_mode]      = true; end
+		if  ( flags & MKD_TAGTEXT         ).nonzero? then opthash[:tagtext_mode]     = true; end
+		if !( flags & MKD_NO_EXT          ).nonzero? then opthash[:pseudoprotocols]  = true; end
+		if  ( flags & MKD_CDATA           ).nonzero? then opthash[:xml_cdata]        = true; end
+		if !( flags & MKD_NOSUPERSCRIPT   ).nonzero? then opthash[:superscript]      = true; end
+		if !( flags & MKD_NORELAXED       ).nonzero? then opthash[:relaxed]          = true; end
+		if !( flags & MKD_NOTABLES        ).nonzero? then opthash[:tables]           = true; end
+		if !( flags & MKD_NOSTRIKETHROUGH ).nonzero? then opthash[:strikethrough]    = true; end
+		if  ( flags & MKD_TOC             ).nonzero? then opthash[:header_labels]    = true; end
+		if  ( flags & MKD_1_COMPAT        ).nonzero? then opthash[:mdtest_1_compat]  = true; end
+		if  ( flags & MKD_AUTOLINK        ).nonzero? then opthash[:auto_links]       = true; end
+		if  ( flags & MKD_SAFELINK        ).nonzero? then opthash[:safe_links]       = true; end
+		if !( flags & MKD_NOHEADER        ).nonzero? then opthash[:pandoc_headers]   = true; end
+		if  ( flags & MKD_TABSTOP         ).nonzero? then opthash[:expand_tabs]      = true; end
+		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
 
 		return opthash
 	end
@@ -147,17 +176,23 @@ class BlueCloth
 
 end # class BlueCloth
 
-# 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}/bluecloth_ext"
-else
+begin
 	require 'bluecloth_ext'
+rescue LoadError => err
+	# If it's a Windows binary gem, try the <major>.<minor> subdirectory
+	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}/bluecloth_ext"
+	else
+		raise
+	end
+
 end
 
 
 
+
 # Set the top-level 'Markdown' constant if it isn't already set
 ::Markdown = ::BlueCloth unless defined?( ::Markdown )
 

data/spec/bluecloth/101_changes_spec.rb

@@ -4,29 +4,26 @@
 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 )
 }
 
-require 'spec'
+require 'rspec'
 require 'bluecloth'
 
 require 'spec/lib/helpers'
-require 'spec/lib/constants'
-require 'spec/lib/matchers'
 
 
 #####################################################################
 ###	C O N T E X T S
 #####################################################################
 
-describe BlueCloth, "1.0.1 changes" do
-	include BlueCloth::TestConstants,
-	        BlueCloth::Matchers
+describe BlueCloth, "after the 1.0.1 changes" do
 
 	it "doesn't touch escapes in code blocks" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
@@ -35,16 +32,16 @@ describe BlueCloth, "1.0.1 changes" do
 		formatting syntax. For example, if you wanted to surround a word with
 		literal asterisks (instead of an HTML `<em>` tag), you can backslashes
 		before the asterisks, like this:
-		
+
 			\\*literal asterisks\\*
-		
+
 		---
 		<p>Markdown allows you to use backslash escapes to generate literal
 		characters which would otherwise have special meaning in Markdown's
 		formatting syntax. For example, if you wanted to surround a word with
 		literal asterisks (instead of an HTML <code>&lt;em&gt;</code> tag), you can backslashes
 		before the asterisks, like this:</p>
-		
+
 		<pre><code>\\*literal asterisks\\*
 		</code></pre>
 		---
@@ -62,11 +59,11 @@ describe BlueCloth, "1.0.1 changes" do
 	it "converts reference-style links at or deeper than tab width to code blocks" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
 		An [example][ex] reference-style link.
-		
+
 			[ex]: http://www.bluefi.com/
 		---
 		<p>An [example][ex] reference-style link.</p>
-		
+
 		<pre><code>[ex]: http://www.bluefi.com/
 		</code></pre>
 		---
@@ -114,23 +111,23 @@ describe BlueCloth, "1.0.1 changes" do
 	it "correctly marks up header + list + code" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
 		## This is a header.
-		
+
 		1.   This is the first list item.
 		2.   This is the second list item.
-		
+
 		Here's some example code:
-		
+
 			return shell_exec("echo $input | $markdown_script");
 		---
 		<h2>This is a header.</h2>
-		
+
 		<ol>
-		<li>This is the first list item.</li>
-		<li>This is the second list item.</li>
+		<li> This is the first list item.</li>
+		<li> This is the second list item.</li>
 		</ol>
-		
+
 		<p>Here's some example code:</p>
-		
+
 		<pre><code>return shell_exec("echo $input | $markdown_script");
 		</code></pre>
 		---