rdiscount 1.6.8 → 2.0.7

data/ext/tags.c

@@ -61,6 +61,9 @@ mkd_search_tags(char *pat, int len)
 }
 
 
+static int populated = 0;
+
+
 /* load in the standard collection of html tags that markdown supports
  */
 void
@@ -70,8 +73,6 @@ mkd_prepare_tags()
 #define KW(x)	mkd_define_tag(x, 0)
 #define SC(x)	mkd_define_tag(x, 1)
 
-    static int populated = 0;
-
     if ( populated ) return;
     populated = 1;
     
@@ -108,3 +109,15 @@ mkd_prepare_tags()
 
     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

@@ -12,6 +12,7 @@ struct kw {
 
 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);
 

data/ext/toc.c

@@ -22,53 +22,66 @@ mkd_toc(Document *p, char **doc)
     Paragraph *tp, *srcp;
     int last_hnumber = 0;
     Cstring res;
+    int size;
     
-    CREATE(res);
-    RESERVE(res, 100);
+    if ( !(doc && p && p->ctx) ) return -1;
 
     *doc = 0;
+    
+    if ( ! (p->ctx->flags & MKD_TOC) ) return 0;
 
-    if ( !(p && p->ctx) ) return -1;
-    if ( ! (p->ctx->flags & TOC) ) return 0;
+    CREATE(res);
+    RESERVE(res, 100);
 
     for ( tp = p->code; tp ; tp = tp->next ) {
 	if ( tp->typ == SOURCE ) {
 	    for ( srcp = tp->down; srcp; srcp = srcp->next ) {
 		if ( srcp->typ == HDR && srcp->text ) {
 	    
-		    if ( last_hnumber == srcp->hnumber )
-			Csprintf(&res,  "%*s</li>\n", srcp->hnumber, "");
-		    else while ( last_hnumber > srcp->hnumber ) {
-			Csprintf(&res, "%*s</li>\n%*s</ul>\n",
-					 last_hnumber, "",
-					 last_hnumber-1,"");
-			--last_hnumber;
+		    if ( last_hnumber >= srcp->hnumber ) {
+			while ( last_hnumber > srcp->hnumber ) {
+			    Csprintf(&res, "%*s</ul></li>\n", last_hnumber-1,"");
+			    --last_hnumber;
+			}
 		    }
 
 		    while ( srcp->hnumber > last_hnumber ) {
-			Csprintf(&res, "\n%*s<ul>\n", srcp->hnumber, "");
+			Csprintf(&res, "%*s%s<ul>\n", last_hnumber, "",
+				    last_hnumber ? "<li>" : "");
 			++last_hnumber;
 		    }
 		    Csprintf(&res, "%*s<li><a href=\"#", srcp->hnumber, "");
-		    mkd_string_to_anchor(T(srcp->text->text), S(srcp->text->text), Csputc, &res);
+		    mkd_string_to_anchor(T(srcp->text->text),
+					 S(srcp->text->text),
+					 (mkd_sta_function_t)Csputc, &res,1);
 		    Csprintf(&res, "\">");
-		    Csreparse(&res, T(srcp->text->text), S(srcp->text->text), 0);
+		    mkd_string_to_anchor(T(srcp->text->text),
+					 S(srcp->text->text),
+					 (mkd_sta_function_t)Csputc, &res,0);
 		    Csprintf(&res, "</a>");
+		    Csprintf(&res, "</li>\n");
 		}
 	    }
         }
     }
 
     while ( last_hnumber > 0 ) {
-	Csprintf(&res, "%*s</li>\n%*s</ul>\n",
-			last_hnumber, "", last_hnumber, "");
 	--last_hnumber;
+	Csprintf(&res, last_hnumber ? "%*s</ul></li>\n" : "%*s</ul>\n", last_hnumber, "");
     }
+
+    if ( (size = S(res)) > 0 ) {
+	EXPAND(res) = 0;
 			/* HACK ALERT! HACK ALERT! HACK ALERT! */
-    *doc = T(res);	/* we know that a T(Cstring) is a character pointer */
-			/* so we can simply pick it up and carry it away, */
-    return S(res);	/* leaving the husk of the Ctring on the stack */
-			/* END HACK ALERT */
+	*doc = T(res);  /* we know that a T(Cstring) is a character pointer
+			 * so we can simply pick it up and carry it away,
+			 * leaving the husk of the Ctring on the stack
+			 * END HACK ALERT
+			 */
+    }
+    else
+	DELETE(res);
+    return size;
 }
 
 
@@ -82,9 +95,9 @@ mkd_generatetoc(Document *p, FILE *out)
     int ret = EOF;
 
     if ( sz > 0 )
-	ret = fwrite(buf, sz, 1, out);
+	ret = fwrite(buf, 1, sz, out);
 
     if ( buf ) free(buf);
 
-    return ret;
+    return (ret == sz) ? ret : EOF;
 }

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '1.6.8'
+  VERSION = '2.0.7'
 
   # Original Markdown formatted text.
   attr_reader :text
@@ -42,6 +42,9 @@ class RDiscount
   # included for compatibility.
   attr_accessor :fold_lines
 
+  # Enable php markdown extra-style footnotes
+  attr_accessor :footnotes
+
   # Enable Table Of Contents generation
   attr_accessor :generate_toc
 
@@ -75,6 +78,7 @@ class RDiscount
   # * <tt>:filter_html</tt> - Do not output any raw HTML tags included in
   #   the source text.
   # * <tt>:fold_lines</tt> - RedCloth compatible line folding (not used).
+  # * <tt>:footnotes</tt> - PHP markdown extra-style footnotes.
   # * <tt>:generate_toc</tt> - Enable Table Of Contents generation
   # * <tt>:no_image</tt> - Do not output any <tt><img></tt> tags.
   # * <tt>:no_links</tt> - Do not output any <tt><a></tt> tags.

data/rdiscount.gemspec

@@ -1,12 +1,11 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '1.6.8'
+  s.version = '2.0.7'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  s.date = '2011-01-25'
+  s.date = '2013-01-29'
   s.email = 'rtomayko@gmail.com'
   s.homepage = 'http://github.com/rtomayko/rdiscount'
-  s.has_rdoc = true
-  s.authors = ["Ryan Tomayko", "David Loren Parsons", "Andrew White"]
+  s.authors = ["Ryan Tomayko", "David Loren Parsons", "Andrew White", "David Foster"]
   # = MANIFEST =
   s.files = %w[
     BUILDING
@@ -33,6 +32,7 @@ Gem::Specification.new do |s|
     ext/mkdio.h
     ext/rdiscount.c
     ext/resource.c
+    ext/setup.c
     ext/tags.c
     ext/tags.h
     ext/toc.c

data/test/rdiscount_test.rb

@@ -48,12 +48,12 @@ class RDiscountTest < Test::Unit::TestCase
   def test_that_generate_toc_sets_toc_ids
     rd = RDiscount.new("# Level 1\n\n## Level 2", :generate_toc)
     assert rd.generate_toc
-    assert_equal %(<h1 id="Level+1\">Level 1</h1>\n\n<h2 id="Level+2\">Level 2</h2>\n), rd.to_html
+    assert_equal %(<a name="Level.1"></a>\n<h1>Level 1</h1>\n\n<a name="Level.2"></a>\n<h2>Level 2</h2>\n), rd.to_html
   end
 
   def test_should_get_the_generated_toc
     rd = RDiscount.new("# Level 1\n\n## Level 2", :generate_toc)
-    exp = %(<ul>\n <li><a href="#Level+1">Level 1</a>\n  <ul>\n  <li><a href="#Level+2">Level 2</a>  </li>\n  </ul>\n </li>\n </ul>)
+    exp = %(<ul>\n <li><a href="#Level.1">Level 1</a></li>\n <li><ul>\n  <li><a href="#Level.2">Level 2</a></li>\n </ul></li>\n</ul>)
     assert_equal exp, rd.toc_content.strip
   end
 
@@ -108,4 +108,14 @@ EOS
     rd = RDiscount.new("foo <asdf-qwerty>bar</asdf-qwerty> and <a_b>baz</a_b>")
     assert_equal "<p>foo <asdf-qwerty>bar</asdf-qwerty> and <a_b>baz</a_b></p>\n", rd.to_html
   end
+
+  def test_that_footnotes_flag_works
+    rd = RDiscount.new(<<EOS, :footnotes)
+Obtuse text.[^1]
+
+[^1]: Clarification
+EOS
+    assert rd.to_html.include?('<a href="#fn:1" rel="footnote">1</a>')
+  end
+
 end

metadata

@@ -1,35 +1,28 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rdiscount
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  - 8
-  version: 1.6.8
+version: !ruby/object:Gem::Version
+  version: 2.0.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ryan Tomayko
 - David Loren Parsons
 - Andrew White
+- David Foster
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-25 00:00:00 -08:00
-default_executable: 
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: rtomayko@gmail.com
-executables: 
+executables:
 - rdiscount
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - COPYING
-files: 
+files:
 - BUILDING
 - COPYING
 - README.markdown
@@ -53,6 +46,7 @@ files:
 - ext/mkdio.h
 - ext/rdiscount.c
 - ext/resource.c
+- ext/setup.c
 - ext/tags.c
 - ext/tags.h
 - ext/toc.c
@@ -67,40 +61,30 @@ files:
 - test/benchmark.txt
 - test/markdown_test.rb
 - test/rdiscount_test.rb
-has_rdoc: true
 homepage: http://github.com/rtomayko/rdiscount
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: wink
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Fast Implementation of Gruber's Markdown in C
-test_files: 
+test_files:
 - test/markdown_test.rb
 - test/rdiscount_test.rb