bluecloth 2.0.2 → 2.0.3

data/ChangeLog

@@ -1,3 +1,14 @@
+-- Tue, 26 May 2009 05:08:15 -0000 by deveiant (r121) -----
+   Added:   ext/Csio.c (new)
+            ext/xmlpage.c (new)
+            ext/xml.c (new)
+            ext/css.c (new)
+   Changed: spec/markdowntest_spec.rb
+
+    * Fixing tests under Ruby 1.9.1. Thanks to Diego Elio Pettenò for the fix.
+    * Adding Discount files for missing symbols on some platforms.
+
+
 -- Thu, 14 May 2009 15:26:02 -0000 by deveiant (r118) -----
    Changed: lib/bluecloth.rb
 

data/ext/Csio.c

@@ -0,0 +1,61 @@
+#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;
+}
+
+
+/* write() into a cstring
+ */
+int
+Cswrite(Cstring *iot, char *bfr, int size)
+{
+    RESERVE(*iot, size);
+    memcpy(T(*iot)+S(*iot), bfr, size);
+    S(*iot) += size;
+    return size;
+}
+
+
+/* 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/css.c

@@ -0,0 +1,76 @@
+/* markdown: a C implementation of John Gruber's Markdown markup language.
+ *
+ * Copyright (C) 2009 David L Parsons.
+ * The redistribution terms are provided in the COPYRIGHT file that must
+ * be distributed with this source code.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <time.h>
+#include <ctype.h>
+
+#include "config.h"
+
+#include "cstring.h"
+#include "markdown.h"
+#include "amalloc.h"
+
+
+/*
+ * dump out stylesheet sections.
+ */
+static void
+stylesheets(Paragraph *p, Cstring *f)
+{
+    Line* q;
+
+    for ( ; p ; p = p->next ) {
+	if ( p->typ == STYLE ) {
+	    for ( q = p->text; q ; q = q->next )
+		Cswrite(f, T(q->text), S(q->text));
+		Csputc('\n', f);
+	}
+	if ( p->down )
+	    stylesheets(p->down, f);
+    }
+}
+
+
+/* dump any embedded styles to a string
+ */
+int
+mkd_css(Document *d, char **res)
+{
+    Cstring f;
+
+    if ( res && *res && d && d->compiled ) {
+	CREATE(f);
+	RESERVE(f, 100);
+	stylesheets(d->code, &f);
+			
+			/* HACK ALERT! HACK ALERT! HACK ALERT! */
+	*res = T(f);	/* we know that a T(Cstring) is a character pointer */
+			/* so we can simply pick it up and carry it away, */
+	return S(f);	/* leaving the husk of the Ctring on the stack */
+			/* END HACK ALERT */
+    }
+    return EOF;
+}
+
+
+/* dump any embedded styles to a file
+ */
+int
+mkd_generatecss(Document *d, FILE *f)
+{
+    char *res;
+    int written = EOF, size = mkd_css(d, &res);
+
+    if ( size > 0 )
+	written = fwrite(res, size, 1, f);
+    if ( res )
+	free(res);
+    return (written == size) ? size : EOF;
+}

data/ext/xml.c

@@ -0,0 +1,82 @@
+/* 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 <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <time.h>
+#include <ctype.h>
+
+#include "config.h"
+
+#include "cstring.h"
+#include "markdown.h"
+#include "amalloc.h"
+
+/* return the xml version of a character
+ */
+static char *
+mkd_xmlchar(unsigned char c)
+{
+    switch (c) {
+    case '<':   return "&lt;";
+    case '>':   return "&gt;";
+    case '&':   return "&amp;";
+    case '"':   return "&quot;";
+    case '\'':  return "&apos;";
+    default:    if ( isascii(c) || (c & 0x80) )
+		    return 0;
+		return "";
+    }
+}
+
+
+/* write output in XML format
+ */
+int
+mkd_generatexml(char *p, int size, FILE *out)
+{
+    unsigned char c;
+    char *entity;
+
+    while ( size-- > 0 ) {
+	c = *p++;
+
+	if ( entity = mkd_xmlchar(c) )
+	    fputs(entity, out);
+	else
+	    fputc(c, out);
+    }
+    return 0;
+}
+
+
+/* build a xml'ed version of a string
+ */
+int
+mkd_xml(char *p, int size, char **res)
+{
+    unsigned char c;
+    char *entity;
+    Cstring f;
+
+    CREATE(f);
+    RESERVE(f, 100);
+
+    while ( size-- > 0 ) {
+	c = *p++;
+	if ( entity = mkd_xmlchar(c) )
+	    Cswrite(&f, entity, strlen(entity));
+	else
+	    Csputc(c, &f);
+    }
+			/* HACK ALERT! HACK ALERT! HACK ALERT! */
+    *res = T(f);	/* we know that a T(Cstring) is a character pointer */
+			/* so we can simply pick it up and carry it away, */
+    return S(f);	/* leaving the husk of the Ctring on the stack */
+			/* END HACK ALERT */
+}

data/ext/xmlpage.c

@@ -0,0 +1,48 @@
+/*
+ * xmlpage -- write a skeletal xhtml page
+ *
+ * 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 <stdlib.h>
+#include <ctype.h>
+
+#include "cstring.h"
+#include "markdown.h"
+#include "amalloc.h"
+
+
+int
+mkd_xhtmlpage(Document *p, int flags, FILE *out)
+{
+    char *title;
+    extern char *mkd_doc_title(Document *);
+    
+    if ( mkd_compile(p, flags) ) {
+	fprintf(out, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+	fprintf(out, "<!DOCTYPE html "
+		     " PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""
+		     " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n");
+
+	fprintf(out, "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n");
+
+	fprintf(out, "<head>\n");
+	if ( title = mkd_doc_title(p) )
+	    fprintf(out, "<title>%s</title>\n", title);
+	mkd_generatecss(p, out);
+	fprintf(out, "</head>\n");
+	
+	fprintf(out, "<body>\n");
+	mkd_generatehtml(p, out);
+	fprintf(out, "</body>\n");
+	fprintf(out, "</html>\n");
+	
+	mkd_cleanup(p);
+
+	return 0;
+    }
+    return -1;
+}

data/lib/bluecloth.rb

@@ -29,7 +29,7 @@
 class BlueCloth
 
 	# Release Version
-	VERSION = '2.0.2'
+	VERSION = '2.0.3'
 
 	# SVN Revision
 	SVNREV = %q$Rev: 118 $

data/rake/packaging.rb

@@ -1,6 +1,6 @@
 # 
 # Packaging Rake Tasks
-# $Id: packaging.rb 99 2009-04-14 13:03:03Z deveiant $
+# $Id: packaging.rb 102 2009-05-23 21:40:00Z deveiant $
 # 
 
 require 'rbconfig'
@@ -35,6 +35,24 @@ file gempath.to_s => [PKGDIR.to_s] + GEMSPEC.files do
 	end
 end
 
+svnrev = get_svn_rev()
+prerelease_gem_file_name = "#{PKG_FILE_NAME}.#{svnrev}.gem"
+prerelease_gempath = PKGDIR + prerelease_gem_file_name
+
+desc "Build a pre-release RubyGem package"
+task :prerelease_gem => prerelease_gempath.to_s
+file prerelease_gempath.to_s => [PKGDIR.to_s] + GEMSPEC.files do
+	when_writing( "Creating prerelease GEM" ) do
+		gemspec = GEMSPEC.clone
+		gemspec.version = Gem::Version.create( "%s.%d" % [GEMSPEC.version, svnrev] )
+		Gem::Builder.new( gemspec ).build
+		verbose( true ) do
+			mv prerelease_gem_file_name, prerelease_gempath
+		end
+	end
+end
+
+
 ### Task: install
 desc "Install #{PKG_NAME} as a conventional library"
 task :install => "spec:quiet" do

data/rake/publishing.rb

@@ -26,8 +26,8 @@ class Net::SMTP
 			return self
 		end
 	end
-	
-	
+
+
 	#######
 	private
 	#######
@@ -111,7 +111,7 @@ begin
 			$publish_privately = true
 			Rake::Task['release:rerelease'].invoke
 		end
-		
+
 
 		desc "Generate the release notes"
 		task :notes => [RELEASE_NOTES_FILE]
@@ -130,12 +130,12 @@ begin
 			edit task.name
 		end
 		CLOBBER.include( RELEASE_NOTES_FILE )
-		
-		
+
+
 		desc "Upload project documentation and packages to #{PROJECT_HOST}"
 		task :upload => [ :upload_docs, :upload_packages ]
 		task :project => :upload # the old name
-		
+
 		desc "Publish the project docs to #{PROJECT_HOST}"
 		task :upload_docs => [ :rdoc ] do
 			when_writing( "Publishing docs to #{PROJECT_SCPDOCURL}" ) do
@@ -172,7 +172,7 @@ begin
 				== Installation
 
 				Via gems:
-				
+
 				  $ sudo gem install #{GEMSPEC.name}
 
 				or from source:
@@ -185,7 +185,7 @@ begin
 				== Changes
 				#{relnotes}
 			}.gsub( /^\t+/, '' )
-			
+
 			File.open( task.name, File::WRONLY|File::TRUNC|File::CREAT ) do |fh|
 				fh.print( announce_body )
 			end
@@ -193,8 +193,8 @@ begin
 			edit task.name
 		end
 		CLOBBER.include( RELEASE_ANNOUNCE_FILE )
-		
-		
+
+
 		desc 'Send out a release announcement'
 		task :announce => [RELEASE_ANNOUNCE_FILE] do
 			email         = TMail::Mail.new
@@ -217,13 +217,13 @@ begin
 			puts '---',
 			     email.to_s,
 			     '---'
-			
+
 				ask_for_confirmation( "Will send via #{SMTP_HOST}." ) do
 				pwent = Etc.getpwuid( Process.euid )
 				curuser = pwent ? pwent.name : 'unknown'
 				username = prompt_with_default( "SMTP user", curuser )
 				password = prompt_for_password()
-			
+
 				trace "Creating SMTP connection to #{SMTP_HOST}:#{SMTP_PORT}"
 				smtp = Net::SMTP.new( SMTP_HOST, SMTP_PORT )
 				smtp.set_debug_output( $stdout )
@@ -237,8 +237,8 @@ begin
 				trace "done."
 			end
 		end
-		
-	
+
+
 		desc 'Publish the new release to RubyForge'
 		task :publish => [:clean, :package, :notes] do |task|
 			project = GEMSPEC.rubyforge_project
@@ -260,9 +260,9 @@ begin
 						rf.create_package( group_id, project )
 					end
 				end
-			
+
 				package_id = rf.autoconfig['package_ids'][ project ]
-     
+
 				# Make sure this release doesn't already exist
 				releases = rf.autoconfig['release_ids']
 				if releases.key?( GEMSPEC.name ) && releases[ GEMSPEC.name ].key?( PKG_VERSION )
@@ -297,17 +297,17 @@ begin
 			end
 		end
 	end
-	
+
 rescue LoadError => err
 	if !Object.const_defined?( :Gem )
 		require 'rubygems'
 		retry
 	end
-	
+
 	task :no_release_tasks do
 		fail "Release tasks not defined: #{err.message}"
 	end
-	
+
 	task :release => :no_release_tasks
 	task "release:announce" => :no_release_tasks
 	task "release:publish" => :no_release_tasks

data/rake/win32.rb

@@ -56,7 +56,7 @@ CONFIGURE_CMD = %W[
     ./configure
 	    --host=i386-mingw32
 	    --target=i386-mingw32
-	    --build=#{Gem::Platform.local}
+	    --build=#{Config::CONFIG['build']}
 	    --prefix=#{XCOMPILER_DIR}
 ]
 
@@ -144,7 +144,7 @@ begin
 				run *CONFIGURE_CMD
 				run 'make', 'ruby'
 				run 'make', 'rubyw.exe'
-				run 'make', '-n', 'install'
+				run 'make', 'install'
 			end
 		end
 

data/spec/markdowntest_spec.rb

@@ -39,6 +39,9 @@ describe BlueCloth, "-- MarkdownTest 1.0.3: " do
 		rescue RuntimeError => err
 			@have_libtidy = false
 			@tidy_error = err.message
+		rescue DL::DLError => err
+			@have_libtidy = false
+			@tidy_error = err.message
 		else
 			@have_libtidy = true
 			@tidy_error = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bluecloth
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Michael Granger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-14 00:00:00 -07:00
+date: 2009-06-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -132,7 +132,11 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.7.0.0
     version: 
-description: "BlueCloth is a Ruby implementation of [Markdown][1], 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)."
+description: |-
+  BlueCloth is a Ruby implementation of [Markdown][1], 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).
 email: ged@FaerieMUD.org
 executables: 
 - bluecloth
@@ -171,12 +175,16 @@ files:
 - bin/bluecloth
 - lib/bluecloth.rb
 - ext/bluecloth.c
+- ext/Csio.c
+- ext/css.c
 - ext/docheader.c
 - ext/generate.c
 - ext/markdown.c
 - ext/mkdio.c
 - ext/resource.c
 - ext/version.c
+- ext/xml.c
+- ext/xmlpage.c
 - ext/amalloc.h
 - ext/config.h
 - ext/cstring.h
@@ -280,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bluecloth
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: BlueCloth is a Ruby implementation of Markdown