bluecloth 2.0.1 → 2.0.2

data/README

@@ -2,22 +2,32 @@
 
 BlueCloth is a Ruby implementation of John Gruber's
 Markdown[http://daringfireball.net/projects/markdown/], a text-to-HTML
-conversion tool for web writers. To quote from the project page: Markdown
-allows you to write using an easy-to-read, easy-to-write plain text format,
-then convert it to structurally valid XHTML (or HTML).
+conversion tool for web writers. To quote from the project page:
+Markdown allows you to write using an easy-to-read, easy-to-write plain
+text format, then convert it to structurally valid XHTML (or HTML).
 
 It borrows a naming convention and several helpings of interface from
-Redcloth[http://www.whytheluckystiff.net/ruby/redcloth/], 
-{Why the Lucky Stiff}[http://www.whytheluckystiff.net/] 's processor for a 
-similar text-to-HTML conversion syntax called 
+Redcloth[http://www.whytheluckystiff.net/ruby/redcloth/], {Why the Lucky
+Stiff}[http://www.whytheluckystiff.net/] 's processor for a similar
+text-to-HTML conversion syntax called
 Textile[http://www.textism.com/tools/textile/].
 
-BlueCloth 2 is a complete rewrite using David Parsons' Discount library, a C
-implementation of Markdown. I rewrote it using the extension for speed and
-accuracy; the original BlueCloth was a straight port from the Perl version 
-that I wrote in a few days for my own use just to avoid having to shell out 
-to Markdown.pl, and it was quite buggy and slow. I apologize to all the good 
-people that sent me patches for it that were never released.
+BlueCloth 2 is a complete rewrite using David Parsons' Discount library,
+a C implementation of Markdown. I rewrote it using the extension for
+speed and accuracy; the original BlueCloth was a straight port from the
+Perl version that I wrote in a few days for my own use just to avoid
+having to shell out to Markdown.pl, and it was quite buggy and slow. I
+apologize to all the good people that sent me patches for it that were
+never released.
+
+Note that the new gem is called 'bluecloth' and the old one 'BlueCloth'. If you have both installed, you can ensure you're loading the new one with the 'gem' directive:
+
+  # Load the 2.0 version
+  gem 'bluecloth', '>= 2.0.0'
+
+  # Load the 1.0 version
+  gem 'BlueCloth'
+  require 'bluecloth'
 
 
 == Authors
@@ -50,22 +60,22 @@ You can also install as a site library via the Rakefile:
 
 == Source 
 
-You can check out the current development source with Subversion from the
-following URL:
+You can check out the current development source with Subversion from
+the following URL:
 
   svn://deveiate.org/BlueCloth/trunk
 
-You can report bugs, suggest improvements, or check on development activity at 
-the project page:
+You can report bugs, suggest improvements, or check on development
+activity at the project page:
 
   http://deveiate.org/projects/BlueCloth/
 
 
 == License
 
-See the LICENSE file included with the distribution for licensing and 
+See the LICENSE file included with the distribution for licensing and
 copyright details.
 
-The licensing terms of Discount are described in the LICENSE.discount file, 
-also included with the distribution.
+The licensing terms of Discount are described in the LICENSE.discount
+file, also included with the distribution.
 

data/Rakefile

@@ -44,6 +44,10 @@ PROJECT_NAME  = 'BlueCloth'
 PKG_NAME      = PROJECT_NAME.downcase
 PKG_SUMMARY   = 'BlueCloth is a Ruby implementation of Markdown'
 
+# Cruisecontrol stuff
+CC_BUILD_LABEL     = ENV['CC_BUILD_LABEL']
+CC_BUILD_ARTIFACTS = ENV['CC_BUILD_ARTIFACTS'] || 'artifacts'
+
 VERSION_FILE  = LIBDIR + 'bluecloth.rb'
 if VERSION_FILE.exist? && buildrev = ENV['CC_BUILD_LABEL']
 	PKG_VERSION = VERSION_FILE.read[ /VERSION\s*=\s*['"](\d+\.\d+\.\d+)['"]/, 1 ] + '.' + buildrev
@@ -58,7 +62,7 @@ GEM_FILE_NAME = "#{PKG_FILE_NAME}.gem"
 
 EXTCONF       = EXTDIR + 'extconf.rb'
 
-ARTIFACTS_DIR = Pathname.new( ENV['CC_BUILD_ARTIFACTS'] || 'artifacts' )
+ARTIFACTS_DIR = Pathname.new( CC_BUILD_ARTIFACTS )
 
 TEXT_FILES    = %w( Rakefile ChangeLog README LICENSE ).collect {|filename| BASEDIR + filename }
 BIN_FILES     = Pathname.glob( "#{BINDIR}/*" ).delete_if {|item| item.to_s =~ /\.svn/ }
@@ -291,7 +295,7 @@ end
 desc "Cruisecontrol build"
 task :cruise => [:clean, 'spec:quiet', :package] do |task|
 	raise "Artifacts dir not set." if ARTIFACTS_DIR.to_s.empty?
-	artifact_dir = ARTIFACTS_DIR.cleanpath + ENV['CC_BUILD_LABEL']
+	artifact_dir = ARTIFACTS_DIR.cleanpath + (CC_BUILD_LABEL || Time.now.strftime('%Y%m%d-%T'))
 	artifact_dir.mkpath
 	
 	coverage = BASEDIR + 'coverage'

data/ext/VERSION

@@ -1 +1 @@
-1.3.6
+1.4.0

data/ext/bluecloth.c

@@ -1,6 +1,6 @@
 /* 
  * BlueCloth -- a Ruby implementation of Markdown
- * $Id: bluecloth.c 107 2009-03-13 22:56:29Z deveiant $
+ * $Id: bluecloth.c 117 2009-05-14 15:21:03Z deveiant $
  * 
  * = Authors
  * 
@@ -327,7 +327,6 @@ void Init_bluecloth_ext( void ) {
 	rb_define_attr( bluecloth_cBlueCloth, "options", 1, 0 );
 	
 	/* --- Constants ----- */
-	/* special flags for markdown() and mkd_text() */
 
 	/* Do not process `[]' and remove A tags from the output. */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_NOLINKS",  INT2FIX(MKD_NOLINKS) );
@@ -344,7 +343,7 @@ void Init_bluecloth_ext( void ) {
 	/* disable SUPERSCRIPT, RELAXED_EMPHASIS */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_STRICT",   INT2FIX(MKD_STRICT) );
 	
-	/* don't expand `_` and `*` */
+	/* process text inside an html tag; no <em>, no <bold>, no html or [] expansion */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_TAGTEXT",  INT2FIX(MKD_TAGTEXT) );
 	
 	/* don't allow pseudo-protocols */
@@ -359,7 +358,6 @@ void Init_bluecloth_ext( void ) {
 	/* MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_EMBED",    INT2FIX(MKD_EMBED) );
 
-	/* -- special flags for mkd_in() and mkd_string() */
 
 	/* don't process header blocks */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_NOHEADER", INT2FIX(MKD_NOHEADER) );

data/ext/cstring.h

@@ -68,6 +68,7 @@ typedef STRING(char) Cstring;
 
 extern void Csputc(int, Cstring *);
 extern int Csprintf(Cstring *, char *, ...);
+extern int Cswrite(Cstring *, char *, int);
 extern void Csreparse(Cstring *, char *, int, int);
 
 #endif/*_CSTRING_D*/

data/ext/generate.c

@@ -410,6 +410,11 @@ linkyurl(MMIOT *f, int *sizep)
 
     ptr = cursor(f);
 
+    /* if I do (title:blah blah blah) embedded links, I need to subvert
+     * linkyurl to do a lookahead for the pseudo-protocol, then snarf
+     * up everything up to the terminating ')'
+     */
+
     if ( c == '<' ) {
 	pull(f);
 	ptr++;
@@ -1311,29 +1316,6 @@ display(Paragraph *p, MMIOT *f)
 }
 
 
-/*
- * dump out stylesheet sections.
- */
-static int
-stylesheets(Paragraph *p, FILE *f)
-{
-    Line* q;
-
-    for ( ; p ; p = p->next ) {
-	if ( p->typ == STYLE ) {
-	    for ( q = p->text; q ; q = q->next )
-		if ( fwrite(T(q->text), S(q->text), 1, f) == 1 )
-		    putc('\n', f);
-		else
-		    return EOF;
-	}
-	if ( p->down && (stylesheets(p->down, f) == EOF) )
-	    return EOF;
-    }
-    return 0;
-}
-
-
 /* return a pointer to the compiled markdown
  * document.
  */
@@ -1352,36 +1334,3 @@ mkd_document(Document *p, char **res)
     return EOF;
 }
 
-
-/*  public interface for ___mkd_reparse()
- */
-int
-mkd_text(char *bfr, int size, FILE *output, int flags)
-{
-    MMIOT f;
-
-    ___mkd_initmmiot(&f, 0);
-    f.flags = flags & USER_FLAGS;
-    
-    ___mkd_reparse(bfr, size, 0, &f);
-    ___mkd_emblock(&f);
-    if ( flags & CDATA_OUTPUT )
-	___mkd_xml(T(f.out), S(f.out), output);
-    else
-	fwrite(T(f.out), S(f.out), 1, output);
-
-    ___mkd_freemmiot(&f, 0);
-    return 0;
-}
-
-
-/* dump any embedded styles
- */
-int
-mkd_style(Document *d, FILE *f)
-{
-    if ( d && d->compiled )
-	return stylesheets(d->code, f);
-    return EOF;
-}
-

data/ext/markdown.h

@@ -104,9 +104,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*);
 

data/ext/mkdio.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,7 +59,8 @@ 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_TOC		0x1000	/* do table-of-contents processing */

data/ext/resource.c

@@ -145,25 +145,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/lib/bluecloth.rb

@@ -18,7 +18,7 @@
 # 
 # == Version
 #
-#  $Id: bluecloth.rb 115 2009-04-29 13:12:34Z deveiant $
+#  $Id: bluecloth.rb 118 2009-05-14 15:26:02Z deveiant $
 # 
 # == License
 # 
@@ -29,13 +29,13 @@
 class BlueCloth
 
 	# Release Version
-	VERSION = '2.0.1'
+	VERSION = '2.0.2'
 
 	# SVN Revision
-	SVNREV = %q$Rev: 115 $
+	SVNREV = %q$Rev: 118 $
 
 	# SVN Id tag
-	SVNID = %q$Id: bluecloth.rb 115 2009-04-29 13:12:34Z deveiant $
+	SVNID = %q$Id: bluecloth.rb 118 2009-05-14 15:26:02Z deveiant $
 
 	# The defaults for all supported options.
 	DEFAULT_OPTIONS = {
@@ -52,7 +52,7 @@ class BlueCloth
 	# The number of characters of the original markdown source to include in the 
 	# output of #inspect
 	INSPECT_TEXT_LENGTH = 50
-	
+
 
 	#################################################################
 	###	C L A S S   M E T H O D S
@@ -84,6 +84,7 @@ class BlueCloth
         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
 
 		return flags
 	end
@@ -92,7 +93,7 @@ class BlueCloth
 	### Returns a Hash that reflects the settings from the specified +flags+ Integer.
 	def self::opthash_from_flags( flags=0 )
 		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
@@ -103,6 +104,7 @@ class BlueCloth
         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
 
 		return opthash
 	end
@@ -130,8 +132,8 @@ class BlueCloth
 	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 )
@@ -140,8 +142,8 @@ class BlueCloth
 			"via #filter_html=. You now must create the BlueCloth object with the :escape_html" +
 			"option set to true instead."
 	end
-	
-	
+
+
 
 end # class BlueCloth