redcarpet 1.13.1 → 1.13.2

data/README.markdown

@@ -34,14 +34,18 @@ Usage
 
 Redcarpet implements the basic protocol popularized by RedCloth:
 
-    require 'redcarpet'
-    markdown = Redcarpet.new("Hello World!")
-    puts markdown.to_html
+~~~~~~ {ruby}
+require 'redcarpet'
+markdown = Redcarpet.new("Hello World!")
+puts markdown.to_html
+~~~~~~
 
 Additional processing options can be turned on when creating the
 Redcarpet object:
 
-    markdown = Redcarpet.new("Hello World!", :smart, :filter_html)
+~~~~~~ {ruby}
+markdown = Redcarpet.new("Hello World!", :smart, :filter_html)
+~~~~~~
 
 Note that by default, Redcarpet parses standard Markdown (with no extensions)
 and offers a sane subset of parse options which allow you to modify the rendering

data/ext/redcarpet/buffer.c

@@ -188,7 +188,7 @@ void
 bufnullterm(struct buf *buf) {
 	if (!buf || !buf->unit) return;
 	if (buf->size < buf->asize && buf->data[buf->size] == 0) return;
-	if (bufgrow(buf, buf->size + 1))
+	if (buf->size + 1 <= buf->asize || bufgrow(buf, buf->size + 1))
 		buf->data[buf->size] = 0; }
 
 
@@ -205,7 +205,9 @@ bufprintf(struct buf *buf, const char *fmt, ...) {
 /* bufput • appends raw data to a buffer */
 void
 bufput(struct buf *buf, const void *data, size_t len) {
-	if (!buf || !bufgrow(buf, buf->size + len)) return;
+	if (!buf) return;
+	if (buf->size + len > buf->asize && !bufgrow(buf, buf->size + len))
+		return;
 	memcpy(buf->data + buf->size, data, len);
 	buf->size += len; }
 
@@ -219,7 +221,9 @@ bufputs(struct buf *buf, const char *str) {
 /* bufputc • appends a single char to a buffer */
 void
 bufputc(struct buf *buf, char c) {
-	if (!buf || !bufgrow(buf, buf->size + 1)) return;
+	if (!buf) return;
+	if (buf->size + 1 > buf->asize && !bufgrow(buf, buf->size + 1))
+		return;
 	buf->data[buf->size] = c;
 	buf->size += 1; }
 

data/ext/redcarpet/html.c

@@ -278,11 +278,11 @@ rndr_header(struct buf *ob, struct buf *text, int level, void *opaque)
 	if (ob->size)
 		bufputc(ob, '\n');
 
-	if (options->flags & HTML_TOC) {
-		bufprintf(ob, "<a name=\"toc_%d\"></a>", options->toc_data.header_count++);
-	}
+	if (options->flags & HTML_TOC)
+		bufprintf(ob, "<h%d id=\"toc_%d\">", level, options->toc_data.header_count++);
+	else
+		bufprintf(ob, "<h%d>", level);
 
-	bufprintf(ob, "<h%d>", level);
 	if (text) bufput(ob, text->data, text->size);
 	bufprintf(ob, "</h%d>\n", level);
 }
@@ -511,20 +511,20 @@ toc_header(struct buf *ob, struct buf *text, int level, void *opaque)
 {
 	struct html_renderopt *options = opaque;
 
-	if (level > options->toc_data.current_level) {
-		if (level > 1)
+	while (level > options->toc_data.current_level) {
+		if (options->toc_data.current_level > 0)
 			BUFPUTSL(ob, "<li>");
 		BUFPUTSL(ob, "<ul>\n");
+		options->toc_data.current_level++;
 	}
-	
-	if (level < options->toc_data.current_level) {
+
+	while (level < options->toc_data.current_level) {
 		BUFPUTSL(ob, "</ul>");
 		if (options->toc_data.current_level > 1)
 			BUFPUTSL(ob, "</li>\n");
+		options->toc_data.current_level--;
 	}
 
-	options->toc_data.current_level = level;
-
 	bufprintf(ob, "<li><a href=\"#toc_%d\">", options->toc_data.header_count++);
 	if (text)
 		bufput(ob, text->data, text->size);

data/ext/redcarpet/markdown.c

@@ -2215,4 +2215,12 @@ ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer,
 	parr_free(&rndr.work_bufs[BUFFER_BLOCK]);
 }
 
+void
+ups_version(int *ver_major, int *ver_minor, int *ver_revision)
+{
+	*ver_major = UPSKIRT_VER_MAJOR;
+	*ver_minor = UPSKIRT_VER_MINOR;
+	*ver_revision = UPSKIRT_VER_REVISION;
+}
+
 /* vim: set filetype=c: */

data/ext/redcarpet/markdown.h

@@ -21,6 +21,11 @@
 
 #include "buffer.h"
 
+#define UPSKIRT_VERSION "1.2.0"
+#define UPSKIRT_VER_MAJOR 1
+#define UPSKIRT_VER_MINOR 2
+#define UPSKIRT_VER_REVISION 0
+
 /********************
  * TYPE DEFINITIONS *
  ********************/
@@ -104,10 +109,14 @@ is_safe_link(const char *link, size_t link_len);
  * EXPORTED FUNCTIONS *
  **********************/
 
-/* markdown • parses the input buffer and renders it into the output buffer */
+/* ups_markdown * parses the input buffer and renders it into the output buffer */
 extern void
 ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndr, unsigned int extensions);
 
+/* ups_version * returns the library version as major.minor.rev */
+extern void
+ups_version(int *major, int *minor, int *revision);
+
 #endif
 
 /* vim: set filetype=c: */

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.13.1'
+  VERSION = '1.13.2'
 
   # Original Markdown formatted text.
   attr_reader :text

data/redcarpet.gemspec

@@ -1,12 +1,11 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.13.1'
+  s.version = '1.13.2'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
-  s.date = '2011-05-06'
+  s.date = '2011-05-16'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
-  s.has_rdoc = true
   s.authors = ["Natacha Porté", "Vicent Martí"]
   # = MANIFEST =
   s.files = %w[

data/test/redcarpet_test.rb

@@ -113,7 +113,7 @@ class RedcarpetTest < Test::Unit::TestCase
   def test_that_generate_toc_sets_toc_ids
     rd = Redcarpet.new("# Level 1\n\n## Level 2", :generate_toc)
     assert rd.generate_toc
-    assert_equal %(<a name="toc_0"></a><h1>Level 1</h1>\n\n<a name="toc_1"></a><h2>Level 2</h2>\n), rd.to_html
+    assert_equal %(<h1 id="toc_0">Level 1</h1>\n\n<h2 id="toc_1">Level 2</h2>\n), rd.to_html
   end
 
   def test_should_get_the_generated_toc

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 39
   prerelease: false
   segments: 
   - 1
   - 13
-  - 1
-  version: 1.13.1
+  - 2
+  version: 1.13.2
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 +03:00
+date: 2011-05-16 00:00:00 +03:00
 default_executable: 
 dependencies: []