redcarpet 1.12.2 → 1.13.0

data/ext/{redcarpet.c → redcarpet/redcarpet.c}

@@ -2,11 +2,11 @@
 #include "ruby.h"
 
 #include "markdown.h"
-#include "xhtml.h"
+#include "html.h"
 
 typedef enum
 {
-	REDCARPET_RENDER_XHTML,
+	REDCARPET_RENDER_HTML,
 	REDCARPET_RENDER_TOC
 } RendererType;
 
@@ -16,41 +16,40 @@ static void rb_redcarpet__get_flags(VALUE ruby_obj,
 		unsigned int *enabled_extensions_p,
 		unsigned int *render_flags_p)
 {
-	unsigned int render_flags = XHTML_EXPAND_TABS;
+	unsigned int render_flags = HTML_EXPAND_TABS;
 	unsigned int extensions = 0;
 
-	/* smart */
-	if (rb_funcall(ruby_obj, rb_intern("smart"), 0) == Qtrue)
-		render_flags |= XHTML_SMARTYPANTS;
-
 	/* filter_html */
 	if (rb_funcall(ruby_obj, rb_intern("filter_html"), 0) == Qtrue)
-		render_flags |= XHTML_SKIP_HTML;
+		render_flags |= HTML_SKIP_HTML;
 
 	/* no_image */
 	if (rb_funcall(ruby_obj, rb_intern("no_image"), 0) == Qtrue)
-		render_flags |= XHTML_SKIP_IMAGES;
+		render_flags |= HTML_SKIP_IMAGES;
 
 	/* no_links */
 	if (rb_funcall(ruby_obj, rb_intern("no_links"), 0) == Qtrue)
-		render_flags |= XHTML_SKIP_LINKS;
+		render_flags |= HTML_SKIP_LINKS;
 
 	/* filter_style */
 	if (rb_funcall(ruby_obj, rb_intern("filter_styles"), 0) == Qtrue)
-		render_flags |= XHTML_SKIP_STYLE;
+		render_flags |= HTML_SKIP_STYLE;
 
 	/* safelink */
 	if (rb_funcall(ruby_obj, rb_intern("safelink"), 0) == Qtrue)
-		render_flags |= XHTML_SAFELINK;
+		render_flags |= HTML_SAFELINK;
 
 	if (rb_funcall(ruby_obj, rb_intern("generate_toc"), 0) == Qtrue)
-		render_flags |= XHTML_TOC;
+		render_flags |= HTML_TOC;
 
 	if (rb_funcall(ruby_obj, rb_intern("hard_wrap"), 0) == Qtrue)
-		render_flags |= XHTML_HARD_WRAP;
+		render_flags |= HTML_HARD_WRAP;
 
 	if (rb_funcall(ruby_obj, rb_intern("gh_blockcode"), 0) == Qtrue)
-		render_flags |= XHTML_GITHUB_BLOCKCODE;
+		render_flags |= HTML_GITHUB_BLOCKCODE;
+
+	if (rb_funcall(ruby_obj, rb_intern("xhtml"), 0) == Qtrue)
+		render_flags |= HTML_USE_XHTML;
 
 	/**
 	 * Markdown extensions -- all disabled by default 
@@ -98,12 +97,12 @@ static VALUE rb_redcarpet__render(VALUE self, RendererType render_type)
 	rb_redcarpet__get_flags(self, &enabled_extensions, &render_flags);
 
 	switch (render_type) {
-	case REDCARPET_RENDER_XHTML:
-		ups_xhtml_renderer(&renderer, render_flags);
+	case REDCARPET_RENDER_HTML:
+		upshtml_renderer(&renderer, render_flags);
 		break;
 
 	case REDCARPET_RENDER_TOC:
-		ups_toc_renderer(&renderer);
+		upshtml_toc_renderer(&renderer);
 		break;
 
 	default:
@@ -112,9 +111,17 @@ static VALUE rb_redcarpet__render(VALUE self, RendererType render_type)
 
 	ups_markdown(output_buf, &input_buf, &renderer, enabled_extensions);
 
-	result = rb_str_new(output_buf->data, output_buf->size);
+	if (rb_funcall(self, rb_intern("smart"), 0) == Qtrue) {
+		struct buf *smart_buf = bufnew(128);
+		upshtml_smartypants(smart_buf, output_buf);
+		result = rb_str_new(smart_buf->data, smart_buf->size);
+		bufrelease(smart_buf);
+	} else {
+		result = rb_str_new(output_buf->data, output_buf->size);
+	}
+
 	bufrelease(output_buf);
-	ups_free_renderer(&renderer);
+	upshtml_free_renderer(&renderer);
 
 	/* force the input encoding */
 	if (rb_respond_to(text, rb_intern("encoding"))) {
@@ -134,7 +141,7 @@ rb_redcarpet_toc(int argc, VALUE *argv, VALUE self)
 static VALUE
 rb_redcarpet_to_html(int argc, VALUE *argv, VALUE self)
 {
-	return rb_redcarpet__render(self, REDCARPET_RENDER_XHTML);
+	return rb_redcarpet__render(self, REDCARPET_RENDER_HTML);
 }
 
 void Init_redcarpet()

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.12.2'
+  VERSION = '1.13.0'
 
   # Original Markdown formatted text.
   attr_reader :text
@@ -76,6 +76,9 @@ class Redcarpet
   # Do not render emphasis_inside_words
   attr_accessor :no_intraemphasis
 
+  # Generate XHTML 1.0 compilant self-closing tags (e.g. <br/>)
+  attr_accessor :xhtml
+
   def initialize(text, *extensions)
     @text  = text
     extensions.each { |e| send("#{e}=", true) }

data/redcarpet.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.12.2'
+  s.version = '1.13.0'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
-  s.date = '2011-05-01'
+  s.date = '2011-05-06'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
   s.has_rdoc = true
@@ -14,16 +14,17 @@ Gem::Specification.new do |s|
     README.markdown
     Rakefile
     bin/redcarpet
-    ext/array.c
-    ext/array.h
-    ext/buffer.c
-    ext/buffer.h
-    ext/extconf.rb
-    ext/markdown.c
-    ext/markdown.h
-    ext/redcarpet.c
-    ext/xhtml.c
-    ext/xhtml.h
+    ext/redcarpet/array.c
+    ext/redcarpet/array.h
+    ext/redcarpet/buffer.c
+    ext/redcarpet/buffer.h
+    ext/redcarpet/extconf.rb
+    ext/redcarpet/html.c
+    ext/redcarpet/html.h
+    ext/redcarpet/html_smartypants.c
+    ext/redcarpet/markdown.c
+    ext/redcarpet/markdown.h
+    ext/redcarpet/redcarpet.c
     lib/markdown.rb
     lib/redcarpet.rb
     redcarpet.gemspec
@@ -36,7 +37,7 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.test_files = ["test/markdown_test.rb", "test/redcarpet_test.rb"]
   s.extra_rdoc_files = ["COPYING"]
-  s.extensions = ["ext/extconf.rb"]
+  s.extensions = ["ext/redcarpet/extconf.rb"]
   s.executables = ["redcarpet"]
   s.require_paths = ["lib"]
 end

data/test/redcarpet_test.rb

@@ -231,6 +231,6 @@ this should have a line break
 This is just a test.
 text
   
-    assert rd.to_html =~ /<br\/>/
+    assert rd.to_html =~ /<br>/
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  version: 1.12.2
+  hash: 35
+  prerelease: false
+  segments: 
+  - 1
+  - 13
+  - 0
+  version: 1.13.0
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -10,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 +03:00
+date: 2011-05-06 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -19,7 +25,7 @@ email: vicent@github.com
 executables: 
 - redcarpet
 extensions: 
-- ext/extconf.rb
+- ext/redcarpet/extconf.rb
 extra_rdoc_files: 
 - COPYING
 files: 
@@ -27,16 +33,17 @@ files:
 - README.markdown
 - Rakefile
 - bin/redcarpet
-- ext/array.c
-- ext/array.h
-- ext/buffer.c
-- ext/buffer.h
-- ext/extconf.rb
-- ext/markdown.c
-- ext/markdown.h
-- ext/redcarpet.c
-- ext/xhtml.c
-- ext/xhtml.h
+- ext/redcarpet/array.c
+- ext/redcarpet/array.h
+- ext/redcarpet/buffer.c
+- ext/redcarpet/buffer.h
+- ext/redcarpet/extconf.rb
+- ext/redcarpet/html.c
+- ext/redcarpet/html.h
+- ext/redcarpet/html_smartypants.c
+- ext/redcarpet/markdown.c
+- ext/redcarpet/markdown.h
+- ext/redcarpet/redcarpet.c
 - lib/markdown.rb
 - lib/redcarpet.rb
 - redcarpet.gemspec
@@ -54,21 +61,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for libupskirt